物模型关联的产品校验

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotModService.java

@@ -25,6 +25,8 @@ import java.util.Optional;
 public class IotModService {
     private final IotModMapper iotModMapper;
     @Resource
+    private IotProductService iotProductService;
+    @Resource
     private CacheService cacheService;
 
     /**
@@ -34,6 +36,7 @@ public class IotModService {
      * @return
      */
     public Object save(IotModPara iotModPara) {
+        iotProductService.checkProduct(iotModPara.getProductId());
         IotMod query = query(iotModPara.getProductId());
         //修改物模型
         if (Objects.nonNull(query)) {
@@ -50,7 +53,7 @@ public class IotModService {
     }
 
     private IotMod query(Long productId) {
-        return iotModMapper.selectOne(new LambdaQueryWrapper<IotMod>().eq(IotMod::getProductId, productId).last("limit 1"));
+        return iotModMapper.selectOne(new LambdaQueryWrapper<IotMod>().eq(IotMod::getProductId, productId).eq(IotMod::getDelFlag, Global.UN_DEL).last("limit 1"));
     }
 
     /**
@@ -60,6 +63,7 @@ public class IotModService {
      * @return
      */
     public Object queryMod(Long productId) {
+        iotProductService.checkProduct(productId);
         return query(productId);
     }
 

iot-module/iot-module-manage/iot-module-manage-biz/src/main/java/com/middle/platform/manage/biz/service/IotProductService.java

@@ -47,7 +47,8 @@ public class IotProductService {
     private final IotDeviceMapper iotDeviceMapper;
     @Resource
     private IotUrlService iotUrlService;
-    private final IotModService iotModService;
+    @Resource
+    private IotModService iotModService;
     @Resource
     private IotCloudService iotCloudService;
     private final TdApi tdApi;