From 6073d90503f964381788e3cf40c6af9bef7faf68 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十一月 2024 10:22:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 273 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 238 insertions(+), 35 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 05fef7f..8886314 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -29,8 +29,10 @@
import com.doumee.service.business.third.BoardService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +50,8 @@
public class BoardServiceImpl implements BoardService {
@Autowired
private PlatformLogMapper platformLogMapper;
+ @Autowired
+ private HiddenDangerMapper hiddenDangerMapper;
@Autowired
private PlatformWaterGasMapper platformWaterGasMapper;
@Autowired
@@ -401,11 +405,11 @@
List<EnergyDataVO> loadCurveList = new ArrayList<>();
try {
BaseResponse<List<EnergyTodayLoadDataResponse>> response = HKService.energyTodayLoadData();
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
for (EnergyTodayLoadDataResponse model :response.getData()) {
EnergyDataVO data = new EnergyDataVO();
data.setTimeData(model.getName());
- data.setEnergy(new BigDecimal(model.getName()));
+ data.setEnergy(new BigDecimal(StringUtils.defaultString(model.getValue(),"0")));
loadCurveList.add(data);
}
}
@@ -434,6 +438,192 @@
return oilDataVOList;
}
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌
+ * @return
+ *
+ */
+ @Override
+ public List<AlarmEventDataVO> fightingAdminAlertList(){
+ List<AlarmEventDataVO> data = new ArrayList<>();
+
+ //鏌ヨ24灏忔椂鍐呯殑
+ FindHomeAlarmInfoPageRequest param = new FindHomeAlarmInfoPageRequest();
+ param.setHour(24);
+ param.setPage(1);
+ param.setAlarmStartTime(DateUtil.getPlusTime2(DateUtil.addDaysToDate(new Date(),-1)));
+ param.setAlarmEndTime(DateUtil.getPlusTime2(new Date()));
+ param.setPageSize(20);
+ BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> response = HKService.findHomeAlarmInfoPage(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null
+ &&response.getData().getList()!=null) {
+ for(FindHomeAlarmInfoPageResponse r : response.getData().getList()){
+ AlarmEventDataVO t = new AlarmEventDataVO();
+ BeanUtils.copyProperties(r,t);
+ data.add(t);
+ }
+ }
+ return data;
+
+ }
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-瀹炴椂鐩戞祴鏁版嵁
+ * @return
+ *
+ */
+ @Override
+ public List<MonitorDataVO> monitorDataList(){
+ List<MonitorDataVO> list = new ArrayList<>();
+ MinitorDataSearchRequest param = new MinitorDataSearchRequest();
+ param.setResourceTypeCodes(new String[]{});
+ param.setRegionIndexCode("root0001");
+ param.setIncludeDown("1");
+ param.setUserId("admin");
+ BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> response = HKService.minitorDataSearch(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null ) {
+ List<MonitorDataSearchResponse> r = response.getData().getList();
+ if(r!= null){
+ for(MonitorDataSearchResponse model : r){
+ MonitorDataVO m = new MonitorDataVO();
+ m.setName(model.getName());
+ m.setDataList(new ArrayList<>());
+ if(model.getValues()!=null){
+ for(MonitorDataValResponse v : model.getValues()){
+ MonitorDataInfoVO vm = new MonitorDataInfoVO();
+ vm.setValue(v.getMonitorValue());
+ vm.setCateName(v.getMonitorSpecificName());
+ vm.setCateCode(v.getMonitorTypeKey());
+ vm.setTypeCode(v.getMonitorTypeCode());
+ vm.setTypeName(v.getMonitorTypeName());
+ }
+ }
+ }
+ }
+ }
+ return list;
+ }
+
+
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅澶勭悊鍒嗘瀽闆嗗悎
+ * @return
+ *
+ */
+ @Override
+ public List<AlarmDataVO> fightingAlarmHandleData(){
+ List<AlarmDataVO> alarmHandleDataVOList = new ArrayList<>();
+ Date now = DateUtil.getStartOfDay(new Date());
+ for (int i = 1; i < 12; i++) {
+ Date start = DateUtil.addMonthToDate(now,-12+i);
+ Date end = DateUtil.addMonthToDate(now,-11+i);
+ AlarmDataVO t = getAlertDataByStartEndTime(DateUtil.getPlusTime2(start),DateUtil.getPlusTime2(end));
+ alarmHandleDataVOList.add(t);
+ }
+ return alarmHandleDataVOList;
+ }
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍛婅淇℃伅闆嗗悎
+ *
+ * @return
+ *
+ */
+ @Override
+ public AlarmDataVO alarmDataSumByCate(){
+ AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(DateUtil.addDaysToDate(new Date(),-1))
+ ,(DateUtil.getPlusTime2(new Date())));
+ return alarmDataVO;
+ }
+
+ public static AlarmDataVO getAlertDataByStartEndTime(String start,String end){
+ AlarmDataVO alarmDataVO = new AlarmDataVO();
+ FindAlarmBaseDataStatisticRequest param = new FindAlarmBaseDataStatisticRequest();
+ param.setAlarmStartTime(start);
+ param.setAlarmEndTime(end);
+ param.setUserId("admin");
+ BaseResponse<FindAlarmBaseDataStatisticResponse> response = HKService.findAlarmBaseDataStatistic(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response.getData()!=null ) {
+ alarmDataVO.setTotalNum(Constants.formatIntegerNum(response.getData().getTotalAlarmNum()));
+ alarmDataVO.setRealNum(Constants.formatIntegerNum(response.getData().getTotalAlarmNum()));
+ alarmDataVO.setErrNum(Constants.formatIntegerNum(response.getData().getMisReportAlarmNum()));
+ alarmDataVO.setLiftNum(Constants.formatIntegerNum(response.getData().getHandledAlarmNum()));
+ alarmDataVO.setProcessingNum(Constants.formatIntegerNum(response.getData().getUnHandedAlarmNum()));
+ alarmDataVO.setStartDate(start);
+ alarmDataVO.setEndDate(end);
+ }
+ return alarmDataVO;
+ }
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鏈勾鍜屾湰鏈堟柊澧炴秷闃茶澶�/璁炬柦缁存姢鎯呭喌
+ * @return
+ */
+ @Override
+ public YearDeviceDataVO yearFightingAdminDeviceData(){
+ YearDeviceDataVO data = new YearDeviceDataVO();
+
+ FireStatisticRequest param = new FireStatisticRequest();
+ param.setIndexCode("api_fire_statistic");
+ BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ) {
+ data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
+ data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
+ }
+
+ param = new FireStatisticRequest();
+ param.setIndexCode("api_fire_statistic_month");
+ BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
+ if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
+ && response1.getData()!=null ) {
+ data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNum()));
+ data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
+ }
+ return data;
+
+ }
+
+ /**
+ * 銆愭秷闃茬鎺с�戠湅鏉�-鍒嗙被鍜屾眹鎬荤殑鍚勭姸鎬佽澶囨暟閲�
+ * @return
+ */
+ @Override
+ public FightingAdminCenterDataVO centerFightingAdminData(){
+ FightingAdminCenterDataVO data = new FightingAdminCenterDataVO();
+ List<DeviceNumByTypeVO> list = new ArrayList<>();
+ FireDevStatusTotalRequest param = new FireDevStatusTotalRequest();
+ param.setIncludeBool(1);
+ param.setRegionIds(new String[]{"root000000"});
+ BaseResponse<List<FireDevStatusListResponse>> response = HKService.getFireDevStatusList(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ for(FireDevStatusListResponse r :response.getData()){
+ DeviceNumByTypeVO t = new DeviceNumByTypeVO();
+ t.setTypeName(r.getDevTypeName());
+ t.setOfflineDeviceNum(Constants.formatIntegerNum(r.getOfflineFireDevCount()));
+ t.setAlarmDeviceNum(Constants.formatIntegerNum(r.getAlarmFireDevCount()));
+ t.setOnlineDeviceNum(Constants.formatIntegerNum(r.getOnlineFireDevCount()));
+ t.setErrDeviceNum(Constants.formatIntegerNum(r.getFaultFireDevCount()));
+ t.setTotalDeviceNum(Constants.formatIntegerNum(r.getTotalFireDevCount()));
+ list.add(t);
+ data.setOfflineDeviceNum(Constants.formatIntegerNum( data.getOfflineDeviceNum())+Constants.formatIntegerNum(r.getOfflineFireDevCount()));
+ data.setAlarmDeviceNum(Constants.formatIntegerNum( data.getAlarmDeviceNum())+Constants.formatIntegerNum(r.getAlarmFireDevCount()));
+ data.setOnlineDeviceNum(Constants.formatIntegerNum( data.getOnlineDeviceNum())+Constants.formatIntegerNum(r.getOnlineFireDevCount()));
+ data.setErrDeviceNum(Constants.formatIntegerNum( data.getErrDeviceNum())+Constants.formatIntegerNum(r.getFaultFireDevCount()));
+ data.setTotalDeviceNum(Constants.formatIntegerNum( data.getTotalDeviceNum())+Constants.formatIntegerNum(r.getTotalFireDevCount()));
+ }
+ }
+ data.setDeviceTypeList(list);
+ Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
+ .eq(HiddenDanger::getIsdeleted,Constants.ZERO )
+ .apply("to_day(create_data) = to_days(now())" ) );
+ data.setDangerTotalNum(totalNum !=null?totalNum.intValue():0);//浠婃棩闅愭偅鏁伴噺
+ totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
+ .eq(HiddenDanger::getIsdeleted,Constants.ZERO )
+ .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
+ .apply("to_day(check_date) = to_days(now())" ) );
+ data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
+ return data;
+ }
/**
* 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
* @return
@@ -464,14 +654,16 @@
data.setGasQuantity(getDefaultData());//涓婃湀鐢ㄦ皵
data.setMonthElectricity(getDefaultData());//鏈湀鐢ㄧ數
data.setYesterdayElectricity(getDefaultData());//鏄ㄦ棩鐢ㄧ數
- getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堟暟鎹�
+ getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堢敤鐢甸噺鏁版嵁
carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
- getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堟暟鎹�
- String firstDate = DateUtil.getFirstDayOfThisMonth() +" 00:00:00";
+ getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堢敤鐢甸噺鏁版嵁
+ getCurrentDateElectircityData(data.getTodayElectricity(),0);//閫氳繃瀹夐槻骞宠幏鍙栦粖鏃ョ敤鐢甸噺鏁版嵁
+ getCurrentDateElectircityData(data.getYesterdayElectricity(),-1);//閫氳繃瀹夐槻骞宠幏鍙栨槰鏃ョ敤鐢甸噺鏁版嵁
+ String firstDate = DateUtil.getFirstDayCurrentMonth() +" 00:00:00";
Date month0 = DateUtil.getDateFromString(firstDate);
Date month1 = DateUtil.increaseMonth(month0,-1);//涓婃湀
Date month2 = DateUtil.increaseMonth(month0,-2);//涓婁笂鏈�
- Date month3 = DateUtil.increaseMonth(month0,-12);//鍘诲勾鍚屾湀
+ Date month3 = DateUtil.increaseMonth(month0,-13);//鍘诲勾鍚屾湀
List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
.lambda()
@@ -492,10 +684,10 @@
data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
@@ -507,23 +699,23 @@
data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
}
if(model.getTimeInfo().getTime() == month2.getTime()){
- data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
}
if(model.getTimeInfo().getTime() == month3.getTime()){
- data.getWaterQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
}
}
}
}
if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
//璁＄畻鐢ㄦ皵鍚屾瘮鐜瘮
- data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
- data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
+ data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
+ data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
}
if( data.getWaterQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
// //璁＄畻鐢ㄦ按鍚屾瘮鐜瘮
- data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
- data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
+ data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
+ data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
}
/*璁＄畻纰虫帓閲忥紝浠ヤ笅涓変釜鍥犵礌涔嬪拰
@@ -543,7 +735,7 @@
*/
private void getMonthElectricityData(EnergyModelDataVO data) {
BaseResponse<MonthDataByMeterTypeResponse> response = HKService.getCurrentMonthDataByMeterType("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
@@ -555,12 +747,35 @@
* @param data
*/
private void getLastMonthElectricityData(EnergyModelDataVO data) {
- BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
}
+ }
+
+ /**
+ * 閫氳繃瀹夐槻骞宠幏鍙栦粖鏃ョ敤鐢甸噺
+ * @param data
+ */
+ private void getCurrentDateElectircityData(EnergyModelDataVO data,int days) {
+ EnergyTrendRequest param = new EnergyTrendRequest();
+ param.setDate(DateUtil.getFomartDate(DateUtil.addDaysToDate(new Date(),days),"yyyy-MM-dd"));//鏃ユ湡
+ param.setMeterType(1);
+ param.setShowType("4");
+ param.setNodeType(2);
+ param.setNodeId("root000000");
+ param.setPeriodType("day");
+ BigDecimal total = new BigDecimal(0);
+ BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+ for (int i = 0; i < response.getData().getYvalues().get(0).getValue().length; i++) {
+ total = total.add(new BigDecimal(StringUtils.defaultString( response.getData().getYvalues().get(0).getValue()[i],"0")));
+ }
+
+ }
+ data.setTotal(Constants.formatBigdecimal2Float(total).toString());
}
private EnergyModelDataVO getDefaultData() {
@@ -582,7 +797,7 @@
public RegionEnergyListResponse energyRegionData(){
RegionEnergyListResponse data = null;
BaseResponse<RegionEnergyListResponse> response = HKService.regionEnergyList("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data = response.getData();
}
if(data == null){
@@ -609,12 +824,12 @@
if(type >=0 && type <=2){
//鐢ㄦ按鐢ㄧ數鐢ㄦ皵
List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
- .select("DATE_FORMAT(TIME_INFO,'yyyy-MM') as time_info_str,sum(num) as num")
+ .select("DATE_FORMAT(TIME_INFO,'%Y-%m') as time_info_str,sum(num) as num")
.lambda()
.eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
.eq(PlatformWaterGas::getType,type)
.apply("time_info BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND CURDATE()")//杩�12涓湀
- .last(" groupby DATE_FORMAT(TIME_INFO,'yyyy-MM')")
+ .last(" group by DATE_FORMAT(TIME_INFO,'%Y-%m')")
);
for (int i = 0; i < 12; i++) {
Date tempDate = DateUtil.increaseMonth(lastMonth,i);
@@ -646,11 +861,11 @@
param.setNodeId("root000000");
param.setPeriodType("year");
BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
for (int i = 0; i < 12; i++) {
if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){
//鍙栫浉搴旂殑鍙傛暟鍊�
- energyDataVOList.get(0).setEnergy(new BigDecimal(response.getData().getYvalues().get(0).getValue()[i]));
+ energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i],"0")));
}
}
@@ -863,19 +1078,6 @@
if(jobList==null || jobList.size()==0){
return workEfficiencyVOList;
}
- /* List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
- .selectAll( PlatformWmsDetail.class)
- .selectAs( PlatformJob::getDoneDate,PlatformWmsDetail::getDoneDate)
- .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
- .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
- .eq(PlatformJob::getIsdeleted, Constants.ZERO)
- .in(Constants.equalsInteger(type,Constants.ZERO),PlatformJob::getType,new Integer[]{0,2,4})
- .in(Constants.equalsInteger(type,Constants.ONE),PlatformJob::getType,new Integer[]{1,3})
- .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
- , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
- , Constants.PlatformJobStatus.LEAVED.getKey())
- .apply("to_days(t1.create_date) = to_days(now())")
- );*/
int curtotalNum = 0;
Date today = Utils.Date.getStart(new Date());
long curTime=0, lastTime=0;
@@ -936,6 +1138,7 @@
public List<PlatformWarnEvent> warningList(int limit){
List<PlatformWarnEvent> platformLogList = platformWarnEventMapper.selectList(new QueryWrapper<PlatformWarnEvent>().lambda()
.eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date) = to_days(now())")
.orderByDesc(PlatformWarnEvent::getCreateDate)
.last(" limit "+limit)
);
--
Gitblit v1.9.3