Skip to content

A
amos-boot-biz
Commit 839d7866 authored by tangwei's avatar tangwei
Browse files
Options

增加日月年发电量

parent 766dc496
Show whitespace changes
Inline Side-by-side
Showing with 1065 additions and 22 deletions
amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java
View file @ 839d7866
...@@ -447,6 +447,186 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -447,6 +447,186 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
KsolarStationCollectData.class KsolarStationCollectData.class
); );
if(jpCollectorlist!=null&&jpCollectorlist.size()>0){
JpCollector jpCollectorflag=null;
for (JpCollector jpCollector : jpCollectorlist) {
if(jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId())&&KSolarConstant.stationStaus.get("1").equals(jpCollector.getState())){
jpCollectorflag=jpCollector;
break;
}
}
if(jpCollectorflag!=null){
//离线状态
JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
eq("sequence_nbr", jpCollectorflag.getSequenceNbr()) );
if (ObjectUtils.isEmpty(jpInverter)) {
jpInverter = new JpInverter();
}
jpInverter.setCapacity( KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollectorflag.getName())));
jpInverter.setSnCode(jpInverter.getSnCode());
jpInverter.setId(jpInverter.getId());
jpInverter.setState(jpCollectorflag.getState());
jpInverter.setCollectorId(ksolarStationCollectList.getCollectId());
jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId());
jpInverter.setUpdateTime(new Date());
jpInverter.setCurrentPower(null);
jpInverter.setDayPowerGeneration(jpInverter.getDayPowerGeneration());
jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration());
jpInverter.setYearPowerGeneration(jpInverter.getYearPowerGeneration());
jpInverter.setTotalPowerGeneration(jpInverter.getTotalPowerGeneration());
jpInverter.setModel(jpInverter.getModel());
jpInverter.setVersion(jpInverter.getVersion());
jpInverter.setThirdStationId(ksolarStationCollectList.getThirdStationId());
jpInverter.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
jpInverter.setStationName(ksolarStationCollectList.getStationName());
jpInverter.setAddr(ksolarStationCollectList.getAddress());
if (!ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
jpInverterMapper.updateById(jpInverter);
} else {
jpInverterMapper.insert(jpInverter);
}
for (int k1 = 1; k1 < 13; k1++) {
JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()).
eq("type", "直流").
eq("name", "PV" + k1)
);
if (ObjectUtils.isEmpty(jpInverterElectricity)) {
jpInverterElectricity = new JpInverterElectricity();
}
jpInverterElectricity.setInverterId(jpInverter.getSnCode());
jpInverterElectricity.setSnCode(jpInverter.getSnCode());
jpInverterElectricity.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
jpInverterElectricity.setThirdStationId(ksolarStationCollectList.getThirdStationId());
jpInverterElectricity.setType("直流");
jpInverterElectricity.setName("PV" + k1);
jpInverterElectricity.setVoltage(null);
jpInverterElectricity.setCurrent(null);
jpInverterElectricity.setPower(null);
if (ObjectUtils.isEmpty(jpInverterElectricity.getSequenceNbr())) {
jpInverterElectricityMapper.insert(jpInverterElectricity);
} else {
jpInverterElectricityMapper.updateById(jpInverterElectricity);
}
}
JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()).
eq("type", "交流").
eq("name", "RS")
);
if (ObjectUtils.isEmpty(jpInverterElectricityR)) {
jpInverterElectricityR = new JpInverterElectricity();
}
jpInverterElectricityR.setInverterId(jpInverter.getSnCode());
jpInverterElectricityR.setSnCode(jpInverter.getSnCode());
jpInverterElectricityR.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
jpInverterElectricityR.setThirdStationId(ksolarStationCollectList.getThirdStationId());
jpInverterElectricityR.setFrequency(null);
jpInverterElectricityR.setType("交流");
jpInverterElectricityR.setName("RS");
jpInverterElectricityR.setVoltage(null);
jpInverterElectricityR.setCurrent(null);
if (ObjectUtils.isEmpty(jpInverterElectricityR.getSequenceNbr())) {
jpInverterElectricityMapper.insert(jpInverterElectricityR);
} else {
jpInverterElectricityMapper.updateById(jpInverterElectricityR);
}
JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()).
eq("type", "交流").
eq("name", "ST")
);
if (ObjectUtils.isEmpty(jpInverterElectricityS)) {
jpInverterElectricityS = new JpInverterElectricity();
}
jpInverterElectricityS.setInverterId(jpInverter.getSnCode());
jpInverterElectricityS.setSnCode(jpInverter.getSnCode());
jpInverterElectricityS.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
jpInverterElectricityS.setThirdStationId(ksolarStationCollectList.getThirdStationId());
jpInverterElectricityS.setType("交流");
jpInverterElectricityS.setName("ST");
jpInverterElectricityS.setVoltage(null);
jpInverterElectricityS.setCurrent(null);
if (ObjectUtils.isEmpty(jpInverterElectricityS.getSequenceNbr())) {
jpInverterElectricityMapper.insert(jpInverterElectricityS);
} else {
jpInverterElectricityMapper.updateById(jpInverterElectricityS);
}
JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
eq("sn_code", jpInverter.getSnCode()).
eq("type", "交流").
eq("name", "TR")
);
if (ObjectUtils.isEmpty(jpInverterElectricityT)) {
jpInverterElectricityT = new JpInverterElectricity();
}
jpInverterElectricityT.setInverterId(jpInverter.getSnCode());
jpInverterElectricityT.setSnCode(jpInverter.getSnCode());
jpInverterElectricityT.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
jpInverterElectricityT.setThirdStationId(ksolarStationCollectList.getThirdStationId());
jpInverterElectricityT.setType("交流");
jpInverterElectricityT.setName("TR");
jpInverterElectricityT.setVoltage(null);
jpInverterElectricityT.setCurrent(null);
if (ObjectUtils.isEmpty(jpInverterElectricityT.getSequenceNbr())) {
jpInverterElectricityMapper.insert(jpInverterElectricityT);
} else {
jpInverterElectricityMapper.updateById(jpInverterElectricityT);
}
//
HYGFJPInverterElecHistory hygfjpInverterElecHistory = new HYGFJPInverterElecHistory();
hygfjpInverterElecHistory.setThirdStationId(ksolarStationCollectList.getThirdStationId());
hygfjpInverterElecHistory.setCreatedTime(System.currentTimeMillis());
hygfjpInverterElecHistory.setSnCode(jpInverter.getSnCode());
hygfjpInverterElecHistory.setUAcCurrent(null);
hygfjpInverterElecHistory.setVAcCurrent(null);
hygfjpInverterElecHistory.setWAcCurrent(null);
hygfjpInverterElecHistory.setUAcVoltage(null);
hygfjpInverterElecHistory.setVAcVoltage(null);
hygfjpInverterElecHistory.setWAcVoltage(null);
hygfjpInverterElecHistory.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
hygfjpInverterElecHistory.setTime(System.currentTimeMillis());
hygfjpInverterElecHistoryMapper.insert(hygfjpInverterElecHistory);
// 逆变器历史
String today = DateUtil.today();
HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper.selectOne(
new QueryWrapper<HYGFJPInverterHistory>().eq("sn_code", jpInverter.getSnCode()).eq("date", today));
if (ObjectUtils.isEmpty(hygfjpInverterHistory)) {
hygfjpInverterHistory = new HYGFJPInverterHistory();
}
// 满发小时数
// hygfjpInverterHistory.setGenerationHours(inverterDetailDto.getFullHour());
hygfjpInverterHistory.setDate(today);
hygfjpInverterHistory.setThirdStationId(ksolarStationCollectList.getThirdStationId());
hygfjpInverterHistory.setInverterId(jpInverter.getSnCode());
hygfjpInverterHistory.setSnCode(jpInverter.getSnCode());
hygfjpInverterHistory.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
hygfjpInverterHistory.setPowerGeneration(null);
if (ObjectUtils.isEmpty(hygfjpInverterHistory.getCreatedTime())) {
hygfjpInverterHistory.setCreatedTime(System.currentTimeMillis());
hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
} else {
hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
}
}else{
if (!CollectionUtils.isEmpty(result)) { if (!CollectionUtils.isEmpty(result)) {
result.forEach(ksolarStationCollectData -> { result.forEach(ksolarStationCollectData -> {
JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>(). JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
...@@ -479,7 +659,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -479,7 +659,7 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId()); jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId());
jpInverter.setUpdateTime(new Date()); jpInverter.setUpdateTime(new Date());
jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent()!=null?ksolarStationCollectData.getPowerApparent()/1000:0.0); jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent()!=null?ksolarStationCollectData.getPowerApparent()/1000:null);
jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration()); jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration());
jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration()); jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration());
jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration()); jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration());
...@@ -633,6 +813,200 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -633,6 +813,200 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
} }
}); });
} }
}
}
// if (!CollectionUtils.isEmpty(result)) {
// result.forEach(ksolarStationCollectData -> {
// JpInverter jpInverter = jpInverterMapper.selectOne(new QueryWrapper<JpInverter>().
// eq("third_station_id", ksolarStationCollectList.getThirdStationId()).
// eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()).
// eq("sn_code", ksolarStationCollectData.getInverterId()));
// if (ObjectUtils.isEmpty(jpInverter)) {
// jpInverter = new JpInverter();
// }
//
// // 品牌
//// jpInverter.setBrand(inverterDetailDto.getName());
// // 国标
//// jpInverter.setNationalStandard(inverterDetailDto.getNationalStandards());
// // 满发小时数
//// jpInverter.setGenerationHours(String.valueOf(inverterDetailDto.getFullHour()));
// // 装机容量
// // jpInverter.setCapacity();
// if(jpCollectorlist!=null&&jpCollectorlist.size()>0){
// for (JpCollector jpCollector : jpCollectorlist) {
// if(jpCollector.getSnCode().equals(ksolarStationCollectList.getCollectId())){
// jpInverter.setCapacity( KSolarConstant.Capacity.get(StringUtils.lowerCase(jpCollector.getName())));
// }
// }
// }
// jpInverter.setSnCode(ksolarStationCollectData.getInverterId());
// jpInverter.setId(ksolarStationCollectData.getInverterId());
// jpInverter.setState(KSolarConstant.stationStaus.get(ksolarStationCollectData.getStatus()));
// jpInverter.setCollectorId(ksolarStationCollectList.getCollectId());
// jpInverter.setCollectorSnCode(ksolarStationCollectList.getCollectId());
// jpInverter.setUpdateTime(new Date());
//
// jpInverter.setCurrentPower(ksolarStationCollectData.getPowerApparent()!=null?ksolarStationCollectData.getPowerApparent()/1000:0.0);
// jpInverter.setDayPowerGeneration(ksolarStationCollectData.getDayGeneration());
// jpInverter.setMonthPowerGeneration(ksolarStationCollectData.getMonthGeneration());
// jpInverter.setYearPowerGeneration(ksolarStationCollectData.getYearGeneration());
// jpInverter.setTotalPowerGeneration(ksolarStationCollectData.getTotalGeneration());
// jpInverter.setModel(ksolarStationCollectData.getDeviceModel());
// jpInverter.setVersion(ksolarStationCollectData.getVersion());
// jpInverter.setThirdStationId(ksolarStationCollectList.getThirdStationId());
// jpInverter.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
// jpInverter.setStationName(ksolarStationCollectList.getStationName());
// jpInverter.setAddr(ksolarStationCollectList.getAddress());
// if (!ObjectUtils.isEmpty(jpInverter.getSequenceNbr())) {
// jpInverterMapper.updateById(jpInverter);
// } else {
// jpInverterMapper.insert(jpInverter);
// }
//
//
// String jsonString = JSON.toJSONString(ksolarStationCollectData);
// Map<String, Object> hanlderResult = JSON.parseObject(jsonString, Map.class);
//
// for (int k1 = 1; k1 < 13; k1++) {
// JpInverterElectricity jpInverterElectricity = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
// eq("sn_code", ksolarStationCollectData.getInverterId()).
// eq("type", "直流").
// eq("name", "PV" + k1)
// );
// if (ObjectUtils.isEmpty(jpInverterElectricity)) {
// jpInverterElectricity = new JpInverterElectricity();
// }
// jpInverterElectricity.setInverterId(ksolarStationCollectData.getInverterId());
// jpInverterElectricity.setSnCode(ksolarStationCollectData.getInverterId());
// jpInverterElectricity.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
// jpInverterElectricity.setThirdStationId(ksolarStationCollectList.getThirdStationId());
// jpInverterElectricity.setType("直流");
// jpInverterElectricity.setName("PV" + k1);
// jpInverterElectricity.setVoltage(Double.valueOf(hanlderResult.get("voltagePv" + k1).toString()));
// jpInverterElectricity.setCurrent(Double.valueOf(hanlderResult.get("currentPv" + k1).toString()));
// jpInverterElectricity.setPower(Double.valueOf(hanlderResult.get("powerPv" + k1).toString()));
// if (ObjectUtils.isEmpty(jpInverterElectricity.getSequenceNbr())) {
// jpInverterElectricityMapper.insert(jpInverterElectricity);
// } else {
// jpInverterElectricityMapper.updateById(jpInverterElectricity);
// }
// }
//
// JpInverterElectricity jpInverterElectricityR = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
// eq("sn_code", ksolarStationCollectData.getInverterId()).
// eq("type", "交流").
// eq("name", "RS")
// );
// if (ObjectUtils.isEmpty(jpInverterElectricityR)) {
// jpInverterElectricityR = new JpInverterElectricity();
// }
// jpInverterElectricityR.setInverterId(ksolarStationCollectData.getInverterId());
// jpInverterElectricityR.setSnCode(ksolarStationCollectData.getInverterId());
// jpInverterElectricityR.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
// jpInverterElectricityR.setThirdStationId(ksolarStationCollectList.getThirdStationId());
// jpInverterElectricityR.setFrequency(ksolarStationCollectData.getFrequencyRs());
// jpInverterElectricityR.setType("交流");
// jpInverterElectricityR.setName("RS");
// jpInverterElectricityR.setVoltage(ksolarStationCollectData.getVoltageRs());
// jpInverterElectricityR.setCurrent(ksolarStationCollectData.getCurrentR());
// if (ObjectUtils.isEmpty(jpInverterElectricityR.getSequenceNbr())) {
// jpInverterElectricityMapper.insert(jpInverterElectricityR);
// } else {
// jpInverterElectricityMapper.updateById(jpInverterElectricityR);
// }
//
// JpInverterElectricity jpInverterElectricityS = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
// eq("sn_code", ksolarStationCollectData.getInverterId()).
// eq("type", "交流").
// eq("name", "ST")
// );
// if (ObjectUtils.isEmpty(jpInverterElectricityS)) {
// jpInverterElectricityS = new JpInverterElectricity();
// }
// jpInverterElectricityS.setInverterId(ksolarStationCollectData.getInverterId());
// jpInverterElectricityS.setSnCode(ksolarStationCollectData.getInverterId());
// jpInverterElectricityS.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
// jpInverterElectricityS.setThirdStationId(ksolarStationCollectList.getThirdStationId());
// jpInverterElectricityS.setType("交流");
// jpInverterElectricityS.setName("ST");
// jpInverterElectricityS.setVoltage(ksolarStationCollectData.getVoltageSt());
// jpInverterElectricityS.setCurrent(ksolarStationCollectData.getCurrents());
// if (ObjectUtils.isEmpty(jpInverterElectricityS.getSequenceNbr())) {
// jpInverterElectricityMapper.insert(jpInverterElectricityS);
// } else {
// jpInverterElectricityMapper.updateById(jpInverterElectricityS);
// }
//
//
// JpInverterElectricity jpInverterElectricityT = jpInverterElectricityMapper.selectOne(new QueryWrapper<JpInverterElectricity>().
// eq("sn_code", ksolarStationCollectData.getInverterId()).
// eq("type", "交流").
// eq("name", "TR")
// );
// if (ObjectUtils.isEmpty(jpInverterElectricityT)) {
// jpInverterElectricityT = new JpInverterElectricity();
// }
// jpInverterElectricityT.setInverterId(ksolarStationCollectData.getInverterId());
// jpInverterElectricityT.setSnCode(ksolarStationCollectData.getInverterId());
// jpInverterElectricityT.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
// jpInverterElectricityT.setThirdStationId(ksolarStationCollectList.getThirdStationId());
// jpInverterElectricityT.setType("交流");
// jpInverterElectricityT.setName("TR");
// jpInverterElectricityT.setVoltage(ksolarStationCollectData.getVoltageTr());
// jpInverterElectricityT.setCurrent(ksolarStationCollectData.getCurrentT());
// if (ObjectUtils.isEmpty(jpInverterElectricityT.getSequenceNbr())) {
// jpInverterElectricityMapper.insert(jpInverterElectricityT);
// } else {
// jpInverterElectricityMapper.updateById(jpInverterElectricityT);
// }
//
////
// HYGFJPInverterElecHistory hygfjpInverterElecHistory = new HYGFJPInverterElecHistory();
// hygfjpInverterElecHistory.setThirdStationId(ksolarStationCollectList.getThirdStationId());
// hygfjpInverterElecHistory.setCreatedTime(System.currentTimeMillis());
// hygfjpInverterElecHistory.setSnCode(ksolarStationCollectData.getInverterId());
//
// hygfjpInverterElecHistory.setUAcCurrent(ksolarStationCollectData.getCurrentR());
// hygfjpInverterElecHistory.setVAcCurrent(ksolarStationCollectData.getCurrents());
// hygfjpInverterElecHistory.setWAcCurrent(ksolarStationCollectData.getCurrentT());
// hygfjpInverterElecHistory.setUAcVoltage(ksolarStationCollectData.getVoltageRs());
// hygfjpInverterElecHistory.setVAcVoltage(ksolarStationCollectData.getVoltageSt());
// hygfjpInverterElecHistory.setWAcVoltage(ksolarStationCollectData.getVoltageTr());
// hygfjpInverterElecHistory.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
// hygfjpInverterElecHistory.setTime(System.currentTimeMillis());
// hygfjpInverterElecHistoryMapper.insert(hygfjpInverterElecHistory);
//
// // 逆变器历史
// String today = DateUtil.today();
// HYGFJPInverterHistory hygfjpInverterHistory = hygfjpInverterHistoryMapper.selectOne(
// new QueryWrapper<HYGFJPInverterHistory>().eq("sn_code", ksolarStationCollectData.getInverterId()).eq("date", today));
// if (ObjectUtils.isEmpty(hygfjpInverterHistory)) {
// hygfjpInverterHistory = new HYGFJPInverterHistory();
// }
//
// // 满发小时数
//// hygfjpInverterHistory.setGenerationHours(inverterDetailDto.getFullHour());
// hygfjpInverterHistory.setDate(today);
// hygfjpInverterHistory.setThirdStationId(ksolarStationCollectList.getThirdStationId());
// hygfjpInverterHistory.setInverterId(ksolarStationCollectData.getInverterId());
// hygfjpInverterHistory.setSnCode(ksolarStationCollectData.getInverterId());
// hygfjpInverterHistory.setThirdCode(PVProducerInfoEnum.KSOLAR.getCode());
// hygfjpInverterHistory.setPowerGeneration(ksolarStationCollectData.getTotalGeneration());
// if (ObjectUtils.isEmpty(hygfjpInverterHistory.getCreatedTime())) {
// hygfjpInverterHistory.setCreatedTime(System.currentTimeMillis());
// hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
// } else {
// hygfjpInverterHistoryMapper.insert(hygfjpInverterHistory);
// }
// });
// }
} }
}); });
} }
...@@ -659,6 +1033,13 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -659,6 +1033,13 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// List<JpInverter> jpInverter1 = jpInverterMapper.selectList(new QueryWrapper<JpInverter>().
// eq("third_code", PVProducerInfoEnum.KSOLAR.getCode()));
HashMap<String, Object> requestInfo = new HashMap<>(1); HashMap<String, Object> requestInfo = new HashMap<>(1);
String requestParaminfo = JSON.toJSONString(requestInfo); String requestParaminfo = JSON.toJSONString(requestInfo);
String url = KSolarConstant.stationCollectAlarmUrl + "?pageNumber=1&pageSize=200"; String url = KSolarConstant.stationCollectAlarmUrl + "?pageNumber=1&pageSize=200";
...@@ -688,10 +1069,17 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe ...@@ -688,10 +1069,17 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
hygfjpInverterWarn = new HYGFJPInverterWarn(); hygfjpInverterWarn = new HYGFJPInverterWarn();
} }
hygfjpInverterWarn.setTime(System.currentTimeMillis()); hygfjpInverterWarn.setTime(System.currentTimeMillis());
hygfjpInverterWarn.setTimeLong(System.currentTimeMillis()); hygfjpInverterWarn.setTimeLong(System.currentTimeMillis());
hygfjpInverterWarn.setSnCode(ksolarAlarmDto.getAlarmId());
// if(jpInverter1!=null&&!jpInverter1.isEmpty()){
// for (JpInverter jpInverter : jpInverter1) {
// if(jpInverter.getCollectorId().equals(ksolarAlarmDto.getDeviceId())){
// hygfjpInverterWarn.setSnCode(jpInverter.getCollectorSnCode());
// break;
// }
// }
// }
hygfjpInverterWarn.setThirdStationId(ksolarAlarmDto.getStationId()); hygfjpInverterWarn.setThirdStationId(ksolarAlarmDto.getStationId());
hygfjpInverterWarn.setLevel(KSolarConstant.alarmLevel.get(ksolarAlarmDto.getLevels())); hygfjpInverterWarn.setLevel(KSolarConstant.alarmLevel.get(ksolarAlarmDto.getLevels()));
hygfjpInverterWarn.setContent(ksolarAlarmDto.getMessage()); hygfjpInverterWarn.setContent(ksolarAlarmDto.getMessage());
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AllGenerateDto.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
public class AllGenerateDto {
private Long createdTime;
/**
* 第三方电站id
*/
private String thirdStationId;
/**
* 年
*/
private String yearTime;
/**
* 平均功率
*/
private String year;
/**
* 平均功率
*/
private Double generate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DayGenerateDto.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
public class DayGenerateDto {
private Long createdTime;
/**
* 第三方电站id
*/
private String thirdStationId;
/**
* 小时
*/
private String hourTime;
/**
* 月份
*/
private String monthDay;
/**
* 发电量
*/
private Double generate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthGenerateDto.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
public class MonthGenerateDto {
private Long createdTime;
/**
* 第三方电站id
*/
private String thirdStationId;
/**
* 天
*/
private String dayTime;
/**
* 月份
*/
private String yearMonth;
/**
* 发电量
*/
private Double generate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/YearGenerateDto.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
public class YearGenerateDto {
private Long createdTime;
/**
* 第三方电站id
*/
private String thirdStationId;
/**
* 年
*/
private String monthTime;
/**
* 平均功率
*/
private String year;
/**
* 平均功率
*/
private Double generate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AllGenerate.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_all_generate")
public class AllGenerate {
@Id
private Long createdTime;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 年
*/
@TableField("year_time")
private String yearTime;
/**
* 平均功率
*/
@TableField("year")
private String year;
/**
* 平均功率
*/
@TableField("generate")
private Double generate;
public AllGenerate(Long createdTime, String thirdStationId, String yearTime, String year, Double generate) {
this.createdTime = createdTime;
this.thirdStationId = thirdStationId;
this.yearTime = yearTime;
this.year = year;
this.generate = generate;
}
public AllGenerate() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DayGenerate.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_day_generate")
public class DayGenerate {
@Id
private Long createdTime;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 小时
*/
@TableField("hour_time")
private String hourTime;
/**
* 月份
*/
@TableField("month_day")
private String monthDay;
/**
* 发电量
*/
@TableField("generate")
private Double generate;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthGenerate.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_month_generate")
public class MonthGenerate {
@Id
private Long createdTime;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 天
*/
@TableField("day_time")
private String dayTime;
/**
* 月份
*/
@TableField("year_month")
private String yearMonth;
/**
* 发电量
*/
@TableField("generate")
private Double generate;
public MonthGenerate(Long createdTime, String thirdStationId, String dayTime, String yearMonth, Double generate) {
this.createdTime = createdTime;
this.thirdStationId = thirdStationId;
this.dayTime = dayTime;
this.yearMonth = yearMonth;
this.generate = generate;
}
public MonthGenerate() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearGenerate.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Data
@Accessors(chain = true)
@TableName("td_hygf_year_generate")
public class YearGenerate {
@Id
private Long createdTime;
/**
* 第三方电站id
*/
@TableField("third_station_id")
private String thirdStationId;
/**
* 年
*/
@TableField("month_time")
private String monthTime;
/**
* 平均功率
*/
@TableField("year")
private String year;
/**
* 平均功率
*/
@TableField("generate")
private Double generate;
public YearGenerate(Long createdTime, String thirdStationId, String monthTime, String year, Double generate) {
this.createdTime = createdTime;
this.thirdStationId = thirdStationId;
this.monthTime = monthTime;
this.year = year;
this.generate = generate;
}
public YearGenerate() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IAllGenerateService.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
public interface IAllGenerateService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDayGenerateService.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
public interface IDayGenerateService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IMonthGenerateService.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
public interface IMonthGenerateService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IYearGenerateService.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
public interface IYearGenerateService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/AllGenerateMapper.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.AllGenerate;
public interface AllGenerateMapper extends BaseMapper<AllGenerate> {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/DayGenerateMapper.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/MonthGenerateMapper.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
public interface MonthGenerateMapper extends BaseMapper<MonthGenerate> {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/YearGenerateMapper.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
public interface YearGenerateMapper extends BaseMapper<YearGenerate> {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml
View file @ 839d7866
...@@ -13,7 +13,10 @@ ...@@ -13,7 +13,10 @@
on hygf_jp_station.third_station_id=hygf_jp_collector.third_station_id on hygf_jp_station.third_station_id=hygf_jp_collector.third_station_id
<where> <where>
<if test="dto.name!=null"> <if test="dto.snCode!=null and dto.snCode!='' ">
and hygf_jp_station.sn_code like concat(concat("%",#{dto.snCode}),"%")
</if>
<if test="dto.name!=null and dto.name!='' ">
and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%") and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
</if> </if>
<if test="dto.area!=null"> <if test="dto.area!=null">
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml
View file @ 839d7866
...@@ -13,7 +13,10 @@ ...@@ -13,7 +13,10 @@
on hygf_jp_station.third_station_id=hygf_jp_inverter.third_station_id on hygf_jp_station.third_station_id=hygf_jp_inverter.third_station_id
<where> <where>
<if test="dto.name!=null"> <if test="dto.snCode!=null and dto.snCode!='' ">
and hygf_jp_station.sn_code like concat(concat("%",#{dto.snCode}),"%")
</if>
<if test="dto.name!=null and dto.name!='' ">
and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%") and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
</if> </if>
<if test="dto.area!=null"> <if test="dto.area!=null">
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpCollectorController.java
View file @ 839d7866
...@@ -136,9 +136,21 @@ public class JpCollectorController extends BaseController { ...@@ -136,9 +136,21 @@ public class JpCollectorController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表分页查询", notes = "户用光伏监盘采集器表分页查询") @ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表分页查询", notes = "户用光伏监盘采集器表分页查询")
public ResponseModel<Page<JpCollectorDto>> queryForPage(@RequestParam(value = "current") int current, public ResponseModel<Page<JpCollectorDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) { @RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) {
List<JpPersonStation> pPersonStation=null;
if(jpCollectorDto.getName()!=null&&!"".equals(jpCollectorDto.getName())){
LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
qug1.like(JpPersonStation::getStationName,jpCollectorDto.getName());
pPersonStation=pPersonStationMapper.selectList(qug1);
}else{
//获取当前人管理场站
LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>(); LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId()); qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug); pPersonStation = pPersonStationMapper.selectList(qug);
}
if (!pPersonStation.isEmpty()) { if (!pPersonStation.isEmpty()) {
Page<JpCollectorDto> page = new Page<JpCollectorDto>(); Page<JpCollectorDto> page = new Page<JpCollectorDto>();
page.setCurrent(current); page.setCurrent(current);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java
View file @ 839d7866
...@@ -117,7 +117,7 @@ public class JpInverterController extends BaseController { ...@@ -117,7 +117,7 @@ public class JpInverterController extends BaseController {
@RequestParam(value = "size") int size, JpInverterDto jpInverterDto) { @RequestParam(value = "size") int size, JpInverterDto jpInverterDto) {
List<JpPersonStation> pPersonStation =null; List<JpPersonStation> pPersonStation =null;
if(jpInverterDto.getName()!=null){ if(jpInverterDto.getName()!=null&&!"".equals(jpInverterDto.getName())){
LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>(); LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
qug1.like(JpPersonStation::getStationName,jpInverterDto.getName()); qug1.like(JpPersonStation::getStationName,jpInverterDto.getName());
pPersonStation=pPersonStationMapper.selectList(qug1); pPersonStation=pPersonStationMapper.selectList(qug1);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ 839d7866
...@@ -129,11 +129,22 @@ public class JpStationController extends BaseController { ...@@ -129,11 +129,22 @@ public class JpStationController extends BaseController {
public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size, JpStationDto reviewDto) { (value = "size") int size, JpStationDto reviewDto) {
// if(reviewDto.getThirdStationId()==null){ List<JpPersonStation> pPersonStation=null;
if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
qug1.like(JpPersonStation::getStationName,reviewDto.getName());
pPersonStation=pPersonStationMapper.selectList(qug1);
}else{
//获取当前人管理场站
//获取当前人管理场站 //获取当前人管理场站
LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>(); LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId()); qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug); pPersonStation=pPersonStationMapper.selectList(qug);
}
// if(reviewDto.getThirdStationId()==null){
if(pPersonStation!=null&&!pPersonStation.isEmpty()){ if(pPersonStation!=null&&!pPersonStation.isEmpty()){
reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation); reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
}else{ }else{
...@@ -150,7 +161,7 @@ public class JpStationController extends BaseController { ...@@ -150,7 +161,7 @@ public class JpStationController extends BaseController {
Set<String> se=new HashSet<>(); Set<String> se=new HashSet<>();
List<JpPersonStation> pPersonStation=null; List<JpPersonStation> pPersonStation=null;
if(reviewDto.getName()!=null){ if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>(); LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
qug1.like(JpPersonStation::getStationName,reviewDto.getName()); qug1.like(JpPersonStation::getStationName,reviewDto.getName());
pPersonStation=pPersonStationMapper.selectList(qug1); pPersonStation=pPersonStationMapper.selectList(qug1);
...@@ -186,7 +197,7 @@ public class JpStationController extends BaseController { ...@@ -186,7 +197,7 @@ public class JpStationController extends BaseController {
public ResponseModel<Map<String,Object>> getpStation(JpStationDto reviewDto) { public ResponseModel<Map<String,Object>> getpStation(JpStationDto reviewDto) {
List<JpPersonStation> pPersonStation=null; List<JpPersonStation> pPersonStation=null;
if(reviewDto.getName()!=null){ if(reviewDto.getName()!=null&&!"".equals(reviewDto.getName())){
LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>(); LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
qug1.like(JpPersonStation::getStationName,reviewDto.getName()); qug1.like(JpPersonStation::getStationName,reviewDto.getName());
pPersonStation=pPersonStationMapper.selectList(qug1); pPersonStation=pPersonStationMapper.selectList(qug1);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java
View file @ 839d7866
...@@ -134,7 +134,7 @@ public class TdHygfJpInverterWarnController extends BaseController { ...@@ -134,7 +134,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current, public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) { @RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
List<JpPersonStation> pPersonStation =null; List<JpPersonStation> pPersonStation =null;
if(tdHygfJpInverterWarnDto.getName()!=null){ if(tdHygfJpInverterWarnDto.getName()!=null&&!"".equals(tdHygfJpInverterWarnDto.getName())){
LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>(); LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
qug1.like(JpPersonStation::getStationName,tdHygfJpInverterWarnDto.getName()); qug1.like(JpPersonStation::getStationName,tdHygfJpInverterWarnDto.getName());
pPersonStation=pPersonStationMapper.selectList(qug1); pPersonStation=pPersonStationMapper.selectList(qug1);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/scheduled/WindSpeedScheduled.java
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.biz.scheduled; package com.yeejoin.amos.boot.module.hygf.biz.scheduled;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpStationServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MonthPowerServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpCollectorHistoryServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.TdHygfJpInvertorElecHistoryServiceImpl;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -27,6 +24,8 @@ public class WindSpeedScheduled { ...@@ -27,6 +24,8 @@ public class WindSpeedScheduled {
@Autowired @Autowired
TdHygfJpInvertorElecHistoryServiceImpl tdHygfJpInvertorElecHistoryServiceImpl; TdHygfJpInvertorElecHistoryServiceImpl tdHygfJpInvertorElecHistoryServiceImpl;
@Autowired
DayGenerateServiceImpl dayGenerateServiceImpl;
@Scheduled(cron = "${cheduled.crons}") @Scheduled(cron = "${cheduled.crons}")
private void initData() { private void initData() {
...@@ -34,4 +33,15 @@ public class WindSpeedScheduled { ...@@ -34,4 +33,15 @@ public class WindSpeedScheduled {
tdHygfJpCollectorHistoryServiceImpl.syncData(); tdHygfJpCollectorHistoryServiceImpl.syncData();
tdHygfJpInvertorElecHistoryServiceImpl.syncData(); tdHygfJpInvertorElecHistoryServiceImpl.syncData();
} }
//发电量
@Scheduled(cron = "${generate.crons}")
private void initGenerateData() {
//发电量
dayGenerateServiceImpl.getGenerate();
}
} }
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AllGenerateServiceImpl.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.yeejoin.amos.boot.module.hygf.api.dto.AllGenerateDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.AllGenerate;
import com.yeejoin.amos.boot.module.hygf.api.service.IAllGenerateService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.AllGenerateMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Service
public class AllGenerateServiceImpl extends BaseService<AllGenerateDto, AllGenerate, AllGenerateMapper> implements IAllGenerateService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DayGenerateServiceImpl.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.module.hygf.api.dto.AllGenerateDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.DayGenerateDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IAllGenerateService;
import com.yeejoin.amos.boot.module.hygf.api.service.IDayGenerateService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.AllGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Service
public class DayGenerateServiceImpl extends BaseService<DayGenerateDto, DayGenerate, DayGenerateMapper> implements IDayGenerateService {
@Autowired
JpStationMapper jpStationMapper;
@Autowired
MonthGenerateMapper monthGenerateMapper;
@Autowired
YearGenerateMapper yearGenerateMapper;
@Autowired
AllGenerateMapper allGenerateMapper;
@Autowired
AllGenerateServiceImpl allGenerateServiceImpl;
@Autowired
MonthGenerateServiceImpl monthGenerateServiceImpl;
@Autowired
YearGenerateServiceImpl yearGenerateServiceImpl;
public void getGenerate() {
LambdaQueryWrapper<JpStation> wrapper = new LambdaQueryWrapper<JpStation>();
Date dayTime=new Date();
SimpleDateFormat simpleDateFormatDay = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat simpleDateFormatMonth = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat simpleDateFormatYear = new SimpleDateFormat("yyyy");
String formattedDateday =simpleDateFormatDay.format(dayTime);
String formattedDateMonth =simpleDateFormatMonth.format(dayTime);
String formattedDateYear =simpleDateFormatYear.format(dayTime);
long utcMillis = dayTime.getTime() ;
// 获取所有场站信息
List<JpStation> list=jpStationMapper.selectList(wrapper);
//查询当日日发电量
LambdaQueryWrapper<MonthGenerate> wrappermonth = new LambdaQueryWrapper<MonthGenerate>();
wrappermonth.eq(MonthGenerate::getDayTime,formattedDateday);
wrappermonth.eq(MonthGenerate::getYearMonth,formattedDateMonth);
List<MonthGenerate> listmonth= monthGenerateMapper.selectList(wrappermonth);
//查询当月月发电量
LambdaQueryWrapper<YearGenerate> wrapperyear = new LambdaQueryWrapper<YearGenerate>();
wrapperyear.eq(YearGenerate::getMonthTime,formattedDateMonth);
wrapperyear.eq(YearGenerate::getYear,formattedDateYear);
List<YearGenerate> listyear= yearGenerateMapper.selectList(wrapperyear);
//查询当年年发电量
LambdaQueryWrapper<AllGenerate> wrapperall = new LambdaQueryWrapper<AllGenerate>();
wrapperall.eq(AllGenerate::getYear,formattedDateYear);
List<AllGenerate> listall= allGenerateMapper.selectList(wrapperall);
List<MonthGenerate> mo=new ArrayList<>();
List<YearGenerate> ye=new ArrayList<>();
List<AllGenerate> al=new ArrayList<>();
//更新数据
if (list!=null&&!list.isEmpty()){
int nu=1;
for (JpStation jpStation : list) {
MonthGenerate monthGenerate=null;
YearGenerate yearGenerate=null;
AllGenerate allGenerate=null;
//更新日发电量
if(listmonth!=null&&!listmonth.isEmpty()){
monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
for (MonthGenerate generate : listmonth) {
if(generate.getYearMonth().equals(formattedDateMonth)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())&&generate.getDayTime().equals(formattedDateday)){
monthGenerate =new MonthGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
break;
}
}
} else{
monthGenerate =new MonthGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateday, formattedDateMonth, jpStation.getDayGenerate());
}
//更新年发电量
if(listyear!=null&&!listyear.isEmpty()){
yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
for (YearGenerate yearGenera : listyear) {
if(yearGenera.getYear().equals(formattedDateYear)&&yearGenera.getThirdStationId().equals(jpStation.getThirdStationId())&&yearGenera.getMonthTime().equals(formattedDateMonth)){
yearGenerate =new YearGenerate(yearGenera.getCreatedTime(), jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
break;
}
}
} else{
yearGenerate =new YearGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateMonth, formattedDateYear, jpStation.getDayGenerate());
}
//更新年发电量
if(listall!=null&&!listall.isEmpty()){
allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
for (AllGenerate generate : listall) {
if(generate.getYear().equals(formattedDateYear)&&generate.getThirdStationId().equals(jpStation.getThirdStationId())){
allGenerate =new AllGenerate(generate.getCreatedTime(), jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
break;
}
}
} else{
allGenerate =new AllGenerate(utcMillis+nu, jpStation.getThirdStationId(), formattedDateYear, formattedDateYear, jpStation.getDayGenerate());
}
mo.add(monthGenerate);
ye.add(yearGenerate);
al.add(allGenerate);
nu=nu+1;
}
//更新保存
allGenerateServiceImpl.saveBatch(al);
monthGenerateServiceImpl.saveBatch(mo);
yearGenerateServiceImpl.saveBatch(ye);
}
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpCollectorServiceImpl.java
View file @ 839d7866
...@@ -43,7 +43,7 @@ public class JpCollectorServiceImpl extends BaseService<JpCollectorDto, JpCollec ...@@ -43,7 +43,7 @@ public class JpCollectorServiceImpl extends BaseService<JpCollectorDto, JpCollec
wrapper.in(JpCollector::getThirdStationId, jpCollectorDto.getStationIds()); wrapper.in(JpCollector::getThirdStationId, jpCollectorDto.getStationIds());
} }
if (!jpCollectorDto.getSnCode().isEmpty()) { if (jpCollectorDto.getSnCode()!=null) {
wrapper.like(JpCollector::getSnCode, jpCollectorDto.getSnCode()); wrapper.like(JpCollector::getSnCode, jpCollectorDto.getSnCode());
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java
View file @ 839d7866
...@@ -35,7 +35,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -35,7 +35,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
wrapper.eq(JpInverter::getState, jpInverterDto.getState()); wrapper.eq(JpInverter::getState, jpInverterDto.getState());
} }
if(StringUtils.isNotEmpty(jpInverterDto.getSnCode())) { if(StringUtils.isNotEmpty(jpInverterDto.getSnCode())) {
wrapper.likeRight(JpInverter::getSnCode, jpInverterDto.getSnCode()); wrapper.like(JpInverter::getSnCode, jpInverterDto.getSnCode());
} }
if (!jpInverterDto.getStationIds().isEmpty()) { if (!jpInverterDto.getStationIds().isEmpty()) {
wrapper.in(JpInverter::getThirdStationId, jpInverterDto.getStationIds()); wrapper.in(JpInverter::getThirdStationId, jpInverterDto.getStationIds());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MonthGenerateServiceImpl.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.yeejoin.amos.boot.module.hygf.api.dto.MonthGenerateDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
import com.yeejoin.amos.boot.module.hygf.api.service.IMonthGenerateService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Service
public class MonthGenerateServiceImpl extends BaseService<MonthGenerateDto, MonthGenerate, MonthGenerateMapper> implements IMonthGenerateService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/YearGenerateServiceImpl.java 0 → 100644
View file @ 839d7866
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.yeejoin.amos.boot.module.hygf.api.dto.YearGenerateDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
import com.yeejoin.amos.boot.module.hygf.api.service.IYearGenerateService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* @description:
* @author: tw
* @createDate: 2023/11/8
*/
@Service
public class YearGenerateServiceImpl extends BaseService<YearGenerateDto, YearGenerate, YearGenerateMapper> implements IYearGenerateService {
}
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application.properties
View file @ 839d7866
...@@ -81,9 +81,9 @@ spring.elasticsearch.rest.username=elastic ...@@ -81,9 +81,9 @@ spring.elasticsearch.rest.username=elastic
spring.elasticsearch.rest.password=Yeejoin@2020 spring.elasticsearch.rest.password=Yeejoin@2020
spring.elasticsearch.rest.read-timeout=30000 spring.elasticsearch.rest.read-timeout=30000
daily.power.generation.cron=*/30 * * * * ? daily.power.generation.cron=0 0/1 * * * ?
moon.power.generation.cron=*/30 * * * * ? moon.power.generation.cron=0 0/1 * * * ?
year.power.generation.cron=*/30 * * * * ? year.power.generation.cron=0 0/1 * * * ?
large.cron=0 0/15 * * * ? large.cron=0 0/5 * * * ?
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment