+ 大屏荷接口对接

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/ElecExpendForecastController.java

@@ -1,27 +1,27 @@
 package com.ruoyi.ems.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.huashe.common.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.ElecExpendForecast;
+import com.ruoyi.ems.service.IElecExpendForecastService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.ElecExpendForecast;
-import com.ruoyi.ems.service.IElecExpendForecastService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.huashe.common.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 电力消耗预测Controller
@@ -32,8 +32,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 @RestController
 @RequestMapping("/forecastConsume")
 @Api(value = "ElecExpendForecastController", description = "电力消耗预测数据访问接口")
-public class ElecExpendForecastController extends BaseController
-{
+public class ElecExpendForecastController extends BaseController {
     @Autowired
     private IElecExpendForecastService elecExpendForecastService;
 
@@ -42,8 +41,7 @@ public class ElecExpendForecastController extends BaseController
      */
     @RequiresPermissions("prediction:consume:list")
     @GetMapping("/list")
-    public TableDataInfo list(ElecExpendForecast elecExpendForecast)
-    {
+    public TableDataInfo list(ElecExpendForecast elecExpendForecast) {
         startPage();
         List<ElecExpendForecast> list = elecExpendForecastService.selectElecExpendForecastList(elecExpendForecast);
         return getDataTable(list);
@@ -55,8 +53,7 @@ public class ElecExpendForecastController extends BaseController
     @RequiresPermissions("prediction:consume:export")
     @Log(title = "电力消耗预测", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ElecExpendForecast elecExpendForecast)
-    {
+    public void export(HttpServletResponse response, ElecExpendForecast elecExpendForecast) {
         List<ElecExpendForecast> list = elecExpendForecastService.selectElecExpendForecastList(elecExpendForecast);
         ExcelUtil<ElecExpendForecast> util = new ExcelUtil<ElecExpendForecast>(ElecExpendForecast.class);
         util.exportExcel(response, list, "电力消耗预测数据");
@@ -67,8 +64,7 @@ public class ElecExpendForecastController extends BaseController
      */
     @RequiresPermissions("prediction:consume:query")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(elecExpendForecastService.selectElecExpendForecastById(id));
     }
 
@@ -78,8 +74,7 @@ public class ElecExpendForecastController extends BaseController
     @RequiresPermissions("prediction:consume:add")
     @Log(title = "电力消耗预测", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ElecExpendForecast elecExpendForecast)
-    {
+    public AjaxResult add(@RequestBody ElecExpendForecast elecExpendForecast) {
         return toAjax(elecExpendForecastService.insertElecExpendForecast(elecExpendForecast));
     }
 
@@ -89,8 +84,7 @@ public class ElecExpendForecastController extends BaseController
     @RequiresPermissions("prediction:consume:edit")
     @Log(title = "电力消耗预测", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ElecExpendForecast elecExpendForecast)
-    {
+    public AjaxResult edit(@RequestBody ElecExpendForecast elecExpendForecast) {
         return toAjax(elecExpendForecastService.updateElecExpendForecast(elecExpendForecast));
     }
 
@@ -99,9 +93,13 @@ public class ElecExpendForecastController extends BaseController
      */
     @RequiresPermissions("prediction:consume:remove")
     @Log(title = "电力消耗预测", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(elecExpendForecastService.deleteElecExpendForecastByIds(ids));
     }
+
+    @GetMapping(value = "/cal/dateRange")
+    public AjaxResult calcElecExpendForecastDateRange(ElecExpendForecast param) {
+        return success(elecExpendForecastService.calcElecExpendForecastDateRange(param));
+    }
 }

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/ElecExpendForecastMapper.java

@@ -58,4 +58,6 @@ public interface ElecExpendForecastMapper {
      * @return 结果
      */
     int deleteElecExpendForecastByIds(Long[] ids);
+
+    List<ElecExpendForecast> calcElecExpendForecastDateRange(ElecExpendForecast emsElecExpendForecast);
 }

ems/ems-core/src/main/java/com/ruoyi/ems/service/IElecExpendForecastService.java

@@ -58,4 +58,6 @@ public interface IElecExpendForecastService {
      * @return 结果
      */
     int deleteElecExpendForecastById(Long id);
+
+    List<ElecExpendForecast> calcElecExpendForecastDateRange(ElecExpendForecast admEmsElecExpendForecast);
 }

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/ElecExpendForecastServiceImpl.java

@@ -84,4 +84,9 @@ public class ElecExpendForecastServiceImpl implements IElecExpendForecastService
     public int deleteElecExpendForecastById(Long id) {
         return emsElecExpendForecastMapper.deleteElecExpendForecastById(id);
     }
+
+    @Override
+    public List<ElecExpendForecast> calcElecExpendForecastDateRange(ElecExpendForecast admEmsElecExpendForecast) {
+        return emsElecExpendForecastMapper.calcElecExpendForecastDateRange(admEmsElecExpendForecast);
+    }
 }

ems/ems-core/src/main/resources/mapper/ems/ElecExpendForecastMapper.xml

@@ -94,4 +94,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <select id="calcElecExpendForecastDateRange" parameterType="ElecExpendForecast" resultMap="ElecExpendForecastResult">
+        select sum(
+        COALESCE(CAST(elec_use_quantity AS DECIMAL(10, 2)), 0)) elec_use_quantity,
+        `date`
+        from adm_ems_elec_expend_forecast d
+        <where>
+            obj_type = 1
+            <if test="startRecTime != null and startRecTime != ''">and DATE >=#{startRecTime}</if>
+            <if test="endRecTime != null and endRecTime != ''">and DATE <![CDATA[ <= ]]>#{endRecTime}</if>
+            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">
+                and obj_code = #{areaCode}
+            </if>
+        </where>
+        group by `date`
+    </select>
 </mapper>

ems/ems-core/src/main/resources/mapper/ems/ElecPvSupplyHMapper.xml

@@ -177,7 +177,9 @@
         sum(
         COALESCE(CAST(up_elec_quantity AS DECIMAL(10, 2)), 0)) up_elec_quantity,
         sum(
-        COALESCE(CAST(up_elec_earn AS DECIMAL(10, 2)), 0)) up_elec_earn
+        COALESCE(CAST(up_elec_earn AS DECIMAL(10, 2)), 0)) up_elec_earn,
+        sum(
+        COALESCE(CAST(use_elec_quantity AS DECIMAL(10, 2)), 0)) use_elec_quantity
         FROM adm_ems_pv_supply_h pv
         <where>
             <if test="date != null and date != ''">DATE like concat(#{date}, '%')</if>
@@ -219,6 +221,8 @@
         COALESCE(CAST(up_elec_quantity AS DECIMAL(10, 2)), 0)) up_elec_quantity,
         sum(
         COALESCE(CAST(up_elec_earn AS DECIMAL(10, 2)), 0)) up_elec_earn,
+        sum(
+        COALESCE(CAST(use_elec_quantity AS DECIMAL(10, 2)), 0)) use_elec_quantity,
         `date`
         FROM adm_ems_pv_supply_h pv
         <where>