Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

pom.xml

@@ -24,6 +24,7 @@
         <module>pqs-prepare</module>
         <module>pqs-process</module>
         <module>pqs-algorithm</module>
+
     </modules>
     <packaging>pom</packaging>
     <name>灿能微服务生态系统</name>
@@ -42,19 +43,19 @@
     <properties>
         <!--中间件目标地址-->
 <!--        <middle.server.url>198.120.100.195</middle.server.url>-->
-        <middle.server.url>192.168.1.18</middle.server.url>
+        <middle.server.url>192.168.1.31</middle.server.url>
         <!--微服务模块发布地址-->
 <!--        <service.server.url>198.120.100.195</service.server.url>-->
-        <service.server.url>192.168.1.117</service.server.url>
+        <service.server.url>192.168.1.111</service.server.url>
         <!--docker仓库地址-->
-        <docker.server.url>192.168.1.18</docker.server.url>
+        <docker.server.url>192.168.1.13</docker.server.url>
         <!--nacos的ip:port-->
         <nacos.url>${middle.server.url}:18848</nacos.url>
         <!--服务器发布内容为空-->
-<!--                        <nacos.namespace></nacos.namespace>-->
+                        <nacos.namespace></nacos.namespace>
 <!--        <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>-->
 <!--        <nacos.namespace>ba3ba5d1-3480-4755-8b87-6b1fce16201c</nacos.namespace>-->
-        <nacos.namespace>a4165300-4f0e-4042-8a2a-e49ceba0644a</nacos.namespace>
+<!--        <nacos.namespace>f6df4a49-39cb-4355-a8fd-8aeb0c537eb1</nacos.namespace>-->
         <!--sentinel:port-->
         <!--        <sentinel.url>192.168.1.14:8080</sentinel.url>-->
         <sentinel.url>${middle.server.url}:8080</sentinel.url>
@@ -66,12 +67,16 @@
         <docker.repostory>${docker.server.url}:8090</docker.repostory>
         <!--docker远程项目仓库名-->
         <docker.registry.name>njcn</docker.registry.name>
-        <docker.operate>test</docker.operate>
+        <!--切换阿里&华为的配置sdk-->
+        <micro.sdk>common-microservice</micro.sdk>
+<!--        <micro.sdk>common-huawei</micro.sdk>-->
+        <docker.operate>site</docker.operate>
         <java.version>1.8</java.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <!--三剑客版本-->
         <springboot.version>2.3.12.RELEASE</springboot.version>
+<!--        <springcloud.version>Hoxton.SR12</springcloud.version>-->
         <springcloud.version>Hoxton.SR12</springcloud.version>
         <springcloud.alibaba.version>2.2.7.RELEASE</springcloud.alibaba.version>
         <hutool.version>5.7.9</hutool.version>
@@ -109,6 +114,7 @@
         <progressbar.version>0.5.3</progressbar.version>
         <okhttp.version>4.8.1</okhttp.version>
         <minio.version>8.2.1</minio.version>
+        <spring-cloud-huawei.version>1.7.0-Hoxton</spring-cloud-huawei.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -134,6 +140,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!--华为云cse微服务引擎-->
+            <dependency>
+                <groupId>com.huaweicloud</groupId>
+                <artifactId>spring-cloud-huawei-dependencies</artifactId>
+                <version>${spring-cloud-huawei.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!--三剑客依赖******end-->
             <!--java工具包-->
             <dependency>

pqs-auth/pom.xml

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-common/common-echarts/pom.xml

@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-common/common-huawei/pom.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>pqs-common</artifactId>
+        <groupId>com.njcn</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>common-huawei</artifactId>
+    <description>华为cse相关sdk</description>
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+<!--        &lt;!&ndash;springcloud alibaba nacos的配置服务器&ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.csp</groupId>-->
+<!--            <artifactId>sentinel-datasource-nacos</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!--华为云cse微服务引擎-->
+<!--        <dependency>-->
+<!--            <groupId>com.huaweicloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-huawei-actuator</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>spring-cloud-starter-huawei-service-engine</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.huaweicloud/spring-cloud-huawei-discovery -->
+        <dependency>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>spring-cloud-huawei-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>spring-cloud-starter-huawei-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

pqs-common/common-huawei/src/main/java/com/njcn/Main.java

@@ -0,0 +1,12 @@
+package com.njcn;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date ${YEAR}年${MONTH}月${DAY}日 ${HOUR}:${MINUTE}
+ */
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}

