新增接口

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java

@@ -10,11 +10,18 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.device.biz.enums.DeviceResponseEnum;
 import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.pq.mapper.*;
+import com.njcn.device.pq.mapper.DeviceMapper;
+import com.njcn.device.pq.mapper.LineDetailMapper;
+import com.njcn.device.pq.mapper.LineMapper;
+import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
 import com.njcn.device.pq.pojo.dto.*;
-import com.njcn.device.pq.pojo.param.*;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.po.*;
+import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
-import com.njcn.device.pq.pojo.po.line.LineInfoVO;
+import com.njcn.device.pq.pojo.param.OnlineRateParam;
+import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
+import com.njcn.device.pq.pojo.po.Device;
+import com.njcn.device.pq.pojo.po.Line;
+import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.service.LineService;
 import com.njcn.web.controller.BaseController;
@@ -93,6 +100,21 @@ public class LineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    /**
+     * 根据变电站id获取子节数据
+     *
+     * @param id 变电站id
+     * @return 结果
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据变电站id获取子节数据")
+    @PostMapping("getSubIndexLineDetail")
+    public HttpResult<List<Line>> getSubIndexLineDetail(@RequestParam("id") String id){
+        String methodDescribe = getMethodDescribe("getSubIndexLineDetail");
+        List<Line> result = lineService.getSubIndexLineDetail(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    };
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getComFlagInfoData")
     @ApiOperation("根据监测点Id终端状态信息")

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java

@@ -211,4 +211,6 @@ public interface LineService extends IService<Line> {
     LineALLInfoDTO getLineAllDetail(String id);
 
     DeviceVO getDeviceDetailData(String id);
+
+    List<Line> getSubIndexLineDetail(String id);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java

@@ -647,6 +647,14 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         return this.baseMapper.getDeviceDetailData(id);
     }
 
+    @Override
+    public List<Line> getSubIndexLineDetail(String id) {
+        return this.lambdaQuery()
+                .eq(Line::getLevel,6)
+                .like(Line::getPids,id)
+                .list();
+    }
+
     @Override
     public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {
         return overlimitMapper.selectBatchIds(pollutionParamDTO.getLineList());

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java

@@ -1,5 +1,6 @@
 package com.njcn.supervision.pojo.param.device;
 
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -158,4 +159,15 @@ public class SupervisionDevMainReportParam {
         private String Id;
 
     }
+    /**
+     * 分页查询实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class SupervisionDevMainReportQuery extends BaseParam {
+
+        @ApiModelProperty(value = "填报部门")
+        private String orgId;
+
+    }
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java

@@ -0,0 +1,159 @@
+package com.njcn.supervision.pojo.vo.device;
+
+import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
+import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Description:
+ * Date: 2024/5/10  18:16【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SupervisionDevMainReportVO {
+
+    @ApiModelProperty("id")
+    private String Id;
+    /**
+     * 填报人
+     */
+
+    @ApiModelProperty(value = "填报人")
+    private String reporter;
+
+    /**
+     * 填报日期
+     */
+
+    @ApiModelProperty(value = "填报日期")
+    private LocalDate reportDate;
+
+    /**
+     * 填报部门
+     */
+
+    @ApiModelProperty(value = "填报部门")
+    private String orgId;
+
+    @ApiModelProperty(value = "填报部门名称")
+    private String orgName;
+
+    /**
+     * 工程预期投产日期
+     */
+
+    @ApiModelProperty(value = "工程预期投产日期")
+    private LocalDate expectedProductionDate;
+
+    /**
+     * 所属地市
+     */
+
+    @ApiModelProperty(value = "所属地市")
+    private String city;
+
+    /**
+     * 用户状态
+     */
+
+    @ApiModelProperty(value = "用户状态")
+    private String userStatus;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userId;
+    /**
+     * 用户名称
+     */
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    /**
+     *监测点台账信息
+     */
+    @ApiModelProperty(value = "监测点台账信息")
+    private String lineFilePath;
+    /**
+     * 台终端账信息文件
+     */
+    @ApiModelProperty(value = "监测点台账信息")
+    private String deviceFilePath;
+
+
+    /**
+     * 验收检验报告
+     */
+
+    @ApiModelProperty(value = "验收检验报告")
+    private String acceptanceInspectionReport;
+
+    /**
+     * 验收检验报告单
+     */
+
+    @ApiModelProperty(value = "验收检验报告单")
+    private String acceptanceInspectionReportSingle;
+
+    /**
+     * 型式实验报告
+     */
+
+    @ApiModelProperty(value = "型式实验报告")
+    private String typeExperimentReport;
+
+    /**
+     * 出厂检验报告
+     */
+
+    @ApiModelProperty(value = "出厂检验报告")
+    private String factoryInspectionReport;
+
+    /**
+     * 性能检测报告
+     */
+
+    @ApiModelProperty(value = "性能检测报告")
+    private String performanceTestReport;
+
+    /**
+     * 信息安全检测报告
+     */
+
+    @ApiModelProperty(value = "信息安全检测报告")
+    private String informationSecurityTestReport;
+
+    /**
+     * 其他附件
+     */
+
+    @ApiModelProperty(value = "其他附件")
+    private String otherAttachments;
+
+    /**
+     * 流程实例的编号
+     */
+
+    @ApiModelProperty(value = "流程实例的编号")
+    private String processInstanceId;
+
+
+    @ApiModelProperty("发起人自选审批人 Map")
+    private Map<String, List<String>> startUserSelectAssignees;
+
+    private SupervisionTempDeviceReport supervisionTempDeviceReport;
+
+    private SupervisionTempLineReport supervisionTempLineReport;
+
+
+}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java

