pack和cell模型被使用就不可删除

src/main/java/cn/fastfun/service/impl/AppDeviceServiceImp.java

@@ -89,6 +89,12 @@ public class AppDeviceServiceImp extends JpaServiceImp<AppDevice, String> implem
             if (!org.apache.commons.lang3.StringUtils.isNotBlank(device.getPackModel())){
                 throw new ApiRuntimeException("包型号缺失");
             }
+            if (!device.getImei().substring(1, 3).equals(device.getPackModel().substring(0, 2))) {
+                throw new ApiRuntimeException("包型号与imei对应关系错误");
+            }
+            if (!device.getImei().substring(3, 6).equals(device.getCellModel().substring(0, 3))) {
+                throw new ApiRuntimeException("单体型号与imei对应关系错误");
+            }
             PackModel packModel = packModelService.getOne(Arrays.asList(QueryParamExp.eq("cellModel", device.getCellModel()),
                     QueryParamExp.eq("packModel", device.getPackModel())));
             if (packModel==null){

src/main/java/cn/fastfun/service/impl/CellModelServiceImpl.java

@@ -128,7 +128,7 @@ public class CellModelServiceImpl extends JpaServiceImp<CellModel, String> imple
             return res;
         }
         //校验包型号是否被使用
-        res = checkCellModelUsed(dto.getCellModel());
+        res = checkCellModelUsed(cellModel.getCellModel());
         if (!res.equals(OK)) {
             return res;
         }

src/main/java/cn/fastfun/service/impl/PackModelServiceImpl.java

@@ -145,7 +145,7 @@ public class PackModelServiceImpl extends JpaServiceImp<PackModel, String> imple
             return res;
         }
         //校验包型号是否被使用
-        res = checkPackModelUsed(dto.getPackModel());
+        res = checkPackModelUsed(packModel.getPackModel());
         if (!res.equals(OK)) {
             return res;
         }