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

1.全过程代码调整

Browse Source 
2.主网测点在线率错误解决
This commit is contained in:
chendaofei
2024-11-27 14:40:44 +08:00
parent 3377da4ae3
commit 0b5a3f0a32
12 changed files with 151 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java
View File

@@ -27,7 +27,7 @@ import java.util.Objects;
/**
* <p>
* 电能质量全过程月报 前端控制器
* 电能质量评估问题
* </p>
*
* @author cdf

24
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.njcn.harmonic.mapper.upload.PmsTemUserMapper;
import com.njcn.harmonic.pojo.param.upload.PmsTemProcessApprovalParam;
import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO;
import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.web.enums.GWSendEnum;
import com.njcn.web.factory.PageFactory;
@@ -26,6 +27,7 @@ import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -52,12 +54,17 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl<PmsTemProcessA
public Boolean createOrUpdate(PmsTemProcessApprovalParam param) {
PmsTemProcessApproval pmsTemProcessApproval = new PmsTemProcessApproval();
BeanUtils.copyProperties(param,pmsTemProcessApproval);
pmsTemProcessApproval.setUploadStatus(DataStateEnum.DELETED.getCode());
if(StrUtil.isBlank(pmsTemProcessApproval.getObjId())){
pmsTemProcessApproval.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemProcessApproval.setUpdateTime(new Timestamp(new Date().getTime()));
pmsTemProcessApproval.setUploadStatus(Integer.valueOf(DicDataEnum.No_Upload.getCode()));
}else {
PmsTemProcessApproval tem = this.getById(param.getObjId());
if(Integer.valueOf(DicDataEnum.Has_Upload.getCode()).equals(tem.getUploadStatus())){
pmsTemProcessApproval.setUploadStatus(Integer.valueOf(DicDataEnum.Return_Upload.getCode()));
}
pmsTemProcessApproval.setUpdateTime(new Timestamp(new Date().getTime()));
pmsTemProcessApproval.setUploadStatus(Integer.valueOf(DicDataEnum.Return_Upload.getCode()));
}
boolean b = this.saveOrUpdate(pmsTemProcessApproval);
return b;
@@ -66,8 +73,9 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl<PmsTemProcessA
@Override
public Page<PmsTemProcessApproval> pageList(PmsTemProcessApprovalParam.QueryPmsTemProcessApprovalParam param) {
List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(param.getMaintOrg()).getData();
List<String> objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper<PmsTemUserPO>().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
List<PmsTemUserPO> pmsTemUserPOList = pmsTemUserMapper.selectList(new LambdaQueryWrapper<PmsTemUserPO>().select(PmsTemUserPO::getObjId,PmsTemUserPO::getCityOrgName,PmsTemUserPO::getMaintOrgName).in(PmsTemUserPO::getMaintOrg,deptCodes));
Map<String,PmsTemUserPO> pmsTemUserPOMap = pmsTemUserPOList.stream().collect(Collectors.toMap(PmsTemUserPO::getObjId, Function.identity()));
List<String> objIds = pmsTemUserPOList.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
if(CollUtil.isEmpty(objIds)){
return new Page<>(param.getPageNum(),param.getPageSize());
}
@@ -75,7 +83,13 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl<PmsTemProcessA
lambdaQueryWrapper
.between(StringUtils.isNotBlank(param.getSearchBeginTime())&&StringUtils.isNotBlank(param.getSearchEndTime()),PmsTemProcessApproval::getCreateTime,param.getSearchBeginTime(),param.getSearchEndTime()).in(PmsTemProcessApproval::getTempUserDossierId,objIds);
return this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper);
Page<PmsTemProcessApproval> page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper);
page.getRecords().forEach(item->{
PmsTemUserPO tem = pmsTemUserPOMap.get(item.getTempUserDossierId());
item.setCityOrgName(tem.getCityOrgName());
item.setMaintOrgName(tem.getMaintOrgName());
});
return page;
}
@Override
@@ -104,7 +118,7 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl<PmsTemProcessA
System.out.println("上送成功,上送成功返回"+count+"条");
if(count == list.get(i).size()){
LambdaUpdateWrapper<PmsTemProcessApproval> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(PmsTemProcessApproval::getUploadStatus,1).in(PmsTemProcessApproval::getObjId,ids);
lambdaUpdateWrapper.set(PmsTemProcessApproval::getUploadStatus,Integer.valueOf(DicDataEnum.Has_Upload.getCode())).in(PmsTemProcessApproval::getObjId,ids);
this.update(lambdaUpdateWrapper);
}
}

16
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTestRunServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessApproval;
import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTestRun;
import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
import com.njcn.harmonic.service.upload.IPmsTemProcessTestRunService;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.web.enums.GWSendEnum;
import com.njcn.web.factory.PageFactory;
@@ -53,7 +54,7 @@ public class PmsTemProcessTestRunServiceImpl extends ServiceImpl<PmsTemProcessTe
public Boolean create(PmsTemProcessTestRunParam param) {
PmsTemProcessTestRun pmsTemProcessTestRun = new PmsTemProcessTestRun();
BeanUtil.copyProperties(param,pmsTemProcessTestRun);
pmsTemProcessTestRun.setUploadStatus(DataStateEnum.DELETED.getCode());
pmsTemProcessTestRun.setUploadStatus(Integer.valueOf(DicDataEnum.No_Upload.getCode()));
pmsTemProcessTestRun.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemProcessTestRun.setUpdateTime(new Timestamp(new Date().getTime()));
this.save(pmsTemProcessTestRun);
@@ -62,9 +63,13 @@ public class PmsTemProcessTestRunServiceImpl extends ServiceImpl<PmsTemProcessTe
@Override
public Boolean update(PmsTemProcessTestRunParam.UpdatePmsTemProcessTestRunParamParam param) {
PmsTemProcessTestRun tem = this.getById(param.getObjId());
PmsTemProcessTestRun pmsTemProcessTestRun = new PmsTemProcessTestRun();
BeanUtil.copyProperties(param,pmsTemProcessTestRun);
pmsTemProcessTestRun.setUpdateTime(new Timestamp(new Date().getTime()));
if(Integer.valueOf(DicDataEnum.Has_Upload.getCode()).equals(tem.getUploadStatus())){
pmsTemProcessTestRun.setUploadStatus(Integer.valueOf(DicDataEnum.Return_Upload.getCode()));
}
this.updateById(pmsTemProcessTestRun);
return true;
}
@@ -89,7 +94,12 @@ public class PmsTemProcessTestRunServiceImpl extends ServiceImpl<PmsTemProcessTe
Page<PmsTemProcessTestRun> page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper);
if(CollUtil.isNotEmpty(page.getRecords())){
page.getRecords().forEach(item->item.setTempUserDossierName(map.get(item.getTempUserDossierId()).getConsName()));
page.getRecords().forEach(item->{
PmsTemUserPO tem = map.get(item.getTempUserDossierId());
item.setTempUserDossierName(tem.getConsName());
item.setCityOrgName(tem.getCityOrgName());
item.setMaintOrgName(tem.getMaintOrgName());
});
}
return page;
@@ -129,7 +139,7 @@ public class PmsTemProcessTestRunServiceImpl extends ServiceImpl<PmsTemProcessTe
System.out.println("上送成功,上送成功返回"+count+"条");
if(count == list.get(i).size()){
LambdaUpdateWrapper<PmsTemProcessTestRun> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(PmsTemProcessTestRun::getUploadStatus,1).in(PmsTemProcessTestRun::getObjId,ids);
lambdaUpdateWrapper.set(PmsTemProcessTestRun::getUploadStatus,Integer.valueOf(DicDataEnum.Has_Upload.getCode())).in(PmsTemProcessTestRun::getObjId,ids);
this.update(lambdaUpdateWrapper);
}
}

26
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO;
import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
import com.njcn.harmonic.service.upload.IPmsTemProcessTrackService;
import com.njcn.harmonic.service.upload.IPmsTemUserService;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.web.enums.GWSendEnum;
import com.njcn.web.factory.PageFactory;
@@ -29,6 +30,7 @@ import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -59,7 +61,7 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName());
pmsTemUserPO.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
pmsTemProcessTrackPO.setUploadStatus(DataStateEnum.DELETED.getCode());
pmsTemProcessTrackPO.setUploadStatus(Integer.valueOf(DicDataEnum.No_Upload.getCode()));
return this.save(pmsTemProcessTrackPO);
}
@@ -70,7 +72,12 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
BeanUtil.copyProperties(updatePmsTemProcessTrackParam, pmsTemProcessTrackPO);
PmsTemUserPO pmsTemUserPO = iPmsTemUserService.getById(updatePmsTemProcessTrackParam.getTempUserDossierId());
pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName());
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
PmsTemProcessTrackPO tem = this.getById(updatePmsTemProcessTrackParam.getObjId());
if(Integer.valueOf(DicDataEnum.Has_Upload.getCode()).equals(tem.getUploadStatus())){
pmsTemProcessTrackPO.setUploadStatus(Integer.valueOf(DicDataEnum.Return_Upload.getCode()));
}
pmsTemProcessTrackPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.updateById(pmsTemProcessTrackPO);
}
@@ -82,15 +89,22 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
@Override
public Page<PmsTemProcessTrackPO> pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam parkQuery) {
List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(parkQuery.getMaintOrg()).getData();
List<String> objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper<PmsTemUserPO>().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
List<PmsTemUserPO> pmsTemUserPOList = pmsTemUserMapper.selectList(new LambdaQueryWrapper<PmsTemUserPO>().select(PmsTemUserPO::getObjId,PmsTemUserPO::getCityOrgName,PmsTemUserPO::getMaintOrgName).in(PmsTemUserPO::getMaintOrg,deptCodes));
Map<String,PmsTemUserPO> pmsTemUserPOMap = pmsTemUserPOList.stream().collect(Collectors.toMap(PmsTemUserPO::getObjId, Function.identity()));
List<String> objIds = pmsTemUserPOList.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList());
if(CollUtil.isEmpty(objIds)){
return new Page<>(parkQuery.getPageNum(),parkQuery.getPageSize());
}
LambdaQueryWrapper<PmsTemProcessTrackPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(PmsTemProcessTrackPO::getTempUserDossierId,objIds);
return this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper);
Page<PmsTemProcessTrackPO> page = this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper);
page.getRecords().forEach(item->{
PmsTemUserPO tem = pmsTemUserPOMap.get(item.getTempUserDossierId());
item.setCityOrgName(tem.getCityOrgName());
item.setMaintOrgName(tem.getMaintOrgName());
});
return page;
}
@Override
@@ -127,7 +141,7 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
System.out.println("上送成功,上送成功返回"+count+"条");
if(count == list.get(i).size()){
LambdaUpdateWrapper<PmsTemProcessTrackPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(PmsTemProcessTrackPO::getUploadStatus,1).in(PmsTemProcessTrackPO::getObjId,ids);
lambdaUpdateWrapper.set(PmsTemProcessTrackPO::getUploadStatus,Integer.valueOf(DicDataEnum.Has_Upload.getCode())).in(PmsTemProcessTrackPO::getObjId,ids);
this.update(lambdaUpdateWrapper);
}
}

10
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java
View File

@@ -25,6 +25,7 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData;
import com.njcn.harmonic.service.upload.IPmsTemProcessTrackService;
import com.njcn.harmonic.service.upload.IPmsTemUserService;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.vo.DeptTreeVO;
import com.njcn.user.pojo.vo.PvTerminalTreeVO;
@@ -73,7 +74,7 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
PmsTemUserPO pmsTemUserPO = new PmsTemUserPO();
BeanUtil.copyProperties(param, pmsTemUserPO);
assOrg(pmsTemUserPO);
pmsTemUserPO.setUploadStatus(DataStateEnum.DELETED.getCode());
pmsTemUserPO.setUploadStatus(Integer.valueOf(DicDataEnum.No_Upload.getCode()));
pmsTemUserPO.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.save(pmsTemUserPO);
@@ -95,7 +96,12 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
updateWrapper.set(PmsTemProcessTrackPO::getTempUserDossierName,updatePmsTemUserParam.getConsName()).eq(PmsTemProcessTrackPO::getTempUserDossierId,result.getObjId());
pmsTemProcessTrackMapper.update(null,updateWrapper);
}
if(Integer.valueOf(DicDataEnum.Has_Upload.getCode()).equals(result.getUploadStatus())){
pmsTemUserPO.setUploadStatus(Integer.valueOf(DicDataEnum.Return_Upload.getCode()));
}
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
pmsTemUserPO.setUploadStatus(Integer.valueOf(DicDataEnum.Return_Upload.getCode()));
return this.updateById(pmsTemUserPO);
}
@@ -164,7 +170,7 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
System.out.println("上送成功,上送成功返回"+count+"条");
if(count == list.get(i).size()){
LambdaUpdateWrapper<PmsTemUserPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(PmsTemUserPO::getUploadStatus,1).in(PmsTemUserPO::getObjId,ids);
lambdaUpdateWrapper.set(PmsTemUserPO::getUploadStatus,Integer.valueOf(DicDataEnum.Has_Upload.getCode())).in(PmsTemUserPO::getObjId,ids);
this.update(lambdaUpdateWrapper);
}
}