三江代码优化

src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java

@@ -121,6 +121,7 @@ public class ProjectController {
     @ApiOperation(value = " 三江业务中台添加项目", notes = "三江业务中台添加项目", httpMethod = "POST")
     @PostMapping(value = "/sj/business/add")
     public Result addSjProject(@RequestBody @Validate SjProjectDto dto) {
+        log.info("addSjProject：{}", dto);
         Project project = new Project();
         BeanUtils.copyProperties(dto, project);
         project.setCompanySn("B386480F85E84592B8E102224D090794");
@@ -138,6 +139,7 @@ public class ProjectController {
     @ApiOperation(value = " 三江业务中台更新项目（根据项目编号projectNumber更新）", notes = "三江业务中台更新项目（根据项目编号projectNumber更新）", httpMethod = "POST")
     @PostMapping(value = "/sj/business/update")
     public Result updateSjProject(@RequestBody @Validate SjProjectDto dto) {
+        log.info("updateSjProject：{}", dto);
         Project project = new Project();
         BeanUtils.copyProperties(dto, project);
         project.setCompanySn("B386480F85E84592B8E102224D090794");
@@ -152,6 +154,7 @@ public class ProjectController {
     @ApiOperation(value = "三江业务中台删除项目（根据项目编号projectNumber删除）", notes = "三江业务中台删除项目（根据项目编号projectNumber删除）", httpMethod = "POST")
     @PostMapping(value = "/sj/business/delete")
     public Result deleteSjProject(@RequestParam String projectNumber) {
+        log.info("deleteSjProject：{}", projectNumber);
         Project one = projectService.getOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectNumber, projectNumber));
         if (one != null) {
             projectService.removeProject(String.valueOf(one.getProjectId()));

src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java

@@ -90,6 +90,7 @@ public class EnterpriseInfoController {
     @ApiOperation(value = " 三江业务中台添加合作单位", notes = "三江业务中台添加合作单位", httpMethod = "POST")
     @PostMapping(value = "/sj/add")
     public Result addSj(@RequestBody SjEnterpriseInfo enterpriseInfo) {
+        log.info("addSj：{}", JSONArray.toJSONString(enterpriseInfo));
         return enterpriseInfoService.addSj(enterpriseInfo);
     }
 
@@ -117,6 +118,7 @@ public class EnterpriseInfoController {
     @ApiOperation(value = "三江业务中台编辑合作单位", notes = "三江业务中台编辑合作单位", httpMethod = "POST")
     @PostMapping(value = "/sj/edit")
     public Result editSj(@RequestBody SjEnterpriseInfo enterpriseInfo) {
+        log.info("editSj：{}", JSONArray.toJSONString(enterpriseInfo));
         return enterpriseInfoService.editSj(enterpriseInfo);
     }
 
@@ -142,6 +144,7 @@ public class EnterpriseInfoController {
     @ApiOperation(value = "三江业务中台通过id和projectNumber删除合作单位", notes = "三江业务中台通过id和projectNumber删除合作单位", httpMethod = "POST")
     @PostMapping(value = "/sj/delete")
     public Result deleteSj(@RequestBody SjEnterpriseInfo enterpriseInfo) {
+        log.info("deleteSj：{}", JSONArray.toJSONString(enterpriseInfo));
         return enterpriseInfoService.deleteSj(enterpriseInfo);
     }
 

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java

@@ -219,14 +219,22 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
 
     @Override
     public Result addSj(SjEnterpriseInfo e) {
-        EnterpriseInfo ei = getEnterpriseInfo(e);
+        String projectSn = getProjectSn(e.getProjectNumber());
+        if (StringUtils.isBlank(projectSn)) {
+            return Result.error("projectNumber=" + e.getProjectNumber() + "的项目不存在");
+        }
+        EnterpriseInfo ei = getEnterpriseInfo(e, projectSn);
         saveEnterpriseInfo(ei);
         return Result.ok();
     }
 
     @Override
     public Result editSj(SjEnterpriseInfo e) {
-        EnterpriseInfo ei = getEnterpriseInfo(e);
+        String projectSn = getProjectSn(e.getProjectNumber());
+        if (StringUtils.isBlank(projectSn)) {
+            return Result.error("projectNumber=" + e.getProjectNumber() + "的项目不存在");
+        }
+        EnterpriseInfo ei = getEnterpriseInfo(e,projectSn);
         updateEnterpriseInfo(ei);
         return Result.ok();
     }
@@ -251,7 +259,7 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
         return Result.ok();
     }
 
-    private EnterpriseInfo getEnterpriseInfo(SjEnterpriseInfo e) {
+    private EnterpriseInfo getEnterpriseInfo(SjEnterpriseInfo e, String projectSn) {
         EnterpriseInfo enterpriseInfo = new EnterpriseInfo();
         enterpriseInfo.setId(e.getId());
         enterpriseInfo.setEnterpriseName(e.getEnterpriseName());
@@ -281,7 +289,7 @@ public class EnterpriseInfoServiceImpl extends ServiceImpl<EnterpriseInfoMapper,
         enterpriseInfo.setEnterpriseTypeId(e.getEnterpriseTypeId());
         enterpriseInfo.setParentEnterpriseId(e.getParentEnterpriseId());
         enterpriseInfo.setEnterpriseTypeName(e.getEnterpriseTypeName());
-        enterpriseInfo.setProjectSn(getProjectSn(e.getProjectNumber()));
+        enterpriseInfo.setProjectSn(projectSn);
         enterpriseInfo.setType(1);
         enterpriseInfo.setProjectDirectorName(e.getProjectDirectorName());
         enterpriseInfo.setProjectDirectorPhone(e.getProjectDirectorPhone());