Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IdxFeign.java

@@ -33,5 +33,9 @@ public interface IdxFeign {
     @RequestMapping(value = "/defect/check/list", method = RequestMethod.POST)
     JSONObject queryDefectByCodes(@RequestBody(required = false) List<String> codes, @RequestParam String checkId);
 
+    @RequestMapping(value = "/qrcode/scrap/expired/put", method = RequestMethod.GET)
+    ResponseModel<JSONObject> handleEquipNotScrapWhenExpired(@RequestParam("equipId") String equipId,
+                                                             @RequestParam("bizOrgCode") String bizOrgCode,
+                                                             @RequestParam("bizOrgCode") String bizOrgName);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -29,6 +29,7 @@ import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.fegin.IdxFeign;
 import com.yeejoin.equipmanage.fegin.SystemctlFeign;
 import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
@@ -192,6 +193,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Autowired
     EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
 
+    @Autowired
+    private IdxFeign idxFeign;
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
     
@@ -1974,22 +1978,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     if(day < Integer.parseInt(equipmentScrapDay) && day > -1) {
                         syncSystemctlMsg(e, scrapTime, day);
                     } else if (day <= -1){
-                        LambdaQueryWrapper<EquipQrcodeRecord> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(EquipQrcodeRecord::getEquipid, Long.valueOf(e.get("id").toString()));
-                        wrapper.eq(EquipQrcodeRecord::getSource,"scrap");
-                        wrapper.isNull(EquipQrcodeRecord::getCleanTime);
-                        EquipQrcodeRecord equipQrcodeRecord = equipQrcodeRecordMapper.selectOne(wrapper);
-                        if (ObjectUtils.isEmpty(equipQrcodeRecord)){
-                            updateEquipSpecificStatus(EquipQrcodeColorEnum.RED.getCode(),e.get("id").toString());
-                            EquipQrcodeRecord newEquipQrcodeRecord = new EquipQrcodeRecord();
-                            newEquipQrcodeRecord.setEquipid(Long.valueOf(e.get("id").toString()));
-                            newEquipQrcodeRecord.setSource("scrap");
-                            newEquipQrcodeRecord.setAlarmTime(new Date());
-                            newEquipQrcodeRecord.setStatus("2");
-                            newEquipQrcodeRecord.setBizOrgCode(e.get("bizOrgCode").toString());
-                            newEquipQrcodeRecord.setBizOrgName(e.get("bizOrgName").toString());
-                            equipQrcodeRecordMapper.insert(newEquipQrcodeRecord);
-                        }
+                        idxFeign.handleEquipNotScrapWhenExpired(String.valueOf(e.get("id")), String.valueOf(e.get("bizOrgCode")), String.valueOf(e.get("bizOrgName")));
                     }
                 }