@@ -1,5 +1,6 @@
 package com.njcn.supervision.controller.device;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -7,6 +8,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
+import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO;
 import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -69,4 +71,14 @@ public class DeVReportManageController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/list")
+    @ApiOperation("分页查询当前用户能看到的接入监测装置设备")
+    @ApiImplicitParam(name = "supervisionDevMainReportQuery", value = "参数", required = true)
+    public HttpResult<Page<SupervisionDevMainReportVO>> getDevReport(@RequestBody @Validated SupervisionDevMainReportParam.SupervisionDevMainReportQuery supervisionDevMainReportQuery) {
+        String methodDescribe = getMethodDescribe("getDevReport");
+        Page<SupervisionDevMainReportVO> out = supervisionDevMainReportPOService.getDevReport(supervisionDevMainReportQuery);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
+    }
+
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java

@@ -99,5 +99,12 @@ public class UserReportManageController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getUserReportList")
+    @ApiOperation("查询干扰源下拉列表")
+    public HttpResult<List<UserReportVO>> getUserReportList(){
+        String methodDescribe = getMethodDescribe("getUserReportList");
+        List<UserReportVO> out = userReportPOService.getUserReportList();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
+    }
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionDevMainReportPOMapper.java

@@ -1,7 +1,11 @@
 package com.njcn.supervision.mapper.device;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
+import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * Description:
@@ -11,4 +15,5 @@ import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
  * @version V1.0.0
  */
 public interface SupervisionDevMainReportPOMapper extends BaseMapper<SupervisionDevMainReportPO> {
+    Page<SupervisionDevMainReportVO> page(@Param("page") Page<Object> objectPage, @Param("ew") QueryWrapper<SupervisionDevMainReportVO> quitRunningDeviceVOQueryWrapper);
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml

@@ -35,4 +35,12 @@
     other_attachments, process_instance_id, `status`, Create_By, Create_Time, Update_By, 
     Update_Time, `State`
   </sql>
+
+  <select id="page" resultType="com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO">
+    SELECT
+    *
+    FROM supervision_dev_main_report supervision_dev_main_report
+    WHERE ${ew.sqlSegment}
+  </select>
+
 </mapper>

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionDevMainReportPOService.java

@@ -1,8 +1,10 @@
 package com.njcn.supervision.service.device;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
 import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
+import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO;
 
 import java.util.List;
 
@@ -22,4 +24,6 @@ public interface SupervisionDevMainReportPOService extends IService<SupervisionD
     boolean auditDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportParamUpdate supervisionDevMainReportParamUpdate);
 
     Boolean removeDevReport(List<String> ids);
+
+    Page<SupervisionDevMainReportVO> getDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportQuery supervisionDevMainReportQuery);
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java

@@ -1,7 +1,11 @@
 package com.njcn.supervision.service.device.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.njcn.bpm.api.BpmProcessFeignClient;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
@@ -15,9 +19,12 @@ import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
 import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
 import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
+import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO;
 import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
 import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
 import com.njcn.supervision.service.device.SupervisionTempLineReportService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -45,11 +52,12 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
      * 用户信息建档对应的流程定义 KEY
      */
     //todo 修改成建设阶段流程图key
-    public static final String PROCESS_KEY = "build_user_info";
+    public static final String PROCESS_KEY = "device_info_add";
 
     private final BpmProcessFeignClient bpmProcessFeignClient;
     private final SupervisionTempDeviceReportService supervisionTempDeviceReportService;
     private final SupervisionTempLineReportService supervisionTempLineReportService;
+    private final DeptFeignClient deptFeignClient;
 
 
     @Override
@@ -101,6 +109,27 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         return true;
     }
 