pqs-common/common-microservice/pom.xml

@@ -54,5 +54,8 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+
+
+
     </dependencies>
 </project>

pqs-common/common-web/pom.xml

@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-common/common-web/src/main/java/com/njcn/web/utils/HttpServletUtil.java

@@ -1,6 +1,5 @@
 package com.njcn.web.utils;
 
-import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import org.springframework.web.context.request.RequestContextHolder;

pqs-common/pom.xml

@@ -23,6 +23,7 @@
         <module>common-poi</module>
         <module>common-echarts</module>
         <module>common-minio</module>
+        <module>common-huawei</module>
     </modules>
 
     <properties>

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>

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 {
 

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 {
 

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);

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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")

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);

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 {
 
     /**

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 {
 
 

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 {
 
     /**

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 {
 
 

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")

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);

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;

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;

pqs-energy/energy-api/pom.xml

@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java

@@ -1,6 +1,6 @@
 package com.njcn.energy.pojo.dto;
 
-import com.google.gson.annotations.SerializedName;;
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 import java.io.Serializable;

pqs-event/event-api/pom.xml

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.checkerframework.checker.units.qual.A;
 
 import java.io.Serializable;
 

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/TimeVO.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.checkerframework.checker.units.qual.A;
 
 import java.io.Serializable;
 

pqs-gateway/pom.xml

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-harmonic/harmonic-api/pom.xml

@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java

@@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.CharUtil;
-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.common.config.GeneralInfo;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PhotovoltaicServiceImpl.java

@@ -1,7 +1,7 @@
 package com.njcn.harmonic.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.common.pojo.exception.BusinessException;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;

pqs-job/job-api/pom.xml

@@ -47,16 +47,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <!-- xxl-job-core -->
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>common-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- cloud context -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

pqs-job/job-executor/pom.xml

@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!-- xxl-job-core -->

pqs-prepare/event-prepare/pom.xml

@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-prepare/harmonic-prepare/pom.xml

@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ReportServiceImpl.java

@@ -2,10 +2,10 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.constant.BizParamConstant;
@@ -218,7 +218,7 @@ public class ReportServiceImpl implements ReportService {
                         if (v.charAt(0) == '$' && v.contains("#")) {
                             String str = assMap.get(v.replace("$", "")).get(0).getValue();
                             //没有值，赋"/"
-                            if (StringUtils.isBlank(str)) {
+                            if (StrUtil.isBlank(str)) {
                                 str = "/";
                             }
                             son.set("v", str);

pqs-process/process-api/pom.xml

@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-quality/quality-api/pom.xml

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-system/system-api/pom.xml

@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @version 1.0.0
  * @date 2022年01月05日 15:11
  */
-@FeignClient(value = ServerInfo.SYSTEM,path = "/area",fallbackFactory = AreaFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.SYSTEM, path = "/area", fallbackFactory = AreaFeignClientFallbackFactory.class, contextId = "area")
 public interface AreaFeignClient {
 
     /**
@@ -41,17 +41,16 @@ public interface AreaFeignClient {
      * 查询所有的行政区域树
      */
     @PostMapping("/areaDeptTree")
-    HttpResult<List<AreaTreeDTO>> areaDeptTree(@RequestParam("id")String id , @RequestParam("type")Integer type);
+    HttpResult<List<AreaTreeDTO>> areaDeptTree(@RequestParam("id") String id, @RequestParam("type") Integer type);
 
     /**
      * 根据区域id获取省份信息
      */
     @PostMapping("/areaPro")
-    HttpResult<Area> areaPro(@RequestParam("id")String id , @RequestParam("type")Integer type);
+    HttpResult<Area> areaPro(@RequestParam("id") String id, @RequestParam("type") Integer type);
 
     @PostMapping("/areaDeptPro")
-    HttpResult<Area> areaDeptPro(@RequestParam("id")String id);
+    HttpResult<Area> areaDeptPro(@RequestParam("id") String id);
-
 
 
     /**

pqs-system/system-api/src/main/java/com/njcn/system/api/ConfigFeignClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @version 1.0.0
  * @date 2022年01月05日 15:11
  */
-@FeignClient(value = ServerInfo.SYSTEM, path = "/config", fallbackFactory = ConfigFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.SYSTEM, path = "/config", fallbackFactory = ConfigFeignClientFallbackFactory.class,contextId = "config")
 public interface ConfigFeignClient {
 
     /**

pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java

@@ -22,7 +22,7 @@ import java.util.List;
  * @author cdf
  * @date 2021/6/24
  */
-@FeignClient(value = ServerInfo.SYSTEM, path = "/dictData", fallbackFactory = DicDataFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.SYSTEM, path = "/dictData", fallbackFactory = DicDataFeignClientFallbackFactory.class, contextId = "dictData")
 public interface DicDataFeignClient {
 
     @GetMapping("/getDicDataById")
@@ -58,7 +58,6 @@ public interface DicDataFeignClient {
     HttpResult<DictData> getDicDataByNameAndTypeName(@RequestParam("dicTypeName") String dicTypeName, @RequestParam("dicDataName") String dicDataName);
 
 
-
     /***
      * 字典类型
      */

pqs-system/system-api/src/main/java/com/njcn/system/api/ThemeFeignClient.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 /**
  * @author 徐扬
  */
-@FeignClient(value = ServerInfo.SYSTEM,path = "/theme",fallbackFactory = AreaFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.SYSTEM,path = "/theme",fallbackFactory = AreaFeignClientFallbackFactory.class,contextId = "theme")
 public interface ThemeFeignClient {
 
     /**

pqs-system/system-api/src/main/java/com/njcn/system/api/UserLogFeignClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @version 1.0.0
  * @date 2022年07月12日 15:20
  */
-@FeignClient(value = ServerInfo.SYSTEM,path = "/userLog",fallbackFactory = UserLogFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.SYSTEM,path = "/userLog",fallbackFactory = UserLogFeignClientFallbackFactory.class,contextId = "userLog")
 public interface UserLogFeignClient {
 
     /**

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java

@@ -6,10 +6,10 @@ import cn.afterturn.easypoi.exception.excel.ExcelImportException;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.system.enums.AuditLogEnum;

pqs-user/user-api/pom.xml

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>common-microservice</artifactId>
+            <artifactId>${micro.sdk}</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pqs-user/user-api/src/main/java/com/njcn/user/api/AuthClientFeignClient.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PathVariable;
  * @version 1.0.0
  * @date 2021年12月15日 13:27
  */
-@FeignClient(value = ServerInfo.USER, path = "/authClient", fallbackFactory = AuthClientFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.USER, path = "/authClient", fallbackFactory = AuthClientFeignClientFallbackFactory.class,contextId = "authClient")
 public interface AuthClientFeignClient {
 
 

pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java

@@ -16,16 +16,19 @@ import java.util.List;
 /**
  * @author denghuajun
  * @date 2022/1/11
- *  部门相关业务对外接口
+ * 部门相关业务对外接口
  */
 @FeignClient(value = ServerInfo.USER,
 //        url = "http://127.0.0.1:10201",
-        path = "/dept", fallbackFactory = DeptFeignClientFallbackFactory.class)
+        path = "/dept", fallbackFactory = DeptFeignClientFallbackFactory.class,
+        contextId = "dept"
+)
 public interface DeptFeignClient {
 
     /**
      * 根据条件获取后代部门索引
-     * @param id 部门id
+     *
+     * @param id   部门id
      * @param type 指定部门类型
      * @return 后代部门索引
      */
@@ -34,18 +37,20 @@ public interface DeptFeignClient {
 
     /**
      * 根据区域获取部门id
+     *
      * @param area
-     * @author xy
      * @return
+     * @author xy
      */
     @GetMapping("/getDeptIdByArea")
     HttpResult<String> getDeptIdByArea(@RequestParam("area") String area);
 
     /**
      * 根据部门id获取区域id
+     *
      * @param deptId
-     * @author denghuajun
      * @return
+     * @author denghuajun
      */
     @GetMapping("/getAreaIdByDeptId")
     HttpResult<String> getAreaIdByDeptId(@RequestParam("deptId") String deptId);
@@ -81,7 +86,6 @@ public interface DeptFeignClient {
     HttpResult<List<String>> getDepSonSelfCodetByDeptId(@RequestParam("deptId") String deptId);
 
 
-
     /**
      * 根据部门id获取子部门ids
      */
@@ -107,12 +111,12 @@ public interface DeptFeignClient {
     HttpResult<Dept> getRootDept();
 
     /**
-    * @Description: 获取当前部门的的下级子部门list，如果没子部门就是返回当前部门
+     * @Description: 获取当前部门的的下级子部门list，如果没子部门就是返回当前部门
-    * @Param: [deptId]
+     * @Param: [deptId]
-    * @return: com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.user.pojo.po.Dept>>
+     * @return: com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.user.pojo.po.Dept>>
-    * @Author: clam
+     * @Author: clam
-    * @Date: 2023/1/10
+     * @Date: 2023/1/10
-    */
+     */
     @GetMapping("/getDepSonDetailIdByDeptId")
-    HttpResult<List<DeptDTO>> getDepSonDetailByDeptId(@RequestParam("deptId")String deptId) ;
+    HttpResult<List<DeptDTO>> getDepSonDetailByDeptId(@RequestParam("deptId") String deptId);
 }

pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.PutMapping;
  * @version 1.0.0
  * @date 2021年05月08日 15:11
  */
-@FeignClient(value = ServerInfo.USER,path = "/user",fallbackFactory = UserFeignClientFallbackFactory.class)
+@FeignClient(value = ServerInfo.USER,path = "/user",fallbackFactory = UserFeignClientFallbackFactory.class,contextId = "user")
 public interface UserFeignClient {
 
     /**

pqs-user/user-boot/src/main/resources/bootstrap.yml

@@ -13,11 +13,37 @@ server:
 feign:
   sentinel:
     enabled: true
-
 spring:
   application:
     name: @artifactId@
-  #nacos注册中心以及配置中心的指定
+#  main:
+#    allow-bean-definition-overriding: true
+#  #nacos注册中心以及配置中心的指定
+#  cloud:
+#    servicecomb:
+#      service:
+#        name: ${spring.application.name}
+#        version: 0.0.1
+#        application: pms-application
+#        environment: production
+#      discovery:
+#        address: https://116.63.42.60:30100
+#        health-check-interval: 10
+#        poll-interval: 15000
+#        wait-time-for-shut-down-in-millis: 15000
+#      config:
+#        server-addr: https://116.63.42.60:30110
+#        server-type: kie
+#        kie:
+#          custom-label: ${spring.application.name}
+#          custom-label-value: default
+#         自定义配置，使用文本的key/value配置项作为yaml格式配置
+#        fileSource: cse.share.yaml,cse.db.yaml
+
+
+
+
+
   cloud:
     nacos:
       discovery:
@@ -51,3 +77,11 @@ mybatis-plus:
 
 mqtt:
   client-id: @artifactId@${random.value}
+
+#oss服务器配置
+#min:
+#  io:
+#    endpoint: http://192.168.1.13:9009
+#    accessKey: minio
+#    secretKey: minio@123
+#    bucket: excelreport

pqs.ipr

@@ -290,6 +290,7 @@
       <module filepath="$PROJECT_DIR$/pqs-common/common-poi/common-poi.iml"/>
       <module filepath="$PROJECT_DIR$/pqs-common/common-echarts/common-echarts.iml"/>
       <module filepath="$PROJECT_DIR$/pqs-common/common-minio/common-minio.iml"/>
+      <module filepath="$PROJECT_DIR$/pqs-common/common-huawei/common-huawei.iml"/>
       <module filepath="$PROJECT_DIR$/pqs-common/pqs-common.iml"/>
       <module filepath="$PROJECT_DIR$/pqs-gateway/pqs-gateway.iml"/>
       <module filepath="$PROJECT_DIR$/pqs-user/user-api/user-api.iml"/>