完成用电控制公司、分厂、产线的尖峰平谷占比的日汇总/月汇总以及谷峰差统计的日汇总/月汇总接口

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/controller/FpgLeanModelController.java

@@ -264,7 +264,7 @@ public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLe
 		return result;
 	}
 
-	@ApiOperation(value="峰平谷用电控制日报", notes="峰平谷用电控制日报")
+	@ApiOperation(value="峰平谷用电控制", notes="峰平谷用电控制")
 	@GetMapping(value = "/electricityControl")
 	public JSONObject electricityControl() {
 
@@ -274,7 +274,47 @@ public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLe
 	}
 
 
-	@ApiOperation(value="峰平谷用电控制月报", notes="峰平谷用电控制月报")
+	@ApiOperation(value="峰平谷用电控制设备日报", notes="峰平谷用电控制设备日报")
+	@GetMapping(value = "/electricityControlDay")
+	public JSONObject electricityControlDay() {
+
+		JSONObject result = fpgLeanModelService.electricityControlDay();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="峰平谷用电控制各线日报", notes="峰平谷用电控制各线日报")
+	@GetMapping(value = "/electricityControlGxDay")
+	public JSONObject electricityControlGxDay() {
+
+		JSONObject result = fpgLeanModelService.electricityControlGxDay();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="峰平谷用电控制分厂日报", notes="峰平谷用电控制分厂日报")
+	@GetMapping(value = "/electricityControlFcDay")
+	public JSONObject electricityControlFcDay() {
+
+		JSONObject result = fpgLeanModelService.electricityControlFcDay();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="峰平谷用电控制公司日报", notes="峰平谷用电控制公司日报")
+	@GetMapping(value = "/electricityControlGsDay")
+	public JSONObject electricityControlGsDay() {
+
+		JSONObject result = fpgLeanModelService.electricityControlGsDay();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="峰平谷用电控制设备月报", notes="峰平谷用电控制设备月报")
 	@GetMapping(value = "/electricityControlMonth")
 	public JSONObject electricityControlMonth() {
 
@@ -284,6 +324,35 @@ public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLe
 	}
 
 
+	@ApiOperation(value="峰平谷用电控制各线月报", notes="峰平谷用电控制各线月报")
+	@GetMapping(value = "/electricityControlGxMonth")
+	public JSONObject electricityControlGxMonth() {
+
+		JSONObject result = fpgLeanModelService.electricityControlGxMonth();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="峰平谷用电控制分厂月报", notes="峰平谷用电控制分厂月报")
+	@GetMapping(value = "/electricityControlFcMonth")
+	public JSONObject electricityControlFcMonth() {
+
+		JSONObject result = fpgLeanModelService.electricityControlFcMonth();
+
+		return result;
+	}
+
+	@ApiOperation(value="峰平谷用电控制分厂月报", notes="峰平谷用电控制分厂月报")
+	@GetMapping(value = "/electricityControlGsMonth")
+	public JSONObject electricityControlGsMonth() {
+
+		JSONObject result = fpgLeanModelService.electricityControlGsMonth();
+
+		return result;
+	}
+
+
 	@ApiOperation(value="峰平谷运行统计表", notes="峰平谷运行统计表")
 	@GetMapping(value = "/operatingStatistic")
 	public JSONObject operatingStatistic() {
@@ -294,7 +363,7 @@ public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLe
 	}
 
 
-	@ApiOperation(value="谷峰差统计", notes="谷峰差统计")
+	@ApiOperation(value="谷峰差日统计", notes="谷峰差日统计")
 	@GetMapping(value = "/valleyPeakDifferenceStatistics")
 	public JSONObject valleyPeakDifferenceStatistics() {
 
@@ -304,7 +373,37 @@ public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLe
 	}
 
 
-	@ApiOperation(value="谷峰差统计", notes="谷峰差统计")
+	@ApiOperation(value="谷峰差各线日统计", notes="谷峰差各线日统计")
+	@GetMapping(value = "/valleyPeakDifferenceGxStatistics")
+	public JSONObject valleyPeakDifferenceGxStatistics() {
+
+		JSONObject result = fpgLeanModelService.valleyPeakDifferenceGxStatistics();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="谷峰差分厂日统计", notes="谷峰差分厂日统计")
+	@GetMapping(value = "/valleyPeakDifferenceFcStatistics")
+	public JSONObject valleyPeakDifferenceFcStatistics() {
+
+		JSONObject result = fpgLeanModelService.valleyPeakDifferenceFcStatistics();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="谷峰差公司日统计", notes="谷峰差公司日统计")
+	@GetMapping(value = "/valleyPeakDifferenceGsStatistics")
+	public JSONObject valleyPeakDifferenceGsStatistics() {
+
+		JSONObject result = fpgLeanModelService.valleyPeakDifferenceGsStatistics();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="谷峰差设备月统计", notes="谷峰差设备月统计")
 	@GetMapping(value = "/valleyPeakDifferenceStatisticsMonth")
 	public JSONObject valleyPeakDifferenceStatisticsMonth() {
 
@@ -312,4 +411,33 @@ public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLe
 
 		return result;
 	}
