Merge remote-tracking branch 'origin/meiteng' into meiteng

# Conflicts:
#	src/main/java/org/rcisoft/business/bchapter/dto/QueryChapterListResDTO.java
#	src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java
#	src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java
#	src/main/resources/mapper/business/bchapter/mapper/BChapterMapper.xml

src/main/java/org/rcisoft/EducationApplication.java

@@ -3,8 +3,11 @@ package org.rcisoft;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
@@ -12,13 +15,15 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 /**
  * Created by lcy on 17/8/9.
  */
+@EnableDiscoveryClient
+//@EnableEurekaClient
+@EnableFeignClients
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableAspectJAutoProxy
 @EnableSwagger2
 @EnableScheduling
-//@EnableFeignClients
-//@EnableEurekaClient
+@EnableAsync(proxyTargetClass=true)    //配置代理为cglib代理，默认使用 的是jdk动态代理
 @MapperScan(basePackages = "org.rcisoft.**.dao")//扫描dao 不需要@repository
 public class EducationApplication {
 

src/main/java/org/rcisoft/business/bchapter/controller/BChapterController.java

@@ -71,7 +71,7 @@ public class BChapterController extends PaginationController<BChapter> {
             @ApiImplicitParam(name = "chapterName", value = "章节名", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "pid", value = "上一级（添加节需要）", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "chapterLevel", value = "等级，1：章 2：节", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "isTest", value = "课件类型（单选） 1视频  2音频  3PPT 4pdf 5资料", required = true, dataType = "varchar")})
+            @ApiImplicitParam(name = "type", value = "课件类型（单选） 0视频  1音频  2PPT 3pdf 4资料", required = true, dataType = "varchar")})
     @PostMapping(value = "/add")
     public Result add(CurUser curUser, @Valid BChapter bChapter, BindingResult bindingResult, uploadDTO dto) {
         PersistModel data = bChapterService.persist(bChapter,curUser.getCorpId(),dto);
@@ -116,12 +116,12 @@ public class BChapterController extends PaginationController<BChapter> {
     }
     @ApiOperation(value = "205 查询章节带进度", notes = "根据lessonId查询章节带进度", response = QueryChapterListResDTO.class)
     @GetMapping(value = "/queryBChaptersWithProgress")
-    public Result queryBChaptersWithProgress(CurUser curUser,@Valid QueryChapterListDTO param,BindingResult br) {
+    public Result queryBChaptersWithProgress(CurUser curUser,@Valid String lessonId,BindingResult br) {
         Map<String, Object> map = new HashedMap();
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                bChapterService.queryBChaptersWithProgress(param,curUser.getCorpId()));
+                bChapterService.queryBChaptersWithProgress(lessonId,curUser));
     }
 
 //    @ApiOperation(value = "206 获取uuid", notes = "获取uuid用于添加章节时使用")

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

@@ -110,7 +110,6 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
 
     /**
      * 根据学生ID和章节ID查询该节的学习情况
-     *
      * @param
      * @return
      */

src/main/java/org/rcisoft/business/bchapter/service/BChapterService.java

@@ -8,6 +8,7 @@ import org.rcisoft.business.bfile.dto.uploadDTO;
 import org.rcisoft.business.bfile.entity.BFile;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
+import org.rcisoft.sys.user.bean.CurUser;
 
 import java.util.List;
 import java.util.Map;
