安装告知修改设备ES信息

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TzsServiceFeignClient.java

@@ -24,4 +24,13 @@ public interface TzsServiceFeignClient {
     @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
     ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map);
 
+    /**
+     * 创建监管码及96333
+     *
+     * @param paramMap 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/commonUpdateEsData", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> commonUpdateEsDataByIds(@RequestBody Map<String, Map<String, Object>> paramMap);
+
 }

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/JgInstallationNoticeServiceImpl.java

@@ -240,7 +240,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type , ReginParams reginParams) {
 
         String orgCode;
-        orgCode = reginParams.getCompany().getOrgCode();
+        orgCode = reginParams.getCompany().getCompanyCode();
 
         Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type, orgCode);
 
@@ -660,6 +660,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
                 jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
                 jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
+                Map<String,Map<String,Object>> objMap = new HashMap<>();
+                Map<String,Object> map1 =new HashMap<>();
+                map1.put("CODE96333",tzsJgOtherInfo.getCode96333() );
+                map1.put("EQU_CODE",tzsJgRegistrationInfo.getEquCode() );
+                map1.put("SUPERVISORY_CODE",tzsJgOtherInfo.getSupervisoryCode());
+                objMap.put(tzsJgOtherInfo.getRecord(),map1);
+                tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
                 tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
                 tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
             } else {
@@ -669,6 +676,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }
 
+
+
+
+
 //        // 组装监管码
 //        String division = "";
 //        if (((XIAN.equals(dto.getCity()) || XIAN_YANG.equals(dto.getCity())) && "1".equals(dto.getIsXixian()))) {