重点工程

src/main/java/com/sooka/sponest/data/generalbusiness/controller/CenterdataTKeyProjectsController.java

@@ -168,26 +168,8 @@ public class CenterdataTKeyProjectsController extends BaseController {
     @ApiOperation(value = "接受报文", notes = "接受报文")
     @Log(title = "接受报文", businessType = BusinessType.INSERT)
     @PostMapping("/receivedMessage")
-    public AjaxResult receivedMessage(@RequestBody Map<String,Object> map) {
-        List list = JSON.parseArray(JSON.toJSONString(map.get("list")));
-        List<CenterdataTKeyProjects> centerdataTKeyProjectsList=new ArrayList<>();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-         list.forEach(item->{
-             CenterdataTKeyProjects centerdataTKeyProjects= new CenterdataTKeyProjects();
-          CenterdataTKeyProjectsBo centerdataTKeyProjectsBo=   JSON.parseObject(JSON.toJSONString(item), CenterdataTKeyProjectsBo.class);
-             BeanUtils.copyProperties(centerdataTKeyProjectsBo,centerdataTKeyProjects);
-             try {
-                 centerdataTKeyProjects.setEndTime(sdf.parse(centerdataTKeyProjectsBo.getEndTime()));
-                 centerdataTKeyProjects.setRealityCompletedTime(sdf.parse(centerdataTKeyProjectsBo.getRealityCompletedTime()));
-                 centerdataTKeyProjects.setStartTime(sdf.parse(centerdataTKeyProjectsBo.getStartTime()));
-                 centerdataTKeyProjects.setContinuationProjectStartTime(sdf.parse(centerdataTKeyProjectsBo.getContinuationProjectStartTime()));
-             } catch (ParseException e) {
-                 e.printStackTrace();
-             }
-             centerdataTKeyProjectsList.add(centerdataTKeyProjects);
-
-         });
-        for (CenterdataTKeyProjects projects : centerdataTKeyProjectsList ){
+    public AjaxResult receivedMessage(@RequestBody List<CenterdataTKeyProjects> centerdataTKeyProjects) {
+        for (CenterdataTKeyProjects projects : centerdataTKeyProjects){
             if (StringUtils.isEmpty(projects.getProjectId())||StringUtils.isEmpty(projects.getProjectName())||StringUtils.isEmpty(projects.getLongitude())||
                     StringUtils.isEmpty(projects.getLatitude())||StringUtils.isEmpty(projects.getTerritoriality())||StringUtils.isEmpty(projects.getPrincipal())||
                     StringUtils.isEmpty(projects.getPhone())||StringUtils.isEmpty(projects.getConstructionSite())||StringUtils.isEmpty(projects.getNature())||
@@ -200,19 +182,9 @@ public class CenterdataTKeyProjectsController extends BaseController {
                 }
             }
         }
-        int result = 0;
-        try {Object userInfoObject = map.get("userInfo");
-            if (userInfoObject instanceof Map) {
-                Map<String, Object> userInfoMap = (Map<String, Object>) userInfoObject;
-                SysUser sysUser = new SysUser();  // 创建SysUser实体类对象
-
-                // 将userInfoMap中的属性值赋值给sysUser对象的对应属性
-                sysUser.setDeptId(Long.valueOf(userInfoMap.get("deptId").toString()));
-                sysUser.setDeptNames(userInfoMap.get("deptNames").toString());
-                sysUser.setUserId(Long.valueOf(userInfoMap.get("userId").toString()));
-                sysUser.setNickName(userInfoMap.get("nickName").toString());
-                result = centerdataTKeyProjectsService.receivedMessage(centerdataTKeyProjectsList,sysUser);
-            }
+        int result;
+        try {
+            result = centerdataTKeyProjectsService.receivedMessage(centerdataTKeyProjects);
         }catch (Exception e){
             logger.error(e.getMessage());
             return AjaxResult.error("数据格式错误");

src/main/java/com/sooka/sponest/data/generalbusiness/service/ICenterdataTKeyProjectsService.java

@@ -60,7 +60,7 @@ public interface ICenterdataTKeyProjectsService {
     * @author 韩福成
     * @date 2024/1/18 14:45
     */
-    int receivedMessage(List<CenterdataTKeyProjects> centerdataTKeyProjects, SysUser userInfo );
+    int receivedMessage(List<CenterdataTKeyProjects> centerdataTKeyProjects);
 
     /*
     * 推送报文

src/main/java/com/sooka/sponest/data/generalbusiness/service/impl/CenterdataTKeyProjectsServiceImpl.java

@@ -40,9 +40,6 @@ public class CenterdataTKeyProjectsServiceImpl extends BaseServiceImpl implement
     @Autowired
     private ICenterdataTEquipmentCameraService centerdataTEquipmentCameraService;
 
-    @Autowired
-    private TokenService tokenService;
-
     /**
      * 查询重点工程列表
      *
@@ -139,33 +136,26 @@ public class CenterdataTKeyProjectsServiceImpl extends BaseServiceImpl implement
     * @author 韩福成
     * @date 2024/1/18 14:45
     */@Override
-    public int receivedMessage(List<CenterdataTKeyProjects> centerdataTKeyProjects, SysUser user) {
+    public int receivedMessage(List<CenterdataTKeyProjects> centerdataTKeyProjects) {
         logger.info("token=========================="+ SecurityUtils.getToken());
         int i = 0;
 //        LoginUser user = tokenService.getLoginUser(SecurityUtils.getToken());
-        logger.info("user=========================="+ user);
+        logger.info("user=========================="+ SecurityUtils.getLoginUser());
         for (CenterdataTKeyProjects projects : centerdataTKeyProjects){
-            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
-            try {
-                projectssdf.parse(projects.getStartTime());
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }*/
             CenterdataTKeyProjects project = centerdataTKeyProjectsMapper.selectCenterdataTKeyProjectsById(projects.getId());
             projects.setMessage(JSON.toJSONString(projects));
             if (project==null){
                 projects.setId(IdUtils.fastUUID());
-                projects.setDeptId(user.getDeptId());
-                logger.info("deptId========================"+ user.getDeptId());
-                projects.setDeptName(user.getDeptNames());
-                projects.setCreateBy(user.getUserId().toString());
-                projects.setCreateName( user.getNickName());
+                projects.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
+                projects.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
+                projects.setCreateBy(SecurityUtils.getUserId().toString());
+                projects.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
                 projects.setCreateTime(DateUtils.getNowDate());
                 i = centerdataTKeyProjectsMapper.insertCenterdataTKeyProjects(projects);
             }else {
-                projects.setUpdateBy(user.getUserId());
+                projects.setUpdateBy(SecurityUtils.getUserId());
                 projects.setUpdateTime(DateUtils.getNowDate());
-                projects.setUpdateName( user.getNickName());
+                projects.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
                 i = centerdataTKeyProjectsMapper.updateCenterdataTKeyProjects(projects);
             }
         }