From 1819b87c6a240fc4a4aaf32083b1adcc0ed814a6 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Wed, 26 Apr 2023 09:51:39 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=9A=82=E9=99=8D=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/po/EventPushLogs.java | 28 +-- .../pq/pojo/vo/TerminalDaliyFlowVO.java | 3 + .../device/pq/mapper/EventPushLogsMapper.java | 8 + .../pq/mapper/mapping/EventPushLogsMapper.xml | 5 + .../pq/mapper/mapping/RateOfFlowMapper.xml | 2 +- .../mapper/mapping/TerminalMaintainMapper.xml | 66 +++---- .../pq/service/impl/FlowMealServiceImpl.java | 6 +- .../pq/service/impl/LogManageServiceImpl.java | 177 +++++++++++++----- .../impl/TerminalMaintainServiceImpl.java | 15 +- .../Impl/EventDetailServiceImpl.java | 4 - 10 files changed, 199 insertions(+), 115 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java index aebce0cae..3ee803bb3 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java @@ -1,10 +1,12 @@ package com.njcn.device.pq.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import org.influxdb.annotation.Column; -import org.influxdb.annotation.Measurement; import java.time.Instant; +import java.time.LocalDateTime; /** * @version 1.0.0 @@ -12,27 +14,25 @@ import java.time.Instant; * @date: 2022/06/09 11:00 */ @Data -@Measurement(name = "pqs_event_push_logs") +@TableName("cld_event_push_log") public class EventPushLogs { - @Column(name = "time") - private Instant timeId; + @TableId("Time_Id") + private LocalDateTime timeId; - @Column(name = "line_id") + @TableField("Line_Id") private String lineId; - @Column(name = "create_time") - private String createTime; + @TableField("Create_Time") + private LocalDateTime createTime; - @Column(name = "update_time") - private String updateTime; + @TableField("Update_Time") + private LocalDateTime updateTime; - @Column(name = "push_failed") + @TableField("Push_Failed") private Integer pushFailed; - @Column(name = "result") + @TableField("Result") private Integer result; - - } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java index 9f7b2f3b0..d234eaba4 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.pojo.vo; +import com.njcn.device.pq.pojo.po.DevFuction; import com.njcn.device.pq.pojo.po.influxdb.DeviceDayFlow; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,6 +33,8 @@ public class TerminalDaliyFlowVO { private Float flowMeal; @ApiModelProperty(name = "deviceDayFlowsList",value = "装置日流量统计集合") private List deviceDayFlowsList; + @ApiModelProperty(name = "functions",value = "装置功能码集合") + private List functions; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java new file mode 100644 index 000000000..7dfd60b7c --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java @@ -0,0 +1,8 @@ +package com.njcn.device.pq.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.po.EventPushLogs; + + +public interface EventPushLogsMapper extends BaseMapper { +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml new file mode 100644 index 000000000..fd2b0d162 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml index 06ede2cc5..d8dda671f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml @@ -38,7 +38,7 @@ `Update_Time` updateTime FROM cld_flow_meal - WHERE Type =0 OR Type =1 AND Flag =1 + WHERE Type =0 AND Flag =1 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml index aa88ddc0c..47df006e1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml @@ -3,39 +3,39 @@ + + + SELECT + r.line_id AS id, + MAX(r.value) AS data + FROM r_mp_pollution_d r + WHERE r.line_id IN + + #{item} + + AND r.pollution_type = #{pollutionType} + AND r.data_date between #{start} and #{end} + GROUP BY r.line_id + ORDER BY data DESC + LIMIT 0,10 + + + insert into r_mp_pollution_d diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java index 6e68a1a20..8130557d2 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/PollutionSubstationService.java @@ -65,4 +65,7 @@ public interface PollutionSubstationService extends IService getLineRank(HarmonicPublicParam param); + + List getLineRankTop10(HarmonicPublicParam param); + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index 0694ee746..db5867cc9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.harmonic.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -570,7 +571,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl lineList = new ArrayList<>(); PollutionParamDTO paramDTO = new PollutionParamDTO(); @@ -646,6 +647,88 @@ public class PollutionSubstationServiceImpl extends ServiceImpl getLineRankTop10 (HarmonicPublicParam param) { + List list= new ArrayList<>(); + String pollutionType = param.getStatisticalType ( ).getId (); + if(param.getType()==0) { + param.setServerName(generalInfo.getMicroServiceName()); + List lineList = new ArrayList<>(); + PollutionParamDTO paramDTO = new PollutionParamDTO(); + if (StringUtils.isBlank(RequestUtil.getDeptIndex())) { + return list; + } + List deviceList = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData(); + deviceList.forEach(item -> { + if (!CollectionUtils.isEmpty(item.getLineIndexes())) { + lineList.addAll(item.getLineIndexes()); + } + }); + if (!CollectionUtils.isEmpty(lineList)) { + paramDTO.setLineList(lineList); + list = lineFeignClient.getLineInfo(paramDTO).getData(); + List result =rMpPollutionDPOMapper.getTop10Line(lineList,DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())),DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())), param.getStatisticalType().getId()); + if (!CollectionUtils.isEmpty(result)) { + list.stream().map(list1 -> result.stream().filter(list2 -> Objects.equals(list1.getId(), list2.getId())).findAny().map(m -> { + list1.setData(m.getData()); + return list1; + })).collect(Collectors.toList()); + } + } + list.sort((item1, item2) -> item2.getData().compareTo(item1.getData())); + if (list.size() > Param.UP_LIMIT) { + return list.subList(Param.DOWN_LIMIT, Param.UP_LIMIT); + } + return list; + } + PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(); + pmsDeviceInfoParam.setDeptIndex(param.getDeptIndex()); + //获取统计类型 + pmsDeviceInfoParam.setStatisticalType(param.getStatisticalType()); + //获取主网台账信息 + List deviceList = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData(); + List monitorIdList=new ArrayList<>(); + deviceList.forEach(dept -> { + monitorIdList.addAll(dept.getMonitorIdList()); + }); + + if(CollectionUtil.isNotEmpty(monitorIdList)){ + //获取监测点数据 + List lineData = rMpPollutionDPOMapper.selectMaxList ( monitorIdList,pollutionType,param.getSearchBeginTime()); + + if(CollectionUtil.isEmpty(lineData)){ + return list; + } + + //获取主网监测点信息 + List data = monitorClient.getMonitorList(monitorIdList).getData(); + Map monitorMap = data.stream().collect(Collectors.toMap(Monitor::getId, Function.identity(), (key1, kye2) -> key1)); + lineData.sort((item1, item2) -> item2.getValue().compareTo(item1.getValue())); + if (lineData.size() > Param.UP_LIMIT) { + lineData = lineData.subList(Param.DOWN_LIMIT, Param.UP_LIMIT); + } + + PollutionLineDTO dto; + for (RMpPollutionDPO lineDatum : lineData) { + if(monitorMap.containsKey(lineDatum.getLineId())){ + Monitor monitor = monitorMap.get(lineDatum.getLineId()); + dto=new PollutionLineDTO(); + dto.setId(monitor.getId()); + dto.setName(monitor.getName()); + dto.setPowerCompany(monitor.getOrgName()); + dto.setSubstation(monitor.getPowerrId()); + dto.setSubstationId(monitor.getPowerrName()); + dto.setBusBar(monitor.getLineName()); + dto.setData(lineDatum.getValue()); + list.add(dto); + } + } + } + return list; + } + /** * 功能描述:根据监测点id查询influxDB污染指数 * From 12b91d0b420e85a6ed109402e1876ec2371fd046 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 26 Apr 2023 20:19:53 +0800 Subject: [PATCH 10/14] ... --- .../com/njcn/harmonic/utils/WordUtil2.java | 5 +++-- .../controller/ExportModelController.java | 20 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java index 6e49f0fcd..c7018cace 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java @@ -3,6 +3,7 @@ package com.njcn.harmonic.utils; import org.apache.poi.xwpf.usermodel.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.core.io.ClassPathResource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; @@ -20,12 +21,12 @@ public class WordUtil2 { public void getWord(String path, Map params, String fileName, HttpServletResponse response) throws Exception { path = ClearPathUtil.cleanString(path); - File file = new File(path); +// File file = new File(path); InputStream inStream = null; CustomXWPFDocument doc = null; //读取报告模板 try { - inStream = new FileInputStream(file); + inStream = new ClassPathResource(path).getInputStream();; doc = new CustomXWPFDocument(inStream); this.replaceInTable(doc, params); // 替换表格里面的变量 this.replaceInPara(doc, params); // 替换文本里面的变量 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java index 3a01dc6f8..ed49a69be 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java @@ -28,6 +28,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.core.io.ClassPathResource; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import sun.misc.BASE64Encoder; @@ -169,10 +170,13 @@ public class ExportModelController extends BaseController { } else { rtfPath = "file/reportModel.docx"; } - + ClassPathResource rtfPathResource=null; + ClassPathResource picPathResource=null; try { - rtfPath = getClass().getClassLoader().getResource(rtfPath).getPath(); - picPath = getClass().getClassLoader().getResource(picPath).getPath(); + rtfPathResource = new ClassPathResource(rtfPath); + picPathResource = new ClassPathResource(picPath); +// rtfPath = getClass().getClassLoader().getResource(rtfPath).getPath(); +// picPath = getClass().getClassLoader().getResource(picPath).getPath(); rtfPath = rtfPath.replaceAll("%20", " "); picPath = picPath.replaceAll("%20", " "); } catch (Exception e1) { @@ -189,10 +193,15 @@ public class ExportModelController extends BaseController { if (!tmpfile.exists()) { return "pathfail"+rtfPath; } +// File tmpfile = new File(rtfPath); +// if (!tmpfile.exists()) { +// return "pathfail"; +// } InputStream ins = null; try { - ins = new FileInputStream(rtfPath); +// ins = new FileInputStream(rtfPath); + ins = rtfPathResource.getInputStream(); if (null != ins) { flagPath = true; } @@ -225,7 +234,8 @@ public class ExportModelController extends BaseController { InputStream inStream = null; byte[] data = null; try { - inStream = new FileInputStream(new File(picPath)); +// inStream = new FileInputStream(new File(picPath)); + inStream = picPathResource.getInputStream(); data = new byte[inStream.available()]; inStream.read(data); } catch (FileNotFoundException e) { From a3377a9327792a2f4a5b0be5c2adc1f92c056e47 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 26 Apr 2023 20:24:09 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/harmonic/utils/WordUtil2.java | 1 - .../controller/ExportModelController.java | 17 +---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java index c7018cace..5b32ca3c2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/WordUtil2.java @@ -21,7 +21,6 @@ public class WordUtil2 { public void getWord(String path, Map params, String fileName, HttpServletResponse response) throws Exception { path = ClearPathUtil.cleanString(path); -// File file = new File(path); InputStream inStream = null; CustomXWPFDocument doc = null; //读取报告模板 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java index ed49a69be..ee81005e6 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java @@ -175,32 +175,20 @@ public class ExportModelController extends BaseController { try { rtfPathResource = new ClassPathResource(rtfPath); picPathResource = new ClassPathResource(picPath); -// rtfPath = getClass().getClassLoader().getResource(rtfPath).getPath(); -// picPath = getClass().getClassLoader().getResource(picPath).getPath(); rtfPath = rtfPath.replaceAll("%20", " "); picPath = picPath.replaceAll("%20", " "); } catch (Exception e1) { log.info("获取报表发生异常，异常是" + e1.getMessage()); } - log.error(LocalDateTime.now()+"----------------------------------rtfPath"+rtfPath); - log.info(LocalDateTime.now()+"----------------------------------rtfPath"+rtfPath); - log.error(LocalDateTime.now()+"----------------------------------rtfPath"+rtfPath); - log.info(LocalDateTime.now()+"----------------------------------rtfPath"+rtfPath); - log.error(LocalDateTime.now()+"----------------------------------rtfPath"+rtfPath); - log.info(LocalDateTime.now()+"----------------------------------rtfPath"+rtfPath); + File tmpfile = new File(rtfPath); if (!tmpfile.exists()) { return "pathfail"+rtfPath; } -// File tmpfile = new File(rtfPath); -// if (!tmpfile.exists()) { -// return "pathfail"; -// } InputStream ins = null; try { -// ins = new FileInputStream(rtfPath); ins = rtfPathResource.getInputStream(); if (null != ins) { flagPath = true; @@ -224,8 +212,6 @@ public class ExportModelController extends BaseController { if (ObjectUtil.isNotEmpty(file)) { byte[] bytes = file.getBytes(); -// byte[] image = (byte[]) session.getAttribute("image"); -// String contentType = (String) session.getAttribute("contentType"); header.put("width", 400); header.put("height", 250); header.put("type", file.getContentType()); @@ -234,7 +220,6 @@ public class ExportModelController extends BaseController { InputStream inStream = null; byte[] data = null; try { -// inStream = new FileInputStream(new File(picPath)); inStream = picPathResource.getInputStream(); data = new byte[inStream.available()]; inStream.read(data); From 4b3cb76165e63b69a609c8ea6d1133cd2e5aaa51 Mon Sep 17 00:00:00 2001 From: hanyong <1334742946@qq.com> Date: Wed, 26 Apr 2023 20:36:18 +0800 Subject: [PATCH 12/14] =?UTF-8?q?device=E7=9A=84pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index 03e054944..b79815acc 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -19,17 +19,17 @@ - + - + com.njcn From 26286a7aed5975bac3c500af4c107cfa78a25027 Mon Sep 17 00:00:00 2001 From: hanyong <1334742946@qq.com> Date: Wed, 26 Apr 2023 20:53:48 +0800 Subject: [PATCH 13/14] =?UTF-8?q?device=E7=9A=84pom=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-device/device-boot/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index b79815acc..03e054944 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -19,17 +19,17 @@ - + - + com.njcn From 7265405f2dc317e61651fa94dec7a01e5a2b3d07 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 27 Apr 2023 11:24:14 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=B3=E6=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/harmonic/controller/ExportModelController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java index ee81005e6..dfeaa98d0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java @@ -181,12 +181,6 @@ public class ExportModelController extends BaseController { log.info("获取报表发生异常，异常是" + e1.getMessage()); } - - File tmpfile = new File(rtfPath); - if (!tmpfile.exists()) { - return "pathfail"+rtfPath; - } - InputStream ins = null; try { ins = rtfPathResource.getInputStream();