hanfucheng před 1 rokem
rodič
revize
5e60279361

+ 14 - 7
src/main/java/com/sooka/sponest/data/generalbusiness/service/impl/CenterdataTKeyProjectsServiceImpl.java

@@ -7,7 +7,9 @@ import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.model.LoginUser;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTKeyProjects;
 import com.sooka.sponest.data.generalbusiness.mapper.CenterdataTKeyProjectsMapper;
@@ -38,6 +40,9 @@ public class CenterdataTKeyProjectsServiceImpl extends BaseServiceImpl implement
     @Autowired
     private ICenterdataTEquipmentCameraService centerdataTEquipmentCameraService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 查询重点工程列表
      *
@@ -137,22 +142,24 @@ public class CenterdataTKeyProjectsServiceImpl extends BaseServiceImpl implement
     public int receivedMessage(List<CenterdataTKeyProjects> centerdataTKeyProjects) {
         logger.info("token=========================="+ SecurityUtils.getToken());
         int i = 0;
+        LoginUser user = tokenService.getLoginUser(SecurityUtils.getToken());
+        logger.info("user=========================="+ user.getSysUser().getNickName());
         for (CenterdataTKeyProjects projects : centerdataTKeyProjects){
             CenterdataTKeyProjects project = centerdataTKeyProjectsMapper.selectCenterdataTKeyProjectsById(projects.getId());
             projects.setMessage(JSON.toJSONString(projects));
             if (project==null){
                 projects.setId(IdUtils.fastUUID());
-                projects.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-                logger.info("deptId========================"+ SecurityUtils.getLoginUser().getSysUser().getDeptId());
-                projects.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
-                projects.setCreateBy(SecurityUtils.getUserId().toString());
-                projects.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
+                projects.setDeptId(user.getSysUser().getDeptId());
+                logger.info("deptId========================"+ user.getSysUser().getDeptId());
+                projects.setDeptName(user.getSysUser().getDeptNames());
+                projects.setCreateBy(user.getUserId().toString());
+                projects.setCreateName( user.getSysUser().getNickName());
                 projects.setCreateTime(DateUtils.getNowDate());
                 i = centerdataTKeyProjectsMapper.insertCenterdataTKeyProjects(projects);
             }else {
-                projects.setUpdateBy(SecurityUtils.getUserId());
+                projects.setUpdateBy(user.getUserId());
                 projects.setUpdateTime(DateUtils.getNowDate());
-                projects.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
+                projects.setUpdateName( user.getSysUser().getNickName());
                 i = centerdataTKeyProjectsMapper.updateCenterdataTKeyProjects(projects);
             }
         }