fix(改造告知)：流程相关接口前端参数key更换

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformByWorkFlowController.java

@@ -27,8 +27,8 @@ import java.util.Objects;
  * @date 2023-12-12
  */
 @RestController
-@Api(tags = "改造告知工作流相关Api")
-@RequestMapping(value = "/jg-reform-workflow")
+@Api (tags = "改造告知工作流相关Api")
+@RequestMapping (value = "/jg-reform-workflow")
 public class JgReformByWorkFlowController {
 
     @Autowired
@@ -39,9 +39,10 @@ public class JgReformByWorkFlowController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/submit")
-    @ApiOperation(httpMethod = "POST", value = "改造告知提交", notes = "改造告知提交")
+    @Deprecated
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "/submit")
+    @ApiOperation (httpMethod = "POST", value = "改造告知提交", notes = "改造告知提交")
     public ResponseModel<JgReformNoticeDto> submit(@RequestBody JgReformNoticeDto model, String op) {
         // TODO 发起改造告知流程
         // jgReformNoticeService.submit(model, op);
@@ -53,13 +54,13 @@ public class JgReformByWorkFlowController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/cancel")
-    @ApiOperation(httpMethod = "POST", value = "改造告知撤销", notes = "改造告知撤销")
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "/cancel")
+    @ApiOperation (httpMethod = "POST", value = "改造告知撤销", notes = "改造告知撤销")
     public ResponseModel<JgReformNoticeDto> cancel(@RequestBody Map<String, Object> model) {
-        JgReformNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("reformInfo")), JgReformNoticeDto.class, true);
+        JgReformNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("reformNoticeAdd")), JgReformNoticeDto.class, true);
         if (Objects.isNull(installationInfo)) {
-            throw new IllegalArgumentException("参数installationInfo不能为空");
+            throw new IllegalArgumentException("参数reformInfo不能为空");
         }
         jgReformNoticeService.cancel(installationInfo);
         return ResponseHelper.buildResponse(installationInfo);
@@ -70,15 +71,15 @@ public class JgReformByWorkFlowController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/accept")
-    @ApiOperation(httpMethod = "POST", value = "改造告知受理", notes = "改造告知受理")
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "/accept")
+    @ApiOperation (httpMethod = "POST", value = "改造告知受理", notes = "改造告知受理")
     public ResponseModel<JgReformNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
         // TODO 受理改造告知流程
-        LinkedHashMap model1 = (LinkedHashMap)model.get("model");
-        LinkedHashMap installationInfo = (LinkedHashMap)model1.get("reformInfo");
+        LinkedHashMap model1 = (LinkedHashMap) model.get("model");
+        LinkedHashMap installationInfo = (LinkedHashMap) model1.get("reformNoticeAdd");
         JgReformNoticeDto JgReformNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgReformNoticeDto.class);
-        jgReformNoticeService.accept(JgReformNoticeDto,op);
+        jgReformNoticeService.accept(JgReformNoticeDto, op);
         return ResponseHelper.buildResponse(null);
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeEqController.java

@@ -5,12 +5,16 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
 import java.util.List;
+
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgReformNoticeEqServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeEqDto;
@@ -24,8 +28,8 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
  * @date 2023-12-19
  */
 @RestController
