初始化加事务

src/main/java/org/rcisoft/business/bchapter/dao/BChapterRepository.java

@@ -349,7 +349,7 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
 
 
     @Select("<script>" +
-            "SELECT DISTINCT bc.*, bp.business_id as BLPBusinessId, brc.business_id as BRSBusinessId, brc.current_location as currentLocation, bf.video_url as videoUrl, brc.progress as progress, bf.file_url as fileUrl " +
+            "SELECT DISTINCT bc.*, bp.business_id as BLPBusinessId, brc.business_id as BRSBusinessId, brc.current_location as currentLocation, bf.video_url as videoUrl, brc.progress as progress, bf.file_url as fileUrl, bf.file_size as fileSize " +
             "FROM " +
             " b_lesson_person bp " +
             " LEFT JOIN b_chapter bc ON bc.business_id = bp.chapter_id " +

src/main/java/org/rcisoft/core/aop/CurUserAspect.java

@@ -89,13 +89,15 @@ public class CurUserAspect {
                     log.info("--------------------该企业正在初始化--------------------");
 
                     // 同步企业人员
-                    int line = userServiceImpl.synchronizedUsers(curUser.getCorpId());
-                    //初始化角色
-                    int userRoleResult = sysRoleService.addAdminRoleMenuUser(curUser);
-                    // 初始化数据字典表
-                    sysRoleService.initDictionary();
-                    //初始化通知
-                    sysRoleService.initBMessage(curUser);
+//                    int line = userServiceImpl.synchronizedUsers(curUser.getCorpId());
+//                    //初始化角色
+//                    int userRoleResult = sysRoleService.addAdminRoleMenuUser(curUser);
+//                    // 初始化数据字典表
+//                    sysRoleService.initDictionary();
+//                    //初始化通知
+//                    sysRoleService.initBMessage(curUser);
+                    sysRoleService.synAll(curUser);
+
                     log.info("--------------------初始化完成--------------------");
                 }
             }

src/main/java/org/rcisoft/sys/role/service/SysRoleService.java

@@ -11,6 +11,7 @@ import org.rcisoft.sys.role.dto.*;
 import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.user.bean.CurUser;
 
+import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -90,4 +91,6 @@ public interface SysRoleService {
 
     int initBMessage(CurUser curUser);
 
+    int synAll(CurUser curUser) throws ParseException;
+
 }

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -24,6 +24,7 @@ import org.rcisoft.sys.role.service.SysRoleService;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dao.SysUserMapper;
 import org.rcisoft.sys.user.entity.SysUser;
