From 0b5a3f0a32686b523ea3394aa26f4099708a4f01 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 27 Nov 2024 14:40:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=85=A8=E8=BF=87=E7=A8=8B=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=202.=E4=B8=BB=E7=BD=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=8E=87=E9=94=99=E8=AF=AF=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/TransientServiceImpl.java | 4 +- .../pojo/po/upload/PmsTemProcessApproval.java | 12 +++++ .../pojo/po/upload/PmsTemProcessTestRun.java | 7 +++ .../pojo/po/upload/PmsTemProcessTrackPO.java | 15 ++++++ .../njcn/harmonic/utils/DataChangeUtil.java | 46 +++++++++++++++++++ .../PmsTemProcessApprovalController.java | 2 +- .../PmsTemProcessApprovalServiceImpl.java | 24 ++++++++-- .../impl/PmsTemProcessTestRunServiceImpl.java | 16 +++++-- .../impl/PmsTemProcessTrackServiceImpl.java | 26 ++++++++--- .../upload/impl/PmsTemUserServiceImpl.java | 10 +++- .../RUploadMainMonitorDataServiceImpl.java | 2 +- .../com/njcn/system/enums/DicDataEnum.java | 8 +++- 12 files changed, 151 insertions(+), 21 deletions(-) create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/DataChangeUtil.java diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index ae9a28a3b..9ab7cb00d 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -200,7 +200,7 @@ public class TransientServiceImpl implements TransientService { if (generalInfo.getBusinessWaveFileStorage() == GeneralConstant.LOCAL_DISK) { cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG; datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT; - log.info("波形文件路径----"+cfgPath); + log.info("本地磁盘波形文件路径----"+cfgPath); InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { @@ -210,7 +210,7 @@ public class TransientServiceImpl implements TransientService { } else { cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG; datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT; - System.out.println("波形路径-------------------" + cfgPath); + log.info("文件服务器波形文件路径----"+cfgPath); try ( InputStream cfgStream = fileStorageUtil.getFileStream(cfgPath); InputStream datStream = fileStorageUtil.getFileStream(datPath) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java index 635c0bd43..b8479c108 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java @@ -46,6 +46,12 @@ public class PmsTemProcessApproval { @TableField(exist = false) private String maintOrgName; + /** + * 所属地市名称 + */ + @TableField(exist = false) + private String cityOrgName; + /** * 验收参与人 */ @@ -121,4 +127,10 @@ public class PmsTemProcessApproval { @JSONField(serializeUsing = TimestampAsLongSerializer.class) private Timestamp updateTime; + + + + + + } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTestRun.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTestRun.java index ff85a9e64..dd6028c12 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTestRun.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTestRun.java @@ -48,6 +48,13 @@ public class PmsTemProcessTestRun { @TableField(exist = false) private String maintOrgName; + /** + * 所属地市名称 + */ + @TableField(exist = false) + private String cityOrgName; + + /** * 测试结论 */ diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java index 051f66771..f06b066b9 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java @@ -265,4 +265,19 @@ public class PmsTemProcessTrackPO{ private Timestamp updateTime; + + + /** + * 所属地市名称 + */ + @TableField(exist = false) + private String cityOrgName; + + + /** + * 运维单位名称 + */ + @TableField(exist = false) + private String maintOrgName; + } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/DataChangeUtil.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/DataChangeUtil.java new file mode 100644 index 000000000..f8332adc4 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/DataChangeUtil.java @@ -0,0 +1,46 @@ +package com.njcn.harmonic.utils; + +public class DataChangeUtil { + + /** + * 用来将二次值转成一次值 + */ + public static double secondaryToPrimary(String formula, Double data,Double pt, Double ct) { + switch (formula) { + + case "*PT": + data = data * pt; + break; + case "*CT": + data = data * ct; + break; + case "*PT*CT": + data = data * pt * ct; + break; + default: + break; + } + return data; + } + + /** + * 用来将一次值转成二次值 + */ + public static double primaryToSecondary(String formula, Double data,Double pt, Double ct) { + switch (formula) { + case "*PT": + data = data / pt; + break; + case "*CT": + data = data / ct; + break; + case "*PT*CT": + data = data / pt / ct; + break; + default: + break; + } + return data; + } + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java index 5ebddc797..35add0b11 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java @@ -27,7 +27,7 @@ import java.util.Objects; /** *

- * 电能质量全过程月报 前端控制器 + * 电能质量评估问题 *

* * @author cdf diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java index 4c2ea9e68..4ddc54f59 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java @@ -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 pageList(PmsTemProcessApprovalParam.QueryPmsTemProcessApprovalParam param) { List deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(param.getMaintOrg()).getData(); - List objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList()); - + List pmsTemUserPOList = pmsTemUserMapper.selectList(new LambdaQueryWrapper().select(PmsTemUserPO::getObjId,PmsTemUserPO::getCityOrgName,PmsTemUserPO::getMaintOrgName).in(PmsTemUserPO::getMaintOrg,deptCodes)); + Map pmsTemUserPOMap = pmsTemUserPOList.stream().collect(Collectors.toMap(PmsTemUserPO::getObjId, Function.identity())); + List 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(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper); + Page 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 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); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTestRunServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTestRunServiceImpl.java index ac96f2288..473465e0e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTestRunServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTestRunServiceImpl.java @@ -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 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 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); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java index 4a3310bec..ac736740c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java @@ -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 pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam parkQuery) { List deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(parkQuery.getMaintOrg()).getData(); - List objIds = pmsTemUserMapper.selectList(new LambdaQueryWrapper().select(PmsTemUserPO::getObjId).in(PmsTemUserPO::getMaintOrg,deptCodes)).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList()); - + List pmsTemUserPOList = pmsTemUserMapper.selectList(new LambdaQueryWrapper().select(PmsTemUserPO::getObjId,PmsTemUserPO::getCityOrgName,PmsTemUserPO::getMaintOrgName).in(PmsTemUserPO::getMaintOrg,deptCodes)); + Map pmsTemUserPOMap = pmsTemUserPOList.stream().collect(Collectors.toMap(PmsTemUserPO::getObjId, Function.identity())); + List objIds = pmsTemUserPOList.stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList()); if(CollUtil.isEmpty(objIds)){ return new Page<>(parkQuery.getPageNum(),parkQuery.getPageSize()); } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(PmsTemProcessTrackPO::getTempUserDossierId,objIds); - return this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper); + Page 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 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); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java index 3bf8c50a5..f27647481 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java @@ -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 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); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java index 2dec5db40..18695690e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java @@ -89,7 +89,7 @@ public class RUploadMainMonitorDataServiceImpl extends MppServiceImpl