web端首页数据：累计碳排放（t）和 累计节约碳排放（t）

src/main/java/com/welampiot/controller/DataController.java

@@ -725,16 +725,33 @@ public class DataController extends BaseController {
     @RequestMapping(value = "/sectionConsumptionInfo", method = RequestMethod.POST)
     public BaseResult<?> sectionConsumptionInfo(BaseVO baseVO) {
         Integer version = baseVO.getVersion();
+        LampLogVO lampLogVO = new LampLogVO();
+        setLampLogData(baseVO, lampLogVO);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS, version, lampLogVO);
+    }
+
+    private void setLampLogData(BaseVO baseVO, LampLogVO lampLogVO) {
         List<Integer> sectionList = getSectionList(baseVO.getUsername());
         baseVO.setSectionList(sectionList);
         baseVO.setPageAndCount(baseVO.getPage(), baseVO.getCount());
         LampInfoLogNewDTO lampLogData = lampInfoLogNewService.getTodayAllLampLogData(baseVO);
         DecimalFormat df = new DecimalFormat("0.##");
-        LampLogVO lampLogVO = new LampLogVO();
         lampLogVO.setDayConsumption(df.format(Double.valueOf(lampLogData.getUsedEnergyTonight())));
         lampLogVO.setDaySavePower(df.format(Double.valueOf(lampLogData.getDayEleSave())));
         lampLogVO.setTotalConsumption(df.format(Double.valueOf(lampLogData.getUsedEnergyTotal())));
         lampLogVO.setTotalSavePower(df.format(Double.valueOf(lampLogData.getTotalEleSave())));
+        lampLogVO.setTotalCarbonEmission(df.format(Double.parseDouble(lampLogData.getUsedEnergyTotal()) * 0.785 / 1000));
+        lampLogVO.setTotalSaveCarbonEmission(df.format(Double.parseDouble(lampLogData.getTotalEleSave()) * 0.785 / 1000));
+    }
+
+    /**
+     * web端首页数据
+     */
+    @RequestMapping(value = "/webInfo", method = RequestMethod.POST)
+    public BaseResult<?> webInfo(BaseVO baseVO) {
+        Integer version = baseVO.getVersion();
+        LampLogVO lampLogVO = new LampLogVO();
+        setLampLogData(baseVO, lampLogVO);
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS, version, lampLogVO);
     }
 }

src/main/java/com/welampiot/vo/LampLogVO.java

@@ -37,4 +37,6 @@ public class LampLogVO {
     private String daySavePower;
     private String totalConsumption;
     private String totalSavePower;
+    private String totalCarbonEmission;
+    private String totalSaveCarbonEmission;
 }