* 储能分析增加容量等状态属性的展示

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

@@ -57,6 +57,12 @@ public class CaMeterDController extends BaseController {
         return success(list);
     }
 
+    @RequiresPermissions("ca-analysis:emission:list")
+    @GetMapping("/area/avg/ca")
+    public AjaxResult qryAvgCa(CaMeterD caMeterD) {
+        List<CaMeterD> list = caMeterDService.selectAvgCaMeterDList(caMeterD);
+        return success(list);
+    }
     /**
      * 导出碳计量日列表
      */

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

@@ -31,6 +31,9 @@ public interface CaMeterDMapper {
 
     List<CaMeterD> selectSumCaMeterDList(CaMeterD caMeterD);
 
+    List<CaMeterD> selectAvgCaMeterDList(CaMeterD caMeterD);
+
+
     /**
      * 新增碳计量日
      *

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

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

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

@@ -46,6 +46,10 @@ public class CaMeterDServiceImpl implements ICaMeterDService {
         return caMeterDMapper.selectSumCaMeterDList(caMeterD);
     }
 
+    @Override
+    public List<CaMeterD> selectAvgCaMeterDList(CaMeterD caMeterD) {
+        return caMeterDMapper.selectAvgCaMeterDList(caMeterD);
+    }
 
 
     /**

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

@@ -52,6 +52,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by date desc
     </select>
 
+    <select id="selectAvgCaMeterDList" parameterType="com.ruoyi.ems.domain.CaMeterD" resultMap="CaMeterDResult">
+        select area_code, avg(ca_emission_quantity) ca_emission_quantity,
+        avg(ca_sink_quantity) from adm_ems_ca_meter_d
+        <where>
+            <if test="areaCode != null  and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
+        </where>
+        group by area_code
+        order by date desc
+    </select>
+
+
     <select id="selectCaMeterDById" parameterType="Long" resultMap="CaMeterDResult">
         <include refid="selectCaMeterDVo"/>
         where id = #{id}