kangwei: 完善能耗分析，添加单位，解决value空值

 package com.skua.tool.util;
 package com.skua.tool.util;
 
 
 import com.skua.constant.BaseConstant;
 import com.skua.constant.BaseConstant;
+import com.skua.modules.common.vo.DateVO;
+
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.ParsePosition;
@@ -72,9 +74,25 @@ public class DateUtils {
     };
     };
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
-        System.out.println(getHbMonth(formatDate("2024-01-01","yyyy-MM")));
+       // System.out.println(getHbMonth(formatDate("2024-01-01","yyyy-MM")));
+        // 获取当前日期的Calendar实例
+        Calendar calendar = Calendar.getInstance();
+        // 将当前日期减去一个月
+        calendar.add(Calendar.MONTH, -1);
+        // 创建日期格式化对象
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
+        // 格式化上个月的日期
+        String lastMonth = dateFormat.format(calendar.getTime());
+
+        calendar.add(Calendar.MONTH, -1);
+        String lastMonth2 = dateFormat.format(calendar.getTime());
 
 
+        calendar.add(Calendar.MONTH, -11);
+        String lastMonth3 = dateFormat.format(calendar.getTime());
 
 
+        System.out.println("上月"+lastMonth);
+        System.out.println("上上月"+lastMonth2);
+        System.out.println("同比"+lastMonth3);
        // System.out.println("天数差异: " + daysBetween);
        // System.out.println("天数差异: " + daysBetween);
     }
     }
 
 

