1.机场特殊需求校验一些已经使用的iotCODE

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -145,6 +145,9 @@ public class CarController extends AbstractBaseController {
     @Autowired
     FireFightingSystemServiceImpl fireFightingSystemServiceImpl;
 
+    @Value("${iot.code.prefix.have.used:20210003,20210004,20210005}")
+    private String haveUsedIotPrefix;
+
     /**
      * 新增消防车信息
      *
@@ -166,21 +169,17 @@ public class CarController extends AbstractBaseController {
 
         // saveFile(carInstance); 图片视频后期统一处理
 
-        //验证车辆code唯一性
-        if(car.getIotCode()!=null){
+        // 验证车辆code唯一性
+        String iotCode = car.getIotCode();
+        if(StringUtils.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())){
             Car ar= carMapper.getCarsByIotCode(car.getIotCode());
             if(ar!=null){
                 throw new BadRequest("物联编码重复");
             }
-            if(car.getIotCode().startsWith("20210003")||car.getIotCode().startsWith("20210004")||car.getIotCode().startsWith("20210005")){
-
+            if(StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)){
                 throw new BadRequest("物联编码航班已占用");
             }
         }
-
-
-
-
         car.setQrCode(QRCodeUtil.generateQRCode());
         List<CarProperty> carPropertyList = car.getCarPropertyList();
         if (carPropertyList.size() > 0) {
@@ -310,14 +309,13 @@ public class CarController extends AbstractBaseController {
 //		carInstance = iCarService.saveCar(getUserInfo(), carInstance, carInfo, carpList);
         // saveFile(carInstance);视频图片文件后期统一处理
 
-
-        if(car.getIotCode()!=null){
+        String iotCode = car.getIotCode();
+        if(StringUtil.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())){
             Car ar= carMapper.getCarsByIotCodeExcludeCarId(car.getIotCode(),car.getId());
-            if(ar!=null){
+            if(ar != null){
                 throw new BadRequest("物联编码重复");
             }
-            if(car.getIotCode().startsWith("20210003")||car.getIotCode().startsWith("20210004")||car.getIotCode().startsWith("20210005")){
-
+            if(StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)){
                 throw new BadRequest("物联编码航班已占用");
             }
         }
@@ -326,8 +324,6 @@ public class CarController extends AbstractBaseController {
 
         //用来解绑车辆
         jcsFeign.getUserCar(car.getId(),car.getTeamId());
-
-        Car oldCar = iCarService.getById(car.getId());
         Car car1 = iCarService.updateOneById(car);
         CarController controllerProxy = SpringUtils.getBean(CarController.class);
         controllerProxy.refreshAllCount();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -94,9 +94,6 @@ public class EquipmentDetailController extends AbstractBaseController {
     private IExcelService excelService;
 
     @Autowired
-    private JcsFeign jcsFeign;
-
-    @Autowired
     private IWarehouseStructureService warehouseStructureService;
 
     @Autowired
@@ -114,6 +111,10 @@ public class EquipmentDetailController extends AbstractBaseController {
     @Autowired
     private RedisUtils redisUtils;
 
+
+    @Value("${iot.code.prefix.have.used:20210003,20210004,20210005}")
+    private String haveUsedIotPrefix;
+
     /**
      * 新增
      *
@@ -252,14 +253,13 @@ public class EquipmentDetailController extends AbstractBaseController {
                 throw new BadRequest("设备编码重复");
             }
         }
-        String iot = vo.getIotCode();
-        if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())) {
-            int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()).ne("id", vo.getId()));
-            if (iotCode > 0) {
+        String iotCode = vo.getIotCode();
+        if (StringUtils.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())) {
+            int exists = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iotCode).ne("id", vo.getId()));
+            if (exists > 0) {
                 throw new BadRequest("设备物联编码重复");
             }
-            if(sysCode.startsWith("20210003")||sysCode.startsWith("20210004")||sysCode.startsWith("20210005")){
-
+            if(StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)){
                 throw new BadRequest("物联编码航班已占用");
             }
         }

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

 package com.yeejoin.equipmanage.service.impl;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -13,6 +9,7 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -145,6 +142,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Autowired
     private TransactionDefinition transactionDefinition;
 
+    @Value("${iot.code.prefix.have.used:20210003,20210004,20210005}")
+    private String haveUsedIotPrefix;
+
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -581,15 +581,15 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                          throw new RuntimeException(String.format("设备编码[%S]填写重复，请重新输入！",sysCode));
                      }
                  }
-                 String iot = equipmentDetailDownloadVOS.getIotCode();
-                 if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())) {
-                     Integer iot_code = equipmentSpecificMapper.selectCount(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
-                     if (iot_code != 0) {
-                         erryy.append(String.format("物联编码[%S]填写重复，请重新输入！",iot)+ ",");
-                         throw new RuntimeException(String.format("物联编码[%S]填写重复，请重新输入！",iot));
-                     }
-                     if(iot.startsWith("20210003")||iot.startsWith("20210004")||iot.startsWith("20210005")){
-                         erryy.append(String.format("物联编码[%S]航班已占用，请重新输入！",iot)+ ",");
+                 String iotCode = equipmentDetailDownloadVOS.getIotCode();
+                 if (StringUtils.isNotEmpty(iotCode) && StringUtils.isNotEmpty(iotCode.trim())) {
+                     Integer exists = equipmentSpecificMapper.selectCount(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iotCode.trim()));
+                     if (exists != 0) {
+                         erryy.append(String.format("物联编码[%S]填写重复，请重新输入！",iotCode)+ ",");
+                         throw new RuntimeException(String.format("物联编码[%S]填写重复，请重新输入！",iotCode));
+                     }
+                     if(StringUtils.isNotEmpty(haveUsedIotPrefix) && Arrays.stream(haveUsedIotPrefix.split(",")).anyMatch(iotCode::startsWith)){
+                         erryy.append(String.format("物联编码[%S]航班已占用，请重新输入！",iotCode)+ ",");
                          throw new BadRequest("物联编码航班已占用");
                      }
                  }
@@ -644,7 +644,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  equipmentSpecific.setOrgCode(reginParams.getCompany().getOrgCode());
                  equipmentSpecific.setEquipmentCode(equipmentDetail.getCode());
                  equipmentSpecific.setName(equipmentDetail.getName());
-                 String iotCode = equipmentDetailDownloadVOS.getIotCode();
                  iotCode = ExcelUtils.replaceAllBlank(iotCode);
                  equipmentSpecific.setIotCode(iotCode);
                  equipmentSpecific.setCode(equipmentDetailDownloadVOS.getSystemCode());