北向代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotSensorLog.java

@@ -29,7 +29,7 @@ public class IotSensorLog implements Serializable {
     @TableId("id")
     private Long id;
 
-    @TableId("iot_sensor_id")
+    @TableField("iot_sensor_id")
     private Long iotSensorId;
 
     @ApiModelProperty(value = "所属机构")

soc-gateway/src/main/java/com/xunmei/gateway/SocGatewayApplication.java

@@ -3,7 +3,9 @@ package com.xunmei.gateway;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 
+@RefreshScope
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class SocGatewayApplication {
     public static void main(String[] args) {

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/DataController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -27,6 +28,7 @@ import java.util.List;
  * @author jingyuanchao
  * @date 2024/1/25 10:23
  */
+@RestController
 public class DataController {
 
 
@@ -86,6 +88,13 @@ public class DataController {
         return ReceiveErrorDto.error("数据处理异常");
     }
 
+    @ApiOperation("设备信息同步")
+    @PostMapping({"/api/1"})
+    public ReceiveErrorDto equipmentLst(@PathVariable String branchId, String msgId, @RequestBody DeviceReceivePageDto deviceReceivePageDto) {
+
+        return ReceiveErrorDto.error("数据处理异常");
+    }
+
     /***
      * 频率：每日录像机信息同步完成后，同步正在使用的、全量的通道信息
      * 粒度：按每个录像机推送接入的通道记录为一个数据包

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/EquipmentSyncService.java

@@ -113,7 +113,6 @@ public class EquipmentSyncService {
      *
      * @param
      */
-    @Async("asyncExecutor_list")
     @Transactional(rollbackFor = Exception.class)
     public void saveDeviceData(List<DeviceReceivePageDto> pages) {
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/NorthStatisticsSyncService.java

@@ -39,7 +39,7 @@ public class NorthStatisticsSyncService {
     /**
      * 接收和落库逻辑不同时的方法
      */
-    @Async("asyncExecutor_list")
+
 //    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)//事務未提交導致鎖失敗
     public void saveOrUpdateBaseCountByDataType(Integer dataType, Integer size, Boolean isSave) {
         synchronized (NorthStatisticsSyncService.class) {
@@ -71,7 +71,6 @@ public class NorthStatisticsSyncService {
      * @param dataType
      * @param size
      */
-    @Async("asyncExecutor_list")
 //    @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdateAllBaseCountByDataType(Integer dataType, Integer size) {
         synchronized (NorthStatisticsSyncService.class) {
@@ -99,7 +98,6 @@ public class NorthStatisticsSyncService {
      * @param dataType
      * @param size
      */
-    @Async("asyncExecutor_list")
 //    @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdateBusinessCountByDateAndDataType(String date,Integer dataType,Long size){
         synchronized (NorthStatisticsSyncService.class){

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/RabbitMsgIdService.java

@@ -49,7 +49,6 @@ public class RabbitMsgIdService {
      * @param interfacePath
      * @param interfaceName
      */
-    @Async("asyncExecutor_list")
     public void sendMsgId(String msgId, String interfacePath, String interfaceName) {
         Date date = new Date();
         String format = DateUtil.format(date, "yyyy-MM-dd");