@@ -21,10 +21,8 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 
 
 
 /**
 /**
@@ -382,6 +380,9 @@ public class ReportItemvService {
         String dsdh_value_Tb = ReportViewUtil.getValueByDSDH(departId,dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime()) ;
         String dsdh_value_Tb = ReportViewUtil.getValueByDSDH(departId,dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime()) ;
 
 
 
 
+        startTime = dateVO.getLastMonthStartTime();
+        endTime = dateVO.getLastMonthEndTime();
+
         String  dfValueSql = "select sum(cost) cost from report_electric_cost t  where t.month >='"+DateUtils.formatDate(startTime,"yyyy-MM")+"'  and t.month<='"+DateUtils.formatDate(endTime,"yyyy-MM")+"' ";
         String  dfValueSql = "select sum(cost) cost from report_electric_cost t  where t.month >='"+DateUtils.formatDate(startTime,"yyyy-MM")+"'  and t.month<='"+DateUtils.formatDate(endTime,"yyyy-MM")+"' ";
         dfValueSql += " and t.depart_id in ("+JSUtils.quoteEach(departId,",")+")";
         dfValueSql += " and t.depart_id in ("+JSUtils.quoteEach(departId,",")+")";
         String  dfValue = getJdbcTemplate().queryForObject(dfValueSql,String.class);
         String  dfValue = getJdbcTemplate().queryForObject(dfValueSql,String.class);
@@ -424,9 +425,38 @@ public class ReportItemvService {
         ReportItemVO  zyhReportVO = ReportViewUtil.getSumValueByTBHB( ReportConstant.view3a24,ReportConstant.fieldYj, departIds, startDate,endDate);
         ReportItemVO  zyhReportVO = ReportViewUtil.getSumValueByTBHB( ReportConstant.view3a24,ReportConstant.fieldYj, departIds, startDate,endDate);
         //日均  value ，同比，环比
         //日均  value ，同比，环比
         //ReportItemVO  zyhReportAVG = ReportViewUtil.getSumValueByTBHB( ReportConstant.view3a24,ReportConstant.fieldYj, departIds, startDate,endDate,"avg");
         //ReportItemVO  zyhReportAVG = ReportViewUtil.getSumValueByTBHB( ReportConstant.view3a24,ReportConstant.fieldYj, departIds, startDate,endDate,"avg");
-        //月吨水药费
-        ReportItemVO  dsyfReportVO = ReportViewUtil.getSumValueByTBHB( ReportConstant.view4411,"yyh", departIds, startDate,endDate);
+        // 获取当前日期的Calendar实例
+        Calendar calendar = Calendar.getInstance();
+        // 将当前日期减去一个月
+        calendar.add(Calendar.MONTH, -1);
+        // 创建日期格式化对象
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
+        // 格式化上个月的日期
+        String month = dateFormat.format(calendar.getTime());
+        calendar.add(Calendar.MONTH, -1);
+        String monthHB = dateFormat.format(calendar.getTime());
+        calendar.add(Calendar.MONTH, -11);
+        String monthTB = dateFormat.format(calendar.getTime());
+
+        String dataViewName3a24_value = ReportViewUtil.buildView(ReportConstant.view4411,"yyh", departIds, month,month);
+        String dataViewName3a24_valueHB = ReportViewUtil.buildView(ReportConstant.view4411,"yyh", departIds, monthHB,monthHB);
+        String dataViewName3a24_valueTB = ReportViewUtil.buildView(ReportConstant.view4411,"yyh", departIds, monthTB,monthTB);
+        String sql = "select ";
+        sql += "(select ROUND(ifnull(avg(aaa.yyh),0) ,2) 'value'  from "  + dataViewName3a24_value+ "aaa) 'value',";
+        sql += "(select  ROUND(ifnull(avg(aaa.yyh),0) ,2) 'value'  from "  + dataViewName3a24_valueHB+ "aaa) 'valueHb',";
+        sql += "(select  ROUND(ifnull(avg(aaa.yyh),0) ,2) 'value'  from "  + dataViewName3a24_valueTB+ "aaa) 'valueTb' ";
+        sql += " from dual";
+        JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
+        ReportItemVO dsyfReportVO = null;
+        List<ReportItemVO> dsyfReportList = masterDB.query(sql,new BeanPropertyRowMapper<ReportItemVO>(ReportItemVO.class));
+        if(	dsyfReportList!= null && !dsyfReportList.isEmpty()){
+            dsyfReportVO = dsyfReportList.get(0);
+        }else{
+            dsyfReportVO = new ReportItemVO();
+        }
 
 
+        //出水量：+同比+环比
+       // ReportItemVO csl_reportVO2 = ReportViewUtil.getSumValueByTBHB(ReportConstant.view2119,ReportConstant.field_CSL, departIds, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
 
 
         List<FRportlCommandCenterVO> dataList = new ArrayList<>();
         List<FRportlCommandCenterVO> dataList = new ArrayList<>();
         dataList.add( new FRportlCommandCenterVO("月总药耗" ,"monthValue","万吨",JSUtils.divide(zyhReportVO.getValue(),"10000"),JSUtils.divide(zyhReportVO.getValueTb(),"10000"),JSUtils.divide(zyhReportVO.getValueHb(),"10000"))  );
         dataList.add( new FRportlCommandCenterVO("月总药耗" ,"monthValue","万吨",JSUtils.divide(zyhReportVO.getValue(),"10000"),JSUtils.divide(zyhReportVO.getValueTb(),"10000"),JSUtils.divide(zyhReportVO.getValueHb(),"10000"))  );

@@ -147,7 +147,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
         sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
         sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
         List<EquipmentRepairAnalysisVO> dataList =  getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairAnalysisVO>(EquipmentRepairAnalysisVO.class));;
         List<EquipmentRepairAnalysisVO> dataList =  getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairAnalysisVO>(EquipmentRepairAnalysisVO.class));;
 
 
-        dataMap.put("totalCost",JSUtils.multiply(repairCost,maintainCost));
+        dataMap.put("totalCost",JSUtils.subtract(repairCost,maintainCost));
         dataMap.put("dataList",dataList);
         dataMap.put("dataList",dataList);
         return dataMap;
         return dataMap;
     }
     }