1.区域报告和监测点报告代码提交

2.终端管理部分代码提交

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/ExportParam.java

@@ -71,4 +71,6 @@ public class ExportParam implements Serializable {
     @ApiModelProperty(name = "flag",value = "标识")
     private Integer flag;
 
+    @ApiModelProperty(name = "type",value = "系统区分(0:pq 1:pms)")
+    private Integer type;
 }

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/ReportController.java

@@ -202,8 +202,14 @@ public class ReportController extends BaseController {
     @ApiImplicitParam(name = "areaReportParam", value = "参数体", required = true)
     public void getAreaReport(@RequestBody @Validated AreaReportParam areaReportParam, HttpServletResponse response) throws Exception {
         reportService.getAreaReport(areaReportParam, response);
-
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getPmsAreaReport")
+    @ApiOperation("获取Pms区域报告")
+    @ApiImplicitParam(name = "areaReportParam", value = "参数体", required = true)
+    public void getPmsAreaReport(@RequestBody @Validated AreaReportParam areaReportParam, HttpServletResponse response) throws Exception {
+        reportService.getPmsAreaReport(areaReportParam, response);
+    }
 
 }

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/ReportService.java

@@ -56,4 +56,12 @@ public interface ReportService {
     void getAreaReport(AreaReportParam areaReportParam, HttpServletResponse response) throws Exception;
 
 
+    /***
+     * Pms获取区域报告
+     * @author wr
+     * @date 2023-03-07 10:16
+     * @param areaReportParam
+     * @param response
+     */
+    void getPmsAreaReport(AreaReportParam areaReportParam, HttpServletResponse response) throws Exception;
 }

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/TerminalParam.java

@@ -28,8 +28,16 @@ public class TerminalParam {
     @ApiModelProperty("单位id")
     private String id;
 
+    public String getStartTime() {
+        return startTime + " 00:00:00";
+    }
+
+    public String getEndTime() {
+        return endTime + " 23:59:59";
+    }
+
     @Data
-    public static class TerminalPageParam extends TerminalParam{
+    public static class TerminalPageParam extends TerminalParam {
 
         @ApiModelProperty(value = "页码")
         private Integer PageNum;
@@ -37,6 +45,9 @@ public class TerminalParam {
         @ApiModelProperty(value = "条数")
         private Integer PageSize;
 
+        @ApiModelProperty("终端名称")
+        private String name;
+
         @ApiModelProperty(value = "是否周期检测列表")
         private Integer type;
     }

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java

@@ -54,12 +54,17 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
 
     @Override
     public Page<TerminalVO> terminalPage(TerminalParam.TerminalPageParam param) {
+        List<DeptDTO> data = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
+        List<String> deptCodes = data.stream().map(DeptDTO::getCode).collect(Collectors.toList());
         Page<PmsTerminalDetection> pageList = this.page(new Page<>(param.getPageNum(), param.getPageSize())
                 , new LambdaQueryWrapper<PmsTerminalDetection>()
+                        .eq(CollectionUtil.isNotEmpty(deptCodes), PmsTerminalDetection::getOrgName, deptCodes)
                         .eq(PmsTerminalDetection::getStatus, DataStateEnum.ENABLE.getCode())
-//                        .in(RMpWpPowerDetailQ::getMeasurementPointId, monitorIds)
+                        .like(StrUtil.isNotBlank(param.getName()), PmsTerminalDetection::getName, param.getName())
                         .le(param.getType() != 0, PmsTerminalDetection::getNextInspectionTime, LocalDate.now())
-//                        .le(StrUtil.isNotBlank(param.getEndTime()), PmsTerminalDetection::getDataDate, param.getEndTime())
+                        .ge(StrUtil.isNotBlank(param.getStartTime()), PmsTerminalDetection::getInspectionTime, param.getStartTime())
+                        .le(StrUtil.isNotBlank(param.getEndTime()), PmsTerminalDetection::getInspectionTime, param.getEndTime())
+
         );
         List<TerminalVO> rMpWpPowerDetailVOS2 = BeanUtil.copyToList(pageList.getRecords(), TerminalVO.class);
 
@@ -131,7 +136,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
     public void importReport(MultipartFile[] files, HttpServletResponse response) {
         PmsTerminalDetection detection;
         List<PmsTerminalDetection> data = new ArrayList<>();
-
+        //传入的文件格式(终端编号-检测报告.docx);
         for (int i = 0; i < files.length; i++) {
             detection = new PmsTerminalDetection();
             //上传的文件名称