1.技术监督试运行，不通过整体预告警单流程

2024-07-05 09:01:12 +08:00
parent fd23719a41
commit 6ec0ef54e9
37 changed files with 714 additions and 96 deletions
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java
@@ -7,8 +7,10 @@ import com.njcn.device.pq.pojo.param.SyncTerminalParam;
 import com.njcn.device.pq.pojo.po.Line;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;

@@ -31,11 +33,17 @@ public interface TerminalBaseClient {
     */
    @PostMapping("/getSubstationById")
    HttpResult<List<Line>> getSubstationById(@RequestBody List<String> list);
-    /*
-    冀北技术监督台账同步
-     */

+    /**
+     * 冀北技术监督台账同步
+     */
    @ApiOperation("终端/母线/监测点同步操作")
    @PostMapping("terminalSync")
    HttpResult<String> terminalSync( @RequestBody SyncTerminalParam syncTerminalParam);
+
+    /**
+     * 监测点和装置同步成运行状态
+     */
+    @GetMapping("/terminalSyncRunFly")
+    HttpResult<Boolean> terminalSyncRunFly(@RequestParam("lineId") String lineId);
 }
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java
@@ -44,6 +44,12 @@ public class TerminalBaseClientFallbackFactory implements FallbackFactory<Termin
                throw new BusinessException(finalExceptionEnum);
            }

+            @Override
+            public HttpResult<Boolean> terminalSyncRunFly(String lineId) {
+                log.error("{}异常，降级处理，异常为：{}", "监测点和装置同步成运行状态", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
        };


--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
@@ -12,10 +12,6 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
-import com.njcn.device.pq.mapper.LineDetailMapper;
-import com.njcn.device.pq.mapper.LineMapper;
-import com.njcn.device.pq.mapper.OverlimitMapper;
-import com.njcn.device.pq.mapper.VoltageMapper;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -27,7 +23,6 @@ import com.njcn.device.pq.pojo.vo.TerminalVO;
 import com.njcn.device.pq.service.TerminalBaseService;
 import com.njcn.device.pq.service.impl.GeneralDeviceService;
 import com.njcn.poi.util.PoiUtil;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
@@ -60,23 +55,6 @@ import java.util.stream.Stream;
 public class TerminalBaseController extends BaseController {

    private final TerminalBaseService terminalBaseService;
-
-
-
-    private final LineDetailMapper lineDetailMapper;
-
-
-    private final OverlimitMapper overlimitMapper;
-
-
-    private final DicDataFeignClient dicDataFeignClient;
-
-
-    private final LineMapper lineMapper;
-
-
-    private final VoltageMapper voltageMapper;
-
    private final GeneralDeviceService generalDeviceService;


@@ -148,11 +126,19 @@ public class TerminalBaseController extends BaseController {
    @PostMapping("terminalSync")
    public HttpResult<String> terminalSync(@Valid @RequestBody SyncTerminalParam syncTerminalParam) {
        String methodDescribe = getMethodDescribe("terminalSync");
-        String subtation = terminalBaseService.terminalSync(syncTerminalParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subtation, methodDescribe);
+        String substation = terminalBaseService.terminalSync(syncTerminalParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, substation, methodDescribe);
    }


+    @ApiOperation("监测点和装置同步成运行状态")
+    @OperateInfo(operateType = OperateType.ADD, info = LogEnum.BUSINESS_MEDIUM)
+    @GetMapping("/terminalSyncRunFly")
+    public HttpResult<Boolean> terminalSyncRunFly(@RequestParam("lineId") String lineId) {
+        String methodDescribe = getMethodDescribe("terminalSyncRunFly");
+        Boolean b = terminalBaseService.terminalSyncRunFly(lineId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
    /**
     * 终端修改操作
     *
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java
@@ -243,4 +243,11 @@ public interface TerminalBaseService {
    * @Date: 2024/5/29 
    */
    String terminalSync(SyncTerminalParam syncTerminalParam);
+
+    /**
+     * 监测点和装置同步成运行状态
+     * @param lineId
+     * @return
+     */
+    Boolean terminalSyncRunFly(String lineId);
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -5,12 +5,15 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.dto.SimpleDTO;
@@ -21,6 +24,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
+import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.biz.pojo.po.DeviceBak;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.biz.utils.COverlimitUtil;
@@ -108,9 +112,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple

    private final FileStorageUtil fileStorageUtil;

-    private final GeneralInfo generalInfo;
-
-
    /**
     * 终端新增操作
     *
@@ -1882,7 +1883,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
            Device deviceDetail = new Device();
            BeanUtils.copyProperties(deviceParam, deviceDetail);
            deviceDetail.setId(device.getId());
-            deviceDetail.setRunFlag(0);
+            deviceDetail.setRunFlag(3);
            deviceDetail.setCallFlag(0);
            deviceDetail.setComFlag(0);
            deviceDetail.setCheckFlag(1);
@@ -1947,7 +1948,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
        LineDetail lineDetail = new LineDetail();
        BeanUtils.copyProperties(lineParam, lineDetail);
        lineDetail.setId(line.getId());
-        lineDetail.setRunFlag(0);
+        lineDetail.setRunFlag(3);
        //判断国网监测点id
        if (StrUtil.isNotBlank(lineDetail.getMonitorId())) {
            lineDetail.setMonitorFlag(1);
@@ -1987,6 +1988,23 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
        return subIndex;
    }

+    @Override
+    public Boolean terminalSyncRunFly(String lineId) {
+        LineDTO lineDTO = this.baseMapper.selectLineDetail(lineId);
+        if(ObjectUtil.isNotNull(lineDTO)){
+            lineDetailMapper.update(null,new LambdaUpdateWrapper<LineDetail>()
+                    .set(LineDetail::getRunFlag, 0)
+                    .eq(LineDetail::getId, lineDTO.getLineId())
+            );
+
+            deviceMapper.update(null,new LambdaUpdateWrapper<Device>()
+                    .set(Device::getRunFlag, 0)
+                    .eq(Device::getId, lineDTO.getDevId())
+                );
+        }
+        return false;
+    }
+

    private String saveTerminalInfo(List<OracleTerminalExcel> oracleTerminalExcels, List<OverLimitExcel> overLimitExcels) {
        List<OracleTerminalExcel.OracleTerminalExcelMsg> oracleTerminalExcelMsg = new ArrayList<>();