-@Api(tags = "改造告知设备关系表Api")
-@RequestMapping(value = "/jg-reform-notice-eq")
+@Api (tags = "改造告知设备关系表Api")
+@RequestMapping (value = "/jg-reform-notice-eq")
 public class JgReformNoticeEqController extends BaseController {
 
     @Autowired
@@ -36,81 +40,81 @@ public class JgReformNoticeEqController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增改造告知设备关系表", notes = "新增改造告知设备关系表")
-	public ResponseModel<JgReformNoticeEqDto> save(@RequestBody JgReformNoticeEqDto model) {
-	    model = jgReformNoticeEqServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "/save")
+    @ApiOperation (httpMethod = "POST", value = "新增改造告知设备关系表", notes = "新增改造告知设备关系表")
+    public ResponseModel<JgReformNoticeEqDto> save(@RequestBody JgReformNoticeEqDto model) {
+        model = jgReformNoticeEqServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
 
-	/**
+    /**
      * 根据sequenceNbr更新
      *
      * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新改造告知设备关系表", notes = "根据sequenceNbr更新改造告知设备关系表")
-	public ResponseModel<JgReformNoticeEqDto> updateBySequenceNbrJgReformNoticeEq(@RequestBody JgReformNoticeEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.updateWithModel(model));
-	}
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @PutMapping (value = "/{sequenceNbr}")
+    @ApiOperation (httpMethod = "PUT", value = "根据sequenceNbr更新改造告知设备关系表", notes = "根据sequenceNbr更新改造告知设备关系表")
+    public ResponseModel<JgReformNoticeEqDto> updateBySequenceNbrJgReformNoticeEq(@RequestBody JgReformNoticeEqDto model, @PathVariable (value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.updateWithModel(model));
+    }
 
-	/**
+    /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除改造告知设备关系表", notes = "根据sequenceNbr删除改造告知设备关系表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @DeleteMapping (value = "/{sequenceNbr}")
+    @ApiOperation (httpMethod = "DELETE", value = "根据sequenceNbr删除改造告知设备关系表", notes = "根据sequenceNbr删除改造告知设备关系表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable (value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.removeById(sequenceNbr));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个改造告知设备关系表",  notes = "根据sequenceNbr查询单个改造告知设备关系表")
-	public ResponseModel<JgReformNoticeEqDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.queryBySeq(sequenceNbr));
-	}
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @GetMapping (value = "/{sequenceNbr}")
+    @ApiOperation (httpMethod = "GET", value = "根据sequenceNbr查询单个改造告知设备关系表", notes = "根据sequenceNbr查询单个改造告知设备关系表")
+    public ResponseModel<JgReformNoticeEqDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.queryBySeq(sequenceNbr));
+    }
 
-	/**
+    /**
      * 列表分页查询
      *
      * @param current 当前页
      * @param current 每页大小
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "改造告知设备关系表分页查询",  notes = "改造告知设备关系表分页查询")
-	public ResponseModel<Page<JgReformNoticeEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JgReformNoticeEqDto> page = new Page<JgReformNoticeEqDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.queryForJgReformNoticeEqPage(page));
-	}
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @GetMapping (value = "/page")
+    @ApiOperation (httpMethod = "GET", value = "改造告知设备关系表分页查询", notes = "改造告知设备关系表分页查询")
+    public ResponseModel<Page<JgReformNoticeEqDto>> queryForPage(@RequestParam (value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<JgReformNoticeEqDto> page = new Page<JgReformNoticeEqDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.queryForJgReformNoticeEqPage(page));
+    }
 
-	/**
-	 * 列表全部数据查询
+    /**
+     * 列表全部数据查询
      *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "改造告知设备关系表列表全部数据查询",   notes = "改造告知设备关系表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<JgReformNoticeEqDto>> selectForList() {
-	    return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.queryForJgReformNoticeEqList());
-	}
+     * @return
+     */
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
+    @ApiOperation (httpMethod = "GET", value = "改造告知设备关系表列表全部数据查询", notes = "改造告知设备关系表列表全部数据查询")
+    @GetMapping (value = "/list")
+    public ResponseModel<List<JgReformNoticeEqDto>> selectForList() {
+        return ResponseHelper.buildResponse(jgReformNoticeEqServiceImpl.queryForJgReformNoticeEqList());
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java

@@ -643,36 +643,37 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
         stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(JgReformNotice.getCity()).append(ym);
         String equCode = stringBuffer.toString();
-        String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
+        // 只有安装设备需要
+        // String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
         Map<String, Object> map = new HashMap<>();
         map.put("cityCode", JgReformNotice.getCity());
         map.put("countyCode", JgReformNotice.getCounty());
         map.put("equCategory", tzsJgRegistrationInfo.getEquCategory());
         map.put("isXiXian", JgReformNotice.getIsXixian() == null ? "0" : JgReformNotice.getIsXixian());
-        Map<String, Object> mapCode;
-        ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
-        mapCode = code.getResult();
-
-        LambdaQueryWrapper<SupervisoryCodeInfo> queryWrapper3 = new LambdaQueryWrapper<>();
-        queryWrapper3.eq(SupervisoryCodeInfo::getSupervisoryCode, mapCode.get("superviseCode").toString());
-        SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
-        supervisoryCodeInfo.setStatus("1");
-        supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
+        // Map<String, Object> mapCode;
+        // ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
+        // mapCode = code.getResult();
+        //
+        // LambdaQueryWrapper<SupervisoryCodeInfo> queryWrapper3 = new LambdaQueryWrapper<>();
+        // queryWrapper3.eq(SupervisoryCodeInfo::getSupervisoryCode, mapCode.get("superviseCode").toString());
+        // SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
+        // supervisoryCodeInfo.setStatus("1");
+        // supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
 
 
         boolean submit = submit(JgReformNotice, op);
         if (submit) {
             if ("0".equals(op)) {
                 JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
-                this.generateInstallationNoticeReport(JgReformNotice.getSequenceNbr());
+                // this.generateInstallationNoticeReport(JgReformNotice.getSequenceNbr());
                 // 更新其他业务表
-                tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
-                tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
-                tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
+                // tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
+                // tzsJgOtherInfo.setSupervisoryCode(mapCode.get("superviseCode").toString());
+                // tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
                 // JgReformNotice.setEquRegisterCode(deviceRegistrationCode);
                 // JgReformNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
-                tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
-                tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
+                // tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
+                // tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
             } else {
                 JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
                 // JgReformNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));