添加参数校验

iot-module/iot-module-data/iot-module-data-biz/src/main/java/com/middle/platform/data/biz/service/DataAnalyseService.java

@@ -71,24 +71,25 @@ public class DataAnalyseService {
         //数据写入
         ProductPara productPara;
         List<ProductPara> list = new ArrayList<>();
-        for (Map.Entry<String, PropertyDto> map : modData.entrySet()) {
-            map.getValue().setTime(LocalDateTimeUtil.formatNormal(LocalDateTime.now()));
-            productPara = new ProductPara();
-            productPara.setCode(productVo.getCode());
-            productPara.setGuid(productVo.getGuid());
-            productPara.setLine(map.getKey());
-            productPara.setReserve("");
-            productPara.setVal(map.getValue().getVal());
-            productPara.setMsgId(msgId);
-            productPara.setTs(TsUtil.getAndIncrement());
-            productPara.setOriginTime(new Date());//todo 有则获取
-            list.add(productPara);
-            cacheService.setHashKey(String.format(CacheConstant.D_DATA_CACHE, productVo.getGuid()), map.getKey(), map.getValue());
-            if (CollUtil.isNotEmpty(list)) {
-                taosMapper.batchInsert(list, productVo.getGuid(), productVo.getCode());
+        if(CollUtil.isNotEmpty(modData)){
+            for (Map.Entry<String, PropertyDto> map : modData.entrySet()) {
+                map.getValue().setTime(LocalDateTimeUtil.formatNormal(LocalDateTime.now()));
+                productPara = new ProductPara();
+                productPara.setCode(productVo.getCode());
+                productPara.setGuid(productVo.getGuid());
+                productPara.setLine(map.getKey());
+                productPara.setReserve("");
+                productPara.setVal(map.getValue().getVal());
+                productPara.setMsgId(msgId);
+                productPara.setTs(TsUtil.getAndIncrement());
+                productPara.setOriginTime(new Date());//todo 有则获取
+                list.add(productPara);
+                cacheService.setHashKey(String.format(CacheConstant.D_DATA_CACHE, productVo.getGuid()), map.getKey(), map.getValue());
+                if (CollUtil.isNotEmpty(list)) {
+                    taosMapper.batchInsert(list, productVo.getGuid(), productVo.getCode());
+                }
             }
         }
-
     }
 
     private void tableCheck(ProductVo productVo) {

iot-module/iot-module-data/iot-module-data-biz/src/main/java/com/middle/platform/data/biz/service/runner/TopicRunner.java

@@ -2,6 +2,7 @@ package com.middle.platform.data.biz.service.runner;
 
 import com.middle.platform.data.biz.service.mqtt.MqttTopicInit;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
@@ -11,12 +12,17 @@ import org.springframework.stereotype.Component;
  * @date 2023-12-23 15:59:53
  */
 @Component
+@Slf4j
 public class TopicRunner implements ApplicationRunner {
     @Resource
     private MqttTopicInit mqttTopicInit;
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        mqttTopicInit.init();
+        try {
+            mqttTopicInit.init();
+        } catch (Exception e) {
+            log.error("初始化异常：{}", e, e);
+        }
     }
 }

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

@@ -45,6 +45,7 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
      * @date 2023-12-23 14:56
      */
     public Object pageQuery(IotProjectDevicePara iotProjectDevicePara) {
+        iotProjectService.check(iotProjectDevicePara.getProjectId());
         PageHelper.startPage(iotProjectDevicePara.getPage(), iotProjectDevicePara.getPageSize());
         List<IotDeviceVo> iotDeviceVos = iotProjectDeviceMapper.pageQuery(iotProjectDevicePara);
         iotDeviceVos.forEach(e -> {
@@ -109,10 +110,11 @@ public class IotProjectDeviceService extends ServiceImpl<IotProjectDeviceMapper,
      * @date 2023-12-24 11:34
      */
     public Object updateProjectDevice(IotProDevicePara iotProDevicePara) {
+        check(iotProDevicePara.getId());
         IotDevice iotDevice = iotDeviceMapper.selectById(iotProDevicePara.getId());
-        BeanUtils.copyProperties(iotProDevicePara, iotDevice);
-        iotDevice.setUpdateBy(StpUtil.getLoginIdAsLong());
-        iotDevice.setUpdateTime(LocalDateTime.now());
+        iotDevice.setLon(iotProDevicePara.getLon());
+        iotDevice.setLat(iotProDevicePara.getLat());
+        iotDevice.setAddress(iotProDevicePara.getAddress());
         return iotDeviceMapper.updateById(iotDevice);
     }