Merge remote-tracking branch 'origin/master'

audio-service/src/main/java/com/zksy/audio/AudioApplication.java

@@ -4,7 +4,9 @@ package com.zksy.audio;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @MapperScan(basePackages = "com.zksy.audio.mapper")
 @SpringBootApplication(scanBasePackages = {"com.zksy.audio","com.zksy.api"})
 public class AudioApplication {

audio-service/src/main/java/com/zksy/audio/config/RestTemplateConfig.java

@@ -0,0 +1,16 @@
+package com.zksy.audio.config;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    @LoadBalanced
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}

manhole-service/src/main/java/com/zksy/manhole/utils/MessageHandler.java

@@ -12,6 +12,7 @@ import io.netty.handler.timeout.ReadTimeoutException;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/manhole/ManholeDeviceController.java

@@ -172,9 +172,11 @@ public class ManholeDeviceController extends BaseController
             ManholeDataOutDTO manholeDataOutDTO = BeanUtil.copyProperties(manholeData, ManholeDataOutDTO.class);
             outDTO.setManholeData(manholeDataOutDTO);
         }
-        // 查询设备预警阈值（支持多个设备编号，用逗号分隔）
+        // 窨井设备仅支持倾斜角度阈值，支持多个设备编号，用逗号分隔
         List<WarningThreshold> warningThresholdList = warningThresholdService.list(new LambdaQueryWrapper<WarningThreshold>()
                 .apply("CONCAT(',', device_code, ',') LIKE CONCAT('%,', {0}, ',%')", outDTO.getEquipmentCode())
+                .eq(WarningThreshold::getWarningCode, "WARN-TILT")
+                .eq(WarningThreshold::getWarningType, "倾斜预警")
                 .orderByDesc(WarningThreshold::getCreateTime));
         if(CollUtil.isNotEmpty(warningThresholdList)){
             List<WarningThresholdOutDTO> warningThresholdOutDTOList = BeanUtil.copyToList(warningThresholdList, WarningThresholdOutDTO.class);
@@ -206,6 +208,13 @@ public class ManholeDeviceController extends BaseController
     @PostMapping("/saveWarningThreshold")
     @ApiOperation(value = "保存设备预警阈值")
     public AjaxResult saveWarningThreshold(@RequestBody WarningThresholdInDTO inDTO) {
+        if (inDTO == null || !StringUtils.equals("WARN-TILT", inDTO.getWarningCode())
+                || !StringUtils.equals("倾斜预警", inDTO.getWarningType())) {
+            return AjaxResult.error("窨井设备仅支持倾斜角度阈值");
+        }
+        if (StringUtils.isBlank(inDTO.getDeviceCode())) {
+            return AjaxResult.error("设备编码不能为空");
+        }
         WarningThreshold warningThreshold = BeanUtil.copyProperties(inDTO, WarningThreshold.class);
         if(StringUtils.isNotEmpty(warningThreshold.getId())){
             warningThreshold.setUpdateTime(LocalDateTime.now());

telemetry-service/src/main/java/com/zksy/telemetry/TelemetryApplication.java

@@ -4,7 +4,9 @@ package com.zksy.telemetry;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @MapperScan({
         "com.zksy.telemetry.mapper",
         "com.zksy.base.mapper",

telemetry-service/src/main/java/com/zksy/telemetry/config/RestTemplateConfig.java

@@ -0,0 +1,16 @@
+package com.zksy.telemetry.config;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    @LoadBalanced
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}