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

代码提交部门新增根据code查询下级所有 pms台账

Browse Source
This commit is contained in:
雨木c
2023-02-22 10:11:24 +08:00
parent 600dc1c38e
commit 044a7bffa7
19 changed files with 223 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ public class DistributionMonitorParam {
* 监测点状态(字典)
*/
@ApiModelProperty(value = "监测点状态(字典)")
@NotBlank(message = "监测点状态不能为空")
//@NotBlank(message = "监测点状态不能为空")
private String monitorState;
@ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电")

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

@@ -15,6 +15,9 @@ public class PmsBaseParam {
@ApiModelProperty(value = "部门id")
private String deptId;
@ApiModelProperty(value = "部门code")
private String deptCode;
@ApiModelProperty(value = "电站id")
private String stationId;

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

@@ -104,4 +104,14 @@ public class PowerDistributionareaParam {
@NotNull(message = "是否是上送国网监测点不可为空")
private Integer isUpToGrid;
/**
* 经度
*/
private Double longitude;
/**
* 维度
*/
private Double latitude;
}

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

@@ -136,6 +136,16 @@ public class PowerDistributionarea extends BaseEntity {
*/
private Integer isUpToGrid;
/**
* 经度
*/
private Double longitude;
/**
* 维度
*/
private Double latitude;
/**
* 数据状态：0-删除；1-正常；
*/

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

@@ -189,7 +189,7 @@ public class PmsMonitorController extends BaseController {
@PostMapping("/updateMonitor")
@ApiOperation("修改主网监测点")
@ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
public HttpResult<Boolean> updateMonitor(@RequestBody MonitorParam monitorParam) {
public HttpResult<Boolean> updateMonitor(@RequestBody @Validated MonitorParam monitorParam) {
String methodDescribe = getMethodDescribe("updateMonitor");
boolean result = monitorService.updateMonitor(monitorParam);
if(result){

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

@@ -52,11 +52,7 @@
where a.status = 1
<if test="baseParam.searchValue!=null and baseParam.searchValue!=''">
and a.Power_Id like concat('%',#{baseParam.searchValue},'%')
</if>
<if test="baseParam.searchValue!=null and baseParam.searchValue!=''">
or a.Power_Name like concat('%',#{baseParam.searchValue},'%')
</if>
<if test="baseParam.searchValue!=null and baseParam.searchValue!=''">
or b.name like concat('%',#{baseParam.searchValue},'%')
</if>
order by a.Create_Time desc

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

@@ -28,6 +28,7 @@ import com.njcn.web.pojo.param.BaseParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
@@ -93,10 +94,10 @@ public class GeneratrixWireImpl extends ServiceImpl<PmsGeneratrixWireMapper, Gen
@Override
public Page<GeneratrixWire> getGeneratrixWirePageList(BaseParam baseParam) {
LambdaQueryWrapper<GeneratrixWire> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),GeneratrixWire::getGeneratrixName,baseParam.getSearchValue())
lambdaQueryWrapper.eq(GeneratrixWire::getStatus, DataStateEnum.ENABLE.getCode())
.and(StrUtil.isNotBlank(baseParam.getSearchValue()), i -> i.like(StrUtil.isNotBlank(baseParam.getSearchValue()), GeneratrixWire::getGeneratrixName, baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),GeneratrixWire::getName,baseParam.getSearchValue())
.eq(GeneratrixWire::getStatus,DataStateEnum.ENABLE.getCode())
.like(StrUtil.isNotBlank(baseParam.getSearchValue()), GeneratrixWire::getName, baseParam.getSearchValue()))
.orderByDesc(GeneratrixWire::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
}
@@ -105,7 +106,6 @@ public class GeneratrixWireImpl extends ServiceImpl<PmsGeneratrixWireMapper, Gen
private void checkName(GeneratrixWireParam generatrixWireParam, Boolean updateFlag) {
LambdaQueryWrapper<GeneratrixWire> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(GeneratrixWire::getName, generatrixWireParam.getName())
.eq(GeneratrixWire::getStationId, generatrixWireParam.getStationId())

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

@@ -73,8 +73,6 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
private final IDistributionMonitorService iDistributionMonitorService;
@Override
public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam);
@@ -151,11 +149,11 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
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())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Monitor::getOrgName,baseParam.getSearchValue())
.and(StrUtil.isNotBlank(baseParam.getSearchValue()), i -> i.like(Monitor::getName, baseParam.getSearchValue())
.or()
.like(Monitor::getId, baseParam.getSearchValue())
.or()
.like(Monitor::getOrgName, baseParam.getSearchValue()))
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode())
.orderByDesc(Monitor::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
@@ -364,5 +362,4 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
}
}

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

@@ -94,9 +94,9 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
LambdaQueryWrapper<PowerClient> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.orderByDesc(PowerClient::getCreateTime)
.eq(PowerClient::getStatus, DataStateEnum.ENABLE.getCode())
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getName,baseParam.getSearchValue())
.and(StrUtil.isNotBlank(baseParam.getSearchValue()),i->i .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getOrgName,baseParam.getSearchValue());
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getOrgName,baseParam.getSearchValue()));
return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.db.bo.BaseEntity;
import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
import com.njcn.device.pms.mapper.majornetwork.PowerDistributionareaMapper;
import com.njcn.device.pms.pojo.param.PmsBaseParam;
@@ -54,12 +55,14 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
@Override
public Page<PowerDistributionarea> getList(BaseParam baseParam) {
LambdaQueryWrapper<PowerDistributionarea> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerDistributionarea::getName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerDistributionarea::getPowerrName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerDistributionarea::getOrgName,baseParam.getSearchValue())
.eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode());
lambdaQueryWrapper.eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode())
.and(StrUtil.isNotBlank(baseParam.getSearchValue()),
i->i.like(PowerDistributionarea::getName,baseParam.getSearchValue())
.or()
.like(PowerDistributionarea::getPowerrName,baseParam.getSearchValue())
.or()
.like(PowerDistributionarea::getOrgName,baseParam.getSearchValue())).orderByDesc(PowerDistributionarea::getCreateTime);
//初始化分页数据
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
}

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