+    @Override
+    public Page<SupervisionDevMainReportVO> getDevReport(SupervisionDevMainReportParam.SupervisionDevMainReportQuery supervisionDevMainReportQuery) {
+        QueryWrapper<SupervisionDevMainReportVO> quitRunningDeviceVOQueryWrapper = new QueryWrapper<>();
+        if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgId())) {
+            /*获取直接下属子单位*/
+            List<String> data = deptFeignClient.getDepSonIdtByDeptId(supervisionDevMainReportQuery.getOrgId()).getData();
+
+            //添加上时间范围
+            quitRunningDeviceVOQueryWrapper.between("supervision_dev_main_report.Create_Time",
+                    DateUtil.beginOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchBeginTime())),
+                    DateUtil.endOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchEndTime())));
+        }
+        quitRunningDeviceVOQueryWrapper.orderByDesc("supervision_dev_main_report.Update_Time");
+        Page<SupervisionDevMainReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionDevMainReportQuery), PageFactory.getPageSize(supervisionDevMainReportQuery)), quitRunningDeviceVOQueryWrapper);
+        page.getRecords().stream().forEach(temp->{
+            temp.setOrgName((deptFeignClient.getDeptById(temp.getOrgId()).getData().getName()));
+
+        });
+        return page;
+    }
+
     /**
     * @Description: 判断干扰源用户是否绑定设备，如果重复则提示干扰源用户已经设备
     * @Param: supervisionDevMainReportParam终端详情 isExcludeSelf是否排除自己，一般新增不排除，更新时需要排除自己

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java

@@ -17,6 +17,7 @@ import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.SubGetBase;
 import com.njcn.device.biz.pojo.param.SubstationParam;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.mapper.survey.SupervisionGeneralSurveyPlanPOMapper;
@@ -89,15 +90,14 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl<Super
                 supervisionGeneralSurveyPlanDetailPO.setSubName(stat.getName());
                 /*目前时间与计划开始时间，结束时间一致*/
                 supervisionGeneralSurveyPlanDetailPO.setVoltageLevel(stat.getVoltageLevel());
-                List<String> unitChildrenList = stat.getUnitChildrenList();
+                List<Line> lines= lineFeignClient.getSubIndexLineDetail(stat.getId()).getData();
-                if(CollectionUtil.isEmpty(unitChildrenList)){
+                if(CollectionUtil.isEmpty(lines)){
                     supervisionGeneralSurveyPlanDetailPO.setMeasurementPointId("");
                     supervisionGeneralSurveyPlanDetailPO.setIsSurvey(0);
                 }else {
-                    List<LineDetailDataVO> data = lineFeignClient.getLineDetailList(unitChildrenList).getData();
+                    String subList = lines.stream().map(Line::getName).collect(Collectors.joining(","));
-                    String subList = data.stream().map(LineDetailDataVO::getLineName).collect(Collectors.joining(","));
                     supervisionGeneralSurveyPlanDetailPO.setMeasurementPointId(subList);
-                    supervisionGeneralSurveyPlanDetailPO.setIsSurvey(0);
+                    supervisionGeneralSurveyPlanDetailPO.setIsSurvey(1);
                 }
                 supervisionGeneralSurveyPlanDetailPO.setState(DataStateEnum.ENABLE.getCode());
                 supervisionGeneralSurveyPlanDetailPOS.add(supervisionGeneralSurveyPlanDetailPO);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java

@@ -29,4 +29,6 @@ public interface UserReportPOService extends IService<UserReportPO> {
     UserReportVO getVOById(String id);
 
     void updateUserReportStatus(String businessKey, Integer status);
+
+    List<UserReportVO> getUserReportList();
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java

@@ -2,7 +2,6 @@ package com.njcn.supervision.service.user.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,7 +17,6 @@ import com.njcn.supervision.enums.FlowStatusEnum;
 import com.njcn.supervision.enums.UserNatureEnum;
 import com.njcn.supervision.mapper.user.UserReportPOMapper;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
-import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
 import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
@@ -240,6 +238,23 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         this.updateById(userReportPO);
     }
 
+    @Override
+    public List<UserReportVO> getUserReportList() {
+        String deptIndex = RequestUtil.getDeptIndex();
+        List<String> data = deptFeignClient.getDepSonIdtByDeptId(deptIndex).getData();
+
+        List<UserReportPO> list = this.lambdaQuery()
+                .eq(UserReportPO::getStatus, 2)
+                .in(CollectionUtil.isNotEmpty(data), UserReportPO::getOrgId, data)
+                .list();
+        List<UserReportVO> collect = list.stream().map(temp -> {
+            UserReportVO vo = new UserReportVO();
+            BeanUtils.copyProperties(temp, vo);
+            return vo;
+        }).collect(Collectors.toList());
+        return collect;
+    }
+
 
     /**
      * 获取所有字段为null的属性名