diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java index e1dbb2670..8d21043f9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributionMonitorParam.java @@ -32,7 +32,7 @@ public class DistributionMonitorParam { * 监测点状态(字典) */ @ApiModelProperty(value = "监测点状态(字典)") - @NotBlank(message = "监测点状态不能为空") + //@NotBlank(message = "监测点状态不能为空") private String monitorState; @ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电") diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java index 7c1a0c416..198dd7041 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsBaseParam.java @@ -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; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java index 507c94b2f..78d8744a8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java @@ -104,4 +104,14 @@ public class PowerDistributionareaParam { @NotNull(message = "是否是上送国网监测点不可为空") private Integer isUpToGrid; + /** + * 经度 + */ + private Double longitude; + + /** + * 维度 + */ + private Double latitude; + } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java index 0d90dece2..7c3bfafdc 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java @@ -136,6 +136,16 @@ public class PowerDistributionarea extends BaseEntity { */ private Integer isUpToGrid; + /** + * 经度 + */ + private Double longitude; + + /** + * 维度 + */ + private Double latitude; + /** * 数据状态：0-删除；1-正常； */ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java index ea7e3f15c..8d471f64a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java @@ -189,7 +189,7 @@ public class PmsMonitorController extends BaseController { @PostMapping("/updateMonitor") @ApiOperation("修改主网监测点") @ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true) - public HttpResult updateMonitor(@RequestBody MonitorParam monitorParam) { + public HttpResult updateMonitor(@RequestBody @Validated MonitorParam monitorParam) { String methodDescribe = getMethodDescribe("updateMonitor"); boolean result = monitorService.updateMonitor(monitorParam); if(result){ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml index d12bc41e1..0c072c554 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml @@ -52,11 +52,7 @@ where a.status = 1 and a.Power_Id like concat('%',#{baseParam.searchValue},'%') - - or a.Power_Name like concat('%',#{baseParam.searchValue},'%') - - or b.name like concat('%',#{baseParam.searchValue},'%') order by a.Create_Time desc diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java index aadbbe6c5..9f8c1a462 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java @@ -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; @@ -45,7 +46,7 @@ public class GeneratrixWireImpl extends ServiceImpl getGeneratrixWireList(PmsBaseParam pmsBaseParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(StrUtil.isNotBlank(pmsBaseParam.getGeneratrixId())){ - lambdaQueryWrapper.eq(GeneratrixWire::getId,pmsBaseParam.getGeneratrixId()); + if (StrUtil.isNotBlank(pmsBaseParam.getGeneratrixId())) { + lambdaQueryWrapper.eq(GeneratrixWire::getId, pmsBaseParam.getGeneratrixId()); } - if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){ - lambdaQueryWrapper.eq(GeneratrixWire::getStationId,pmsBaseParam.getStationId()); + if (StrUtil.isNotBlank(pmsBaseParam.getStationId())) { + lambdaQueryWrapper.eq(GeneratrixWire::getStationId, pmsBaseParam.getStationId()); } - lambdaQueryWrapper.eq(GeneratrixWire::getStatus,DataStateEnum.ENABLE.getCode()) + lambdaQueryWrapper.eq(GeneratrixWire::getStatus, DataStateEnum.ENABLE.getCode()) .orderByAsc(GeneratrixWire::getCreateTime); return this.list(lambdaQueryWrapper); } @@ -93,30 +94,29 @@ public class GeneratrixWireImpl extends ServiceImpl getGeneratrixWirePageList(BaseParam baseParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.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()) + 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())) .orderByDesc(GeneratrixWire::getCreateTime); - return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); + return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); } - private void checkName(GeneratrixWireParam generatrixWireParam,Boolean updateFlag){ - + private void checkName(GeneratrixWireParam generatrixWireParam, Boolean updateFlag) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(GeneratrixWire::getName,generatrixWireParam.getName()) - .eq(GeneratrixWire::getStationId,generatrixWireParam.getStationId()) - .eq(GeneratrixWire::getStatus,DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper.eq(GeneratrixWire::getName, generatrixWireParam.getName()) + .eq(GeneratrixWire::getStationId, generatrixWireParam.getStationId()) + .eq(GeneratrixWire::getStatus, DataStateEnum.ENABLE.getCode()); - if(updateFlag){ + if (updateFlag) { //更新 - lambdaQueryWrapper.ne(GeneratrixWire::getId,generatrixWireParam.getId()); - }else { + lambdaQueryWrapper.ne(GeneratrixWire::getId, generatrixWireParam.getId()); + } else { //新增校验 - if(StrUtil.isNotBlank(generatrixWireParam.getId())) { + if (StrUtil.isNotBlank(generatrixWireParam.getId())) { LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); lambdaQuery.eq(GeneratrixWire::getId, generatrixWireParam.getId()); int count = this.count(lambdaQuery); @@ -127,7 +127,7 @@ public class GeneratrixWireImpl extends ServiceImpl 0){ + if (count > 0) { throw new BusinessException(PmsDeviceResponseEnum.GENERATRIXWIRE_NAME_REPEAT); } } @@ -170,9 +170,9 @@ public class GeneratrixWireImpl extends ServiceImpl getGeneratrixByCondition(ConditionParam param) { - List data = deptFeignClient.getDepSonSelfCodetByDeptId (param.getDeptId ( )).getData ( ); + List data = deptFeignClient.getDepSonSelfCodetByDeptId(param.getDeptId()).getData(); - return this.baseMapper.getGeneratrixByCondition(data,param); + return this.baseMapper.getGeneratrixByCondition(data, param); } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 5841f746b..42fa2fe9b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -73,8 +73,6 @@ public class MonitorServiceImpl extends ServiceImpl impl private final IDistributionMonitorService iDistributionMonitorService; - - @Override public List getMonitorByCondition(List deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) { return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam); @@ -107,7 +105,7 @@ public class MonitorServiceImpl extends ServiceImpl impl .in(CollUtil.isNotEmpty(pmsMonitorParam.getMonitorIds()), Monitor::getId, pmsMonitorParam.getMonitorIds()) .like(StringUtils.isNotBlank(pmsMonitorParam.getMonitorName()), Monitor::getName, pmsMonitorParam.getMonitorName()) .in(CollUtil.isNotEmpty(pmsMonitorParam.getVoltageLevels()), Monitor::getVoltageLevel, pmsMonitorParam.getVoltageLevels()) - .in(CollUtil.isNotEmpty(pmsMonitorParam.getPowerrIds()),Monitor::getPowerrId,pmsMonitorParam.getPowerrIds()) + .in(CollUtil.isNotEmpty(pmsMonitorParam.getPowerrIds()), Monitor::getPowerrId, pmsMonitorParam.getPowerrIds()) .like(StringUtils.isNotBlank(pmsMonitorParam.getPowerrName()), Monitor::getPowerrName, pmsMonitorParam.getPowerrName()) .eq(Objects.nonNull(pmsMonitorParam.getIsSpecialMonitor()), Monitor::getIsSpecialMonitor, pmsMonitorParam.getIsSpecialMonitor()) .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorType()), Monitor::getMonitorType, pmsMonitorParam.getMonitorType()) @@ -150,27 +148,27 @@ public class MonitorServiceImpl extends ServiceImpl impl public Page getAllMonitorPageList(TerminalQueryParam baseParam) { LambdaQueryWrapper 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()) - .eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()) - .orderByDesc(Monitor::getCreateTime); - return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); + .eq(StrUtil.isNotBlank(baseParam.getMonitorState()), Monitor::getMonitorState, baseParam.getMonitorState()) + .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); } @Override public List getMonitorList(List monitorIds) { List monitorList = new ArrayList<>(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()); - if(CollUtil.isEmpty(monitorIds)){ + lambdaQueryWrapper.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); + if (CollUtil.isEmpty(monitorIds)) { //为空查询所有监测点 monitorList = this.list(lambdaQueryWrapper); - }else { - lambdaQueryWrapper.in(Monitor::getId,monitorIds); + } else { + lambdaQueryWrapper.in(Monitor::getId, monitorIds); monitorList = this.list(lambdaQueryWrapper); } return monitorList; @@ -180,9 +178,9 @@ public class MonitorServiceImpl extends ServiceImpl impl public List getMonitorListByParam(MonitorParam monitorParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); //根据部门 - if(StrUtil.isNotBlank(monitorParam.getOrgId())){ - List deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(monitorParam.getOrgId()).getData(); - lambdaQueryWrapper.in(Monitor::getOrgId,deptIds).eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()); + if (StrUtil.isNotBlank(monitorParam.getOrgId())) { + List deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(monitorParam.getOrgId()).getData(); + lambdaQueryWrapper.in(Monitor::getOrgId, deptIds).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); } return this.list(lambdaQueryWrapper); } @@ -190,10 +188,10 @@ public class MonitorServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public boolean addMonitor(MonitorParam monitorParam) { - checkParam(monitorParam,false); + checkParam(monitorParam, false); Monitor monitor = new Monitor(); - BeanUtils.copyProperties(monitorParam,monitor); - checkOther(monitorParam,monitor,false); + BeanUtils.copyProperties(monitorParam, monitor); + checkOther(monitorParam, monitor, false); monitor.setStatus(DataStateEnum.ENABLE.getCode()); //新增监测点同时新增pms_special_monitor @@ -209,10 +207,10 @@ public class MonitorServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public boolean updateMonitor(MonitorParam monitorParam) { - checkParam(monitorParam,true); + checkParam(monitorParam, true); Monitor monitor = new Monitor(); - BeanUtils.copyProperties(monitorParam,monitor); - checkOther(monitorParam,monitor,true); + BeanUtils.copyProperties(monitorParam, monitor); + checkOther(monitorParam, monitor, true); this.updateById(monitor); @@ -228,32 +226,32 @@ public class MonitorServiceImpl extends ServiceImpl impl @Override public boolean delMonitor(List monitorIds) { - this.removeByIds(monitorIds); - specialMonitorMapper.deleteBatchIds(monitorIds); - return true; + this.removeByIds(monitorIds); + specialMonitorMapper.deleteBatchIds(monitorIds); + return true; } @Override public boolean retirementMonitor(Integer type, List lineIds) { List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_STATE.getCode()).getData(); - Map map = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity())); + Map map = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity())); DictData dictData = map.get(DicDataEnum.RETIREMENT.getCode()); - if(type == 0){ - //主网 - LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.in(Monitor::getId,lineIds).eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()); + if (type == 0) { + //主网 + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.in(Monitor::getId, lineIds).eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); //退役 - lambdaUpdateWrapper.set(Monitor::getMonitorState,dictData.getId()); + lambdaUpdateWrapper.set(Monitor::getMonitorState, dictData.getId()); this.update(lambdaUpdateWrapper); - }else if(type == 1) { - //配网 + } else if (type == 1) { + //配网 LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.in(DistributionMonitor::getMonitorId,lineIds).eq(DistributionMonitor::getStatus,DataStateEnum.ENABLE.getCode()); + lambdaUpdateWrapper.in(DistributionMonitor::getMonitorId, lineIds).eq(DistributionMonitor::getStatus, DataStateEnum.ENABLE.getCode()); //退役 - lambdaUpdateWrapper.set(DistributionMonitor::getMonitorState,dictData.getId()); + lambdaUpdateWrapper.set(DistributionMonitor::getMonitorState, dictData.getId()); iDistributionMonitorService.update(lambdaUpdateWrapper); - } - return true; + } + return true; } @Override @@ -264,95 +262,95 @@ public class MonitorServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public boolean updateStatus(MonitorStatus monitorParam) { - LambdaUpdateWrapper update=new LambdaUpdateWrapper<>(); - update.set(Monitor::getStatus,monitorParam.getStatus()) - .in(Monitor::getId,monitorParam.getId()); + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(Monitor::getStatus, monitorParam.getStatus()) + .in(Monitor::getId, monitorParam.getId()); return this.update(update); } - private void checkParam(MonitorParam monitorParam,boolean update){ + private void checkParam(MonitorParam monitorParam, boolean update) { //校验同一单位下面不能有同名1类监测点 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Monitor::getName,monitorParam.getName()) - .eq(Monitor::getOrgId,monitorParam.getOrgId()) - .eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()); + lambdaQueryWrapper.eq(Monitor::getName, monitorParam.getName()) + .eq(Monitor::getOrgId, monitorParam.getOrgId()) + .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()); - if(update){ - lambdaQueryWrapper.ne(Monitor::getId,monitorParam.getId()); + if (update) { + lambdaQueryWrapper.ne(Monitor::getId, monitorParam.getId()); } int count = this.count(lambdaQueryWrapper); - if(count>0){ + if (count > 0) { throw new BusinessException(PmsDeviceResponseEnum.DEPT_MONITOR_REPEAT); } //校验电压等级数据 DictData voltageDic = dicDataFeignClient.getDicDataById(monitorParam.getVoltageLevel()).getData(); - if(Objects.isNull(voltageDic)){ + if (Objects.isNull(voltageDic)) { throw new BusinessException(SystemResponseEnum.VOLTAGE_EMPTY); } //校验监测点状态 DictData stateDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorState()).getData(); - if(Objects.isNull(stateDic)){ + if (Objects.isNull(stateDic)) { throw new BusinessException(SystemResponseEnum.LINE_STATE_EMPTY); } //校验监测点类型 DictData typeDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorType()).getData(); - if(Objects.isNull(typeDic)){ + if (Objects.isNull(typeDic)) { throw new BusinessException(SystemResponseEnum.LINE_TYPE_EMPTY); } //校验电压互感器 DictData potentialDic = dicDataFeignClient.getDicDataById(monitorParam.getPotentialTransFormerType()).getData(); - if(Objects.isNull(potentialDic)){ + if (Objects.isNull(potentialDic)) { throw new BusinessException(SystemResponseEnum.POTENTIAL_TYPE_EMPTY); } //校验中性点接地方式 DictData neutralDic = dicDataFeignClient.getDicDataById(monitorParam.getNeutralGroundingMode()).getData(); - if(Objects.isNull(neutralDic)){ + if (Objects.isNull(neutralDic)) { throw new BusinessException(SystemResponseEnum.Neutral_Mode_EMPTY); } //校验监测点标签 DictData tagDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorTag()).getData(); - if(Objects.isNull(tagDic)){ + if (Objects.isNull(tagDic)) { throw new BusinessException(SystemResponseEnum.MONITOR_TAG_EMPTY); } //校验监测对象类型 DictData objTypeDic = dicDataFeignClient.getDicDataById(monitorParam.getMonitorObjectType()).getData(); - if(Objects.isNull(objTypeDic)){ + if (Objects.isNull(objTypeDic)) { throw new BusinessException(SystemResponseEnum.MONITORY_TYPE_EMPTY); } //校验监测终端接线方式 DictData wireDic = dicDataFeignClient.getDicDataById(monitorParam.getTerminalWiringMethod()).getData(); - if(Objects.isNull(wireDic)){ + if (Objects.isNull(wireDic)) { throw new BusinessException(SystemResponseEnum.TERMINAL_WIRING_EMPTY); } } - private void checkOther(MonitorParam monitorParam,Monitor monitor,boolean update){ + private void checkOther(MonitorParam monitorParam, Monitor monitor, boolean update) { //校验组织机构 Dept dept = deptFeignClient.getDeptByCode(monitorParam.getOrgId()).getData(); - if(Objects.isNull(dept)){ + if (Objects.isNull(dept)) { throw new BusinessException(PmsDeviceResponseEnum.ORG_ITEM_EMPTY); } //校验运维单位 Dept deptOp = deptFeignClient.getDeptByCode(monitorParam.getOperationId()).getData(); - if(Objects.isNull(deptOp)){ + if (Objects.isNull(deptOp)) { throw new BusinessException(PmsDeviceResponseEnum.Operation_ITEM_EMPTY); } //校验线路 GeneratrixWire generatrix = generatrixWireMapper.selectById(monitorParam.getLineId()); - if(Objects.isNull(generatrix)){ + if (Objects.isNull(generatrix)) { throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY); } @@ -364,5 +362,4 @@ public class MonitorServiceImpl extends ServiceImpl impl } - } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java index 229b52042..b88ce9d23 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java @@ -94,9 +94,9 @@ public class PowerClientServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.orderByDesc(PowerClient::getCreateTime) .eq(PowerClient::getStatus, DataStateEnum.ENABLE.getCode()) - .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getName,baseParam.getSearchValue()) - .or(StrUtil.isNotBlank(baseParam.getSearchValue())) - .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getOrgName,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())); return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); } 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 93c0e1d1e..af3f19fc2 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 @@ -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 getList(BaseParam baseParam) { LambdaQueryWrapper 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); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java index e45931d3b..88a2c6554 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerGenerationUserServiceImpl.java @@ -89,10 +89,11 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl getPowerGenerationUserPageList(BaseParam baseParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.orderByDesc(PowerGenerationUser::getCreateTime).eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode()) - .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getName,baseParam.getSearchValue()) - .or(StrUtil.isNotBlank(baseParam.getSearchValue())) - .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getOrgName,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())) + .orderByDesc(PowerGenerationUser::getCreateTime); return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java index ced2ebffb..8b0285660 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java @@ -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 lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.orderByDesc(StatationStat::getCreateTime); if(StrUtil.isNotBlank(pmsBaseParam.getDeptId())){ - List 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); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java index 6ed6adef0..db92a540e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java @@ -55,11 +55,11 @@ public class TerminalServiceImpl extends ServiceImpl 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 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); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java index 47c804200..fc8bdd46a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TractionStationServiceImpl.java @@ -60,14 +60,14 @@ public class TractionStationServiceImpl extends ServiceImpl getTractionStationPageList(BaseParam baseParam) { LambdaQueryWrapper 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); } diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java index 404c60658..9e0e2a13c 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java @@ -85,6 +85,12 @@ public interface DeptFeignClient { @GetMapping("/getDepSonSelfCodetByDeptId") HttpResult> getDepSonSelfCodetByDeptId(@RequestParam("deptId") String deptId); + /** + * 根据部门code获取所有子部门codes + */ + @GetMapping("/getDepSonSelfCodetByCode") + HttpResult> getDepSonSelfCodetByCode(@RequestParam("code") String code); + /** * 根据部门id获取子部门ids diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java index b0aa7fa8a..2f3ac6e5e 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java @@ -88,6 +88,12 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory> getDepSonSelfCodetByCode(String code) { + log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult> getDepSonIdByDeptId(String deptId) { log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString()); diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java index b2c01fbb0..e25136150 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java @@ -392,13 +392,13 @@ public class DeptController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } } - /** + /** * @Description: "获取当前部门的的下级子部门list，如果没子部门就是返回当前部门 - * @Param: [deptId] + * @Param: [deptId] * @return: com.njcn.common.pojo.response.HttpResult> * @Author: clam - * @Date: 2023/1/10 - */ + * @Date: 2023/1/10 + */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getDepSonDetailIdByDeptId") @ApiOperation("获取当前部门的的下级子部门list，如果没子部门就是返回当前部门") @@ -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> getDepSonSelfCodetByCode(@RequestParam("code")String code) { + String methodDescribe = getMethodDescribe("getDepSonSelfCodetByCode"); + List deptList = deptService.getDepSonSelfCodetByCode(code); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptList, methodDescribe); + } + + + + /*++++++++++++++++++++++++++++++++pms专用+++++++++++++++++++++++++++++++begin*/ + + + + + /*++++++++++++++++++++++++++++++++pms专用+++++++++++++++++++++++++++++++end*/ } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java index 954a8d0d6..da91d9f1f 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java @@ -170,6 +170,14 @@ public interface IDeptService extends IService { */ List getDepSonSelfCodetByDeptId(String id); + /** + * 根据部code获取所有子部门以及自身的code + * @author cdf + * @date 2022/7/13 + */ + List getDepSonSelfCodetByCode(String code); + + /** * 根据部门id获取子部门ids * @author dhj @@ -198,12 +206,12 @@ public interface IDeptService extends IService { * @date 2023/1/6 */ Dept getRootDept(); - /** + /** * @Description: 获取当前部门的的下级子部门list，如果没子部门就是返回当前部门 - * @Param: [deptId] - * @return: java.util.List + * @Param: [deptId] + * @return: java.util.List * @Author: clam - * @Date: 2023/1/10 - */ + * @Date: 2023/1/10 + */ List getDepSonDetailByDeptId(String deptId); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java index 17b15262e..52eced822 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java @@ -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; /** *

@@ -342,6 +344,21 @@ public class DeptServiceImpl extends ServiceImpl implements ID return sonIds; } + @Override + public List getDepSonSelfCodetByCode(String code) { + List codes = new ArrayList<>(); + Dept dept = this.getDeptByCode(code); + if(Objects.isNull(dept)){ + throw new BusinessException(UserResponseEnum.DEPT_MISSING); + } + List 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 getDepSonIdByDeptId(String id) { List sonId = this.baseMapper.getDeptSonId(id);