Merge remote-tracking branch 'origin/master'

# Conflicts: # pom.xml
2023-02-15 11:37:03 +08:00
parent c220b93f69 22cb7670a3
commit b580ca931e
57 changed files with 222 additions and 82 deletions
--- a/pqs-device/common-device-biz/pom.xml
+++ b/pqs-device/common-device-biz/pom.xml
@@ -31,7 +31,7 @@
        </dependency>
        <dependency>
            <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java
@@ -19,6 +19,7 @@ import java.util.List;
@FeignClient(
        value = ServerInfo.DEVICE,
        path = "/pms/distributionMonitor",
+        contextId = "pms/distributionMonitor",
        fallbackFactory = DistributionMonitorClientFallbackFactory.class)
 public interface DistributionMonitorClient {

--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
@@ -23,6 +23,7 @@ import java.util.List;
@FeignClient(
        value = ServerInfo.DEVICE,
        path = "/pms/monitor",
+        contextId = "/pms/monitor",
        fallbackFactory = MonitorClientFallbackFactory.class)
 public interface MonitorClient {

--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneralDeviceInfoClient.java
@@ -16,7 +16,7 @@ import java.util.List;
 * @version 1.0.0
 * @date 2022年02月14日 14:02
 */
-@FeignClient(value = ServerInfo.DEVICE, path = "/pmsDeviceInfo", fallbackFactory = PmsGeneralDeviceInfoClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE, path = "/pmsDeviceInfo", contextId = "pmsDeviceInfo", fallbackFactory = PmsGeneralDeviceInfoClientFallbackFactory.class)
 public interface PmsGeneralDeviceInfoClient {


@@ -25,7 +25,7 @@ public interface PmsGeneralDeviceInfoClient {
     * @author hongawen
     * @date 2022/10/18 10:12
     * @param pmsDeviceInfoParam 查询条件
-     * @return HttpResult<List<PmsGeneralDeviceDTO>> 统计结果
+     * @return HttpResult<List < PmsGeneralDeviceDTO>> 统计结果
     */
    @PostMapping("/getPmsDeviceInfoWithInOrg")
    HttpResult<List<PmsGeneralDeviceDTO>> getPmsDeviceInfoWithInOrg(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam);
@@ -35,7 +35,7 @@ public interface PmsGeneralDeviceInfoClient {
     * @author cdf
     * @date 2022/10/18 10:12
     * @param pmsDeviceInfoParam 查询条件
-     * @return HttpResult<List<PmsGeneralDeviceDTO>> 统计结果
+     * @return HttpResult<List < PmsGeneralDeviceDTO>> 统计结果
     */
    @PostMapping("/getPwPmsDeviceInfoWithOrgId")
    HttpResult<List<PmsGeneralDeviceDTO>> getPwPmsDeviceInfoWithOrgId(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam);
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
@@ -18,6 +18,7 @@ import java.util.List;
 */
@FeignClient(value = ServerInfo.DEVICE,
        path = "/pmsGeneratrixWire",
+        contextId = "pmsGeneratrixWire",
        fallbackFactory = PmsGeneratrixClientFallbackFactory.class)
 public interface PmsGeneratrixClient {

--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsTerminalClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsTerminalClient.java
@@ -19,6 +19,7 @@ import java.util.List;
@FeignClient(
        value = ServerInfo.DEVICE,
        path = "/pms/terminal",
+        contextId = "pms/terminal",
        fallbackFactory = PwMonitorClientFallbackFactory.class)
 public interface PmsTerminalClient {

--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
@@ -19,6 +19,7 @@ import java.util.List;
@FeignClient(
        value = ServerInfo.DEVICE,
        path = "/pms/pwMonitor",
+        contextId = "pms/pwMonitor",
        fallbackFactory = PwMonitorClientFallbackFactory.class)
 public interface PwMonitorClient {

--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
@@ -18,6 +18,7 @@ import java.util.List;
 */
@FeignClient(value = ServerInfo.DEVICE,
        path = "/pms/statationStat",
+        contextId = "pms/statationStat",
        fallbackFactory = StatationStatClientFallbackFactory.class)
 public interface StatationStatClient {

--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java
@@ -20,6 +20,7 @@ import java.util.List;
@FeignClient(
        value = ServerInfo.DEVICE,
        path = "/pms/tractionStation",
+        contextId = "pms/tractionStation",
        fallbackFactory = TractionStationClientFallbackFactory.class)
 public interface TractionStationClient {

--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/AlarmClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/AlarmClient.java
@@ -11,14 +11,16 @@ import java.util.List;

 /**
 * 告警管理Feign客户端
+ *
 * @author yzh
 * @date 2022/9/19
 */
-@FeignClient(value = ServerInfo.DEVICE,path = "/Alarm",fallbackFactory = DeviceTreeClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE, path = "/Alarm", fallbackFactory = DeviceTreeClientFallbackFactory.class, contextId = "Alarm")
 public interface AlarmClient {

    /**
     * 获取告警策略列表
+     *
     * @return
     */
    @PostMapping("/getAlarmStrategyData")
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java
@@ -15,7 +15,7 @@ import java.util.Map;
 * @date 2022/2/11
 *
 */
-@FeignClient(value = ServerInfo.DEVICE,path = "/deptLine",fallbackFactory = DeptLineFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE,path = "/deptLine",fallbackFactory = DeptLineFeignClientFallbackFactory.class,contextId = "deptLine")
 public interface DeptLineFeignClient {
    @PostMapping("/getLineByDeptId")
    HttpResult<List<String>> getLineByDeptId(String id);
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceTreeClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceTreeClient.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 * @author cdf
 * @date 2022/1/13
 */
-@FeignClient(value = ServerInfo.DEVICE,path = "/terminalTree",fallbackFactory = DeviceTreeClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE, path = "/terminalTree", fallbackFactory = DeviceTreeClientFallbackFactory.class, contextId = "terminalTree")
 public interface DeviceTreeClient {

    /**
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java
@@ -17,7 +17,7 @@ import java.util.List;
 * @version 1.0.0
 * @date 2022年02月14日 14:02
 */
-@FeignClient(value = ServerInfo.DEVICE, path = "/deviceInfo", fallbackFactory = GeneralDeviceInfoClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE, path = "/deviceInfo", fallbackFactory = GeneralDeviceInfoClientFallbackFactory.class, contextId = "deviceInfo")
 public interface GeneralDeviceInfoClient {


--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
@@ -21,7 +21,7 @@ import java.util.Map;
 * @author denghuajun
 * @date 2022/2/28
 */
-@FeignClient(value = ServerInfo.DEVICE, path = "/line", fallbackFactory = LineFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE, path = "/line", fallbackFactory = LineFeignClientFallbackFactory.class, contextId = "line")
 public interface LineFeignClient {

    /**
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/SubstationFeignClient.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/SubstationFeignClient.java
@@ -15,7 +15,7 @@ import java.util.List;
 * @version 1.0.0
 * @date 2022年10月13日 19:54
 */
-@FeignClient(value = ServerInfo.DEVICE, path = "/substation", fallbackFactory = SubstationFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE, path = "/substation", fallbackFactory = SubstationFeignClientFallbackFactory.class,contextId = "substation")
 public interface SubstationFeignClient {


--- 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
@@ -18,7 +18,7 @@ import java.util.List;
 * @version 1.0.0
 * @date 2022年02月14日 14:02
 */
-@FeignClient(value = ServerInfo.DEVICE,path = "/device",fallbackFactory = TerminalBaseClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.DEVICE, path = "/device", fallbackFactory = TerminalBaseClientFallbackFactory.class, contextId = "device")
 public interface TerminalBaseClient {


@@ -36,7 +36,8 @@ public interface TerminalBaseClient {

    /**
     * 获取监测点限值
-     * @param  list 设备id集合
+     *
+     * @param list 设备id集合
     * @return 监测点限值信息
     */
    @PostMapping("getDevInfoByIds")
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TabCensusController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TabCensusController.java
@@ -1,6 +1,6 @@
 package com.njcn.device.pq.controller;

-import com.alibaba.nacos.client.naming.utils.CollectionUtils;
+import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -47,7 +47,7 @@ public class TabCensusController extends BaseController {
        String methodDescribe = getMethodDescribe("getDeviceOnlineData");
        LogUtil.njcnDebug(log, "{}", methodDescribe, tabCensusParam);
        List<DeviceOnlineTabVO> result = deviceOnlineDataService.getDeviceOnlineData(tabCensusParam);
-        if (CollectionUtils.isEmpty(result)) {
+        if (CollectionUtil.isEmpty(result)) {
            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
        } else {
            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java
@@ -1,7 +1,7 @@
 package com.njcn.device.pq.service.impl;

-import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.njcn.device.pq.mapper.LogManageMapper;
 import com.njcn.device.pq.pojo.constant.DeviceValidMessage;
 import com.njcn.device.pq.pojo.param.DeviceLogParam;
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
@@ -1,9 +1,9 @@
 package com.njcn.device.pq.service.impl;

-import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pq.enums.DeviceResponseEnum;