From 59fb524d6b081f0faba177ffd13a0132d314dbae Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 19 十一月 2024 14:15:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 305 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 290 insertions(+), 15 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 2feae0f..dcabfe6 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
@@ -49,6 +49,8 @@
@Autowired
private PlatformLogMapper platformLogMapper;
@Autowired
+ private PlatformWaterGasMapper platformWaterGasMapper;
+ @Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private PlatformWarnEventMapper platformWarnEventMapper;
@@ -395,6 +397,293 @@
return null;
}
@Override
+ public List<EnergyDataVO> loadEnergyCurve(){
+ 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 ){
+ for (EnergyTodayLoadDataResponse model :response.getData()) {
+ EnergyDataVO data = new EnergyDataVO();
+ data.setTimeData(model.getName());
+ data.setEnergy(new BigDecimal(model.getName()));
+ loadCurveList.add(data);
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return loadCurveList;
+ }
+ @Override
+ public List<OilDataVO> energyLastMonthOilSort(){
+ List<OilDataVO> oilDataVOList = new ArrayList<>();
+ //涓婃湀娌硅��
+ List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>().lambda()
+ .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWaterGas::getType,Constants.TWO)
+ .apply("DATE_FORMAT(time_info, '%Y-%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')")
+ .orderByDesc(PlatformWaterGas::getNum)
+ .last("limit 30" )
+ );
+ for (PlatformWaterGas model :list) {
+ OilDataVO oilDataVO = new OilDataVO();
+ oilDataVO.setCarNo(model.getCarCode());
+ oilDataVO.setQuantity(model.getNum());
+ oilDataVOList.add(oilDataVO);
+ }
+ return oilDataVOList;
+ }
+
+ /**
+ * 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
+ * @return
+ */
+ @Override
+ public EnergyBoardVO centerEnergyData(){
+ EnergyBoardVO data = new EnergyBoardVO();
+ Random random = new Random();
+ PlatformWaterGas smoke= platformWaterGasMapper.selectOne(new QueryWrapper<PlatformWaterGas>()
+ .select("sum(num) as num")
+ .lambda()
+ .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWaterGas::getType,Constants.THREE)
+ .apply("year(time_info) = year(now())")
+ .last("limit 1 " ));
+
+ data.setSmokeBoxTotal(0);
+ if(smoke!=null){
+ data.setSmokeBoxTotal(Constants.formatBigdecimal(smoke.getNum()).intValue());//褰撳勾鐑熺鏁�
+ }
+ BigDecimal carbonGas = new BigDecimal(0);//鏈湀鐢ㄦ皵
+ BigDecimal carbonWater = new BigDecimal(0);//鏈湀鐢ㄦ按
+ BigDecimal carbonElec = new BigDecimal(0);//鐢ㄧ數
+
+ data.setTodayElectricity(getDefaultData());//浠婃棩鐢ㄧ數
+ data.setElectricityQuantity(getDefaultData());//涓婃湀鐢ㄧ數
+ data.setWaterQuantity(getDefaultData());//涓婃湀鐢ㄦ按
+ data.setGasQuantity(getDefaultData());//涓婃湀鐢ㄦ皵
+ data.setMonthElectricity(getDefaultData());//鏈湀鐢ㄧ數
+ data.setYesterdayElectricity(getDefaultData());//鏄ㄦ棩鐢ㄧ數
+ getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堢敤鐢甸噺鏁版嵁
+ carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
+ 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);//鍘诲勾鍚屾湀
+
+ List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
+ .lambda()
+ .eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
+ .in(PlatformWaterGas::getType,Constants.ZERO,Constants.ONE)
+ .in(PlatformWaterGas::getTimeInfo,month0,month1,month3,month2)
+ );
+
+ if(list!=null){
+ //绫诲瀷 0鐢ㄦ按 1鐢ㄦ皵 2鐢ㄦ补
+ for(PlatformWaterGas model : list){
+ if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+ if(model.getTimeInfo().getTime() == month0.getTime()){
+ carbonGas = Constants.formatBigdecimal(model.getNum());
+ }
+ if(model.getTimeInfo().getTime() == month1.getTime()){
+ data.getGasQuantity().setTotalNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getGasQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
+ }
+ if(model.getTimeInfo().getTime() == month2.getTime()){
+ data.getGasQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ }
+ if(model.getTimeInfo().getTime() == month3.getTime()){
+ data.getGasQuantity().setRingNum(Constants.formatBigdecimal(model.getNum()) );
+ }
+
+ }else if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
+ if(model.getTimeInfo().getTime() == month0.getTime()){
+ carbonWater = Constants.formatBigdecimal(model.getNum());
+ }
+ if(model.getTimeInfo().getTime() == month1.getTime()){
+ data.getWaterQuantity().setTotalNum(Constants.formatBigdecimal(model.getNum()) );
+ data.getWaterQuantity().setTotal(Constants.formatBigdecimal(model.getNum())+"");
+ }
+ if(model.getTimeInfo().getTime() == month2.getTime()){
+ data.getWaterQuantity().setSameNum(Constants.formatBigdecimal(model.getNum()) );
+ }
+ if(model.getTimeInfo().getTime() == month3.getTime()){
+ data.getWaterQuantity().setRingNum(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(),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(),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 +"");
+ }
+
+ /*璁＄畻纰虫帓閲忥紝浠ヤ笅涓変釜鍥犵礌涔嬪拰
+ 1)鐢ㄧ數鐨勪簩姘у寲纰虫帓鏀鹃噺(kg)=鑰楃數閲�(kWh)x0.785锛�
+ 2) 澶╃劧姘斾簩姘у寲纰虫帓鏀鹃噺(kg)=澶╃劧姘斾娇鐢ㄩ噺(m3)脳0.19锛�
+ 3) 鑷潵姘翠簩姘у寲纰虫帓鏀鹃噺(kg)=鑷潵姘翠娇鐢ㄩ噺(m3)脳0.91锛�*/
+ data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
+ .add(carbonGas.multiply(new BigDecimal(0.19)))
+ .add(carbonWater.multiply(new BigDecimal(0.91)))));
+ return data;
+
+ }
+
+ /**
+ * 閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堟暟鎹�
+ * @param data
+ */
+ private void getMonthElectricityData(EnergyModelDataVO data) {
+ BaseResponse<MonthDataByMeterTypeResponse> response = HKService.getCurrentMonthDataByMeterType("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 getLastMonthElectricityData(EnergyModelDataVO data) {
+ 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() {
+ EnergyModelDataVO data = new EnergyModelDataVO();
+ data.setTotal("0");
+ data.setSameRate("0");
+ data.setRingRate("0");
+ data.setTotalNum(new BigDecimal(0));
+ data.setSameNum(new BigDecimal(0));
+ data.setRingNum(new BigDecimal(0));
+ return data;
+ }
+
+ /**
+ * 鐢ㄧ數鎬昏兘鑰楀悓姣斻�佺幆姣斿拰鍖哄煙鐢ㄧ數閲忛泦鍚�
+ * @return
+ */
+ @Override
+ 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 ){
+ data = response.getData();
+ }
+ if(data == null){
+ data = new RegionEnergyListResponse();
+ data.setSecondRegionDataList(new ArrayList<>());
+ data.setRootValue("0");
+ data.setSamePercent("0");
+ data.setRingPercent("0");
+ data.setSecondRegionDataList(new ArrayList<>());
+ }
+ return data;
+
+ }
+ /**
+ * 杩�12涓按鐢垫皵娌硅�楁暟鎹粺璁�
+ * @param type
+ * @return
+ */
+ @Override
+ public List<EnergyDataVO> energyDataList(Integer type){
+ List<EnergyDataVO> energyDataVOList = new ArrayList<>();
+ List<OilDataVO> oilDataVOList = new ArrayList<>();
+ Date lastMonth = DateUtil.increaseMonth(new Date(),-11);
+ if(type >=0 && type <=2){
+ //鐢ㄦ按鐢ㄧ數鐢ㄦ皵
+ List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
+ .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(" group by DATE_FORMAT(TIME_INFO,'%Y-%m')")
+ );
+ for (int i = 0; i < 12; i++) {
+ Date tempDate = DateUtil.increaseMonth(lastMonth,i);
+ EnergyDataVO data = new EnergyDataVO();
+ data.setTimeData(DateUtil.getFomartDate(tempDate,"YYYY-MM"));
+ data.setEnergy(new BigDecimal(0));
+ if(list!=null){
+ for(PlatformWaterGas m : list){
+ if(StringUtils.equals(m.getTimeInfoStr(),data.getTimeData())){
+ data.setEnergy(Constants.formatBigdecimal(m.getNum()));
+ }
+ }
+ }
+ energyDataVOList.add(data);
+ }
+ }else{
+ for (int i = 0; i < 12; i++) {
+ Date tempDate = DateUtil.increaseMonth(lastMonth,i);
+ EnergyDataVO data = new EnergyDataVO();
+ data.setTimeData(DateUtil.getFomartDate(tempDate,(i+1)+"鏈�"));
+ data.setEnergy(new BigDecimal(0));
+ energyDataVOList.add(data);
+ }
+ //濡傛灉鏄敤鐢垫暟鎹�
+ EnergyTrendRequest param = new EnergyTrendRequest();
+ param.setDate(DateUtil.getFomartDate(new Date(),"yyyy"));//骞翠唤
+ param.setMeterType(1);
+ param.setNodeType(2);
+ 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 ){
+ for (int i = 0; i < 12; i++) {
+ if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){
+ //鍙栫浉搴旂殑鍙傛暟鍊�
+ energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i],"0")));
+ }
+ }
+
+ }
+ }
+ return energyDataVOList;
+ }
+ @Override
public VisitDataVO visitSecurityData(){
//寰呰闂�佸凡鐧昏銆佸凡绂诲紑
@@ -436,8 +725,6 @@
SecurityBoardVO data = new SecurityBoardVO();
getParkingCarsNum(data);//鑾峰彇杞︿綅鏁版嵁
- Random random = new Random();
-
List<Retention> retentionList = retentionMapper.selectJoinList(Retention.class,
new MPJLambdaWrapper<Retention>()
.selectAll(Retention.class)
@@ -601,19 +888,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;
@@ -674,6 +948,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