八小时回路代码提交

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

@@ -1,90 +1,89 @@
-/*
-package com.xunmei.mediator.api.controller;
-
-
-import com.alibaba.fastjson.JSON;
-import com.isp.mediator.api.dto.DataPageDto;
-import com.isp.mediator.api.dto.protection.ReceiveErrorDto;
-import com.isp.mediator.upsandloop.dto.BreakerDeviceDataDto;
-import com.isp.mediator.upsandloop.dto.BreakerDeviceDto;
-import com.isp.mediator.upsandloop.service.IBreakerDeviceService;
-import com.isp.mediator.utils.LogUtils;
-import com.isp.mediator.utils.RedisCheckRepeatDataUtil;
+
+package com.xunmei.mediator.api.breaker.controller;
+
+
+import com.alibaba.fastjson2.JSON;
+import com.xunmei.mediator.api.breaker.dto.BreakerDeviceDataDto;
+import com.xunmei.mediator.api.breaker.dto.BreakerDeviceDto;
+import com.xunmei.mediator.api.breaker.service.IotBreakerDeviceService;
+import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
+import com.xunmei.system.api.dto.DataPageDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.util.LogUtils;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
-*/
 /**
  * <p>
- * 8小时回路信息同步表 前端控制器
+ * 8小时回路信息同步表 前端控制器i
  * </p>
  *
  * @author oygj
  * @since 2022-11-28
- *//*
+ */
 
 @RestController
 @RequestMapping
 public class BreakerController {
     @Resource
-    IBreakerDeviceService breakerDeviceService;
-    @Autowired
-    private RedisTemplate redisTemplate;
-    @Resource
-    private RedisCheckRepeatDataUtil redisCheckRepeatDataUtil;
+    IotBreakerDeviceService breakerDeviceService;
+
+
 
     @ApiOperation("接受8小时回路信息同步")
-    @PostMapping({"/api/{branchId}/data/breakerDeviceList"})
-    public ReceiveErrorDto breakerDeviceList(@PathVariable String branchId, String msgId, @RequestBody DataPageDto<BreakerDeviceDto> request) {
-        LogUtils.BASE_INFO_BREAKER_DEVICE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接受8小时回路信息同步:/api/data/breakerDeviceList", branchId, msgId, JSON.toJSONString(request));
+    @PostMapping({"/api/data/breakerDeviceList"})
+    public ReceiveErrorDto breakerDeviceList(String msgId, @RequestBody DataPageDto<BreakerDeviceDto> request) {
+        LogUtils.BASE_INFO_BREAKER_DEVICE.info("【北向接口-{}】msgId:{}】【接收参数：{}】", "接受8小时回路信息同步:/api/data/breakerDeviceList", msgId, JSON.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
-            errorDto = this.breakerDeviceService.saveBreakerDevice(request, msgId, branchId);
+            errorDto = this.breakerDeviceService.saveBreakerDevice(request, msgId);
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.BASE_INFO_BREAKER_DEVICE.error("保存失败，{}", e);
-            return ReceiveErrorDto.error("保存失败:"+ e);
+            return ReceiveErrorDto.error("保存失败:" + e);
         }
-        LogUtils.BASE_INFO_BREAKER_DEVICE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接受8小时回路信息同步:/api/data/breakerDeviceList", branchId, msgId, JSON.toJSONString(errorDto));
+        LogUtils.BASE_INFO_BREAKER_DEVICE.info("【北向接口-{}】msgId:{}】【返回参数：{}】", "接受8小时回路信息同步:/api/data/breakerDeviceList", msgId, JSON.toJSONString(errorDto));
         return errorDto;
     }
 
     @ApiOperation("8小时回路实时状态信息")
-    @PostMapping({"/api/{branchId}/status/breaker"})
-    public ReceiveErrorDto statusBreaker(@PathVariable String branchId, String msgId, @RequestBody BreakerDeviceDataDto request) {
-        LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "8小时回路实时状态信息:/api/status/breaker", branchId, msgId, JSON.toJSONString(request));
+    @PostMapping({"/api/status/breaker"})
+    public ReceiveErrorDto statusBreaker(String msgId, @RequestBody BreakerDeviceDataDto request) {
+        LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.info("【北向接口-{}】【branchId:{}】接收参数：{}】", "8小时回路实时状态信息:/api/status/breaker", msgId, JSON.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
-        String value = request.getStatus()+"";
+        String value = request.getStatus() + "";
         //String key =request.getOrgCode()+request.getDeviceCode()+"breakerdata"+ DateUtil.format(new Date(),"yyyyMMdd");
-        String key =request.getOrgCode()+request.getDeviceCode()+"breakerdata";
+        String key = request.getOrgCode() + request.getDeviceCode() + "breakerdata";
         try {
             //目前对数据不做拦截
-             */
-/*if(redisCheckRepeatDataUtil.checkData(key,value,24*60*60*1000)){*//*
-
-            //修改为状态不变用不接受
-            if(redisCheckRepeatDataUtil.checkData(key,value,-1)){
-                 errorDto = this.breakerDeviceService.saveBreakerData(request, msgId, branchId);
-            }else{
-                 //保存拦截数据
-                 this.breakerDeviceService.saveBreakerDataLog(request, msgId, branchId);
-                errorDto.setSuccess(true);
-                errorDto.setErrorMsg("数据已接受，短时间内收到相同的回路数据，处理结果忽略：拒绝处理该数据");
+
+            if (RedisCheckRepeatDataUtil.checkData(key, value, 24 * 60 * 60 * 1000)) {
+
+                //修改为状态不变用不接受
+                if (RedisCheckRepeatDataUtil.checkData(key, value, -1)) {
+                    errorDto = this.breakerDeviceService.saveBreakerData(request, msgId);
+                } else {
+                    //保存拦截数据
+                    this.breakerDeviceService.saveBreakerDataLog(request, msgId);
+                    errorDto.setSuccess(true);
+                    errorDto.setErrorMsg("数据已接受，短时间内收到相同的回路数据，处理结果忽略：拒绝处理该数据");
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.error("保存失败，{}", e);
-            return ReceiveErrorDto.error("保存失败:"+ e);
+            return ReceiveErrorDto.error("保存失败:" + e);
         }
-        LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "8小时回路实时状态信息:/api/status/breaker", branchId, msgId, JSON.toJSONString(errorDto));
+        LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "8小时回路实时状态信息:/api/status/breaker", msgId, JSON.toJSONString(errorDto));
         return errorDto;
     }
 
 
 }
 
-*/
+

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/breaker/dto/BreakerDeviceDataDto.java

@@ -0,0 +1,47 @@
+package com.xunmei.mediator.api.breaker.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * UPS信息同步表
+ * </p>
+ *
+ * @author oygj
+ * @since 2022-11-28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class BreakerDeviceDataDto implements Serializable {
+    @ApiModelProperty(value = "机构guid")
+    private String orgCode;
+    @ApiModelProperty(value = "视频物联网检测主机唯一标识")
+    private String hostCode;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "设备code")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备类型编码: 408")
+    private String deviceType;
+
+    @ApiModelProperty(value = "数据更新时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "状态标识（0/1）")
+    private Integer status;
+
+
+
+
+}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/breaker/dto/BreakerDeviceDto.java

@@ -0,0 +1,39 @@
+package com.xunmei.mediator.api.breaker.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *  8小时回路信息同步表
+ * </p>
+ *
+ * @author oygj
+ * @since 2022-11-28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class BreakerDeviceDto implements Serializable {
+    @ApiModelProperty(value = "机构guid")
+    private String orgCode;
+    @ApiModelProperty(value = "视频物联网检测主机唯一标识")
+    private String hostCode;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "设备code")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备类型编码: 408")
+    private String deviceType;
+
+
+}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/breaker/dto/BreakerDevicePageDto.java

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.breaker.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class BreakerDevicePageDto {
+    private Long totalPage;
+    private Long currPage;
+    private String packageGuid;
+    private String buildTime;
+    private List<BreakerDeviceDto> data;
+}

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

@@ -2,6 +2,10 @@ package com.xunmei.mediator.api.breaker.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotBreakerDevice;
+import com.xunmei.mediator.api.breaker.dto.BreakerDeviceDataDto;
+import com.xunmei.mediator.api.breaker.dto.BreakerDeviceDto;
+import com.xunmei.system.api.dto.DataPageDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 
 /**
  * <p>
@@ -13,4 +17,9 @@ import com.xunmei.common.core.domain.iot.domain.IotBreakerDevice;
  */
 public interface IotBreakerDeviceService extends IService<IotBreakerDevice> {
 
+    ReceiveErrorDto saveBreakerDevice(DataPageDto<BreakerDeviceDto> request, String msgId);
+
+    ReceiveErrorDto saveBreakerData(BreakerDeviceDataDto request, String msgId);
+
+    void saveBreakerDataLog(BreakerDeviceDataDto request, String msgId);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/breaker/service/impl/IotBreakerDeviceServiceImpl.java

@@ -2,8 +2,12 @@ package com.xunmei.mediator.api.breaker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.iot.domain.IotBreakerDevice;
+import com.xunmei.mediator.api.breaker.dto.BreakerDeviceDataDto;
+import com.xunmei.mediator.api.breaker.dto.BreakerDeviceDto;
 import com.xunmei.mediator.api.breaker.mapper.IotBreakerDeviceMapper;
 import com.xunmei.mediator.api.breaker.service.IotBreakerDeviceService;
+import com.xunmei.system.api.dto.DataPageDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class IotBreakerDeviceServiceImpl extends ServiceImpl<IotBreakerDeviceMapper, IotBreakerDevice> implements IotBreakerDeviceService {
 
+
+    @Override
+    public ReceiveErrorDto saveBreakerDevice(DataPageDto<BreakerDeviceDto> request, String msgId) {
+        return null;
+    }
+
+    @Override
+    public ReceiveErrorDto saveBreakerData(BreakerDeviceDataDto request, String msgId) {
+        return null;
+    }
+
+    @Override
+    public void saveBreakerDataLog(BreakerDeviceDataDto request, String msgId) {
+
+    }
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/util/RedisCheckRepeatDataUtil.java

@@ -47,7 +47,7 @@ public class RedisCheckRepeatDataUtil {
         return flag;
     }
 
-    public boolean checkData(String key, String value, int timeOut) {
+    public static boolean checkData(String key, String value, int timeOut) {
         boolean flag = true;
         if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
             String val = (String) redisTemplate.opsForValue().get(key);