@@ -47,10 +48,10 @@ public interface BChapterService{
 
     /**
     * 根据条件查找全部
-    * @param model
+    * @param
     * @return
     */
-    Map queryBChaptersWithProgress(QueryChapterListDTO model,String corpId);
+    Map queryBChaptersWithProgress(String lessonId, CurUser curUser);
 
     /**
     * 插入

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -29,6 +29,7 @@ import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.UserUtil;
+import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dao.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -92,11 +93,14 @@ public class BChapterServiceImpl implements BChapterService {
     }
 
     @Override
-    public Map queryBChaptersWithProgress(QueryChapterListDTO model, String corpId) {
-        List<QueryChapterListResDTO> queryChapterListResDTOS = queryChapterListResDTO(model, corpId);
+    public Map queryBChaptersWithProgress(String lessonId, CurUser curUser) {
+        QueryChapterListDTO model = new QueryChapterListDTO();
+        model.setLessonId(lessonId);
+        model.setStudentId(curUser.getUserId());
+        List<QueryChapterListResDTO> queryChapterListResDTOS = queryChapterListResDTO(model, curUser.getCorpId());
         queryChapterListResDTOS.stream().forEach(queryChapterListResDTO -> {
             queryChapterListResDTO.getChildList().stream().forEach(childList -> {
-                List<BRStudentChapter> brStudentChapterList = brStudentChapterRepository.queryByStuIdAndChapter(childList.getBusinessId(), model.getStudentId());
+                List<BRStudentChapter> brStudentChapterList = brStudentChapterRepository.queryByStuIdAndChapter(childList.getBusinessId(), curUser.getUserId());
                 if (null != brStudentChapterList && brStudentChapterList.size() > 0) {
                     childList.setProgress(brStudentChapterList.get(0).getProgress());
                 }

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -5,6 +5,7 @@ import org.rcisoft.business.blabel.dto.QueryLabelResDTO;
 import org.rcisoft.business.blesson.dto.*;
 import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.business.blesson.entity.BLessonLabel;
+import org.rcisoft.business.blesson.entity.BRecommend;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.stereotype.Repository;
@@ -784,5 +785,9 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
             "urUserSet") Set<CurUser> CurUserSet, @Param("bLesson") BLesson bLesson, @Param("isAdmin") boolean isAdmin, @Param("corpId") String corpId) ;
 
 
+    @Select("<script>" +
+            "SELECT * FROM `b_recommend` where type = 0   and corp_id = #{corpId}  and lesson_id = #{lessonId} " +
+            "</script>")
+    List<BRecommend> queryRecommendByLessonId(@Param("corpId") String corpId, @Param("lessonId")String lessonId);
 }
 

src/main/java/org/rcisoft/business/blesson/service/BLessonService.java

@@ -6,6 +6,7 @@ import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.user.bean.CurUser;
+import org.rcisoft.sys.user.entity.SysUser;
 
 import java.util.List;
 
@@ -66,6 +67,7 @@ public interface BLessonService{
      */
     List<BLesson> queryRecommendByPagination(PageUtil pageUtil,CurUser curUser);
 
+
     /**
      * 分页查找最受关注
      * @author: zhangqingle

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -11,6 +11,10 @@ import org.rcisoft.business.blesson.dto.*;
 import org.rcisoft.business.blesson.entity.*;
 import org.rcisoft.business.blesson.service.BLessonService;
 import org.rcisoft.business.blesson.util.recursion;
+import org.rcisoft.business.blesson.dao.BViewrangeRepository;
+import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
+import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
+import org.rcisoft.common.util.outClient.MTCotactApiRequestClient;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.exception.ServiceException;
@@ -22,6 +26,7 @@ import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dao.SysUserMapper;
+import org.rcisoft.sys.user.entity.SysUser;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -64,6 +69,10 @@ public class BLessonServiceImpl implements BLessonService {
     @Autowired
     private BAppointRepository bAppointRepository;
 
+    @Autowired
+    MTCotactApiRequestClient cotactApiRequestClient;
+
+
 
     //获取部门（目前写死）
     private List<String> getDeparts(){
@@ -116,7 +125,19 @@ public class BLessonServiceImpl implements BLessonService {
     @Override
     @Transactional(propagation = Propagation.REQUIRED,readOnly = false)
     public List<BLesson> queryRecommendByPagination(PageUtil pageUtil,CurUser curUser) {
-        List<String> departs = getDeparts();
+//        List<String> departs = getDeparts();
+        List<String> departs = new ArrayList<>();
+        List<String> ids = Arrays.asList(new String[]{curUser.getUserId()});
+        MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
+        mtUserGetsReqDTO.setCorpId(curUser.getCorpId());
+        mtUserGetsReqDTO.setIds(ids);
+        List<MTUserInfoRspDTO> mtUserInfoRspDTOList = cotactApiRequestClient.userGets(mtUserGetsReqDTO);
+        mtUserInfoRspDTOList.forEach(mtUserInfoRspDTO -> {
+            List<MTUserInfoRspDTO.DeptsBean> deptsBeans = mtUserInfoRspDTO.getDepts();
+            deptsBeans.forEach(deptsBean -> {
+                departs.addAll(Arrays.asList(deptsBean.getPid().split(",")));
+            });
+        });
         return bLessonRepository.queryRecommend(curUser,departs);
     }
 
@@ -319,8 +340,8 @@ public class BLessonServiceImpl implements BLessonService {
                 String[] recommendPerson = recommendLessonDTO.getRecommendPerson().split(",");
                 bRecommendSons  = addBRecommendSon(bRecommendSons,recommendPerson,"0",bRecommend.getBusinessId());
             }
-            if (StringUtils.isNotEmpty(recommendLessonDTO.getRecommendPerson())){
-                String[] recommendDepart = recommendLessonDTO.getRecommendPerson().split(",");
+            if (StringUtils.isNotEmpty(recommendLessonDTO.getRecommendDepart())){
+                String[] recommendDepart = recommendLessonDTO.getRecommendDepart().split(",");
                 bRecommendSons  = addBRecommendSon(bRecommendSons,recommendDepart,"1",bRecommend.getBusinessId());
             }
             //插入子表

src/main/java/org/rcisoft/common/util/feignClient/ContactFeignClient.java

@@ -3,6 +3,9 @@ package org.rcisoft.common.util.feignClient;
 import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignDto.*;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -10,6 +13,7 @@ import java.util.List;
 /**
  * 通讯录客户端接口
  */
+@Component
 @FeignClient(value = "ZX-CONTACT")
 public interface ContactFeignClient {
 

src/main/java/org/rcisoft/common/util/outClient/MTCotactApiRequestClient.java

@@ -39,7 +39,7 @@ public class MTCotactApiRequestClient {
     @Value("${server.type}")
     private String serverType;
 
-    //@Autowired
+    @Autowired
     private ContactFeignClient contactFeignClient;
     //@Autowired
     private GateWayFeignClient gateWayFeignClient;
@@ -66,23 +66,26 @@ public class MTCotactApiRequestClient {
      * @return
      */
     public List<GetAllRspDTO> accountGetMyInfoList(String corpId,String updateTime) {
-        login();
+        if("dev".equalsIgnoreCase(serverType)) {
 
-        Map<String, String> queries = new HashMap<>(2);
-        queries.put("corpId", corpId);
-        queries.put("updateTime", updateTime);
+            login();
 
-        Map<String, String> headerParams = new HashMap<>(2);
-        headerParams.put("clientType", "app");
-        headerParams.put("Authorization", "Bearer " + ACCESS_TOKEN);
-        String json = okHttpUtil.get(api + "contact/v1/user/getUsersByUpdateTime", queries, headerParams);
-        if(StrUtil.isNotEmpty(json)) {
-            return JSON.parseObject(json, new TypeReference<Ret<List<GetAllRspDTO>>>() {
-            }).getData();
+            Map<String, String> queries = new HashMap<>(2);
+            queries.put("corpId", corpId);
+            queries.put("updateTime", updateTime);
+
+            Map<String, String> headerParams = new HashMap<>(2);
+            headerParams.put("clientType", "app");
+            headerParams.put("Authorization", "Bearer " + ACCESS_TOKEN);
+            String json = okHttpUtil.get(api + "contact/v1/user/getUsersByUpdateTime", queries, headerParams);
+            if (StrUtil.isNotEmpty(json)) {
+                return JSON.parseObject(json, new TypeReference<Ret<List<GetAllRspDTO>>>() {
+                }).getData();
+            }
+            return null;
         }
-        return null;
 
-//        return contactFeignClient.getUsersByUpdateTime(corpId,updateTime,zxClientType,zxAccountId).getData();
+        return contactFeignClient.getUsersByUpdateTime(corpId,updateTime,zxClientType,zxAccountId).getData();
     }
 
     /**

src/main/java/org/rcisoft/common/util/outClient/MTNotificationApiRequestClient.java

@@ -36,27 +36,27 @@ public class MTNotificationApiRequestClient {
      * @param mtNotificationSendReqDTO
      * @return
      */
-    public boolean send(MTNotificationSendReqDTO mtNotificationSendReqDTO, String type) {
-        List<String> userIds = mtNotificationSendReqDTO.getReceiverIds();
-        List<String> accountIds = new ArrayList<>();
-        MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
-        mtUserGetsReqDTO.setCorpId(mtNotificationSendReqDTO.getCorpId());
-        mtUserGetsReqDTO.setIds(userIds);
-        List<MTUserInfoRspDTO> allUserList = mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
-        if(allUserList != null && allUserList.size() > 0){
-            for(MTUserInfoRspDTO mtUserInfoRspDTO : allUserList){
-                accountIds.add(mtUserInfoRspDTO.getAccountId());
-            }
-        }
-        log.info("消息发送人accountId:" + accountIds);
-        mtNotificationSendReqDTO.setReceiverIds(accountIds);
-        mtNotificationSendReqDTO.setChannels("ALL");
-        mtNotificationSendReqDTO.setCategoryCodes(Arrays.asList(new String[]{type}));
-        Ret ret = notificationFeignClient.sendMessage(mtNotificationSendReqDTO,"app",(long)1);
-        if(ret != null && ResultCode.SUCCESS.getCode().toString().equals(ret.getCode())){
-            return true;
-        }
-        return false;
-    }
+//    public boolean send(MTNotificationSendReqDTO mtNotificationSendReqDTO, String type) {
+//        List<String> userIds = mtNotificationSendReqDTO.getReceiverIds();
+//        List<String> accountIds = new ArrayList<>();
+//        MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
+//        mtUserGetsReqDTO.setCorpId(mtNotificationSendReqDTO.getCorpId());
+//        mtUserGetsReqDTO.setIds(userIds);
+//        List<MTUserInfoRspDTO> allUserList = mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
+//        if(allUserList != null && allUserList.size() > 0){
+//            for(MTUserInfoRspDTO mtUserInfoRspDTO : allUserList){
+//                accountIds.add(mtUserInfoRspDTO.getAccountId());
+//            }
+//        }
+//        log.info("消息发送人accountId:" + accountIds);
+//        mtNotificationSendReqDTO.setReceiverIds(accountIds);
+//        mtNotificationSendReqDTO.setChannels("ALL");
+//        mtNotificationSendReqDTO.setCategoryCodes(Arrays.asList(new String[]{type}));
+//        Ret ret = notificationFeignClient.sendMessage(mtNotificationSendReqDTO,"app",(long)1);
+//        if(ret != null && ResultCode.SUCCESS.getCode().toString().equals(ret.getCode())){
+//            return true;
+//        }
+//        return false;
+//    }
 
 }

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

@@ -97,10 +97,10 @@ public class CurUserAspect {
             userRoleDTO.setBusinessId(IdGen.uuid());
             userRoleDTO.setRoleId(rId);
             userRoleDTO.setUserId(curUser.getUserId());
-            //插入tm_admin_role、s_role_menu、s_r_user_role表
-            int userRoleResult = sysRoleService.addAdminRoleMenuUser(initAddAdminDTO,roleMenuDTOs,userRoleDTO);
             // 同步企业人员
             int line = userServiceImpl.synchronizedUsers(curUser.getCorpId());
+            //插入tm_admin_role、s_role_menu、s_r_user_role表
+            int userRoleResult = sysRoleService.addAdminRoleMenuUser(initAddAdminDTO,roleMenuDTOs,userRoleDTO);
             log.info("--------------------初始化完成--------------------");
         }
     }

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -206,7 +206,10 @@ public enum ResultServiceEnums {
 
     COURSE_ERROR(109,"三级分类不允许添加子分类"),
 
-    NAME_IS_NULL(110,"名称为空")
+    NAME_IS_NULL(110,"名称为空"),
+
+    ZX_FAILED(111,"调用智信接口失败"),
+
     ;
 
     private Integer code;

src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java

@@ -34,7 +34,7 @@ public class SysRoleController extends PaginationController<SysRole> {
     private SysRoleService sysRoleServiceImpl;
 
 
-    @ApiOperation(value="1001 分页查询所有角色", notes="分页查询所有角色")
+    @ApiOperation(value="1001 分页查询角色", notes="分页查询角色")
     @GetMapping(value = "/queryRoles")
     public GridModel queryRolesByPagination(CurUser curUser, @Valid FindRolePaginDTO findRolePaginDTO, BindingResult bindingResult){
         sysRoleServiceImpl.queryRolesByPagination(getPaginationUtility(), findRolePaginDTO);

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Repository
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    @Select("<script>SELECT su.*, sr.r_name AS roleList  FROM s_user AS su " +
+    @Select("<script>SELECT DISTINCT su.* FROM s_user AS su " +
             "LEFT JOIN s_r_user_role AS ru ON su.business_id = ru.user_id " +
             "LEFT JOIN tm_admin_role AS sr ON sr.r_id = ru.role_id " +
             "WHERE su.del_flag = 0 " +

src/main/java/org/rcisoft/sys/user/entity/SysUser.java

@@ -50,7 +50,9 @@ public class SysUser extends IdEntity<SysUser> {
     private String gitLabUsername; //gitLab账号
     private String gitLabImpressionToken; //gitLab账号模拟令牌
 
+    @Transient
     private String depart;
+    @Transient
     private String position;
 
     /**

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

@@ -6,6 +6,8 @@ import org.rcisoft.business.synchronizationtime.entity.SynchronizationTime;
 import org.rcisoft.business.synchronizationtime.service.SynchronizationTimeService;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.common.util.feignDto.GetAllRspDTO;
+import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
+import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
 import org.rcisoft.common.util.outClient.MTCotactApiRequestClient;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
@@ -55,9 +57,34 @@ public class SysUserServiceImpl implements SysUserService {
     public List<SysUser> queryUsersByPagination(PageUtil pageUtil, QuerySysUserDTO dto) {
         List<SysUser> users = sysUserMapper.queryUsers(dto);
         List<String> list = new ArrayList<>();
-        for(SysUser user:users){
+        for (SysUser user : users) {
             list.add(user.getBusinessId());
         }
+        MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
+        mtUserGetsReqDTO.setCorpId(dto.getCorpId());
+        mtUserGetsReqDTO.setIds(list);
+        List<MTUserInfoRspDTO> depart = mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
+
+        StringBuffer sb = new StringBuffer();
+        String position = "";
+        for (SysUser sysUser : users) {
+            for (MTUserInfoRspDTO mtUserInfoRspDTO : depart) {
+                if (sysUser.getBusinessId().equals(mtUserInfoRspDTO.getId())) {
+                    for (MTUserInfoRspDTO.DeptsBean deptsBean : mtUserInfoRspDTO.getDepts()) {
+                        for (MTUserInfoRspDTO.DeptsBean.PathBean pathBean : deptsBean.getPath()) {
+                            if (null != pathBean)
+                                sb.append(pathBean.getName() + "-");
+                        }
+                        position = deptsBean.getPosition() == null ? "" : String.valueOf(deptsBean.getPosition());
+                    }
+                    sysUser.setDepart(sb.toString().substring(0, sb.toString().length() - 1));
+                    sb = new StringBuffer();
+                    sysUser.setPosition(position);
+                }
+            }
+        }
+
+
         return users;
 
     }
@@ -147,7 +174,7 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public List<QueryMenuResDTO> queryMenusById(String corpId, String id, String modelId) {
-        return sysUserMapper.queryMenus(corpId,id,modelId);
+        return sysUserMapper.queryMenus(corpId, id, modelId);
     }
 
     @Override
@@ -199,21 +226,21 @@ public class SysUserServiceImpl implements SysUserService {
                 "\t\t}\n" +
                 "\t]\n" +
                 "}";
-        Map maps = (Map)JSON.parse(str);
+        Map maps = (Map) JSON.parse(str);
         return maps;
     }
 
     @Override
     public int insertOrUpdateList(List<SysUser> sysUserList) {
         int line = 0;
-        if (null!=sysUserList && sysUserList.size()>0){
+        if (null != sysUserList && sysUserList.size() > 0) {
             for (SysUser sysUser : sysUserList) {
                 SysUser user = sysUserMapper.selectOne(sysUser);
-                if (null != user && StringUtils.isNotEmpty(sysUser.getBusinessId())){
+                if (null != user && StringUtils.isNotEmpty(sysUser.getBusinessId())) {
                     sysUser.setUpdateDate(new Date());
                     sysUserMapper.updateByPrimaryKeySelective(sysUser);
                     line++;
-                }else {
+                } else {
                     sysUser.setCreateDate(new Date());
                     sysUser.setUpdateDate(new Date());
                     sysUserMapper.insertSelective(sysUser);
@@ -228,17 +255,20 @@ public class SysUserServiceImpl implements SysUserService {
     public int synchronizedUsers(String corpId) {
         SynchronizationTime synchronizationTime = synchronizationTimeServiceImpl.getById("1");
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");  //调用智信接口根据更新时间查询所有人员
-        if (null == synchronizationTime){
+        if (null == synchronizationTime) {
             synchronizationTime = new SynchronizationTime();
             synchronizationTime.setBusinessId("1");
-            synchronizationTime.setSynchronizationTime(new Date(1999,01,01,0,0,0));
+            synchronizationTime.setSynchronizationTime(new Date(1999, 01, 01, 0, 0, 0));
             synchronizationTimeServiceImpl.save(synchronizationTime);
         }
         String updateTime = df.format(synchronizationTime.getSynchronizationTime());
-        List<GetAllRspDTO> userGetRspDTOList = mtCotactApiRequestClient.accountGetMyInfoList(corpId,updateTime);
+        List<GetAllRspDTO> userGetRspDTOList = mtCotactApiRequestClient.accountGetMyInfoList(corpId, updateTime);
+        if (null == userGetRspDTOList){
+            throw new ServiceException(ResultServiceEnums.ZX_FAILED);
+        }
         List<SysUser> personnelsList = new ArrayList<>();
         int line = 0;
-        if (null !=userGetRspDTOList) {
+        if (null != userGetRspDTOList) {
             for (GetAllRspDTO userInfo : userGetRspDTOList) {
                 SysUser personnels = new SysUser();
                 personnels.setCorpId(corpId);
@@ -254,7 +284,7 @@ public class SysUserServiceImpl implements SysUserService {
             }
             line = this.insertOrUpdateList(personnelsList);
         }
-        if (line > 0){
+        if (line > 0) {
             // 同步成功后，更新同步时间
             synchronizationTime.setSynchronizationTime(new Date());
             synchronizationTimeServiceImpl.upadteById(synchronizationTime);

src/main/resources/application-dev.yml

@@ -14,12 +14,12 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-#  url: jdbc:mysql://127.0.0.1:3306/edu_db2?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-  url: jdbc:mysql://10.96.131.16:55558/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  url: jdbc:mysql://127.0.0.1:3307/edu_db2?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+#  url: jdbc:mysql://10.96.131.16:55558/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   #url: jdbc:mysql://120.52.179.75:13318/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
-  password: 91isoft
-#  password: root
+#  password: 91isoft
+  password: 123456
   initial-size: 1
   min-idle: 1
   max-active: 20

src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@ server:
   servlet:
     context-path: /
     #uri-encoding: UTF-8
-  type: dev1
+  type: prod
 
 #logging:
 #  level:
@@ -13,9 +13,9 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-  url: jdbc:mysql://mt_mysql:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  url: jdbc:mysql://192.168.5.47:3306/edu_db?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&useSSL=false
   username: root
-  password: 91isoft
+  password: 123456
   initial-size: 1
   min-idle: 1
   max-active: 20
@@ -56,6 +56,8 @@ spring:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB
+  application:
+    name: zx-education
 
 global:
   lk:
@@ -86,7 +88,7 @@ libreoffice:
   ip: 192.168.1.125
   port: 10188
 mt:
-  api: http://192.168.5.41/api/
+  api: http://192.168.5.47/api/
 
 
 eureka:
@@ -94,7 +96,7 @@ eureka:
     hostname: localhost
     prefer-ip-address: true
   client:
-    register-with-eureka: false
-    fetch-registry: false
+    register-with-eureka: true
+    fetch-registry: true
     service-url:
-      defaultZone=http://zx:zgiot@192:168:5:40:7001/eureka/:
\ No newline at end of file
+      defaultZone: http://zx:zgiot@192.168.5.48:7001/eureka/
\ No newline at end of file

src/main/resources/application.yml

 spring:
   profiles:
-    active: dev
+    active: prod
 #    active: prod