Bläddra i källkod

+ 子系统数据初始化

chen.cheng 4 veckor sedan
förälder
incheckning
7886f8ee40

+ 30 - 27
ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/CaMeterDController.java

@@ -1,15 +1,9 @@
 package com.ruoyi.ems.controller;
 
-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.CaMeterD;
-import com.ruoyi.ems.service.ICaMeterDService;
-import io.swagger.annotations.Api;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,8 +14,17 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+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.CaMeterD;
+import com.ruoyi.ems.service.ICaMeterDService;
+
+import io.swagger.annotations.Api;
 
 /**
  * 碳计量日Controller
@@ -32,8 +35,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/caMeterD")
 @Api(value = "CaMeterDController", description = "碳计量日数据访问接口")
-public class CaMeterDController extends BaseController
-{
+public class CaMeterDController extends BaseController {
     @Autowired
     private ICaMeterDService caMeterDService;
 
@@ -42,21 +44,26 @@ public class CaMeterDController extends BaseController
      */
     @RequiresPermissions("ca-analysis:emission:list")
     @GetMapping("/list")
-    public TableDataInfo list(CaMeterD caMeterD)
-    {
+    public TableDataInfo list(CaMeterD caMeterD) {
         startPage();
         List<CaMeterD> list = caMeterDService.selectCaMeterDList(caMeterD);
         return getDataTable(list);
     }
 
+    @RequiresPermissions("ca-analysis:emission:list")
+    @GetMapping("/list/all")
+    public AjaxResult listAll(CaMeterD caMeterD) {
+        List<CaMeterD> list = caMeterDService.selectSumCaMeterDList(caMeterD);
+        return success(list);
+    }
+
     /**
      * 导出碳计量日列表
      */
     @RequiresPermissions("ca-analysis:emission:export")
     @Log(title = "碳计量日", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, CaMeterD caMeterD)
-    {
+    public void export(HttpServletResponse response, CaMeterD caMeterD) {
         List<CaMeterD> list = caMeterDService.selectCaMeterDList(caMeterD);
         ExcelUtil<CaMeterD> util = new ExcelUtil<CaMeterD>(CaMeterD.class);
         util.exportExcel(response, list, "碳计量日数据");
@@ -67,8 +74,7 @@ public class CaMeterDController extends BaseController
      */
     @RequiresPermissions("ca-analysis:emission:query")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(caMeterDService.selectCaMeterDById(id));
     }
 
@@ -78,8 +84,7 @@ public class CaMeterDController extends BaseController
     @RequiresPermissions("ca-analysis:emission:add")
     @Log(title = "碳计量日", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CaMeterD caMeterD)
-    {
+    public AjaxResult add(@RequestBody CaMeterD caMeterD) {
         return toAjax(caMeterDService.insertCaMeterD(caMeterD));
     }
 
@@ -89,8 +94,7 @@ public class CaMeterDController extends BaseController
     @RequiresPermissions("ca-analysis:emission:edit")
     @Log(title = "碳计量日", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CaMeterD caMeterD)
-    {
+    public AjaxResult edit(@RequestBody CaMeterD caMeterD) {
         return toAjax(caMeterDService.updateCaMeterD(caMeterD));
     }
 
@@ -99,9 +103,8 @@ public class CaMeterDController extends BaseController
      */
     @RequiresPermissions("ca-analysis:emission:remove")
     @Log(title = "碳计量日", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(caMeterDService.deleteCaMeterDByIds(ids));
     }
 }

+ 5 - 2
ems/ems-core/src/main/java/com/ruoyi/ems/mapper/CaMeterDMapper.java

@@ -1,9 +1,10 @@
 package com.ruoyi.ems.mapper;
 
-import com.ruoyi.ems.domain.CaMeterD;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.ruoyi.ems.domain.CaMeterD;
 
 /**
  * 碳计量日Mapper接口
@@ -28,6 +29,8 @@ public interface CaMeterDMapper {
      */
     List<CaMeterD> selectCaMeterDList(CaMeterD caMeterD);
 
+    List<CaMeterD> selectSumCaMeterDList(CaMeterD caMeterD);
+
     /**
      * 新增碳计量日
      *

+ 2 - 0
ems/ems-core/src/main/java/com/ruoyi/ems/service/ICaMeterDService.java

@@ -27,6 +27,8 @@ public interface ICaMeterDService {
      */
     List<CaMeterD> selectCaMeterDList(CaMeterD caMeterD);
 
+    List<CaMeterD> selectSumCaMeterDList(CaMeterD caMeterD);
+
     /**
      * 新增碳计量日
      *

+ 7 - 0
ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/CaMeterDServiceImpl.java

@@ -41,6 +41,13 @@ public class CaMeterDServiceImpl implements ICaMeterDService {
         return caMeterDMapper.selectCaMeterDList(caMeterD);
     }
 
+    @Override
+    public List<CaMeterD> selectSumCaMeterDList(CaMeterD caMeterD) {
+        return caMeterDMapper.selectSumCaMeterDList(caMeterD);
+    }
+
+
+
     /**
      * 新增碳计量日
      *

+ 19 - 0
ems/ems-core/src/main/resources/mapper/ems/CaMeterDMapper.xml

@@ -33,6 +33,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by date desc
     </select>
 
+    <select id="selectSumCaMeterDList" parameterType="com.ruoyi.ems.domain.CaMeterD" resultMap="CaMeterDResult">
+        select d.id, d.area_code,area.area_name, date, sum(ca_emission_quantity) ca_emission_quantity,
+        sum(ca_sink_quantity) from adm_ems_ca_meter_d d
+        inner join adm_area area on area.area_code = d.area_code
+        <where>
+            <if test="areaName != null  and areaName != ''">and area.area_name like concat('%', #{areaName}, '%')</if>
+            <if test="areaCode != null  and areaCode != '' and areaCode !='-1'">and d.area_code = #{areaCode}</if>
+            <if test="date != null ">and date = #{date}</if>
+            <if test="startRecTime != null and startRecTime != '' ">
+                and d.`date` &gt;= #{startRecTime}
+            </if>
+            <if test="endRecTime != null and endRecTime !=''">
+                and d.`date` &lt;= #{endRecTime}
+            </if>
+        </where>
+        group by d.date
+        order by date desc
+    </select>
+
     <select id="selectCaMeterDById" parameterType="Long" resultMap="CaMeterDResult">
         <include refid="selectCaMeterDVo"/>
         where id = #{id}

+ 2 - 0
ems/sql/ems_sys_data.sql

@@ -648,6 +648,8 @@ INSERT INTO `sys_dict_data` VALUES (143, 0, '异常', '1', 'inspection_result',
 -- ----------------------------
 insert into sys_config values(6, '系统信息-平台标题',           'sys.info.title',    '常泰大桥服务区能源管理',   'Y', 'admin', sysdate(), '', null, null);
 insert into sys_config values(7, '主路光伏大屏标题',           'sys.info.pv-road-title',    '常泰大桥服务区主路光伏',   'Y', 'admin', sysdate(), '', null, null);
+INSERT INTO sys_config VALUES
+    (8,'储能设备桩机容量','storage-equipped-capacity','storage-equipped-capacity','Y','admin','2025-06-23 14:43:29','admin','2025-07-01 16:20:10','{ "321283124S3001": {  "name": "南区",  "pv":660.8,   "store":200 }, "321283124S3002": {"name": "北区",  "pv":605.05,   "store":200 }}');
 
 -- ----------------------------
 -- 15、定时任务初始化数据