解决冲突

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/controller/MybatisGeneratorUtils.java

@@ -43,16 +43,9 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-<<<<<<< Updated upstream
-        dsc.setUrl("jdbc:mysql://47.111.81.118:13307/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
-        dsc.setDriverName("com.mysql.jdbc.Driver");
-        dsc.setUsername("usky");
-        dsc.setPassword("Yt#75Usky");
-=======
         dsc.setUrl("jdbc:mysql://192.168.10.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setUsername("root");
         dsc.setPassword("yt123456");
->>>>>>> Stashed changes
         mpg.setDataSource(dsc);
 
         // 3、包配置
@@ -77,11 +70,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-<<<<<<< Updated upstream
-        strategy.setInclude("dmp_product");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
-=======
         strategy.setInclude("dmp_device");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
->>>>>>> Stashed changes
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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/impl/AlarmDataTransferService.java

@@ -2,7 +2,6 @@ package com.usky.cdi.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-<<<<<<< Updated upstream
 // import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.usky.cdi.service.config.mqtt.MqttOutConfig;
 import com.usky.cdi.service.mqtt.MqttConnectionTool;
@@ -10,27 +9,12 @@ import com.usky.cdi.service.util.SnowflakeIdGenerator;
 import com.usky.cdi.service.vo.alarm.AlarmMessageVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-=======
-import com.alibaba.nacos.shaded.com.google.gson.Gson;
-import com.usky.cdi.service.config.mqtt.MqttOutConfig;
-import com.usky.cdi.service.util.SnowflakeIdGenerator;
-import com.usky.cdi.service.vo.alarm.AlarmMessage1VO;
-import com.usky.cdi.service.vo.alarm.AlarmMessageVO;
-import com.usky.cdi.service.vo.base.FloorPlaneVO;
-import lombok.extern.slf4j.Slf4j;
->>>>>>> Stashed changes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-<<<<<<< Updated upstream
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-=======
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
->>>>>>> Stashed changes
 import java.util.Date;
 import java.util.HashMap;
 
@@ -43,16 +27,10 @@ import java.util.HashMap;
  */
 @Slf4j
 @Service
-<<<<<<< Updated upstream
 public class AlarmDataTransferService {
 
     @Autowired
     private MqttConnectionTool mqttConnectionTool;
-=======
-@ConditionalOnProperty(prefix = "mqtt", value = {"enabled"}, havingValue = "true")
-public class AlarmDataTransferService {
-
->>>>>>> Stashed changes
     @Resource
     private MqttOutConfig.MqttGateway mqttGateway;
 
@@ -61,14 +39,9 @@ public class AlarmDataTransferService {
 
     public AlarmDataTransferService() {
         // 使用默认的workerId和datacenterId，实际项目中可以从配置读取
-<<<<<<< Updated upstream
         this.idGenerator = new SnowflakeIdGenerator(3L, 3L);
     }
 
-=======
-        this.idGenerator = new SnowflakeIdGenerator(1L, 1L);
-    }
->>>>>>> Stashed changes
     /**
      * 获取当前时间字符串
      */
@@ -96,17 +69,10 @@ public class AlarmDataTransferService {
                 vo.setDataPacketID(generateDataPacketID());
             }
             if (vo.getPublishTime() == null) {
-<<<<<<< Updated upstream
                 vo.setPublishTime(LocalDateTime.now());
             }
 
 //            HashMap<String, Object> map = new HashMap<>();
-=======
-                vo.setPublishTime(getCurrentTime());
-            }
-
-            HashMap<String, Object> map = new HashMap<>();
->>>>>>> Stashed changes
 //            map.put("dataPacketID", vo.getDataPacketID());
 //            map.put("engineeringID", vo.getEngineeringID());
 //            map.put("floor", vo.getFloor());
@@ -117,7 +83,6 @@ public class AlarmDataTransferService {
 //            map.put("filePixHeight", vo.getFilePixHeight());
 //            map.put("floorFile", imageBytes);
 //            map.put("publishTime", vo.getPublishTime());
-<<<<<<< Updated upstream
 //            Gson gson = new Gson();
             JSONObject jsonObject = (JSONObject) JSON.toJSON(vo);
             String json = jsonObject.toJSONString();
@@ -125,14 +90,6 @@ public class AlarmDataTransferService {
             MqttConnectionTool.MqttGateway IQeIRyXG = mqttConnectionTool.connectOrRefresh("3101070011", "5RqhJ7VG");
             String topic = "alarm/message";
             IQeIRyXG.sendToMqtt(topic, json);
-=======
-            Gson gson = new Gson();
-            JSONObject jsonObject = (JSONObject) JSON.toJSON(vo);
-            String json = jsonObject.toJSONString();
-            System.out.println(json);
-            String topic = "alarm/message";
-            mqttGateway.sendToMqtt(topic, json);
->>>>>>> Stashed changes
 
             return true;
         } catch (Exception e) {
@@ -148,23 +105,15 @@ public class AlarmDataTransferService {
      * @param vo 楼层平面图信息
      * @return 是否发送成功
      */
-<<<<<<< Updated upstream
     public boolean sendAlarmMessage1(AlarmMessageVO vo) {
         MqttConnectionTool.MqttGateway IQeIRyXG = mqttConnectionTool.connectOrRefresh("3101070011", "5RqhJ7VG");
 
-=======
-    public boolean sendAlarmMessage1(AlarmMessage1VO vo) {
->>>>>>> Stashed changes
         try {
             if (vo.getDataPacketID() == null) {
                 vo.setDataPacketID(generateDataPacketID());
             }
             if (vo.getPublishTime() == null) {
-<<<<<<< Updated upstream
                 vo.setPublishTime(LocalDateTime.now());
-=======
-                vo.setPublishTime(getCurrentTime());
->>>>>>> Stashed changes
             }
 
             HashMap<String, Object> map = new HashMap<>();
@@ -178,7 +127,6 @@ public class AlarmDataTransferService {
 //            map.put("filePixHeight", vo.getFilePixHeight());
 //            map.put("floorFile", imageBytes);
 //            map.put("publishTime", vo.getPublishTime());
-<<<<<<< Updated upstream
 //             Gson gson = new Gson();
             JSONObject jsonObject = (JSONObject) JSON.toJSON(vo);
             String json = jsonObject.toJSONString();
@@ -208,14 +156,6 @@ public class AlarmDataTransferService {
             MqttConnectionTool.MqttGateway IQeIRyXG = mqttConnectionTool.connectOrRefresh("3101070011", "5RqhJ7VG");
             String topic = "alarm/message";
             IQeIRyXG.sendToMqtt(topic, json);
-=======
-            Gson gson = new Gson();
-            JSONObject jsonObject = (JSONObject) JSON.toJSON(vo);
-            String json = jsonObject.toJSONString();
-            System.out.println(json);
-            String topic = "alarm/message";
-            mqttGateway.sendToMqtt(topic, json);
->>>>>>> Stashed changes
 
             return true;
         } catch (Exception e) {
@@ -223,7 +163,6 @@ public class AlarmDataTransferService {
             return false;
         }
     }
-<<<<<<< Updated upstream
 
     public boolean sendEngineeringBase(AlarmMessageVO vo) {
         try {
@@ -248,6 +187,4 @@ public class AlarmDataTransferService {
             return false;
         }
     }
-=======
->>>>>>> Stashed changes
 }

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/BaseDataTransferService.java

@@ -224,13 +224,8 @@ public class BaseDataTransferService {
             userIdToName.put(709, 15);
             userIdToName.put(710, 16);
             userIdToName.put(711, 2);
-<<<<<<< Updated upstream
-            //userIdToName.put(712, 34);
-            //userIdToName.put(713, 36);
-=======
             userIdToName.put(712, 34);
             userIdToName.put(713, 36);
->>>>>>> Stashed changes
             userIdToName.put(714, 37);
 
             HashMap<String, Object> map = new HashMap<>();

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/IotDataTransferService.java

@@ -2,15 +2,12 @@ package com.usky.cdi.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-<<<<<<< Updated upstream
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.usky.cdi.domain.DmpDevice;
 import com.usky.cdi.domain.DmpProduct;
 import com.usky.cdi.mapper.DmpDeviceMapper;
 import com.usky.cdi.mapper.DmpProductMapper;
-=======
 //import com.usky.cdi.service.config.mqtt.MqttGateway;
->>>>>>> Stashed changes
 import com.usky.cdi.service.config.mqtt.MqttOutConfig;
 import com.usky.cdi.service.enums.EnvMonitorMqttTopic;
 import com.usky.cdi.service.mqtt.MqttConnectionTool;
@@ -25,12 +22,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
 import org.springframework.stereotype.Service;
 
-<<<<<<< Updated upstream
 import javax.annotation.PostConstruct;
-
-=======
 import javax.annotation.Resource;
->>>>>>> Stashed changes
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -47,8 +40,6 @@ import java.util.stream.Collectors;
 @Service
 public class IotDataTransferService {
 
-<<<<<<< Updated upstream
-    private MqttOutConfig.MqttGateway mqttGateway;
 
     @Autowired
     private MqttConnectionTool mqttConnectionTool;
@@ -66,10 +57,8 @@ public class IotDataTransferService {
     // 存储每个任务的MQTT客户端工厂和网关
     private final Map<String, MqttConnectionTool.MqttGateway> mqttGatewayMap = new ConcurrentHashMap<>();
     private final Map<String, DefaultMqttPahoClientFactory> mqttClientFactoryMap = new ConcurrentHashMap<>();
-=======
     @Resource
     private MqttOutConfig.MqttGateway mqttGateway;
->>>>>>> Stashed changes
 
     private SnowflakeIdGenerator idGenerator;
 

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
 }