From 0ae02d157a958111ef2bf75db8aff5e7ba92438f Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Wed, 26 Oct 2022 11:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/common/pojo/constant/ServerInfo.java | 2 + .../influxdb/param/InfluxDBSqlConstant.java | 4 ++ .../java/com/njcn/web/config/WebConfig.java | 2 +- .../impl/HistoryResultServiceImpl.java | 2 +- .../impl/PollutionSubstationServiceImpl.java | 62 ++++++++++--------- 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java index 637fb140f..90d61b0d6 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java @@ -23,5 +23,7 @@ public interface ServerInfo { String USER = "user-boot"; String JOB = "job-admin"; String QUALITY = "quality-boot"; + String HARMONIC_PREPARE = "harmonic-prepare"; + String EVENT_PREPARE = "event-prepare"; } diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java index c03691fa3..c4ddae894 100644 --- a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java +++ b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBSqlConstant.java @@ -65,6 +65,10 @@ public interface InfluxDBSqlConstant { String QM = "'"; String LBK = "("; String RBK = ")"; + String GT = ">"; + String GE = ">="; + String LT = "<"; + String LE = "<="; /** * influxDB函数拼接 diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/config/WebConfig.java b/pqs-common/common-web/src/main/java/com/njcn/web/config/WebConfig.java index b16f54423..c1dfdd1a8 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/config/WebConfig.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/config/WebConfig.java @@ -16,7 +16,7 @@ public class WebConfig { * 配置请求对象 */ @Bean - public RestTemplate create() { + public RestTemplate restTemplate() { return new RestTemplate(); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java index 990dcc241..dd986bac1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java @@ -78,7 +78,7 @@ public class HistoryResultServiceImpl implements HistoryResultService { List eventDetailVOList = new ArrayList<>(); if (!eventDetailList.isEmpty()) { for (EventDetail eventdetail : eventDetailList) { - Instant now = eventdetail.getTimeId().plusMillis(TimeUnit.HOURS.toMillis(8)); + Instant now = eventdetail.getTimeId(); Long time = now.toEpochMilli(); String timeText = format.format(time); EventDetailVO eventDetailVO = new EventDetailVO(); 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 2c4c39dc6..abed34803 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 @@ -24,7 +24,6 @@ import java.util.*; import java.util.stream.Collectors; /** - * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/13 8:56【需求编号】 @@ -60,51 +59,58 @@ public class PollutionSubstationServiceImpl extends ServiceImpl getPollutionSubstationData(PollutionSubstationQuryParam pollutionSubstationQuryParam) { - List pollutionSubstationVOList = new ArrayList<> (); + List pollutionSubstationVOList = new ArrayList<>(); /*根据部门获取变电站详情*/ HarmonicPublicParam harmonicPublicParam = new HarmonicPublicParam(); - BeanUtils.copyProperties (pollutionSubstationQuryParam, harmonicPublicParam); + BeanUtils.copyProperties(pollutionSubstationQuryParam, harmonicPublicParam); harmonicPublicParam.setServerName(generalInfo.getMicroServiceName()); List pollutionSubstationDTOList = new ArrayList<>(); List sub = generalDeviceInfoClient.getPracticalRunDeviceInfoAsSubstation(harmonicPublicParam).getData(); - - sub.forEach(item->{ + + sub.forEach(item -> { PollutionSubstationDTO pollutionSubstationDTO = lineFeignClient.getSubstationInfo(item.getIndex()).getData(); pollutionSubstationDTOList.add(pollutionSubstationDTO); }); - List collect = pollutionSubstationDTOList.stream ( ).map (PollutionSubstationDTO::getId).collect (Collectors.toList ( )); - List locationData = substationFeignClient.getSubstationById (collect).getData ( ); + List collect = pollutionSubstationDTOList.stream().map(PollutionSubstationDTO::getId).collect(Collectors.toList()); + List locationData = substationFeignClient.getSubstationById(collect).getData(); /*todo 后期可以把locationData存入redis*/ /*把所有的变电站的污染指数查出来*/ - QueryWrapper wrapper = new QueryWrapper<> (); - wrapper.in ("substation_id",collect). - eq ("pollution_type", pollutionSubstationQuryParam.getPollutionStatis ().getId ()). - apply("DATE_FORMAT( data_date ,'%Y-%m') = '"+pollutionSubstationQuryParam.getLocalDate ()+"'"); - List rStatPollutionSubstationMList = pollutionSubstationMMapper.selectList (wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in("substation_id", collect). + eq("pollution_type", pollutionSubstationQuryParam.getPollutionStatis().getId()). + apply("DATE_FORMAT( data_date ,'%Y-%m') = '" + pollutionSubstationQuryParam.getLocalDate() + "'"); + List rStatPollutionSubstationMList = pollutionSubstationMMapper.selectList(wrapper); - pollutionSubstationDTOList.forEach (substationInfo ->{ + pollutionSubstationDTOList.forEach(substationInfo -> { - PollutionSubstationVO pollutionSubstationVO =new PollutionSubstationVO (); - pollutionSubstationVO.setSubstationId (substationInfo.getId ()); - pollutionSubstationVO.setSubstationName (substationInfo.getName ()); + PollutionSubstationVO pollutionSubstationVO = new PollutionSubstationVO(); + pollutionSubstationVO.setSubstationId(substationInfo.getId()); + pollutionSubstationVO.setSubstationName(substationInfo.getName()); /*todo 添加经纬度接口返回数据暂时没有*/ - SubstationDTO substationDTO = locationData.stream ().filter (temp -> Objects.equals (substationInfo.getId ( ), temp.getId ())). - collect (Collectors.toList ( )).get (0); + SubstationDTO substationDTO = locationData + .stream() + .filter(temp -> Objects.equals(substationInfo.getId(), temp.getId())) + .collect(Collectors.toList()) + .get(0); - pollutionSubstationVO.setLatitude (substationDTO.getLat ()); - pollutionSubstationVO.setLongitude (substationDTO.getLng ()); + pollutionSubstationVO.setLatitude(substationDTO.getLat()); + pollutionSubstationVO.setLongitude(substationDTO.getLng()); - Double value = Optional.ofNullable ( - rStatPollutionSubstationMList.stream ( ).filter (temp -> Objects.equals (substationInfo.getId ( ), temp.getSubstationId ( ))). - collect (Collectors.toList ( )).get (0).getValue ( ) - ).orElse (new Double ("0.00")); - pollutionSubstationVO.setPollutionData (value); - pollutionSubstationVO.setPollutionStatis ( pollutionSubstationQuryParam.getStatisticalType ().getName ()); - pollutionSubstationVOList.add (pollutionSubstationVO); + Double value = Optional.ofNullable( + rStatPollutionSubstationMList + .stream() + .filter(temp -> Objects.equals(substationInfo.getId(), temp.getSubstationId())) + .collect(Collectors.toList()) + .get(0) + .getValue() + ).orElse(new Double("0.00")); + pollutionSubstationVO.setPollutionData(value); + pollutionSubstationVO.setPollutionStatis(pollutionSubstationQuryParam.getStatisticalType().getName()); + pollutionSubstationVOList.add(pollutionSubstationVO); }); - List result = pollutionSubstationVOList.stream ( ).sorted (Comparator.comparing (PollutionSubstationVO::getPollutionData).reversed ( )).collect (Collectors.toList ( )); + List result = pollutionSubstationVOList.stream().sorted(Comparator.comparing(PollutionSubstationVO::getPollutionData).reversed()).collect(Collectors.toList()); return result; }