+
+
+	@ApiOperation(value="谷峰差各线月统计", notes="谷峰差各线月统计")
+	@GetMapping(value = "/valleyPeakDifferenceGxStatisticsMonth")
+	public JSONObject valleyPeakDifferenceGxStatisticsMonth() {
+
+		JSONObject result = fpgLeanModelService.valleyPeakDifferenceGxStatisticsMonth();
+
+		return result;
+	}
+
+	@ApiOperation(value="谷峰差分厂月统计", notes="谷峰差分厂月统计")
+	@GetMapping(value = "/valleyPeakDifferenceFcStatisticsMonth")
+	public JSONObject valleyPeakDifferenceFcStatisticsMonth() {
+
+		JSONObject result = fpgLeanModelService.valleyPeakDifferenceFcStatisticsMonth();
+
+		return result;
+	}
+
+
+	@ApiOperation(value="谷峰差公司月统计", notes="谷峰差公司月统计")
+	@GetMapping(value = "/valleyPeakDifferenceGsStatisticsMonth")
+	public JSONObject valleyPeakDifferenceGsStatisticsMonth() {
+
+		JSONObject result = fpgLeanModelService.valleyPeakDifferenceGsStatisticsMonth();
+
+		return result;
+	}
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/entity/ElectricityControlReport.java

@@ -18,7 +18,7 @@ public class ElectricityControlReport {
     private String deviceTitle;
     @ApiModelProperty(value = "区域名称")
     private String regionTitle;
-    @ApiModelProperty(value = "区域名称")
+    @ApiModelProperty(value = "各线名称")
     private String deviceTypeName;
     /**区域ID*/
     @ApiModelProperty(value = "区域ID")
@@ -97,6 +97,10 @@ public class ElectricityControlReport {
 
     private BigDecimal monthTotalValue;
 
+    private BigDecimal totalNum;
+
+    private BigDecimal proportion;
+
     private Integer orderIndex;
 
 

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/entity/ModelReportFormResult.java

@@ -148,8 +148,14 @@ public class ModelReportFormResult {
     @ApiModelProperty(value = "设备类型名称")
     private String deviceTypeName;
 
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
 
-    public ModelReportFormResult(String deviceTitle, String devicePointId, String deviceRegionId, String deviceInformationId, BigDecimal ingTime, BigDecimal selectricCurrent, BigDecimal power, BigDecimal topsPower, BigDecimal peaksPower, BigDecimal flatPower, BigDecimal valleysPower, BigDecimal topsIngTime, BigDecimal peaksIngTime, BigDecimal flatIngTime, BigDecimal valleysIngTime, BigDecimal topsSelectricCurrent, BigDecimal peaksSelectricCurrent, BigDecimal flatSelectricCurrent, BigDecimal valleysSelectricCurrent, BigDecimal topsProportion, BigDecimal peaksProportion, BigDecimal flatProportion, BigDecimal valleysProportion, Integer proportion, String dates, String createTime, String regionName, String deviceTypeName) {
+    public ModelReportFormResult(String deviceTitle, String devicePointId, String deviceRegionId, String deviceInformationId, BigDecimal ingTime, BigDecimal selectricCurrent, BigDecimal power, BigDecimal topsPower, BigDecimal peaksPower, BigDecimal flatPower, BigDecimal valleysPower, BigDecimal topsIngTime, BigDecimal peaksIngTime, BigDecimal flatIngTime, BigDecimal valleysIngTime, BigDecimal topsSelectricCurrent, BigDecimal peaksSelectricCurrent, BigDecimal flatSelectricCurrent, BigDecimal valleysSelectricCurrent, BigDecimal topsProportion, BigDecimal peaksProportion, BigDecimal flatProportion, BigDecimal valleysProportion, Integer proportion, String dates, String createTime, String regionName, String deviceTypeName,String companyName) {
         this.deviceTitle = deviceTitle;
         this.devicePointId = devicePointId;
         this.deviceRegionId = deviceRegionId;
@@ -178,5 +184,6 @@ public class ModelReportFormResult {
         this.createTime = createTime;
         this.regionName = regionName;
         this.deviceTypeName = deviceTypeName;
+        this.companyName = companyName;
     }
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/service/IFpgLeanModelService.java

@@ -30,13 +30,39 @@ public interface IFpgLeanModelService extends IService<FpgLeanModel> {
 
     JSONObject electricityControl();
 
+    JSONObject electricityControlDay();
+
+    JSONObject electricityControlGxDay();
+
+    JSONObject electricityControlFcDay();
+
+    JSONObject electricityControlGsDay();
+
     JSONObject electricityControlMonth();
 
+    JSONObject electricityControlGxMonth();
+
+    JSONObject electricityControlFcMonth();
+
+    JSONObject electricityControlGsMonth();
+
     JSONObject operatingStatistic();
 
     JSONObject valleyPeakDifferenceStatistics();
 
+    JSONObject valleyPeakDifferenceGxStatistics();
+
+    JSONObject valleyPeakDifferenceFcStatistics();
+
+    JSONObject valleyPeakDifferenceGsStatistics();
+
     JSONObject valleyPeakDifferenceStatisticsMonth();
 
+    JSONObject valleyPeakDifferenceGxStatisticsMonth();
+
+    JSONObject valleyPeakDifferenceFcStatisticsMonth();
+
+    JSONObject valleyPeakDifferenceGsStatisticsMonth();
+
 
 }