@@ -89,10 +89,11 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
@Override
public Page<PowerGenerationUser> getPowerGenerationUserPageList(BaseParam baseParam) {
LambdaQueryWrapper<PowerGenerationUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.orderByDesc(PowerGenerationUser::getCreateTime).eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode())
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getName,baseParam.getSearchValue())
lambdaQueryWrapper.eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode())
.and(StrUtil.isNotBlank(baseParam.getSearchValue()),i->i .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getName,baseParam.getSearchValue())
.or(StrUtil.isNotBlank(baseParam.getSearchValue()))
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getOrgName,baseParam.getSearchValue());
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getOrgName,baseParam.getSearchValue()))
.orderByDesc(PowerGenerationUser::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
}

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

@@ -16,6 +16,7 @@ import com.njcn.device.pms.pojo.vo.StatationStatVO;
import com.njcn.device.pms.service.majornetwork.IStatationStatService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.BaseParam;
import lombok.RequiredArgsConstructor;
@@ -107,8 +108,12 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
LambdaQueryWrapper<StatationStat> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.orderByDesc(StatationStat::getCreateTime);
if(StrUtil.isNotBlank(pmsBaseParam.getDeptId())){
List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(pmsBaseParam.getDeptId()).getData();
lambdaQueryWrapper.in(StatationStat::getOrgId,deptCodes);
Dept dept = deptFeignClient.getDeptById(pmsBaseParam.getDeptId()).getData();
lambdaQueryWrapper.eq(StatationStat::getOrgId,dept.getCode());
}
if(StrUtil.isNotBlank(pmsBaseParam.getDeptCode())){
lambdaQueryWrapper.eq(StatationStat::getOrgId,pmsBaseParam.getDeptCode());
}
return this.list(lambdaQueryWrapper);

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

