diff --git a/pom.xml b/pom.xml index 76531d928..fb613a012 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ pqs-prepare pqs-process pqs-algorithm + pom 灿能微服务生态系统 @@ -42,19 +43,19 @@ - 192.168.1.18 + 192.168.1.31 - 192.168.1.117 + 192.168.1.111 - 192.168.1.18 + 192.168.1.13 ${middle.server.url}:18848 - + - a4165300-4f0e-4042-8a2a-e49ceba0644a + ${middle.server.url}:8080 @@ -66,12 +67,16 @@ ${docker.server.url}:8090 njcn - test + + common-microservice + + site 1.8 8 8 2.3.12.RELEASE + Hoxton.SR12 2.2.7.RELEASE 5.7.9 @@ -109,6 +114,7 @@ 0.5.3 4.8.1 8.2.1 + 1.7.0-Hoxton @@ -134,6 +140,14 @@ pom import + + + com.huaweicloud + spring-cloud-huawei-dependencies + ${spring-cloud-huawei.version} + pom + import + diff --git a/pqs-auth/pom.xml b/pqs-auth/pom.xml index 78b6e2a15..a3e48eea5 100644 --- a/pqs-auth/pom.xml +++ b/pqs-auth/pom.xml @@ -29,7 +29,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-common/common-echarts/pom.xml b/pqs-common/common-echarts/pom.xml index 39bdeba13..cc049f778 100644 --- a/pqs-common/common-echarts/pom.xml +++ b/pqs-common/common-echarts/pom.xml @@ -24,7 +24,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-common/common-huawei/pom.xml b/pqs-common/common-huawei/pom.xml new file mode 100644 index 000000000..66ed9f3f4 --- /dev/null +++ b/pqs-common/common-huawei/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + pqs-common + com.njcn + 1.0.0 + + common-huawei + 华为cse相关sdk + + 8 + 8 + UTF-8 + + + + + + + + + + + + + + + org.springframework.boot + spring-boot-starter-validation + + + + com.njcn + common-core + ${project.version} + + + + + + + + com.huaweicloud + spring-cloud-starter-huawei-service-engine + + + + com.huaweicloud + spring-cloud-huawei-discovery + + + com.huaweicloud + spring-cloud-starter-huawei-config + + + io.micrometer + micrometer-registry-prometheus + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + + io.github.openfeign + feign-okhttp + + + + + \ No newline at end of file diff --git a/pqs-common/common-huawei/src/main/java/com/njcn/Main.java b/pqs-common/common-huawei/src/main/java/com/njcn/Main.java new file mode 100644 index 000000000..8c7cdb121 --- /dev/null +++ b/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!"); + } +} \ No newline at end of file diff --git a/pqs-common/common-microservice/pom.xml b/pqs-common/common-microservice/pom.xml index 23887e970..25170a199 100644 --- a/pqs-common/common-microservice/pom.xml +++ b/pqs-common/common-microservice/pom.xml @@ -54,5 +54,8 @@ org.springframework.boot spring-boot-starter-validation + + + \ No newline at end of file diff --git a/pqs-common/common-web/pom.xml b/pqs-common/common-web/pom.xml index 269cd2967..39e5d70f9 100644 --- a/pqs-common/common-web/pom.xml +++ b/pqs-common/common-web/pom.xml @@ -24,7 +24,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/HttpServletUtil.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/HttpServletUtil.java index 32744213d..7c0b39ff1 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/HttpServletUtil.java +++ b/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; diff --git a/pqs-common/pom.xml b/pqs-common/pom.xml index cfd3d1c8a..a92424a53 100644 --- a/pqs-common/pom.xml +++ b/pqs-common/pom.xml @@ -23,6 +23,7 @@ common-poi common-echarts common-minio + common-huawei diff --git a/pqs-device/common-device-biz/pom.xml b/pqs-device/common-device-biz/pom.xml index a4136c16a..34b1f8e28 100644 --- a/pqs-device/common-device-biz/pom.xml +++ b/pqs-device/common-device-biz/pom.xml @@ -31,7 +31,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git 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 index 7c3451c35..b4ea31fc1 100644 --- 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 { diff --git 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 index d8f4c22c6..67e97232d 100644 --- 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 { diff --git 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 index a761a681c..ec1a46d63 100644 --- 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> 统计结果 + * @return HttpResult> 统计结果 */ @PostMapping("/getPmsDeviceInfoWithInOrg") HttpResult> getPmsDeviceInfoWithInOrg(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam); @@ -35,7 +35,7 @@ public interface PmsGeneralDeviceInfoClient { * @author cdf * @date 2022/10/18 10:12 * @param pmsDeviceInfoParam 查询条件 - * @return HttpResult> 统计结果 + * @return HttpResult> 统计结果 */ @PostMapping("/getPwPmsDeviceInfoWithOrgId") HttpResult> getPwPmsDeviceInfoWithOrgId(@RequestBody PmsDeviceInfoParam pmsDeviceInfoParam); diff --git 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 index c7996c968..665f6a8f2 100644 --- 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 { diff --git 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 index afa8dc2d9..38802f604 100644 --- 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 { diff --git 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 index 9bfab9e00..2a5656dc4 100644 --- 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 { diff --git 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 index 365a3e637..8ac0fb065 100644 --- 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 { diff --git 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 index fb1c45a89..40147db64 100644 --- 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 { diff --git 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 index d460bc7c5..266b2afa0 100644 --- 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") diff --git 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 index b52a54a09..d8f842943 100644 --- 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> getLineByDeptId(String id); diff --git 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 index f97cc3677..6286e612c 100644 --- 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 { /** diff --git 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 index 9cb6dd25b..133f3b73c 100644 --- 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 { diff --git 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 index 3f53e0774..20e4a77f7 100644 --- 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 { /** diff --git 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 index 0742ead20..012156e63 100644 --- 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 { diff --git 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 index 3e0e6d4ab..42a746620 100644 --- 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") diff --git 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 index 14da24cbf..3aaa7c9b3 100644 --- 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 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); diff --git 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 index 4a6d09946..5c3d8cb0a 100644 --- 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; diff --git 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 index dc66eb45b..fee8cd1f9 100644 --- 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; diff --git a/pqs-energy/energy-api/pom.xml b/pqs-energy/energy-api/pom.xml index 5558d940d..d110beb1b 100644 --- a/pqs-energy/energy-api/pom.xml +++ b/pqs-energy/energy-api/pom.xml @@ -32,7 +32,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java b/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java index 34447e9fd..ef1394493 100644 --- a/pqs-energy/energy-api/src/main/java/com/njcn/energy/pojo/dto/TemplateDataArrayDTO.java +++ b/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; diff --git a/pqs-event/event-api/pom.xml b/pqs-event/event-api/pom.xml index bdd2fa9dd..67e68a01b 100644 --- a/pqs-event/event-api/pom.xml +++ b/pqs-event/event-api/pom.xml @@ -29,7 +29,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java index d12cd9a52..0701a26a4 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java +++ b/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; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/TimeVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/TimeVO.java index 0c54baa0d..61f77cdaf 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/TimeVO.java +++ b/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; diff --git a/pqs-gateway/pom.xml b/pqs-gateway/pom.xml index 68071219a..a0772a625 100644 --- a/pqs-gateway/pom.xml +++ b/pqs-gateway/pom.xml @@ -29,7 +29,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-harmonic/harmonic-api/pom.xml b/pqs-harmonic/harmonic-api/pom.xml index 246ddc258..2ffbf72ed 100644 --- a/pqs-harmonic/harmonic-api/pom.xml +++ b/pqs-harmonic/harmonic-api/pom.xml @@ -30,7 +30,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java index b1ad76a4c..29a619456 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java +++ b/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; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PhotovoltaicServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PhotovoltaicServiceImpl.java index d113a0587..3b39d2c5a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PhotovoltaicServiceImpl.java +++ b/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; diff --git a/pqs-job/job-api/pom.xml b/pqs-job/job-api/pom.xml index 1aab7d063..ab770ed2d 100644 --- a/pqs-job/job-api/pom.xml +++ b/pqs-job/job-api/pom.xml @@ -47,16 +47,6 @@ org.springframework.boot spring-boot-starter-actuator - - - com.xuxueli - xxl-job-core - - - com.njcn - common-core - ${project.version} - org.springframework.cloud diff --git a/pqs-job/job-executor/pom.xml b/pqs-job/job-executor/pom.xml index 6a39aaa1e..c7ff9446f 100644 --- a/pqs-job/job-executor/pom.xml +++ b/pqs-job/job-executor/pom.xml @@ -35,7 +35,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-prepare/event-prepare/pom.xml b/pqs-prepare/event-prepare/pom.xml index 3ccbca8e1..0003c89db 100644 --- a/pqs-prepare/event-prepare/pom.xml +++ b/pqs-prepare/event-prepare/pom.xml @@ -50,7 +50,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-prepare/harmonic-prepare/pom.xml b/pqs-prepare/harmonic-prepare/pom.xml index ce8a06f84..cd43ff66b 100644 --- a/pqs-prepare/harmonic-prepare/pom.xml +++ b/pqs-prepare/harmonic-prepare/pom.xml @@ -53,7 +53,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ReportServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ReportServiceImpl.java index 4d4e80f43..8de56fda1 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ReportServiceImpl.java +++ b/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); diff --git a/pqs-process/process-api/pom.xml b/pqs-process/process-api/pom.xml index cef078f3b..51e40ab80 100644 --- a/pqs-process/process-api/pom.xml +++ b/pqs-process/process-api/pom.xml @@ -30,7 +30,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-quality/quality-api/pom.xml b/pqs-quality/quality-api/pom.xml index ff0a0c847..f3c00b6fe 100644 --- a/pqs-quality/quality-api/pom.xml +++ b/pqs-quality/quality-api/pom.xml @@ -29,7 +29,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-system/system-api/pom.xml b/pqs-system/system-api/pom.xml index d6086d6f9..e1779dd6e 100644 --- a/pqs-system/system-api/pom.xml +++ b/pqs-system/system-api/pom.xml @@ -30,7 +30,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java index 13889ac8f..f945624d5 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/AreaFeignClient.java +++ b/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> areaDeptTree(@RequestParam("id")String id , @RequestParam("type")Integer type); + HttpResult> areaDeptTree(@RequestParam("id") String id, @RequestParam("type") Integer type); /** * 根据区域id获取省份信息 */ @PostMapping("/areaPro") - HttpResult areaPro(@RequestParam("id")String id , @RequestParam("type")Integer type); + HttpResult areaPro(@RequestParam("id") String id, @RequestParam("type") Integer type); @PostMapping("/areaDeptPro") - HttpResult areaDeptPro(@RequestParam("id")String id); - + HttpResult areaDeptPro(@RequestParam("id") String id); /** diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/ConfigFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/ConfigFeignClient.java index 6ffcfc738..7b9c4118b 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/ConfigFeignClient.java +++ b/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 { /** diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java index 20c6fb2a2..5675e9773 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java +++ b/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 getDicDataByNameAndTypeName(@RequestParam("dicTypeName") String dicTypeName, @RequestParam("dicDataName") String dicDataName); - /*** * 字典类型 */ diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/ThemeFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/ThemeFeignClient.java index 75fb2b16b..9ab4031cb 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/ThemeFeignClient.java +++ b/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 { /** diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/UserLogFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/UserLogFeignClient.java index 6b2869eeb..25ab2a095 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/UserLogFeignClient.java +++ b/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 { /** diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 360af8bbe..2d4b263bb 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/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; diff --git a/pqs-user/user-api/pom.xml b/pqs-user/user-api/pom.xml index 2e7cc342a..48168aa36 100644 --- a/pqs-user/user-api/pom.xml +++ b/pqs-user/user-api/pom.xml @@ -29,7 +29,7 @@ com.njcn - common-microservice + ${micro.sdk} ${project.version} diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/AuthClientFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/AuthClientFeignClient.java index 4c1a9bed2..7ca6d632d 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/AuthClientFeignClient.java +++ b/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 { diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java index 58ab46ad1..404c60658 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java +++ b/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 getDeptIdByArea(@RequestParam("area") String area); /** * 根据部门id获取区域id + * * @param deptId - * @author denghuajun * @return + * @author denghuajun */ @GetMapping("/getAreaIdByDeptId") HttpResult getAreaIdByDeptId(@RequestParam("deptId") String deptId); @@ -81,7 +86,6 @@ public interface DeptFeignClient { HttpResult> getDepSonSelfCodetByDeptId(@RequestParam("deptId") String deptId); - /** * 根据部门id获取子部门ids */ @@ -107,12 +111,12 @@ public interface DeptFeignClient { HttpResult getRootDept(); /** - * @Description: 获取当前部门的的下级子部门list，如果没子部门就是返回当前部门 - * @Param: [deptId] - * @return: com.njcn.common.pojo.response.HttpResult> - * @Author: clam - * @Date: 2023/1/10 - */ + * @Description: 获取当前部门的的下级子部门list，如果没子部门就是返回当前部门 + * @Param: [deptId] + * @return: com.njcn.common.pojo.response.HttpResult> + * @Author: clam + * @Date: 2023/1/10 + */ @GetMapping("/getDepSonDetailIdByDeptId") - HttpResult> getDepSonDetailByDeptId(@RequestParam("deptId")String deptId) ; + HttpResult> getDepSonDetailByDeptId(@RequestParam("deptId") String deptId); } diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java index ee55085d6..1b6faafa0 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/UserFeignClient.java +++ b/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 { /** diff --git a/pqs-user/user-boot/src/main/resources/bootstrap.yml b/pqs-user/user-boot/src/main/resources/bootstrap.yml index 24ea12ff4..85d5047a4 100644 --- a/pqs-user/user-boot/src/main/resources/bootstrap.yml +++ b/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 diff --git a/pqs.ipr b/pqs.ipr index c7a2059db..c248a621a 100644 --- a/pqs.ipr +++ b/pqs.ipr @@ -290,6 +290,7 @@ +