Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
wurui
2023-02-15 11:37:03 +08:00
parent c220b93f69 22cb7670a3
commit b580ca931e
57 changed files with 222 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/AlarmClient.java
View File

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

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeptLineFeignClient.java
View File

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

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/DeviceTreeClient.java
View File

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

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java
View File

@@ -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 {

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
View File

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

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/SubstationFeignClient.java
View File

@@ -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 {

5
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java
View File

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

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TabCensusController.java
View File

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

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java
View File

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

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
View File

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