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

代码提交

Browse Source
This commit is contained in:
雨木c
2023-02-21 11:17:50 +08:00
parent f5ea9a9ad0
commit 600dc1c38e
28 changed files with 336 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java
View File

@@ -37,4 +37,38 @@ public class DistributionMonitorParam {
@ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电")
private Integer smallType;
@ApiModelProperty(value = "终端id")
private String terminalId;
/**
* 监测终端接线方式(字典)
*/
@ApiModelProperty(value = "监测终端接线方式(字典)")
private String terminalWiringMethod;
/**
* pt变比
*/
@ApiModelProperty(value = "pt1")
private Float pt1;
/**
* pt变比
*/
@ApiModelProperty(value = "pt2")
private Float pt2;
/**
* ct变比
*/
@ApiModelProperty(value = "ct1")
private Float ct1;
/**
* ct变比
*/
@ApiModelProperty(value = "ct2")
private Float ct2;
}

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
View File

@@ -58,6 +58,13 @@ public class PmsTerminalParam {
@NotBlank(message = "装置型号不能为空")
private String deviceModel;
/**
* 装置类别(字典)
*/
@ApiModelProperty(name = "deviceCategory", value = "装置类别")
@NotBlank(message = "装置类别不能为空")
private String deviceCategory;
@ApiModelProperty(name = "manufacture", value = "生产厂家")
@NotBlank(message = "生产厂家不能为空")
private String manufacture;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TaiZhangParam.java
View File

@@ -33,6 +33,8 @@ public class TaiZhangParam extends BaseParam {
private Integer treeType;
@ApiModelProperty(value = "监测点状态(字典)")
private String monitorState;

25
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TerminalQueryParam.java Normal file
View File

@@ -0,0 +1,25 @@
package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* pqs
*
* @author cdf
* @date 2023/2/20
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class TerminalQueryParam extends BaseParam {
@ApiModelProperty(value = "监测点状态(字典)")
private String monitorState;
@ApiModelProperty(value = "装置类别(字典)")
private String deviceCategory;
}

6
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java
View File

@@ -77,6 +77,12 @@ public class PmsTerminal extends BaseEntity {
*/
private String deviceModel;
/**
* 装置类别(字典)
*/
private String deviceCategory;
/**
* 生产厂家(字典)
*/

43
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsDistributionMonitorController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsDistributionMonitorController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import cn.hutool.core.collection.CollectionUtil;
@@ -63,6 +63,45 @@ public class PmsDistributionMonitorController extends BaseController {
}
}
/**
* 修改配网监测点表
* @author cdf
* @date 2022/10/26
*/
@PostMapping("updateDistributionMonitor")
@ApiImplicitParam(name = "distributionMonitorParam",value = "配网监测点实体",required = true)
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
@ApiOperation("修改配网监测点")
public HttpResult<Boolean> updateDistributionMonitor(@RequestBody @Validated DistributionMonitorParam distributionMonitorParam){
String methodDescribe = getMethodDescribe("updateDistributionMonitor");
boolean res= iDistributionMonitorService.updateDistributionMonitor(distributionMonitorParam);
if(res){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
}
/**
* 根据监测点id获取配网监测点
* @author cdf
* @date 2023/2/20
*/
@PostMapping("getDistributionMonitorById")
@ApiImplicitParams({
@ApiImplicitParam(name = "monitorSort",value = "配网类别",required = true),
@ApiImplicitParam(name = "id",value = "配网监测点编号",required = true)
})
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("根据监测点id获取配网监测点")
public HttpResult<DistributionMonitor> getDistributionMonitorById(@RequestParam("monitorSort") String monitorSort,@RequestParam("id") String id){
String methodDescribe = getMethodDescribe("getDistributionMonitorById");
DistributionMonitor res = iDistributionMonitorService.getDistributionMonitorById(monitorSort,id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
}
/**
* 获取配网监测点
* @author cdf
@@ -153,5 +192,7 @@ public class PmsDistributionMonitorController extends BaseController {
}
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneralDeviceController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneralDeviceController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import cn.hutool.core.collection.CollectionUtil;
import com.njcn.common.pojo.annotation.OperateInfo;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixWireController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixWireController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

32
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsMonitorController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +10,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
import com.njcn.device.pms.pojo.param.TerminalQueryParam;
import com.njcn.device.pms.pojo.param.MonitorParam;
import com.njcn.device.pms.pojo.param.MonitorStatus;
import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
@@ -20,9 +21,9 @@ import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.web.controller.BaseController;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -30,6 +31,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Objects;
@@ -119,7 +121,7 @@ public class PmsMonitorController extends BaseController {
@PostMapping("/getAllMonitorPageList")
@ApiOperation("分页获取所有主网监测点")
@ApiImplicitParam(name = "baseParam",required = true)
public HttpResult<Page<Monitor>> getAllMonitorPageList(@RequestBody BaseParam baseParam) {
public HttpResult<Page<Monitor>> getAllMonitorPageList(@RequestBody TerminalQueryParam baseParam) {
String methodDescribe = getMethodDescribe("getAllMonitorList");
Page<Monitor> monitor= monitorService.getAllMonitorPageList(baseParam);
if (Objects.isNull(monitor)) {
@@ -212,6 +214,30 @@ public class PmsMonitorController extends BaseController {
}
/**
* 退役监测点
* @author cdf
* @date 2023/2/20
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
@PostMapping("/retirementMonitor")
@ApiOperation("退役服役监测点")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "0.主网 1.配网", required = true),
@ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true)
})
public HttpResult<Boolean> retirementMonitor(@NotNull(message = "监测类别不可为空") @RequestParam("type") Integer type,
@NotEmpty(message = "监测点不可为空") @RequestBody List<String> lineIds) {
String methodDescribe = getMethodDescribe("retirementMonitor");
boolean result = monitorService.retirementMonitor(type,lineIds);
if(result){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
/**分割线-----------------------------------------------------------*/

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerClientController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerClientController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerDistributionareaController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerDistributionareaController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerGenerationUserController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerGenerationUserController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsPowerQualityMatterController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsPowerQualityMatterController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import org.springframework.web.bind.annotation.RequestMapping;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsStatationStatController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

5
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsTerminalController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsTerminalController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +11,7 @@ import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
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.device.pms.pojo.vo.PmsTerminalVO;
import com.njcn.device.pms.service.majornetwork.ITerminalService;
@@ -50,7 +51,7 @@ public class PmsTerminalController extends BaseController {
@PostMapping("getTerminalList")
@ApiOperation("分页查询监测终端台账所有信息")
@ApiImplicitParam(name = "baseParam",value = "查询监测终端台账信息",required = true)
public HttpResult<Page<PmsTerminal>> getTerminalList(@RequestBody @Validated BaseParam baseParam){
public HttpResult<Page<PmsTerminal>> getTerminalList(@RequestBody @Validated TerminalQueryParam baseParam){
String methodDescribe = getMethodDescribe("getTerminalList");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam);
Page<PmsTerminal> res = iTerminalService.getTerminalList(baseParam);

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsTractionStationController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsTractionStationController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalEliminateDataController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/TerminalEliminateDataController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.controller.majornetwork;
package com.njcn.device.pms.controller.ledgerManger;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

14
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml
View File

@@ -60,13 +60,16 @@
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=null">
and a.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
<if test="taiZhangParam.monitorState!='' and taiZhangParam.monitorState !=null">
and b.Monitor_State = #{taiZhangParam.monitorState}
</if>
and a.status = 1
</select>
<select id="getPowerDisAreaMonitorByOrg" resultType="PowerDistributionarea">
select a.* from pms_power_distributionarea a
inner join pms_distribution_monitor b on a.id = b.Monitor_Id
and b.Monitor_Sort = #{taiZhangParam.lineType}
and b.Monitor_Sort = #{taiZhangParam.lineType}
where a.org_id in
<foreach collection="deptIds" item="item" open="(" close=")" separator=",">
#{item}
@@ -74,6 +77,9 @@
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=null">
and a.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
<if test="taiZhangParam.monitorState!='' and taiZhangParam.monitorState !=null">
and b.monitor_state = #{taiZhangParam.monitorState}
</if>
and a.status = 1
</select>
@@ -89,6 +95,9 @@
</foreach>
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=null">
and yong.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
<if test="taiZhangParam.monitorState!='' and taiZhangParam.monitorState !=null">
and dis.Monitor_State = #{taiZhangParam.monitorState}
</if>
and dis.status = 1
</select>
@@ -107,6 +116,9 @@
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=null">
and fa.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
<if test="taiZhangParam.monitorState!='' and taiZhangParam.monitorState !=null">
and dis.Monitor_State = #{taiZhangParam.monitorState}
</if>
and dis.status = 1
</select>
<select id="distributionMonitorListByCondition" resultType="com.njcn.device.pms.pojo.po.DistributionMonitor">

20
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java
View File

@@ -45,6 +45,13 @@ public interface IDistributionMonitorService extends IService<DistributionMonito
*/
Boolean addDistributionMonitor(DistributionMonitorParam distributionMonitorParam);
/**
* 修改配网监测点
* @author cdf
* @date 2022/11/23
*/
Boolean updateDistributionMonitor(DistributionMonitorParam distributionMonitorParam);
/**
* 查询配网监测点
* @author cdf
@@ -53,19 +60,22 @@ public interface IDistributionMonitorService extends IService<DistributionMonito
List<DistributionMonitor> distributionMonitorList(List<String> disMonitorIds);
DistributionMonitor getDistributionMonitorById(String monitorSort,String id);
/**
* 删除配网监测点
* @author cdf
* @date 2022/12/5
*/
Boolean delDistributionMonitor(TaiZhangDelParam taiZhangDelParam);
/**
/**
* @Description: 按部门获取旗下配网所有监测点(分一类，二类，三类)
* @Param: [orgId, monitorSort]
* @return: java.util.List<com.njcn.device.pms.pojo.po.DistributionMonitor>
* @Param: [orgId, monitorSort]
* @return: java.util.List<com.njcn.device.pms.pojo.po.DistributionMonitor>
* @Author: clam
* @Date: 2022/12/14
*/
* @Date: 2022/12/14
*/
List<DistributionMonitor> distributionMonitorListByCondition(String orgId, String monitorSort);
/**

13
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java
View File

@@ -3,17 +3,13 @@ package com.njcn.device.pms.service.majornetwork;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
import com.njcn.device.pms.pojo.param.*;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.web.pojo.param.BaseParam;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -73,7 +69,7 @@ public interface IMonitorService extends IService<Monitor> {
Page<Monitor> getAllMonitorPageList(BaseParam baseParam);
Page<Monitor> getAllMonitorPageList(TerminalQueryParam baseParam);
List<Monitor> getMonitorList(List<String> monitorIds);
@@ -107,6 +103,13 @@ public interface IMonitorService extends IService<Monitor> {
*/
boolean delMonitor(List<String> monitorIds);
/**
*
* @author cdf
* @date 2023/2/20
*/
boolean retirementMonitor(Integer type, List<String> lineIds);
/***
*

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
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;
@@ -23,7 +24,7 @@ public interface ITerminalService extends IService<PmsTerminal> {
* 分页查询所有
* @return Page<PmsTerminal>
*/
Page<PmsTerminal> getTerminalList(BaseParam baseParam);
Page<PmsTerminal> getTerminalList(TerminalQueryParam baseParam);
/**
* 查询所有

81
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java
View File

@@ -31,7 +31,10 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* <p>
@@ -104,6 +107,12 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
distributionMonitor.setVoltageLevel(monitor.getVoltageLevel());
distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
distributionMonitor.setTerminalId(monitor.getTerminalId());
distributionMonitor.setTerminalWiringMethod(monitor.getTerminalWiringMethod());
distributionMonitor.setCt1(monitor.getCt1());
distributionMonitor.setCt2(monitor.getCt2());
distributionMonitor.setPt1(monitor.getPt1());
distributionMonitor.setPt2(monitor.getPt2());
this.save(distributionMonitor);
break;
case DicDataConstant.TWO_LINE:
@@ -119,6 +128,13 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
distributionMonitor.setVoltageLevel(powerDistributionareaTem.getVoltageLevel());
distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
distributionMonitor.setTerminalId(distributionMonitorParam.getTerminalId());
distributionMonitor.setTerminalWiringMethod(distributionMonitorParam.getTerminalWiringMethod());
distributionMonitor.setCt1(distributionMonitorParam.getCt1());
distributionMonitor.setCt2(distributionMonitorParam.getCt2());
distributionMonitor.setPt1(distributionMonitorParam.getPt1());
distributionMonitor.setPt2(distributionMonitorParam.getPt2());
this.save(distributionMonitor);
break;
case DicDataConstant.THREE_LINE:
@@ -146,6 +162,12 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
distributionMonitor.setCreatedDate(LocalDateTime.now());
distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
distributionMonitor.setTerminalId(distributionMonitorParam.getTerminalId());
distributionMonitor.setTerminalWiringMethod(distributionMonitorParam.getTerminalWiringMethod());
distributionMonitor.setCt1(distributionMonitorParam.getCt1());
distributionMonitor.setCt2(distributionMonitorParam.getCt2());
distributionMonitor.setPt1(distributionMonitorParam.getPt1());
distributionMonitor.setPt2(distributionMonitorParam.getPt2());
this.save(distributionMonitor);
break;
default:
@@ -154,6 +176,54 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
return true;
}
@Override
public Boolean updateDistributionMonitor(DistributionMonitorParam distributionMonitorParam) {
DictData dictData = dicDataFeignClient.getDicDataById(distributionMonitorParam.getMonitorSort()).getData();
if (Objects.isNull(dictData)) {
throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
}
LambdaUpdateWrapper<DistributionMonitor> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(DistributionMonitor::getMonitorSort,dictData.getId());
switch (dictData.getCode()) {
case DicDataConstant.TWO_LINE:
//二类监测点(台区)
PowerDistributionarea powerDistributionarea = powerDistributionareaMapper.selectById(distributionMonitorParam.getMonitorId());
if (Objects.isNull(powerDistributionarea)) {
throw new BusinessException(PmsDeviceResponseEnum.TWO_MONITOR_NOT_FIND);
}
lambdaUpdateWrapper.eq(DistributionMonitor::getMonitorId,powerDistributionarea.getId());
break;
case DicDataConstant.THREE_LINE:
//三类监测点
if (distributionMonitorParam.getSmallType() == 1) {
//发电
PowerGenerationUser powerGenerationUser = powerGenerationUserMapper.selectById(distributionMonitorParam.getMonitorId());
if (Objects.isNull(powerGenerationUser)) {
throw new BusinessException(PmsDeviceResponseEnum.THREE_MONITOR_NOT_FIND);
}
lambdaUpdateWrapper.eq(DistributionMonitor::getMonitorId,powerGenerationUser.getId());
} else {
//用电
PowerClient powerClient = powerClientMapper.selectById(distributionMonitorParam.getMonitorId());
if (Objects.isNull(powerClient)) {
throw new BusinessException(PmsDeviceResponseEnum.THREE_MONITOR_NOT_FIND);
}
lambdaUpdateWrapper.eq(DistributionMonitor::getMonitorId,powerClient.getId());
}
break;
default:
throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
}
lambdaUpdateWrapper.set(DistributionMonitor::getMonitorState,distributionMonitorParam.getMonitorState())
.set(DistributionMonitor::getTerminalId,distributionMonitorParam.getTerminalId())
.set(DistributionMonitor::getTerminalWiringMethod,distributionMonitorParam.getTerminalWiringMethod())
.set(DistributionMonitor::getCt1,distributionMonitorParam.getCt1())
.set(DistributionMonitor::getCt2,distributionMonitorParam.getCt2())
.set(DistributionMonitor::getPt1,distributionMonitorParam.getPt1())
.set(DistributionMonitor::getPt2,distributionMonitorParam.getPt2());
return this.update(lambdaUpdateWrapper);
}
@Override
public List<DistributionMonitor> distributionMonitorList(List<String> disMonitorIds) {
List<DistributionMonitor> distributionMonitorList = new ArrayList<>();
@@ -168,6 +238,17 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
return distributionMonitorList;
}
@Override
public DistributionMonitor getDistributionMonitorById(String monitorSort,String id) {
DictData dictData = dicDataFeignClient.getDicDataById(monitorSort).getData();
if(Objects.isNull(dictData)){
throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
}
LambdaUpdateWrapper<DistributionMonitor> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(DistributionMonitor::getMonitorSort,monitorSort).eq(DistributionMonitor::getMonitorId,id);
return this.getOne(lambdaUpdateWrapper);
}
/**
* 删除配网监测点
*

38
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
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.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.dto.SimpleDTO;
@@ -16,11 +15,15 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
import com.njcn.device.pms.pojo.param.*;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.po.GeneratrixWire;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.po.SpecialMonitor;
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.system.api.DicDataFeignClient;
@@ -28,7 +31,6 @@ import com.njcn.system.enums.SystemResponseEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.BaseParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -38,7 +40,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -66,6 +70,10 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
private final SpecialMonitorMapper specialMonitorMapper;
private final IDistributionMonitorService iDistributionMonitorService;
@Override
public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
@@ -139,9 +147,10 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
}
@Override
public Page<Monitor> getAllMonitorPageList(BaseParam baseParam) {
public Page<Monitor> getAllMonitorPageList(TerminalQueryParam baseParam) {
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper
.eq(StrUtil.isNotBlank(baseParam.getMonitorState()),Monitor::getMonitorState,baseParam.getMonitorState())
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Monitor::getName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Monitor::getId,baseParam.getSearchValue())
@@ -224,6 +233,29 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
return true;
}
@Override
public boolean retirementMonitor(Integer type, List<String> lineIds) {
List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData();
Map<String,DictData> map = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity()));
DictData dictData = map.get(DicDataEnum.RETIREMENT.getCode());
if(type == 0){
//主网
LambdaUpdateWrapper<Monitor> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.in(Monitor::getId,lineIds).eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode());
//退役
lambdaUpdateWrapper.set(Monitor::getMonitorState,dictData.getId());
this.update(lambdaUpdateWrapper);
}else if(type == 1) {
//配网
LambdaUpdateWrapper<DistributionMonitor> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.in(DistributionMonitor::getMonitorId,lineIds).eq(DistributionMonitor::getStatus,DataStateEnum.ENABLE.getCode());
//退役
lambdaUpdateWrapper.set(DistributionMonitor::getMonitorState,dictData.getId());
iDistributionMonitorService.update(lambdaUpdateWrapper);
}
return true;
}
@Override
public List<SimpleDTO> getPmsPowerrInfoWithInOrg(List<String> orgIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
return this.baseMapper.getPmsPowerrInfoWithInOrg(orgIdList, pmsDeviceInfoParam);

5
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java
View File

@@ -75,7 +75,10 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
if(StrUtil.isNotBlank(powerDistributionareaParam.getLineId())){
lambdaQueryWrapper.eq(PowerDistributionarea::getLineId,powerDistributionareaParam.getLineId());
}
lambdaQueryWrapper.select(PowerDistributionarea::getId,PowerDistributionarea::getName,PowerDistributionarea::getOrgId,PowerDistributionarea::getOrgName);
lambdaQueryWrapper.select(PowerDistributionarea::getId,PowerDistributionarea::getName,PowerDistributionarea::getOrgId,PowerDistributionarea::getOrgName,PowerDistributionarea::getPowerStationId)
;
lambdaQueryWrapper.orderByDesc(PowerDistributionarea::getCreateTime);
return this.list(lambdaQueryWrapper);
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalEliminateDataServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -63,6 +64,7 @@ public class TerminalEliminateDataServiceImpl extends ServiceImpl<TerminalElimin
//主网
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(Monitor::getOrgId,deptIds)
.eq(StrUtil.isNotBlank(taiZhangParam.getMonitorState()),Monitor::getMonitorState,taiZhangParam.getMonitorState())
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).orderByDesc(Monitor::getCreateTime);
monitorPage = monitorMapper.selectPage(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),lambdaQueryWrapper);
}else {

26
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java
View File

@@ -10,6 +10,7 @@ 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;
import com.njcn.device.pms.pojo.param.TerminalQueryParam;
import com.njcn.device.pms.pojo.po.PmsTerminal;
import com.njcn.device.pms.pojo.po.StatationStat;
import com.njcn.device.pms.service.majornetwork.IStatationStatService;
@@ -48,16 +49,19 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
private DicDataFeignClient dicDataFeignClient;
@Override
public Page<PmsTerminal> getTerminalList(BaseParam baseParam) {
public Page<PmsTerminal> getTerminalList(TerminalQueryParam baseParam) {
LambdaQueryWrapper<PmsTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode()).like(StrUtil.isNotBlank(baseParam.getSearchValue()),PmsTerminal::getName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PmsTerminal::getOrgName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PmsTerminal::getPowerrName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue())).orderByDesc(PmsTerminal::getCreateTime);
lambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode())
.eq(StrUtil.isNotBlank(baseParam.getDeviceCategory()),PmsTerminal::getDeviceCategory,baseParam.getDeviceCategory());
if(StrUtil.isNotBlank(baseParam.getSearchValue())) {
lambdaQueryWrapper.and(i -> i.like(StrUtil.isNotBlank(baseParam.getSearchValue()), PmsTerminal::getName, baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()), PmsTerminal::getOrgName, baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()), PmsTerminal::getPowerrName, baseParam.getSearchValue()));
}
lambdaQueryWrapper.orderByDesc(PmsTerminal::getCreateTime);
//初始化分页数据
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
}
@@ -65,13 +69,17 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
@Override
public List<PmsTerminal> getTerminalSelectList(PmsBaseParam pmsBaseParam) {
LambdaQueryWrapper<PmsTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(PmsTerminal::getName,PmsTerminal::getOrgId,PmsTerminal::getOrgName,PmsTerminal::getId);
lambdaQueryWrapper.select(PmsTerminal::getName,PmsTerminal::getOrgId,PmsTerminal::getOrgName,PmsTerminal::getId,PmsTerminal::getPowerrName);
lambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode())
.orderByDesc(PmsTerminal::getCreateTime);
if(StrUtil.isNotBlank(pmsBaseParam.getDeptId())){
List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(pmsBaseParam.getDeptId()).getData();
lambdaQueryWrapper.in(PmsTerminal::getOrgId,deptCodes);
}
/* if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){
lambdaQueryWrapper.in(PmsTerminal::getPowerStationId,pmsBaseParam.getStationId());
}*/
return this.list(lambdaQueryWrapper);
}

4
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
View File

@@ -129,15 +129,13 @@ public enum DicDataEnum {
OVERHAUL("检修","Overhaul"),
DEBUGGING("调试","Debugging"),
DECOMMISSIONING("停运","Decommissioning"),
RETIREMENT("退役","Retirement"),
/**
* 终端状态
*/
FREE_MOORY("剩余内存","Free_Mmory"),
FREE_STORE("剩余存储空间","Free_Store"),
CPU_VESION("CPU版本","Cpu_Vesion"),
CPU1_LOAD("CPU1的负荷","Cpu1_load"),
CPU2_LOAD("CPU2的负荷","Cpu2_load"),
NOT_OPERATION("未投运","Not_Operation"),
RUNNING("在运","Running"),
RETIRE("退役","Retire"),