一码通提交报错数据回滚

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -52,5 +52,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     List<EquipExportVo> getEquipExportData(@Param("dto") EquipExportDto dto);
     Page<EquipExportVo> exportImageZip (@Param("page")Page<EquipExportVo> page, @Param("dto") EquipExportDto dto);
+
+    void updateIsNotEs(String supervisoryCode);
 }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipmentCategoryMapper.xml

@@ -417,4 +417,11 @@
         </where>
 
     </select>
+
+    <update id="updateIsNotEs">
+        UPDATE idx_biz_jg_use_info ibjui
+        SET ibjui."IS_NOT_ES" = 2
+        WHERE
+            RECORD = ( SELECT ibjoi."RECORD" FROM idx_biz_jg_other_info ibjoi WHERE ibjoi."SUPERVISORY_CODE" = #{supervisoryCode} )
+    </update>
 </mapper>

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

@@ -1040,9 +1040,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 if (!ObjectUtils.isEmpty(responseModel) && "200".equals(String.valueOf(responseModel.getStatus()))) {
                     supervisoryCodeInfo.setStatus(EquipmentCategoryEnum.YSY.getCode());
                 } else {
-                    UseInfo useInfo = new UseInfo();
-                    useInfo.setIsNotEs(2);
-                    useInfoMapper.update(useInfo,new QueryWrapper<UseInfo>().eq("SUPERVISORY_CODE",supervisionMap.get("SUPERVISORY_CODE")));
+                    equipmentCategoryMapper.updateIsNotEs(String.valueOf(supervisionMap.get("SUPERVISORY_CODE")));
                     supervisoryCodeInfo.setStatus(EquipmentCategoryEnum.BF.getCode());
                 }
             } else if (EquipmentCategoryEnum.DRL.getName().equals(claimStatus)) {
@@ -1056,15 +1054,24 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 map.remove("data");
                 responseModel = idxFeignService.batchUpdate(null, null, map);
             }
+            if (!ObjectUtils.isEmpty(responseModel) && "200".equals(String.valueOf(responseModel.getStatus()))) {
+                log.info("responseModel.getResult().toString()->>>>>>>>>>>>>>",responseModel.getResult());
+                checkEsData(String.valueOf(responseModel.getResult()));
+            }
+            supervisoryCodeInfoMapper.update(supervisoryCodeInfo, new QueryWrapper<SupervisoryCodeInfo>().eq("supervisory_code", supervisionMap.get("SUPERVISORY_CODE")));
             stopWatch.stop();
             if (log.isInfoEnabled()) {
                 log.info("通用提交耗时：{} 秒", stopWatch.getTotalTimeSeconds());
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            UseInfo useInfo = new UseInfo();
-            useInfo.setIsNotEs(2);
-            useInfoMapper.update(useInfo,new QueryWrapper<UseInfo>().eq("SUPERVISORY_CODE",supervisionMap.get("SUPERVISORY_CODE")));
+            equipmentCategoryMapper.updateIsNotEs(String.valueOf(supervisionMap.get("SUPERVISORY_CODE")));
+            if (!ObjectUtils.isEmpty(responseModel) && "200".equals(String.valueOf(responseModel.getStatus()))) {
+                List<String> records = new ArrayList<>();
+                records.add(String.valueOf(responseModel.getResult()));
+                superviseInfoMapper.deleteDataAll(records);
+                esEquipmentCategory.deleteById(String.valueOf(responseModel.getResult()));
+            }
             supervisoryCodeInfo.setStatus(EquipmentCategoryEnum.BF.getCode());
             ResponseModel<Object> response = new ResponseModel<>();
             response.setDevMessage(e.getMessage());
@@ -1075,12 +1082,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         } finally {
             log.info("已生成对应监管码" + supervisionMap.get("SUPERVISORY_CODE"));
             log.info("已生成对应96333电梯识别码" + supervisionMap.get("CODE96333"));
-            if (!ObjectUtils.isEmpty(responseModel) && "200".equals(String.valueOf(responseModel.getStatus()))) {
-                log.info("responseModel.getResult().toString()->>>>>>>>>>>>>>",responseModel.getResult().toString());
-                checkEsData(responseModel.getResult().toString());
-            }
             updateEquipmentCategoryData(unitCode, orgBranchCode);
-            supervisoryCodeInfoMapper.update(supervisoryCodeInfo, new QueryWrapper<SupervisoryCodeInfo>().eq("supervisory_code", supervisionMap.get("SUPERVISORY_CODE")));
         }
         return responseModel;
     }