Merge branch 'han' of http://47.111.81.118:3000/uskycloud/usky-modules into han

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/MybatisGeneratorUtils.java

@@ -43,8 +43,8 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUrl("jdbc:mysql://192.168.10.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("yt123456");
         mpg.setDataSource(dsc);

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/controller/AlarmDataController.java

@@ -1,13 +1,8 @@
 package com.usky.cdi.controller;
 
 import com.usky.cdi.service.impl.AlarmDataTransferService;
-<<<<<<< Updated upstream
 import com.usky.cdi.service.vo.alarm.AlarmMessageVO;
-=======
 import com.usky.cdi.service.vo.alarm.AlarmMessage1VO;
-import com.usky.cdi.service.vo.alarm.AlarmMessageVO;
-import com.usky.cdi.service.vo.base.EngineeringBaseVO;
->>>>>>> Stashed changes
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -30,10 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class AlarmDataController {
     @Autowired
     private AlarmDataTransferService alarmDataTransferService;
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
     /**
      * 上报人防工程基础信息
      */
@@ -47,7 +39,6 @@ public class AlarmDataController {
      * 上报人防工程基础信息
      */
     @PostMapping("/alarmMessage1")
-<<<<<<< Updated upstream
     public String sendAlarmMessage1(@RequestBody AlarmMessageVO vo) {
         boolean success = alarmDataTransferService.sendAlarmMessage1(vo);
         return success ? "上报成功" : "上报失败";
@@ -67,10 +58,4 @@ public class AlarmDataController {
         boolean success = alarmDataTransferService.sendEngineeringBase(vo);
         return success ? "上报成功" : "上报失败";
     }
-=======
-    public String sendAlarmMessage1(@RequestBody AlarmMessage1VO vo) {
-        boolean success = alarmDataTransferService.sendAlarmMessage1(vo);
-        return success ? "上报成功" : "上报失败";
-    }
->>>>>>> Stashed changes
 }

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/config/mqtt/MqttOutConfig.java

@@ -1,12 +1,9 @@
 package com.usky.cdi.service.config.mqtt;
 
-<<<<<<< Updated upstream
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-=======
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
->>>>>>> Stashed changes
 import org.springframework.context.annotation.Bean;
 import org.springframework.integration.annotation.MessagingGateway;
 import org.springframework.integration.annotation.ServiceActivator;
@@ -69,7 +66,6 @@ public class MqttOutConfig {
         return messageHandler;
     }
 
-<<<<<<< Updated upstream
     /**
      * MQTT客户端工厂
      * 注意：这个方法会被Spring自动创建，用于创建MQTT客户端
@@ -95,8 +91,7 @@ public class MqttOutConfig {
 
     // 注意：这个接口需要被Spring扫描到，所以我们保留@MessagingGateway注解
     // Spring会自动创建这个接口的实现类
-=======
->>>>>>> Stashed changes
+
     @MessagingGateway(defaultRequestChannel = CHANNEL_NAME_OUT)
     public interface MqttGateway {
         /**

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/vo/alarm/AlarmMessageVO.java

@@ -1,6 +1,5 @@
 package com.usky.cdi.service.vo.alarm;
 
-<<<<<<< Updated upstream
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
@@ -144,77 +143,4 @@ public class AlarmMessageVO<T extends Number> implements Serializable {
      * Int 10
      **/
     private Integer lineNo;
-=======
-import lombok.Data;
-
-@Data
-public class AlarmMessageVO {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 数据包ID
-     */
-    private Long dataPacketID;
-
-    /**
-     * 人防工程ID
-     */
-    private Long engineeringID;
-
-    /**
-     * 事件ID
-     */
-    private Integer alarmID;
-
-    /**
-     * 事件来源
-     */
-    private Integer alarmSource;
-
-    /**
-     * 物联设施ID
-     */
-    private Integer sensorID;
-
-    /**
-     * 事件类型
-     */
-    private String alarmType;
-
-    /**
-     * 事件状态
-     */
-    private Integer alarmStatus;
-
-    /**
-     * 最新水浸状态
-     */
-    private Double sensorValue;
-
-    /**
-     * 告警阈值
-     */
-    private Double thresholding;
-
-    /**
-     * 事件发生/更新时间
-     */
-    private String alarmUpdateTime;
-
-    /**
-     * 监测对象编号
-     */
-    private String monitorObjNo;
-
-    /**
-     * 事件描述
-     */
-    private String alarmDesc;
-
-    /**
-     * 上报时间
-     */
-    private String publishTime;
-
->>>>>>> Stashed changes
 }