From a33b9590e6a3df46fa5d14791cd5d3900a68800a Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 15 May 2023 20:00:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../algorithm/api/CsEdDataFeignClient.java | 28 ++++++++++++ .../CsEdDataFeignClientFallbackFactory.java | 44 +++++++++++++++++++ .../njcn/algorithm/pojo/po/CsEdDataPO.java | 9 ++++ .../njcn/algorithm/pojo/vo/CsEdDataVO.java | 3 ++ .../EquipmentDeliveryController.java | 4 +- .../project/CsEdDataController.java | 20 +++++++-- .../algorithm/service/CsEdDataService.java | 8 ++++ .../service/impl/CsEdDataServiceImpl.java | 19 ++++++++ .../impl/CsEquipmentDeliveryServiceImpl.java | 2 +- 9 files changed, 130 insertions(+), 7 deletions(-) create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/CsEdDataFeignClient.java create mode 100644 pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/CsEdDataFeignClientFallbackFactory.java diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/CsEdDataFeignClient.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/CsEdDataFeignClient.java new file mode 100644 index 000000000..c4f6f8a88 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/CsEdDataFeignClient.java @@ -0,0 +1,28 @@ +package com.njcn.algorithm.api; + +import com.njcn.algorithm.api.fallback.CsEdDataFeignClientFallbackFactory; +import com.njcn.algorithm.pojo.po.CsEdDataPO; +import com.njcn.algorithm.pojo.vo.CsEdDataVO; +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @author xy + */ +@FeignClient(value = ServerInfo.ALGORITHM_BOOT, path = "/edData", fallbackFactory = CsEdDataFeignClientFallbackFactory.class,contextId = "edData") +public interface CsEdDataFeignClient { + + @PostMapping("/findByDevTypeId") + HttpResult findByDevTypeId(@RequestParam("devType") String devType); + + @PostMapping("/getAll") + HttpResult> getAll(@RequestParam("devType") String devType); +} diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/CsEdDataFeignClientFallbackFactory.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/CsEdDataFeignClientFallbackFactory.java new file mode 100644 index 000000000..e18d7e711 --- /dev/null +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/api/fallback/CsEdDataFeignClientFallbackFactory.java @@ -0,0 +1,44 @@ +package com.njcn.algorithm.api.fallback; + +import com.njcn.algorithm.api.CsEdDataFeignClient; +import com.njcn.algorithm.pojo.po.CsEdDataPO; +import com.njcn.algorithm.pojo.vo.CsEdDataVO; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author xy + */ +@Slf4j +@Component +public class CsEdDataFeignClientFallbackFactory implements FallbackFactory { + @Override + public CsEdDataFeignClient create(Throwable cause) { + //判断抛出异常是否为解码器抛出的业务异常 + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (cause.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException) cause.getCause(); + } + Enum finalExceptionEnum = exceptionEnum; + return new CsEdDataFeignClient() { + + @Override + public HttpResult findByDevTypeId(String devType) { + log.error("{}异常，降级处理，异常为：{}","根据装置型号获取装置类型",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> getAll(String devType) { + log.error("{}异常，降级处理，异常为：{}","根据装置型号获取装置类型",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java index d38813498..fc2a12542 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsEdDataPO.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; import java.util.Date; /** @@ -23,6 +25,7 @@ import java.util.Date; */ @Data @TableName(value = "cs_ed_data") +@EqualsAndHashCode(callSuper = true) public class CsEdDataPO extends BaseEntity { /** * id @@ -78,4 +81,10 @@ public class CsEdDataPO extends BaseEntity { @TableField(value = "file_path") private String filePath; + /** + * 装置类型 + */ + @TableField(value = "type") + private String type; + } \ No newline at end of file diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java index 4fa7af5f4..e5708bb0c 100644 --- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java +++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsEdDataVO.java @@ -68,4 +68,7 @@ public class CsEdDataVO extends BaseEntity { @ApiModelProperty(value = ".bin文件") private String filePath; + @ApiModelProperty(value = "type") + private String type; + } \ No newline at end of file diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java index 3258486f1..4c0faf7d8 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/Equipment/EquipmentDeliveryController.java @@ -74,8 +74,8 @@ public class EquipmentDeliveryController extends BaseController { - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/queryEquipmentByndid") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryEquipmentByndid") @ApiOperation("通过ndid查询出厂设备") @ApiImplicitParam(name = "ndid", value = "网关识别码", required = true) public HttpResult queryEquipmentByndid(@RequestParam("ndid")String ndid){ diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/CsEdDataController.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/CsEdDataController.java index 7f22b15eb..dd94c7ba6 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/CsEdDataController.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/project/CsEdDataController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.njcn.algorithm.pojo.param.CsEdDataAddParm; import com.njcn.algorithm.pojo.param.CsEdDataAuditParm; import com.njcn.algorithm.pojo.param.CsEdDataQueryParm; +import com.njcn.algorithm.pojo.po.CsDictPO; +import com.njcn.algorithm.pojo.po.CsEdDataPO; import com.njcn.algorithm.pojo.vo.CsEdDataVO; import com.njcn.algorithm.service.CsEdDataService; import com.njcn.common.pojo.annotation.OperateInfo; @@ -18,10 +20,10 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; /** * Description: @@ -72,4 +74,14 @@ public class CsEdDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/findByDevTypeId") + @ApiOperation("根据装置型号获取装置类型") + @ApiImplicitParam(name = "devType", value = "装置型号", required = true) + public HttpResult findByDevTypeId(@Validated @RequestParam("devType") String devType){ + String methodDescribe = getMethodDescribe("findByDevTypeId"); + CsEdDataVO vo = csEdDataService.findByDevTypeId(devType); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe); + } + } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java index 43b87add1..0e2a14035 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/CsEdDataService.java @@ -8,6 +8,8 @@ import com.njcn.algorithm.pojo.po.CsEdDataPO; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.algorithm.pojo.vo.CsEdDataVO; +import java.util.List; + /** * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html @@ -42,5 +44,11 @@ public interface CsEdDataService extends IService { * @Date: 2023/4/7 */ IPage queryEdDataPage(CsEdDataQueryParm csEdDataQueryParm); + + /** + * @Description: 根据装置型号获取装置类型 + * @author: xuyang + */ + CsEdDataVO findByDevTypeId(String devType); } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEdDataServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEdDataServiceImpl.java index 15e051aed..53d40c162 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEdDataServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEdDataServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.algorithm.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,7 +17,10 @@ import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; /** @@ -66,5 +70,20 @@ public class CsEdDataServiceImpl extends ServiceImpl returnpage = this.getBaseMapper ().getPage(returnpage,csEdDataQueryParm); return returnpage; } + + @Override + public CsEdDataVO findByDevTypeId(String devType) { + CsEdDataPO csEdDataPo = new CsEdDataPO(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(CsEdDataPO::getDevType,devType); + lambdaQueryWrapper.eq(CsEdDataPO::getStatus,1); + List list = this.baseMapper.selectList(lambdaQueryWrapper); + if (!CollectionUtils.isEmpty(list)){ + csEdDataPo = list.get(0); + } + CsEdDataVO csEdDataVo = new CsEdDataVO(); + BeanUtils.copyProperties(csEdDataPo,csEdDataVo); + return csEdDataVo; + } } diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java index fe45a2c34..28cd43308 100644 --- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -73,7 +73,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl wrapper = new QueryWrapper(); wrapper.eq ("ndid", ndid); - wrapper.eq("status",2); + wrapper.eq("status",1); CsEquipmentDeliveryPO csEquipmentDeliveryPO = this.baseMapper.selectOne (wrapper); return csEquipmentDeliveryPO; } From 889039f2b4f8cde7f7b0509d9d71dce5c42aa051 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 16 May 2023 09:11:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerManger/DeptMonitorController.java | 100 +++++++++--------- .../pq/service/ISubstationExpendService.java | 5 + 2 files changed, 55 insertions(+), 50 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java index 94154c611..8a02a587a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java @@ -1,50 +1,50 @@ -package com.njcn.device.pms.controller.ledgerManger; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; -import com.njcn.device.biz.pojo.param.DeptGetLineParam; -import com.njcn.device.pms.service.majornetwork.IMonitorService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author wr - * @description - * @date 2023/4/26 10:00 - */ -@RestController -@RequestMapping("/commTerminal") -@RequiredArgsConstructor -@Slf4j -@Api(tags = "通用台账-所有子孙部门以及监测点") -public class DeptMonitorController extends BaseController { - - private final IMonitorService monitorService; - - /** - * 通过部门获取所有子集部门所拥有的监测点 - * - * @author wr - * @date 2023/4/26 - */ - @PostMapping("/deptGetLineIds") - @ApiImplicitParam(name = "param", value = "请求参数", required = true) - public HttpResult> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) { - String methodDescribe = getMethodDescribe("deptGetLineList"); - List monitor = monitorService.deptMonitor(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); - } - -} +//package com.njcn.device.pms.controller.ledgerManger; +// +//import com.njcn.common.pojo.enums.response.CommonResponseEnum; +//import com.njcn.common.pojo.response.HttpResult; +//import com.njcn.common.utils.HttpResultUtil; +//import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; +//import com.njcn.device.biz.pojo.param.DeptGetLineParam; +//import com.njcn.device.pms.service.majornetwork.IMonitorService; +//import com.njcn.web.controller.BaseController; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiImplicitParam; +//import lombok.RequiredArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.util.List; +// +///** +// * @author wr +// * @description +// * @date 2023/4/26 10:00 +// */ +//@RestController +//@RequestMapping("/commTerminal") +//@RequiredArgsConstructor +//@Slf4j +//@Api(tags = "通用台账-所有子孙部门以及监测点") +//public class DeptMonitorController extends BaseController { +// +// private final IMonitorService monitorService; +// +// /** +// * 通过部门获取所有子集部门所拥有的监测点 +// * +// * @author wr +// * @date 2023/4/26 +// */ +// @PostMapping("/deptGetLineIds") +// @ApiImplicitParam(name = "param", value = "请求参数", required = true) +// public HttpResult> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) { +// String methodDescribe = getMethodDescribe("deptGetLineList"); +// List monitor = monitorService.deptMonitor(param); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); +// } +// +//} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java index 58437386c..72ad7e90c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java @@ -17,5 +17,10 @@ import java.util.List; */ public interface ISubstationExpendService { + /** + * 冀北主网监测点通讯状态统计 + * @param param + * @return + */ List getCommunicationStatus(DeviceInfoParam.CompareLimitParam param); } From 412cbc41244a48ee27866d4ff794b79441b38b7f Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 16 May 2023 09:39:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pms/pojo/dto/PmsLedgerStaticDTO.java | 2 +- .../device/pms/pojo/dto/PmsMonitorBaseDTO.java | 2 +- .../njcn/device/pms/pojo/dto/PmsSimpleDTO.java | 4 ++-- .../ledgerManger/SubstationExpendController.java | 6 +----- .../mapping/DistributionMonitorMapper.xml | 4 ++-- .../majornetwork/mapping/MonitorMapper.xml | 16 ++++++++-------- .../pms/service/ISubstationExpendService.java | 1 - .../impl/SubstationExpendServiceImpl.java | 2 -- .../service/majornetwork/ITerminalService.java | 1 - .../majornetwork/impl/TerminalServiceImpl.java | 3 --- .../device/pq/pojo/param/CommunicateParam.java | 2 +- .../device/pq/pojo/param/DeviceInfoParam.java | 2 +- .../com/njcn/device/pq/pojo/po/Communicate.java | 4 +++- .../njcn/device/pq/pojo/vo/CommunicateVO.java | 3 +-- .../controller/SubstationExpendController.java | 2 +- .../njcn/device/pq/mapper/mapping/LineMapper.xml | 3 +-- .../pq/service/ISubstationExpendService.java | 3 +-- .../impl/SubstationExpendServiceImpl.java | 16 +--------------- .../com/njcn/event/pojo/param/WaveTypeParam.java | 5 +---- .../majornetwork/Impl/ReportServiceImpl.java | 2 -- .../service/impl/TerminalServiceImpl.java | 4 ---- 21 files changed, 26 insertions(+), 61 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsLedgerStaticDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsLedgerStaticDTO.java index cc5741a03..afa842d7b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsLedgerStaticDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsLedgerStaticDTO.java @@ -35,7 +35,7 @@ public class PmsLedgerStaticDTO implements Serializable { private List> monitorStatisticsByDept; /** - * 根据单位统计终端数量 + *根据单位统计终端数量 */ private List> terminalStatisticsByDept; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java index f31ed197b..4a9c83fcd 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java @@ -38,7 +38,7 @@ public class PmsMonitorBaseDTO implements Serializable { private String powerrId; /*** - * 终端ID + *终端ID */ private String terminalId; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsSimpleDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsSimpleDTO.java index 2e0438693..f518c5c20 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsSimpleDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsSimpleDTO.java @@ -31,7 +31,7 @@ public class PmsSimpleDTO implements Serializable { @Data public static class PmsSimpleOrg extends PmsSimpleDTO{ - @ApiModelProperty(name = "OrgName", value = "部门名称") - private String OrgName; + @ApiModelProperty(name = "orgName", value = "部门名称") + private String orgName; } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java index 4dc7ec6aa..53bda4b1a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java @@ -8,8 +8,6 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pms.pojo.dto.PmsLedgerStaticDTO; -import com.njcn.device.pms.pojo.param.PmsBaseParam; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.po.SubstationExpend; import com.njcn.device.pms.service.ISubstationExpendService; import com.njcn.device.pq.pojo.param.CommunicateParam; @@ -26,8 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.njcn.web.controller.BaseController; -import java.math.BigDecimal; -import java.util.Arrays; import java.util.List; import java.util.Map; @@ -71,7 +67,7 @@ public class SubstationExpendController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getPVCommunicationStatus") - @ApiOperation("冀北主网监测点通讯状态统计") + @ApiOperation("冀北主网监测点pms:通讯状态统计") @ApiImplicitParam(name = "param", value = "冀北主网监测点台账统计参数", required = true) public HttpResult> getPVCommunicationStatus(@RequestBody CommunicateParam param) { String methodDescribe = getMethodDescribe("getPVCommunicationStatus"); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml index 337a1ea8a..07a8cd51b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml @@ -206,8 +206,8 @@ SELECT - pms_monitor.id monitorId, - pms_monitor.Operation_Id, - pms_monitor.Powerr_id, - pms_monitor.Terminal_Id, - pms_monitor.line_Name, - pms_monitor.line_Id + pms_monitor.id monitorId, + pms_monitor.Operation_Id, + pms_monitor.Powerr_id, + pms_monitor.Terminal_Id, + pms_monitor.line_Name, + pms_monitor.line_Id FROM - pms_monitor pms_monitor LEFT JOIN pms_terminal pms_terminal ON pms_monitor.Terminal_Id = pms_terminal.id + pms_monitor pms_monitor LEFT JOIN pms_terminal pms_terminal ON pms_monitor.Terminal_Id = pms_terminal.id WHERE - pms_monitor.Org_Id IN + pms_monitor.Org_Id IN #{orgId} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISubstationExpendService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISubstationExpendService.java index cc6c754b3..e2271f4b5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISubstationExpendService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISubstationExpendService.java @@ -4,7 +4,6 @@ package com.njcn.device.pms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.device.pms.pojo.dto.PmsLedgerStaticDTO; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.po.SubstationExpend; import com.njcn.device.pq.pojo.param.CommunicateParam; import com.njcn.device.pq.pojo.vo.CommunicateVO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java index 338142b7a..321c9f1e7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java @@ -9,8 +9,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.param.StatisticsBizBaseParam; -import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; -import com.njcn.device.pms.controller.ledgerManger.PmsGeneralDeviceController; import com.njcn.device.pms.mapper.SubstationExpendMapper; import com.njcn.device.pms.mapper.majornetwork.DistributionMonitorMapper; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java index dbc277260..4f858ebe7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java @@ -6,7 +6,6 @@ import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.param.PmsTerminalParam; import com.njcn.device.pms.pojo.param.TerminalQueryParam; import com.njcn.device.pms.pojo.po.PmsTerminal; -import com.njcn.web.pojo.param.BaseParam; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java index bd11bd97d..38f2ff46d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; -import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; import com.njcn.device.pms.mapper.majornetwork.TerminalMapper; import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.param.PmsTerminalParam; @@ -25,13 +24,11 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.web.factory.PageFactory; -import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Objects; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java index 6c2f9f033..befeb0005 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java @@ -13,7 +13,7 @@ import lombok.Data; public class CommunicateParam extends StatisticsBizBaseParam { /** - * 查询条数 + * (查询条数) */ @ApiModelProperty("查询条数") private Integer limit; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java index c4ef6cb2b..2b9cb1752 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java @@ -173,7 +173,7 @@ public class DeviceInfoParam implements Serializable { public static class CompareLimitParam extends BusinessParam{ @ApiModelProperty("查询条数") - @NotNull(message = "查询条数查询条数不能为空") + @NotNull(message = " 查询条数查询条数不能为空") private Integer limit; } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java index 0a51184df..45939488c 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java @@ -25,7 +25,9 @@ public class Communicate { */ @Column(name = "time") private Instant updateTime; - + /** + * 监测点id + */ @Column(name = "line_id") private String id; /** diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java index 1ae1f9bfa..fc3c897e6 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.common.utils.serializer.InstantDateSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.influxdb.annotation.Column; import java.io.Serializable; import java.time.Instant; @@ -51,7 +50,7 @@ public class CommunicateVO implements Serializable { @ApiModelProperty("描述") private String remark; - @ApiModelProperty("终端ip(终端名称_ip)") + @ApiModelProperty("终端ip：(终端名称_ip)") private String devIp; } } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/SubstationExpendController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/SubstationExpendController.java index 895f5f7cc..ca943213e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/SubstationExpendController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/SubstationExpendController.java @@ -38,7 +38,7 @@ public class SubstationExpendController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getPVCommunicationStatus") - @ApiOperation("冀北主网监测点通讯状态统计") + @ApiOperation("冀北主网监测点pq:通讯状态统计") @ApiImplicitParam(name = "param", value = "冀北主网监测点台账统计参数", required = true) public HttpResult> getPVCommunicationStatus(@RequestBody DeviceInfoParam.CompareLimitParam param) { String methodDescribe = getMethodDescribe("getPVCommunicationStatus"); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 80a33d4c5..612e7a615 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -211,8 +211,7 @@