From c5b427d8a3048cfd0770e5d3d9060524bda835fe Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 26 Mar 2024 16:11:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4=202.=E5=9B=BD=E7=BD=91=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1=203.=E5=9B=BD?= =?UTF-8?q?=E7=BD=91=E6=96=B0=E8=83=BD=E6=BA=90=E5=9C=BA=E7=AB=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/biz/pojo/dto/LineDevGetDTO.java | 10 ++ .../biz/pojo/param/DeptGetLineParam.java | 2 + .../pms/enums/PmsDeviceResponseEnum.java | 3 + .../pms/pojo/param/NewEnergyQueryParam.java | 80 ++++++++++ .../njcn/device/pms/pojo/po/PmsNewEnergy.java | 82 ++++++++++ .../device/pms/pojo/vo/gw/MonitorEnergy.java | 59 ++++++++ .../gwPush/MonitorStatisticsController.java | 38 +++++ .../ledgerManger/PmsNewEnergyController.java | 116 ++++++++++++++ .../majornetwork/PmsNewEnergyMapper.java | 16 ++ .../majornetwork/SpecialAnalysisMapper.java | 3 +- .../mapping/DistributionMonitorMapper.xml | 2 +- .../mapping/PmsNewEnergyMapper.xml | 5 + .../mapping/SpecialAnalysisMapper.xml | 1 + .../service/gwPush/IPmsNewEnergyService.java | 51 +++++++ .../gwPush/MonitorStatisticsService.java | 18 +++ .../impl/MonitorStatisticsServiceImpl.java | 143 ++++++++++++++++++ .../gwPush/impl/PmsNewEnergyServiceImpl.java | 141 +++++++++++++++++ .../impl/CommTerminalServiceImpl.java | 6 +- .../PowerDistributionareaServiceImpl.java | 3 + .../impl/SpecialAnalysisServiceImpl.java | 4 +- .../pojo/vo/RLoadTypeUserManageVO.java | 10 ++ .../PmsTerminalDetectionController.java | 2 +- .../RGeneralSurveyPlanController.java | 25 +-- .../mapper/LoadTypeUserManageMapper.java | 7 +- .../mapping/LoadTypeUserManageMapper.xml | 18 ++- .../service/PmsTerminalDetectionService.java | 2 +- .../service/RSurveyPlanConfigServiceImpl.java | 17 +++ .../impl/LoadTypeUserManageServiceImpl.java | 19 ++- .../impl/PmsTerminalDetectionServiceImpl.java | 2 +- .../impl/RGeneralSurveyPlanPOServiceImpl.java | 3 + .../impl/RSurveyPlanConfigService.java | 7 +- 31 files changed, 858 insertions(+), 37 deletions(-) create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/NewEnergyQueryParam.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsNewEnergy.java create mode 100644 pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/MonitorEnergy.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsNewEnergyController.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsNewEnergyMapper.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsNewEnergyMapper.xml create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/IPmsNewEnergyService.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/PmsNewEnergyServiceImpl.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java index 9290c12a0..5b8effe2b 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/LineDevGetDTO.java @@ -82,6 +82,16 @@ public class LineDevGetDTO { */ private Integer isUpToGrid; + /** + * 0.未上送 1.已上送 2.取消上送 3.待重新上送(用于典型负荷) + */ + private Integer isUploadHead; + + /** + * 0.未上送 1.已上送 2.取消上送 3.待重新上送(用于主网监测点) + */ + private Integer monitorUploadStatus; + /** * oracle监测点id */ diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java index 9b3b3e388..d67e6973f 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java @@ -26,5 +26,7 @@ public class DeptGetLineParam { @ApiModelProperty(name = "systemType",value = "0.只返回主网的监测点信息; 1.只返回配网的监测点信息; null、2.返回主网配网两种监测点信息") private Integer systemType; + @ApiModelProperty(name = "monitorStateAll",value = "true.只返回在线监测点信息 false.返回全部监测点信息") + private Boolean monitorStateRunning=true; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java index cd12e4a40..1f54d7e63 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java @@ -59,6 +59,9 @@ public enum PmsDeviceResponseEnum { NO_ID_STATION("A00357","变电站编号为空"), NO_ID_ORG("A00357","部门编号为空"), + NE_ENERGY_ID("A003560","场站编号重复"), + MONITOR_NE_ENERGY_FIND("A00361","主网监测点存在绑定该场站信息关系,请先解除绑定关系"), + ; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/NewEnergyQueryParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/NewEnergyQueryParam.java new file mode 100644 index 000000000..a865cd7a1 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/NewEnergyQueryParam.java @@ -0,0 +1,80 @@ +package com.njcn.device.pms.pojo.param; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import com.njcn.web.pojo.param.BaseParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import javax.validation.constraints.NotBlank; + +/** + * pqs + * + * @author cdf + * @date 2023/2/20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NewEnergyQueryParam extends BaseParam { + + @ApiModelProperty(value = "单位id") + private String orgId; + + @Data + public static class Info { + + private static final long serialVersionUID = 1L; + /** + * id + */ + @TableId("Id") + private String id; + + /** + * 名称 + */ + @NotBlank(message = "对象类型不能为空") + @TableField("Obj_Name") + private String objName; + /** + * 组织机构名称 + */ + @TableField("Org_Name") + private String orgName; + + /** + * 组织机构ID(外键) + */ + @TableField("Org_Id") + private String orgId; + /** + * 电压等级 + */ + @TableField("voltage_Level") + private String voltageLevel; + + /** + * 电压等级 + */ + @TableField("Powerr_Name") + private String powerrName; + + /** + * 检测点对象类型(字典) + */ + @TableField("Obj_Type") + private String objType; + + /** + * 电压等级 + */ + @TableField("station_status") + private String stationStatus; + + } + +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsNewEnergy.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsNewEnergy.java new file mode 100644 index 000000000..a50c83c48 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsNewEnergy.java @@ -0,0 +1,82 @@ +package com.njcn.device.pms.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * + *

+ * + * @author wr + * @since 2024-03-26 + */ +@Getter +@Setter +@TableName("pms_new_energy") +public class PmsNewEnergy extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId("Id") + private String id; + + /** + * 名称 + */ + @TableField("Obj_Name") + private String objName; + /** + * 组织机构名称 + */ + @TableField("Org_Name") + private String orgName; + + /** + * 组织机构ID(外键) + */ + @TableField("Org_Id") + private String orgId; + /** + * 电压等级 + */ + @TableField("voltage_Level") + private String voltageLevel; + + /** + * 电压等级 + */ + @TableField("Powerr_Name") + private String powerrName; + + /** + * 检测点对象类型(字典) + */ + @TableField("Obj_Type") + private String objType; + + /** + * 电压等级 + */ + @TableField("station_status") + private String stationStatus; + + /** + * 状态：0-删除 1-正常 + */ + @TableField("State") + private Integer state; + + + +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/MonitorEnergy.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/MonitorEnergy.java new file mode 100644 index 000000000..b1bbd0270 --- /dev/null +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/MonitorEnergy.java @@ -0,0 +1,59 @@ +package com.njcn.device.pms.pojo.vo.gw; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author wr + * @description + * @date 2024/3/22 11:05 + */ +@Data +public class MonitorEnergy { + + @ApiModelProperty(value = "部门名称") + private String orgName; + + @ApiModelProperty(value = "监测点信息") + List
info; + + + @Data + public static class Details { + + @ApiModelProperty(value = "对象类型") + private String objType; + + @ApiModelProperty(value = "接入线路电压等级为110kV及以上变电站数量(座)") + private String num; + + @ApiModelProperty(value = "接入线路电压等级为110kV及以上变电站数量(座)") + List voltageInfo; + } + + @Data + public static class VoltageInfo { + + @ApiModelProperty(value = "已监测数量") + private Integer monitorNum; + + @ApiModelProperty(value = "新能源场站总数") + private Integer totalNum; + + @ApiModelProperty(value = "监测率") + private Float monitorRate; + + @ApiModelProperty(value = "装置数量（台）") + private Integer deviceNum; + + @ApiModelProperty(value = "覆盖变电站数量(座)") + private Integer substationsNum; + + @ApiModelProperty(value = "电站覆盖率(%)") + private Float substationsRate; + + } + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java new file mode 100644 index 000000000..3c23a4c10 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java @@ -0,0 +1,38 @@ +package com.njcn.device.pms.controller.gwPush; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +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.pms.service.gwPush.MonitorStatisticsService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +@RestController +@RequestMapping("/monitorStatistics") +@Api(tags = "台账类国网上送监测点统计") +@RequiredArgsConstructor +public class MonitorStatisticsController extends BaseController { + + private final MonitorStatisticsService monitorStatisticsService; + + @PostMapping("/objType") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("国网上送接口") + public HttpResult< List>> objType(String deptId){ + String methodDescribe = getMethodDescribe("objType"); + List> gwMonitorStatistics = monitorStatisticsService.getGwMonitorStatistics(deptId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, gwMonitorStatistics, methodDescribe); + } + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsNewEnergyController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsNewEnergyController.java new file mode 100644 index 000000000..53d4639b0 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsNewEnergyController.java @@ -0,0 +1,116 @@ +package com.njcn.device.pms.controller.ledgerManger; + + +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; +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.pms.pojo.param.NewEnergyQueryParam; +import com.njcn.device.pms.pojo.po.PmsNewEnergy; +import com.njcn.device.pms.service.gwPush.IPmsNewEnergyService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import com.njcn.web.controller.BaseController; + +import java.util.List; + +/** + *

+ * 前端控制器 + *

+ * + * @author wr + * @since 2024-03-26 + */ +@RestController +@RequestMapping("/pmsNewEnergy") +@RequiredArgsConstructor +public class PmsNewEnergyController extends BaseController { + + private final IPmsNewEnergyService newEnergyService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("getNewEnergyList") + @ApiOperation("分页场站台账所有信息") + @ApiImplicitParam(name = "baseParam",value = "查询监测终端台账信息",required = true) + public HttpResult> getNewEnergyList(@RequestBody @Validated NewEnergyQueryParam baseParam){ + String methodDescribe = getMethodDescribe("getNewEnergyList"); + Page res = newEnergyService.getNewEnergyList(baseParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("getNewEnergySelectList") + @ApiOperation("查询场站台账所有信息") + public HttpResult> getNewEnergySelectList(String orgId){ + String methodDescribe = getMethodDescribe("getNewEnergySelectList"); + List res = newEnergyService.getNewEnergySelectList(orgId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe); + } + + + /** + * 新增监测终端台账信息 + * @author hany + * @date 2022/10/26 + */ + @PostMapping("/addNewEnergy") + @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType= OperateType.ADD) + @ApiOperation("新增监测终端台账信息") + @ApiImplicitParam(name = "param", value = "新增实体", required = true) + public HttpResult add(@RequestBody @Validated NewEnergyQueryParam.Info param){ + String methodDescribe = getMethodDescribe("add"); + boolean result = newEnergyService.add(param); + if (result) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + /** + * 修改监测终端台账信息 + * @author hany + * @date 2022/10/27 + */ + @PostMapping("/updateNewEnergy") + @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE) + @ApiOperation("修改监测终端台账信息") + @ApiImplicitParam(name = "updateParam", value = "更新实体", required = true) + public HttpResult update(@RequestBody @Validated NewEnergyQueryParam.Info updateParam){ + String methodDescribe = getMethodDescribe("update"); + boolean result = newEnergyService.update(updateParam); + if (result) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + /** + * 删除监测终端台账信息 + * @param ids id + * @author hany + * @date 2022/10/27 + */ + @PostMapping("/deleteNewEnergy") + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE) + @ApiOperation("删除监测终端台账信息") + @ApiImplicitParam(name = "ids", value = "ID索引", required = true) + public HttpResult delete(@RequestBody List ids){ + String methodDescribe = getMethodDescribe("delete"); + boolean result = newEnergyService.delete(ids); + if(result){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } +} + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsNewEnergyMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsNewEnergyMapper.java new file mode 100644 index 000000000..5251fc7ed --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsNewEnergyMapper.java @@ -0,0 +1,16 @@ +package com.njcn.device.pms.mapper.majornetwork; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pms.pojo.po.PmsNewEnergy; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wr + * @since 2024-03-26 + */ +public interface PmsNewEnergyMapper extends BaseMapper { + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java index 30e9aea57..9e1840d43 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/SpecialAnalysisMapper.java @@ -22,7 +22,8 @@ public interface SpecialAnalysisMapper { * @return */ List selectList(@Param("deptIdList") List deptIdList, - @Param("monitorTags") String monitorTags); + @Param("monitorTags") String monitorTags, + @Param("status") String status); /** * 同比环比数据(风电场，光伏电站，冶炼负荷) 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 bfa8eb1c2..b444fded8 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 @@ -63,7 +63,7 @@ 1 as Status, now() as Create_Time, now() as Update_Time, - Line_Id as Statistical_Interval, + Line_Id as Line_Id, 15 as Statistical_Interval, Power_Station_Id as Power_Station_Id from diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsNewEnergyMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsNewEnergyMapper.xml new file mode 100644 index 000000000..021f62a18 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsNewEnergyMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml index 0915c68e7..018945a32 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml @@ -22,6 +22,7 @@ pm.`Status` = 1 AND ps.`Status` = 1 + AND pm.`Monitor_State` = #{status} AND pm.Org_Id IN diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/IPmsNewEnergyService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/IPmsNewEnergyService.java new file mode 100644 index 000000000..a61a558ec --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/IPmsNewEnergyService.java @@ -0,0 +1,51 @@ +package com.njcn.device.pms.service.gwPush; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pms.pojo.param.NewEnergyQueryParam; +import com.njcn.device.pms.pojo.param.PmsBaseParam; +import com.njcn.device.pms.pojo.po.PmsNewEnergy; +import com.njcn.web.pojo.param.BaseParam; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author wr + * @since 2024-03-26 + */ +public interface IPmsNewEnergyService extends IService { + /** + * 分页查询所有 + * @return Page + */ + Page getNewEnergyList(NewEnergyQueryParam baseParam); + + /** + * 查询所有 + * @param + * @return + */ + List getNewEnergySelectList(String orgId); + + + /** + * 新增 + */ + boolean add(NewEnergyQueryParam.Info param); + + /** + * 修改 + * @param + */ + boolean update(NewEnergyQueryParam.Info updateParam); + + /** + * 删除 + * @param ids ids + */ + boolean delete(List ids); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java new file mode 100644 index 000000000..dbe72f835 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java @@ -0,0 +1,18 @@ +package com.njcn.device.pms.service.gwPush; + +import com.njcn.device.pms.pojo.vo.gw.MonitorEnergy; + +import java.util.List; + +/** + * 国网台账类上送 + */ +public interface MonitorStatisticsService { + + /** + * @Description: 国网上送统计类型数量统计 + * @Author: wr + * @Date: 2024/3/22 9:49 + */ + List> getGwMonitorStatistics(String deptId); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java new file mode 100644 index 000000000..c07310c46 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java @@ -0,0 +1,143 @@ +package com.njcn.device.pms.service.gwPush.impl; + +import cn.hutool.core.collection.CollUtil; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; +import com.njcn.device.biz.pojo.dto.LineDevGetDTO; +import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.device.pms.service.gwPush.MonitorStatisticsService; +import com.njcn.device.pms.service.ledgerManger.CommTerminalService; +import com.njcn.system.api.DictTreeFeignClient; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.enums.DicTreeEnum; +import com.njcn.system.pojo.po.SysDicTreePO; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.po.Dept; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * pqs + * + * @author cdf + * @date 2023/12/11 + */ +@Service +@RequiredArgsConstructor +public class MonitorStatisticsServiceImpl implements MonitorStatisticsService { + + private final CommTerminalService commTerminalService; + private final DictTreeFeignClient dictTreeFeignClient; + + @Override + public List> getGwMonitorStatistics(String deptId) { + List> info = new ArrayList<>(); + //查询所有一级树字典 + List sysDicTreePOList = dictTreeFeignClient.queryAll().getData(); + + //监测点大类 + List broadCategory = sysDicTreePOList.stream() + .filter(item -> Objects.equals(item.getPid(), "0")) + .filter(item -> !Objects.equals(item.getCode(), DicDataTypeEnum.DEVICE_UNIT.getCode())) + .collect(Collectors.toList()); + broadCategory.sort(Comparator.comparing(SysDicTreePO::getSort)); + + List list = new ArrayList<>(); + list.add(""); + List collect = broadCategory.stream().map(SysDicTreePO::getName).collect(Collectors.toList()); + list.addAll(collect); + list.add("合计"); + //获取主网监测统计 + Map> metWorkMap = mapDicIds(broadCategory, sysDicTreePOList); + + //筛选典型源荷统计 + List sourceLoad = sysDicTreePOList.stream().filter(item -> + Objects.equals(DicTreeEnum.Power_Station.getCode(), item.getCode()) || + Objects.equals(DicTreeEnum.Ele_Railways.getCode(), item.getCode()) || + Objects.equals(DicTreeEnum.Wind_Farms.getCode(), item.getCode()) || + Objects.equals(DicTreeEnum.Imp_Users.getCode(), item.getCode()) + ).collect(Collectors.toList()); + sourceLoad.sort(Comparator.comparing(SysDicTreePO::getSort)); + //获取典型源荷监测统计 + Map> sourceLoadMap = mapDicIds(sourceLoad, sysDicTreePOList); + list.addAll(sourceLoad.stream().map(SysDicTreePO::getName).collect(Collectors.toList())); + list.add("其他"); + list.add("合计"); + info.add(list); + //筛选出国网统计信息 + DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); + deptGetLineParam.setDeptId(deptId); + deptGetLineParam.setMonitorStateRunning(false); + List deptGetChildrenMoreDTOS = commTerminalService.deptGetLine(deptGetLineParam); + //部门信息循环 + List line; + for (DeptGetChildrenMoreDTO deptMonitor : deptGetChildrenMoreDTOS) { + line = new ArrayList<>(); + line.add(deptMonitor.getUnitName()); + List lineBaseList = deptMonitor.getLineBaseList(); + if(CollUtil.isEmpty(lineBaseList)){ + continue; + } + List upToGridList = lineBaseList.stream().filter(item -> Objects.equals(item.getIsUpToGrid(), DataStateEnum.ENABLE.getCode())) + .collect(Collectors.toList()); + addmetWorkList(metWorkMap, upToGridList, line); + addSourceLoadList(sourceLoadMap, upToGridList, line); + info.add(line); + } + return info; + } + + private List addmetWorkList(Map> mapSourceLoad, List upToGridList, List line) { + long total = 0; + for (String s : mapSourceLoad.keySet()) { + List value = mapSourceLoad.get(s); + long monitorCount = upToGridList.stream().filter(item -> value.contains(item.getObjType()) && + Objects.equals(item.getMonitorUploadStatus(), DataStateEnum.ENABLE.getCode()) + ).map(LineDevGetDTO::getPointId).count(); + total += monitorCount; + line.add(String.valueOf(monitorCount)); + } + line.add(String.valueOf(total)); + return line; + } + private List addSourceLoadList(Map> mapSourceLoad, List upToGridList, List line) { + long total = 0; + for (String s : mapSourceLoad.keySet()) { + List value = mapSourceLoad.get(s); + long monitorCount = upToGridList.stream().filter(item -> value.contains(item.getObjType()) && + Objects.equals(item.getIsUploadHead(), DataStateEnum.ENABLE.getCode()) + ).map(LineDevGetDTO::getPointId).count(); + total += monitorCount; + line.add(String.valueOf(monitorCount)); + } + List sourceLoad = mapSourceLoad.values().stream().flatMap(list -> list.stream()).distinct().collect(Collectors.toList()); + long count = upToGridList.stream().filter(item -> !sourceLoad.contains(item.getObjType()) && + Objects.equals(item.getIsUploadHead(), DataStateEnum.ENABLE.getCode()) + ).map(LineDevGetDTO::getPointId).count(); + line.add(String.valueOf(count)); + total += count; + line.add(String.valueOf(total)); + return line; + } + /** + * + * @param objType 监测点对象类型大类 + * @param objTypeAll 监测点所有对象类型 + * @return + */ + private Map> mapDicIds(List objType, List objTypeAll) { + Map> mapKey = new LinkedHashMap<>(); + for(SysDicTreePO load : objType){ + List ids = objTypeAll.stream().filter(item -> item.getPid().equals(load.getId()) || + item.getId().equals(load.getId()) + ).map(SysDicTreePO::getId).collect(Collectors.toList());; + mapKey.put(load.getCode(), ids); + } + return mapKey; + } + + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/PmsNewEnergyServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/PmsNewEnergyServiceImpl.java new file mode 100644 index 000000000..50c4a8262 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/PmsNewEnergyServiceImpl.java @@ -0,0 +1,141 @@ +package com.njcn.device.pms.service.gwPush.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.PmsNewEnergyMapper; +import com.njcn.device.pms.pojo.param.NewEnergyQueryParam; +import com.njcn.device.pms.pojo.po.*; +import com.njcn.device.pms.service.gwPush.IPmsNewEnergyService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +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; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + *

+ * 服务实现类 + *

+ * + * @author wr + * @since 2024-03-26 + */ +@Service +@RequiredArgsConstructor +public class PmsNewEnergyServiceImpl extends ServiceImpl implements IPmsNewEnergyService { + + private final DeptFeignClient deptFeignClient; + private final IMonitorService monitorService; + @Override + public Page getNewEnergyList(NewEnergyQueryParam baseParam) { + List orgIds = new ArrayList<>(); + if(StrUtil.isNotBlank(baseParam.getOrgId())){ + orgIds.addAll(deptFeignClient.getDepSonSelfCodetByDeptId(baseParam.getOrgId()).getData()); + } + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PmsNewEnergy::getState,DataStateEnum.ENABLE.getCode()) + .in(CollUtil.isNotEmpty(orgIds),PmsNewEnergy::getOrgId,orgIds); + if(StrUtil.isNotBlank(baseParam.getSearchValue())) { + lambdaQueryWrapper.and(i -> i.like(PmsNewEnergy::getObjName, baseParam.getSearchValue()) + .or() + .like(PmsNewEnergy::getOrgName, baseParam.getSearchValue()) + .or() + .like(PmsNewEnergy::getPowerrName, baseParam.getSearchValue())); + } + lambdaQueryWrapper.orderByDesc(PmsNewEnergy::getCreateTime); + //初始化分页数据 + return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); + } + + @Override + public List getNewEnergySelectList(String orgId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PmsNewEnergy::getState,DataStateEnum.ENABLE.getCode()); + if(StrUtil.isNotBlank(orgId)){ + List deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(orgId).getData(); + lambdaQueryWrapper.in(PmsNewEnergy::getOrgId,deptCodes); + } + return this.list(lambdaQueryWrapper); + } + + + + @Override + public boolean add(NewEnergyQueryParam.Info param) { + List list = this.list(new LambdaQueryWrapper() + .eq(PmsNewEnergy::getState,DataStateEnum.ENABLE.getCode()) + .eq(PmsNewEnergy::getId, param.getId()) + .or(wrapper -> + wrapper.eq(PmsNewEnergy::getObjName, param.getOrgName()) + ) + ); + if (CollectionUtil.isNotEmpty(list)) { + List collect = list.stream().map(PmsNewEnergy::getObjName).collect(Collectors.toList()); + if(collect.contains(param.getObjName())){ + throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + } + throw new BusinessException(PmsDeviceResponseEnum.NE_ENERGY_ID); + } + PmsNewEnergy pmsNewEnergy = new PmsNewEnergy(); + BeanUtils.copyProperties(param, pmsNewEnergy); + return this.save(pmsNewEnergy); + } + + /** + * 修改监测终端台账 + * @author hany + * @date 2022/10/27 + */ + @Override + public boolean update(NewEnergyQueryParam.Info param) { + List list = this.list(new LambdaQueryWrapper() + .eq(PmsNewEnergy::getState,DataStateEnum.ENABLE.getCode()) + .ne(PmsNewEnergy::getId, param.getId()) + .and(wrapper -> + wrapper.eq(PmsNewEnergy::getObjName, param.getObjName()) + ) + ); + if (CollectionUtil.isNotEmpty(list)) { + List collect = list.stream().map(PmsNewEnergy::getObjName).collect(Collectors.toList()); + if(collect.contains(param.getObjName())){ + throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + } + } + PmsNewEnergy pmsNewEnergy = BeanUtil.copyProperties(param, PmsNewEnergy.class); + return this.updateById(pmsNewEnergy); + } + + /** + * 删除 + * @param ids + */ + @Override + public boolean delete(List ids) { + //删除前需要判断依赖终端的监测点是否存在 + LambdaQueryWrapper monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + monitorLambdaQueryWrapper.in(Monitor::getTractionId,ids).eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()); + int mCount = monitorService.count(monitorLambdaQueryWrapper); + if(mCount>0){ + throw new BusinessException(PmsDeviceResponseEnum.MONITOR_NE_ENERGY_FIND); + } + return this.update(new LambdaUpdateWrapper() + .set(PmsNewEnergy::getState, DataStateEnum.DELETED.getCode()) + .in(PmsNewEnergy::getId, ids)); + } + +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 3108f941d..72f1ea5b6 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -129,7 +129,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { Map> map = new HashMap<>(); if (deptGetLineParam.getSystemType() == 0 || deptGetLineParam.getSystemType() == 2) { - List monitorList = monitorMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getStatus, 1).eq(Monitor::getMonitorState, dictData.getId())); + List monitorList = monitorMapper.selectList(new LambdaQueryWrapper() + .eq(Monitor::getStatus, 1) + .eq(deptGetLineParam.getMonitorStateRunning(),Monitor::getMonitorState, dictData.getId())); map = monitorList.stream().collect(Collectors.groupingBy(Monitor::getOrgId)); } //TODO 配网数据量巨大，暂时注释 @@ -168,6 +170,8 @@ public class CommTerminalServiceImpl implements CommTerminalService { //预处理模块需要的id修改value为id lineDevGetDTO.setVoltageLevel(it.getVoltageLevel()); lineDevGetDTO.setIsUpToGrid(it.getIsUpToGrid()); + lineDevGetDTO.setIsUploadHead(it.getIsUploadHead()); + lineDevGetDTO.setMonitorUploadStatus(it.getMonitorUploadStatus()); lineList.add(lineDevGetDTO); }); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java index 9d3008439..14e15e147 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java @@ -83,8 +83,11 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl getList(BaseParam baseParam) { + List deptInfo = deptFeignClient.getAllDept().getData(); + List deptIds = deptInfo.stream().map(Dept::getCode).collect(Collectors.toList()); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode()) + .in(CollUtil.isNotEmpty(deptIds),PowerDistributionarea::getOrgId,deptIds) .and(StrUtil.isNotBlank(baseParam.getSearchValue()), i->i.like(PowerDistributionarea::getName,baseParam.getSearchValue()) .or() diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java index 5d015831e..21cfd2abd 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java @@ -43,7 +43,7 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService { List voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); //将电压信息转成map，key：id value：name Map voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - + DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData(); //专项分析-只是统计当前所在部门及下部门直接挂钩的监测点 List deptList = deptFeignClient.getSpecialDeptList().getData(); List deptIds = deptList.stream().map(Dept::getCode).collect(Collectors.toList()); @@ -64,7 +64,7 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService { break; } //1.获取原始数据(参数1，部门id。参数2，监测点标签字典id集合) - List infoList = specialAnalysisMapper.selectList(deptIds, data.getId()); + List infoList = specialAnalysisMapper.selectList(deptIds, data.getId(),dictData.getId()); //获取部门区域 if (CollectionUtil.isNotEmpty(infoList)) { diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java index bdbf6b784..ca5c9f043 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RLoadTypeUserManageVO.java @@ -80,6 +80,11 @@ public class RLoadTypeUserManageVO implements Serializable { */ @ApiModelProperty("入网报告路径") private String iFilePath; + /** + * 入网报告名称 + */ + @ApiModelProperty("入网报告名称") + private String iFilePathName; /** * 入网报告上传时间 */ @@ -120,6 +125,11 @@ public class RLoadTypeUserManageVO implements Serializable { */ @ApiModelProperty("实测报告路径") private String aFilePath; + /** + * 实测报告名称 + */ + @ApiModelProperty("实测报告名称") + private String aFilePathName; /** * 实测报告上传时间 */ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/PmsTerminalDetectionController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/PmsTerminalDetectionController.java index 9f160e08b..ca81524ab 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/PmsTerminalDetectionController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/PmsTerminalDetectionController.java @@ -125,7 +125,7 @@ public class PmsTerminalDetectionController extends BaseController { @ApiOperation("检测报告下载") @GetMapping(value = "/reportDownload") - public InputStreamResource reportDownload( TerminalParam.DownloadParam param) throws IOException { + public InputStreamResource reportDownload( TerminalParam.DownloadParam param){ InputStreamResource minIoUploadResDTO = pmsTerminalDetectionService.reportDownload(param); return minIoUploadResDTO; } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java index 102692c14..55b8416e8 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java @@ -26,7 +26,6 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -98,33 +97,23 @@ public class RGeneralSurveyPlanController extends BaseController { @PostMapping("/addPlanConfig") @ApiOperation("增加普测计划参数") @ApiImplicitParam(name = "rSurveyPlanConfigVOList", value = "", required = true) - public HttpResult addPlanConfig(@Validated @RequestBody List rSurveyPlanConfigVOList) { - String methodDescribe = getMethodDescribe("querySubStatation"); - double sum = rSurveyPlanConfigVOList.stream().mapToDouble(RSurveyPlanConfigVO::getProportion).sum(); + public HttpResult addPlanConfig(@Validated @RequestBody List rSurveyPlanConfigVOList) { + String methodDescribe = getMethodDescribe("addPlanConfig"); + double sum = rSurveyPlanConfigVOList.stream().mapToDouble(RSurveyPlanConfigPO::getProportion).sum(); if (sum > 1) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.MATH_ERROR, false, methodDescribe); } - List collect = rSurveyPlanConfigVOList.stream().map(temp -> { - RSurveyPlanConfigPO rs = new RSurveyPlanConfigPO(); - BeanUtils.copyProperties(temp, rs); - return rs; - }).collect(Collectors.toList()); - boolean b = rSurveyPlanConfigService.saveOrUpdateBatchByMultiId(collect, 500); + boolean b = rSurveyPlanConfigService.saveOrUpdateBatchByMultiId(rSurveyPlanConfigVOList, 500); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe); } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPlanConfig") @ApiOperation("查询普测计划参数") - public HttpResult> queryPlanConfig() { + public HttpResult> queryPlanConfig() { String methodDescribe = getMethodDescribe("queryPlanConfig"); - List list = rSurveyPlanConfigService.list(); - List collect = list.stream().map(temp -> { - RSurveyPlanConfigVO rs = new RSurveyPlanConfigVO(); - BeanUtils.copyProperties(temp, rs); - return rs; - }).collect(Collectors.toList()); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, collect, methodDescribe); + List list = rSurveyPlanConfigService.getOrgIds(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java index badaf99cc..3ba209bb7 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java @@ -28,7 +28,8 @@ public interface LoadTypeUserManageMapper extends BaseMapper getLoadTypeUserPage(IPage page, @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam, - @Param("ids") List ids + @Param("ids") List ids, + @Param("aStatus") String aStatus ); /** @@ -38,6 +39,8 @@ public interface LoadTypeUserManageMapper extends BaseMapper getLoadTypeRelationPage(IPage page, - @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam + @Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam, + @Param("ids") List ids, + @Param("aStatus") String aStatus ); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml index 32c715396..1d0c208e4 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml @@ -15,7 +15,7 @@ - and r.i_check_person is null and r.i_check_person !="" + AND ( r.i_check_person IS not NULL or r.i_check_person != "") and r.load_type = #{param.loadType} @@ -26,6 +26,9 @@ and r.i_is_file_upload = #{param.fileUploadflag} + + and r.a_status != #{aStatus} + order by record_time desc @@ -39,8 +42,14 @@ AND ISNULL( relation_user_id )= 0 AND LENGTH( trim( relation_user_id ))> 0 - - and r.org_no = #{param.orgNo} + + AND r.org_no IN + + #{item} + + + + AND ( r.i_check_person IS not NULL or r.i_check_person != "") and r.load_type = #{param.loadType} @@ -53,6 +62,9 @@ and r.a_is_file_upload = #{param.aIsFileUpload} + + + and r.a_status != #{aStatus} order by record_time desc diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java index ea6936166..52fef3e31 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java @@ -92,7 +92,7 @@ public interface PmsTerminalDetectionService extends IService implements RSurveyPlanConfigService{ + private final DeptFeignClient deptFeignClient; + @Override + public List getOrgIds() { + List data = deptFeignClient.getAllDept().getData(); + List orgIds = data.stream().map(Dept::getCode).collect(Collectors.toList()); + return this.list(new LambdaQueryWrapper().in(CollUtil.isNotEmpty(orgIds),RSurveyPlanConfigPO::getOrgId,orgIds )); + } } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java index d231ca979..5f37b1e8e 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java @@ -29,6 +29,7 @@ import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.WebUtil; +import liquibase.pro.packaged.S; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.jdbc.Null; @@ -72,13 +73,14 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService Page page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize()); List ids=deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( ); Integer checkType = loadTypeUserSearchParam.getCheckType(); + String aStatus = null; //0表示不是审核信息 1标识审核信息 - List data = deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( ); if(checkType==1){ - ids=data.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList()); + ids=ids.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList()); + aStatus = dicDataFeignClient.getDicDataByCode(DicDataEnum.FINISH.getCode()).getData().getId(); } //干扰源用户信息录入 - Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam,ids); + Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam,ids,aStatus); List dept = deptFeignClient.allDeptList().getData(); Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, pvTerminalTreeVO -> pvTerminalTreeVO)); //部门处理：根据部门code取名称 @@ -202,8 +204,15 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService @Override public Page getLoadTypeRelationList(LoadTypeUserSearchParam loadTypeUserSearchParam) { Page page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize()); - Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeRelationPage(page, loadTypeUserSearchParam); - + List ids=deptFeignClient.getDepSonIdtByDeptId (loadTypeUserSearchParam.getOrgNo()).getData ( ); + Integer checkType = loadTypeUserSearchParam.getCheckType(); + String aStatus = null; + //0表示不是审核信息 1标识审核信息 + if(checkType==1){ + ids=ids.stream().filter(x->!x.contains(loadTypeUserSearchParam.getOrgNo())).collect(Collectors.toList()); + aStatus = dicDataFeignClient.getDicDataByCode(DicDataEnum.FINISH.getCode()).getData().getId(); + } + Page loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeRelationPage(page, loadTypeUserSearchParam,ids,aStatus); //部门处理：根据部门code取名称 List list = loadTypeUserPage.getRecords(); List dept = deptFeignClient.allDeptList().getData(); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java index 3a9fe67d6..494555aba 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java @@ -306,7 +306,7 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))). diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyPlanConfigService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyPlanConfigService.java index 6175ffda0..b68edfd25 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyPlanConfigService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RSurveyPlanConfigService.java @@ -2,7 +2,10 @@ package com.njcn.process.service.impl; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.process.pojo.po.RSurveyPlanConfigPO; - /** + +import java.util.List; + +/** * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html @@ -14,4 +17,6 @@ import com.njcn.process.pojo.po.RSurveyPlanConfigPO; public interface RSurveyPlanConfigService extends IMppService { + List getOrgIds(); + }