From 682b40c84955b75393637851a0b6f0c5fccd16db Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 22 May 2023 15:59:51 +0800 Subject: [PATCH] =?UTF-8?q?pqbug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProgramVersionController.java | 4 +-- .../impl/ProgramVersionServiceImpl.java | 36 ++++++++++--------- .../majornetwork/Impl/ReportServiceImpl.java | 9 +++-- .../system/service/impl/AuditServiceImpl.java | 8 ++--- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java index 016da84f7..632bbc3ad 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ProgramVersionController.java @@ -58,7 +58,7 @@ public class ProgramVersionController extends BaseController { @RequestParam("remark") String remark, @RequestParam(value = "versionType",required = false) String versionType, @RequestParam("filename") String fileName, - @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) { + @ApiParam(value = "文件") @RequestPart(value = "file",required = false) MultipartFile file) { String methodDescribe = getMethodDescribe("addProgramVersion"); boolean res = programService.addProgramVersion(name,protocol,date,devType,remark,versionType,fileName,file); if (res) { @@ -93,7 +93,7 @@ public class ProgramVersionController extends BaseController { @RequestParam("remark") String remark, @RequestParam(value = "versionType",required = false) String versionType, @RequestParam("filename") String fileName, - @ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) { + @ApiParam(value = "文件") @RequestPart(name = "file",required = false) MultipartFile file) { String methodDescribe = getMethodDescribe("updateProgramVersion"); boolean res = programService.updateProgramVersion(id,name,protocol,date,devType,remark,versionType,fileName,file); if (res) { diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java index 52f71bf4e..e7ea6ea5e 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -79,17 +80,18 @@ public class ProgramVersionServiceImpl extends ServiceImpl= 1) { throw new BusinessException(DeviceResponseEnum.FLOW_SAME_NAME); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 8b5691ad1..a77f1cdbf 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -138,7 +138,7 @@ public class ReportServiceImpl implements ReportService { private final ReportMapper reportMapper; - public List getED(DeviceInfoParam.BusinessParam businessParam) { + public List getED(DeviceInfoParam.BusinessParam businessParam,String id) { List info = new ArrayList<>(); List deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData(); List lineIds = deviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); @@ -146,6 +146,7 @@ public class ReportServiceImpl implements ReportService { //数据暂降查询 List eventDetails = eventDetailService.list(new LambdaQueryWrapper() .in(RmpEventDetailPO::getMeasurementPointId, lineIds) + .eq(RmpEventDetailPO::getEventType, id) .ge(StrUtil.isNotBlank(businessParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(businessParam.getSearchBeginTime()))) .le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime()))) ); @@ -384,9 +385,11 @@ public class ReportServiceImpl implements ReportService { public List getReason(DeviceInfoParam.BusinessParam businessParam) { //获取暂降字典信息 DictData dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); - + if(ObjectUtil.isNull(dictData)){ + throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY); + } List result = new ArrayList<>(); - List info = getED(businessParam); + List info = getED(businessParam, dictData.getId()); //获取字典表 HttpResult> reason = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()); List data = reason.getData(); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 3e4cc1c3d..e12d53340 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -129,8 +129,8 @@ public class AuditServiceImpl extends ServiceImpl implem aa.le("sys_user_log.update_time", endTime); String nowTime = date + "至" + endTime; //必须放到循环外，否则会刷新流 - ExcelWriter excelWriter = EasyExcel.write(generalInfo.getBusinessTempPath() + "//" + nowTime + ExcelTypeEnum.CSV.getValue(), UserLogExcel.class) - .excelType(ExcelTypeEnum.CSV) + ExcelWriter excelWriter = EasyExcel.write(generalInfo.getBusinessTempPath() + "//" + nowTime + ExcelTypeEnum.XLSX.getValue(), UserLogExcel.class) +// .excelType(ExcelTypeEnum.CSV) .build(); try { @@ -201,7 +201,7 @@ public class AuditServiceImpl extends ServiceImpl implem try { in = new FileInputStream(newFile); String name = newFile.getName(); - String[] split = name.split(ExcelTypeEnum.CSV.getValue()); + String[] split = name.split(ExcelTypeEnum.XLSX.getValue()); String[] splitTime = split[0].split("至"); if (StrUtil.isBlank(splitTime[0]) || StrUtil.isBlank(splitTime[1])) { @@ -212,7 +212,7 @@ public class AuditServiceImpl extends ServiceImpl implem .le(UserLog::getCreateTime, splitTime[1].replace("_", ":")); this.remove(le); EasyExcel.read(newFile, UserLogExcel.class, new DemoDataListener(this.getBaseMapper())) - .excelType(ExcelTypeEnum.CSV).doReadAll(); + .excelType(ExcelTypeEnum.XLSX).doReadAll(); } catch (Exception e) { e.printStackTrace();