+import org.rcisoft.sys.user.service.SysUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
 import java.util.*;
 
 /**
@@ -53,6 +55,9 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Autowired
     BMessageRepository bMessageRepository;
 
+    @Autowired
+    private SysUserService userServiceImpl;
+
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public int persistRole(AddOrUpdateRoleDTO addOrUpdateRoleDTO) {
@@ -183,7 +188,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT,rollbackFor = Exception.class)
     public int addAdminRoleMenuUser(CurUser curUser) {
 
         String privilege = "M-LESSON-MANAGE,F-ADD-LESSON,F-UPDATE-LESSON,F-CLOSE-LESSON,F-DELETE-LESSON,M-TRAIN-MANAGE,F-ADD-TRAIN,F-UPDATE-TRAIN,F-CLOSE-TRAIN,F-DELETE-TRAIN,M-PRESERVE,F-DOWNLOAD-PRESERVE,F-REPRINT-PRESERVE,F-DELETE-PRESERVE,M-UPLOAD,F-DOWNLOAD-UPLOAD,F-REPRINT-UPLOAD,F-DELETE-UPLOAD,M-CTS-B,F-ONLINE,P-ONLINE-ADD,P-ONLINE-UPDATE,P-ONLINE-APPOINT,P-ONLINE-TRACK,P-ONLINE-RECOMMEND,P-ONLINE-CLOSE,P-ONLINE-DEL,F-UNDERLINE,P-UNDER-ADD,P-UNDER-UPDATE,P-UNDER-APPOINT,P-UNDER-TRACK,P-UNDER-RECOMMEND,P-UNDER-CLOSE,P-UNDER-DEL,F-CATEGORY,P-CATEGORY-ADD,P-CATEGORY-UPDATE,P-CATEGORY-DEL,F-LABEL,P-LABEL-ADD,P-LABEL-UPDATE,P-LABEL-DEL,F-INTEGRAL-M,P-NULL-2,M-QDB,F-QDB,P-QDB-ADD,P-QDB-UPDATE,P-QDB-DELETE,P-QDB-ANALYSIS,F-QES,P-QES-ADD,P-QES-UPDATE,P-QES-DELETE,P-QES-IMPORT,M-PAPER,F-PAPER-CATE,P-PAPER-CATE-ADD,P-PAPER-CATE-UPDATE,P-PAPER-CATE-DELETE,F-PAPER,P-PAPER-ADD,P-PAPER-UPDATE,P-PAPER-DELETE,P-PAPER-CONFIG,P-PAPER-HISTORY-VIEW,P-PAPER-HISTORY-CHECK,M-ANALYSIS,P-ANA-PAPER,P-ANA-EXAM,P-ANA-SCORE,M-SYSTEM,F-MAIN-MANAGE,P-COLUMN,P-BANNER,P-OUTER-LINK,F-USER-MANAGE,P-STOP-START,P-ROLE-EDIT,P-SYNCHRO,F-ROLE-MANAGE,P-ROLE-MANAGE,P-OPERATION,P-DATALIMIT,P-PAPER-CLONE,P-ROLE-DEL,F-NOTICE-MANAGE,F-DAILY-QUESTION,F-GALLERY-MANAGE";
@@ -287,6 +292,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT,rollbackFor = Exception.class)
     public int initDictionary() {
         List<BDictionary> dictionaryList = new ArrayList<>();
         BDictionary bDictionary1 = new BDictionary();
@@ -316,7 +322,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT,rollbackFor = Exception.class)
     public int initBMessage(CurUser curUser) {
         List<BMessage> bMessageList = new ArrayList<>();
         BMessage bMessage = new BMessage(MessageEnum.PXJJKS.getName(),"0","1",curUser.getCorpId(),0);
@@ -350,6 +356,20 @@ public class SysRoleServiceImpl implements SysRoleService {
         return bMessageRepository.insertList(bMessageList);
     }
 
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT,rollbackFor = Exception.class)
+    public int synAll(CurUser curUser) throws ParseException {
+
+        int line = userServiceImpl.synchronizedUsers(curUser.getCorpId());
+        //初始化角色
+        addAdminRoleMenuUser(curUser);
+        // 初始化数据字典表
+        initDictionary();
+        //初始化通知
+        initBMessage(curUser);
+        return line;
+    }
+
 
     List<RoleMenuDTO> setRoleMenu(List<String> menuIds,String rId){
         List<RoleMenuDTO> roleMenuDTOs = new ArrayList<>();

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -31,6 +31,7 @@ import org.rcisoft.sys.user.service.SysUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -418,18 +419,16 @@ public class SysUserServiceImpl implements SysUserService {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT,rollbackFor = Exception.class)
     public int synchronizedUsers(String corpId) throws ParseException {
         SynchronizationTime synchronizationTime = synchronizationTimeServiceImpl.getById(corpId);
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");  //调用智信接口根据更新时间查询所有人员
-        if (null == synchronizationTime) {
-            synchronizationTime = new SynchronizationTime();
-            synchronizationTime.setBusinessId(IdGen.uuid());
-            synchronizationTime.setCorpId(corpId);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            synchronizationTime.setSynchronizationTime(sdf.parse("1999-01-01 00:00:00"));
-            synchronizationTimeServiceImpl.save(synchronizationTime);
+        String updateTime;
+        if (synchronizationTime != null){
+            updateTime = df.format(synchronizationTime.getSynchronizationTime());
+        }else {
+            updateTime = "1999-01-01 00:00:00";
         }
-        String updateTime = df.format(synchronizationTime.getSynchronizationTime());
         List<GetAllRspDTO> userGetRspDTOList = mtCotactApiRequestClient.accountGetMyInfoList(corpId, updateTime);
 //        if (null == userGetRspDTOList) {
 //            throw new ServiceException(ResultServiceEnums.ZX_FAILED);
@@ -459,6 +458,13 @@ public class SysUserServiceImpl implements SysUserService {
             }
             line = this.insertOrUpdateList(personnelsList);
         }
+        if (null == synchronizationTime) {
+            synchronizationTime = new SynchronizationTime();
+            synchronizationTime.setBusinessId(IdGen.uuid());
+            synchronizationTime.setCorpId(corpId);
+            synchronizationTime.setSynchronizationTime(new Date());
+            synchronizationTimeServiceImpl.save(synchronizationTime);
+        }else {
             if (line > 0) {
                 // 同步成功后，更新同步时间
                 synchronizationTime.setSynchronizationTime(new Date());
@@ -466,6 +472,7 @@ public class SysUserServiceImpl implements SysUserService {
             }else {
                 log.info("同步人员......0.......记录");
             }
+        }
         return line;
     }