@@ -55,11 +55,11 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
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.and(i -> i.like(PmsTerminal::getName, baseParam.getSearchValue())
.or()
.like(PmsTerminal::getOrgName, baseParam.getSearchValue())
.or()
.like(PmsTerminal::getPowerrName, baseParam.getSearchValue()));
}
lambdaQueryWrapper.orderByDesc(PmsTerminal::getCreateTime);
//初始化分页数据
@@ -77,9 +77,14 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
lambdaQueryWrapper.in(PmsTerminal::getOrgId,deptCodes);
}
/* if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){
lambdaQueryWrapper.in(PmsTerminal::getPowerStationId,pmsBaseParam.getStationId());
}*/
if(StrUtil.isNotBlank(pmsBaseParam.getDeptCode())){
List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByCode(pmsBaseParam.getDeptCode()).getData();
lambdaQueryWrapper.in(PmsTerminal::getOrgId,deptCodes);
}
if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){
lambdaQueryWrapper.eq(PmsTerminal::getPowerStationId,pmsBaseParam.getStationId());
}
return this.list(lambdaQueryWrapper);
}

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

@@ -60,14 +60,14 @@ public class TractionStationServiceImpl extends ServiceImpl<TractionStationMappe
public Page<TractionStation> getTractionStationPageList(BaseParam baseParam) {
LambdaQueryWrapper<TractionStation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(TractionStation::getStatus,DataStateEnum.ENABLE.getCode())
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getOrgName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getOperationName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getPowerName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.and(StrUtil.isNotBlank(baseParam.getSearchValue()),
i->i.like(TractionStation::getName,baseParam.getSearchValue())
.or()
.like(TractionStation::getOrgName,baseParam.getSearchValue())
.or()
.like(TractionStation::getOperationName,baseParam.getSearchValue())
.or()
.like(TractionStation::getPowerName,baseParam.getSearchValue()))
.orderByDesc(TractionStation::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
}

6
pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
View File

@@ -85,6 +85,12 @@ public interface DeptFeignClient {
@GetMapping("/getDepSonSelfCodetByDeptId")
HttpResult<List<String>> getDepSonSelfCodetByDeptId(@RequestParam("deptId") String deptId);
/**
* 根据部门code获取所有子部门codes
*/
@GetMapping("/getDepSonSelfCodetByCode")
HttpResult<List<String>> getDepSonSelfCodetByCode(@RequestParam("code") String code);
/**
* 根据部门id获取子部门ids

6
pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
View File

@@ -88,6 +88,12 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory<DeptFeign
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<String>> getDepSonSelfCodetByCode(String code) {
log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<String>> getDepSonIdByDeptId(String deptId) {
log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString());

22
pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
View File

@@ -409,6 +409,28 @@ public class DeptController extends BaseController {
}
/**
* 根据部code获取所有子部门以及自身的code
* @author cdf
* @date 2023/2/21
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getDepSonSelfCodetByCode")
@ApiOperation("根据部门code获取所有子部门以及自身的code")
public HttpResult<List<String>> getDepSonSelfCodetByCode(@RequestParam("code")String code) {
String methodDescribe = getMethodDescribe("getDepSonSelfCodetByCode");
List<String> deptList = deptService.getDepSonSelfCodetByCode(code);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe);
}
/*++++++++++++++++++++++++++++++++pms专用+++++++++++++++++++++++++++++++begin*/
/*++++++++++++++++++++++++++++++++pms专用+++++++++++++++++++++++++++++++end*/
}

8
pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
View File

@@ -170,6 +170,14 @@ public interface IDeptService extends IService<Dept> {
*/
List<String> getDepSonSelfCodetByDeptId(String id);
/**
* 根据部code获取所有子部门以及自身的code
* @author cdf
* @date 2022/7/13
*/
List<String> getDepSonSelfCodetByCode(String code);
/**
* 根据部门id获取子部门ids
* @author dhj

17
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.njcn.user.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,6 +41,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* <p>
@@ -342,6 +344,21 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
return sonIds;
}
@Override
public List<String> getDepSonSelfCodetByCode(String code) {
List<String> codes = new ArrayList<>();
Dept dept = this.getDeptByCode(code);
if(Objects.isNull(dept)){
throw new BusinessException(UserResponseEnum.DEPT_MISSING);
}
List<DeptDTO> deptList = this.baseMapper.getDeptDescendantIndexes(dept.getId(), Stream.of(0,1).collect(Collectors.toList()));
if(CollectionUtil.isNotEmpty(deptList)){
codes = deptList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
codes.add(dept.getCode());
}
return codes;
}
@Override
public List<String> getDepSonIdByDeptId(String id) {
List<String> sonId = this.baseMapper.getDeptSonId(id);