建筑用能：用电集抄优化

module_ems/src/main/java/org/jeecg/modules/dataElectricity/controller/DataElectricityController.java

@@ -11,6 +11,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.dataElectricity.entity.DataElectricity;
+import org.jeecg.modules.dataElectricity.entity.DataElectricityCrtVo;
 import org.jeecg.modules.dataElectricity.entity.DataElectricitySta;
 import org.jeecg.modules.dataElectricity.service.IDataElectricityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -183,9 +184,9 @@ public class DataElectricityController extends JeecgController<DataElectricity,
 	 @ApiOperation("用电集抄")
 //	 @PreAuthorize("@ss.hasPermi('ems:emselectricity:list')")
 	 @GetMapping("/liststa")
-	 public Result<Object> liststa(DataElectricity emsElectricity) {
-		 System.out.println(emsElectricity);
-		 List<DataElectricitySta> list = dataElectricityService.selectEmsElecSta(emsElectricity);
+	 public Result<Object> liststa(DataElectricityCrtVo dataElectricityCrtVo) {
+		 System.out.println(dataElectricityCrtVo);
+		 List<DataElectricitySta> list = dataElectricityService.selectEmsElecSta(dataElectricityCrtVo);
 		 return Result.OK(list);
 	 }
 
@@ -196,9 +197,9 @@ public class DataElectricityController extends JeecgController<DataElectricity,
 //	 @PreAuthorize("@ss.hasPermi('ems:emselectricity:export')")
 //	 @Log(title = "用电集抄", businessType = BusinessType.EXPORT)
 	 @RequestMapping(value = "/exportsta")
-	 public ModelAndView exportsta(HttpServletRequest request, DataElectricity dataElectricity) {
-		 System.out.println(dataElectricity);
-		 return dataElectricityService.exportsta(request, DataElectricitySta.class, "用电集抄数据", dataElectricity);
+	 public ModelAndView exportsta(HttpServletRequest request, DataElectricityCrtVo dataElectricityCrtVo) {
+		 System.out.println(dataElectricityCrtVo);
+		 return dataElectricityService.exportsta(request, DataElectricitySta.class, "用电集抄数据", dataElectricityCrtVo);
 	 }
 
 }

module_ems/src/main/java/org/jeecg/modules/dataElectricity/entity/DataElectricity.java

@@ -138,17 +138,4 @@ public class DataElectricity implements Serializable {
     @ApiModelProperty(value = "附加电费")
     private java.lang.Double addamount;
 
-
-    /** 设备编号 */
-    @Excel(name = "设备编号")
-    private String equipmentcode;
-    /** 电费(元) */
-    @Excel(name = "电费(元)")
-    private Double electricityvalue;
-    /** 开始示数 */
-    private Double beginvalue;
-    /** 结束示数 */
-    private Double endvalue;
-
-    private Map<String, Object> params;
 }

module_ems/src/main/java/org/jeecg/modules/dataElectricity/entity/DataElectricityCrtVo.java

@@ -0,0 +1,35 @@
+package org.jeecg.modules.dataElectricity.entity;
+
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Map;
+
+/**
+ * ClassName: DataElectricityCrtVo
+ * Package: org.jeecg.modules.dataElectricity.entity
+ * Description:
+ *
+ * @Author sl
+ * @Create 2024/2/29 15:28
+ * @Version 1.0
+ */
+@Data
+public class DataElectricityCrtVo extends DataElectricity{
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String equipmentcode;
+    /** 电费(元) */
+    @Excel(name = "电费(元)")
+    private Double electricityvalue;
+    /** 开始示数 */
+    private Double beginvalue;
+    /** 结束示数 */
+    private Double endvalue;
+
+    /** 统计开始时间 */
+    private String beginTime;
+    /** 统计结束时间 */
+    private String endTime;
+
+}

module_ems/src/main/java/org/jeecg/modules/dataElectricity/mapper/DataElectricityMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.dataElectricity.entity.DataElectricity;
+import org.jeecg.modules.dataElectricity.entity.DataElectricityCrtVo;
 import org.jeecg.modules.dataElectricity.vo.DataElectricityVO;
 import org.jeecg.modules.paramquery.dto.ParamQueryDataDTO;
 
@@ -45,8 +46,8 @@ public interface DataElectricityMapper extends BaseMapper<DataElectricity> {
     /**
      * 用电集抄
      *
-     * @param emsElectricity 分时电量
+     * @param dataElectricityCrtVo 分时电量
      * @return 分时电量集合
      */
-    public List<DataElectricity> selectEmsElecSta(DataElectricity emsElectricity);
+    public List<DataElectricityCrtVo> selectEmsElecSta(DataElectricityCrtVo dataElectricityCrtVo);
 }

module_ems/src/main/java/org/jeecg/modules/dataElectricity/mapper/xml/DataElectricityMapper.xml

@@ -34,7 +34,7 @@
     </select>
 
     <!-- 用电集抄 -->
-    <select id="selectEmsElecSta" parameterType="org.jeecg.modules.dataElectricity.entity.DataElectricity" resultMap="DataElectricityResult">
+    <select id="selectEmsElecSta" parameterType="org.jeecg.modules.dataElectricity.entity.DataElectricityCrtVo" resultType="org.jeecg.modules.dataElectricity.entity.DataElectricityCrtVo">
         SELECT a.equipmentid,e.equipmentname,e.equipmentcode,b.tagvalue as beginvalue,c.tagvalue as endvalue,c.tagvalue-b.tagvalue as tagvalue
         FROM tpm_equipment_status as a
                  left join tpm_equipment as e
@@ -45,7 +45,7 @@
                      select equipmentid,tagvalue,
                             row_number() over(partition by equipmentid order by logtime asc) mm
                      from ems_data_electricity
-                     where logtime &gt;= #{params.beginTime} and logtime &lt;= #{params.endTime}
+                     where logtime &gt;= #{beginTime} and logtime &lt;= #{endTime}
                  ) as z
             where mm=1
         ) as b on a.equipmentid=b.equipmentid
@@ -55,7 +55,7 @@
                      select equipmentid,tagvalue,
                             row_number() over(partition by equipmentid order by logtime desc) mm
                      from ems_data_electricity
-                     where logtime &gt;= #{params.beginTime} and logtime &lt;= #{params.endTime}
+                     where logtime &gt;= #{beginTime} and logtime &lt;= #{endTime}
                  ) as y
             where mm=1
         ) as c

module_ems/src/main/java/org/jeecg/modules/dataElectricity/service/IDataElectricityService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.dataElectricity.service;
 
 import org.jeecg.modules.dataElectricity.entity.DataElectricity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.dataElectricity.entity.DataElectricityCrtVo;
 import org.jeecg.modules.dataElectricity.entity.DataElectricitySta;
 import org.jeecg.modules.dataElectricity.vo.DataElectricityVO;
 import org.jeecg.modules.paramquery.dto.ParamQueryDataDTO;
@@ -34,14 +35,14 @@ public interface IDataElectricityService extends IService<DataElectricity> {
     /**
      * 用电集抄
      *
-     * @param emsElectricity 分时电量
+     * @param dataElectricityCrtVo 分时电量
      * @return 分时电量
      */
-    public List<DataElectricitySta> selectEmsElecSta(DataElectricity emsElectricity);
+    public List<DataElectricitySta> selectEmsElecSta(DataElectricityCrtVo dataElectricityCrtVo);
 
     /**
      * 导出用电集抄
      */
-    public ModelAndView exportsta(HttpServletRequest request, Class<DataElectricitySta> clazz, String title, DataElectricity dataElectricity);
+    public ModelAndView exportsta(HttpServletRequest request, Class<DataElectricitySta> clazz, String title, DataElectricityCrtVo dataElectricityCrtVo);
 
 }

module_ems/src/main/java/org/jeecg/modules/dataElectricity/service/impl/DataElectricityServiceImpl.java

@@ -4,6 +4,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.dataElectricity.entity.DataElectricity;
+import org.jeecg.modules.dataElectricity.entity.DataElectricityCrtVo;
 import org.jeecg.modules.dataElectricity.entity.DataElectricitySta;
 import org.jeecg.modules.dataElectricity.mapper.DataElectricityMapper;
 import org.jeecg.modules.dataElectricity.service.IDataElectricityService;
@@ -74,18 +75,18 @@ public class DataElectricityServiceImpl extends ServiceImpl<DataElectricityMappe
     /**
      * 用电集抄
      *
-     * @param emsElectricity 分时电量
+     * @param dataElectricityCrtVo 分时电量
      * @return 分时电量
      */
     @Override
-    public List<DataElectricitySta> selectEmsElecSta(DataElectricity emsElectricity)
+    public List<DataElectricitySta> selectEmsElecSta(DataElectricityCrtVo dataElectricityCrtVo)
     {
-        List<DataElectricity> tempList = dataElectricityMapper.selectEmsElecSta(emsElectricity);
+        List<DataElectricityCrtVo> tempList = dataElectricityMapper.selectEmsElecSta(dataElectricityCrtVo);
         List<DataElectricitySta> elecList = new ArrayList<>();
 
         // 将信息转换一下
         if (tempList != null && tempList.size() > 0) {
-            for (DataElectricity elec : tempList) {
+            for (DataElectricityCrtVo elec : tempList) {
                 if (elec == null) {
                     continue;
                 }
@@ -109,11 +110,11 @@ public class DataElectricityServiceImpl extends ServiceImpl<DataElectricityMappe
      * 导出用电集抄
      */
     @Override
-    public ModelAndView exportsta(HttpServletRequest request, Class<DataElectricitySta> clazz, String title, DataElectricity dataElectricity) {
+    public ModelAndView exportsta(HttpServletRequest request, Class<DataElectricitySta> clazz, String title, DataElectricityCrtVo dataElectricityCrtVo) {
 //        System.out.println("进入服务层");
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //1.根据传送的时间找出用电集抄记录
-        List<DataElectricitySta> dataElectricityStaList = selectEmsElecSta(dataElectricity);
+        List<DataElectricitySta> dataElectricityStaList = selectEmsElecSta(dataElectricityCrtVo);
         System.out.println(dataElectricityStaList);
 
         // 2. AutoPoi 导出Excel

module_ems/src/main/java/org/jeecg/modules/emsStatistics/mapper/xml/EmsStatisticsMapper.xml

@@ -76,26 +76,13 @@
         from ems_data_electricity_day as e,base_energy_type as y
         where e.year=#{year} and e.month=#{month} and e.equipmentid in (301156947525633) and y.name='电'
         union
-        select 290016857227265 as energyitemid,'其它用电' as type,
-               round((
-                             (
-                                 select ifnull(sum(electricityvalue),0)
-                                 from ems_data_electricity_day
-                                 where equipmentid in (301156882513921) and year=#{year} and month=#{month}
-                             ) -
-                             (
-                                 select ifnull(sum(electricityvalue),0)
-                                 from ems_data_electricity_day
-                                 where equipmentid in (301156930748417,301156962205697) and year=#{year} and month=#{month}
-                             ) -
-                             (
-                                 select ifnull(sum(electricityvalue),0)
-                                 from ems_data_electricity_day
-                                 where equipmentid in (301156947525633) and year=#{year} and month=#{month}
-                             )
-                         )*y.kgce,3) as howManyValue
-        from base_energy_type as y
-        where y.name='电'
+        select 290016838352897 as energyitemid,'照明用电' as type,round(ifnull(sum(e.electricityvalue),0)*y.kgce,3) as howManyValue
+        from ems_data_electricity_day as e,base_energy_type as y
+        where e.year=#{year} and e.month=#{month} and e.equipmentid in (301154594521089) and y.name='电'
+        union
+        select 290016857227265 as energyitemid,'其它用电' as type,round(ifnull(sum(e.electricityvalue),0)*y.kgce,3) as howManyValue
+        from ems_data_electricity_day as e,base_energy_type as y
+        where e.year=#{year} and e.month=#{month} and e.equipmentid in (300984435802113) and y.name='电'
     </select>
     <select id="selectKgceMonth" resultType="org.jeecg.modules.emsStatistics.entity.EmsStatistics">
         select t.energyitemid,i.energyitemname as type,round(ifnull(sum(e.electricityvalue),0)*y.kgce,3) as howManyValue

module_tpm/src/main/java/org/jeecg/modules/equipmentStatus/mapper/xml/EquipmentStatusMapper.xml

@@ -32,7 +32,7 @@
     </resultMap>
 
     <select id="getEquipmentElectricity" resultMap="EquipmentStatusResult">
-        select s.equipmentid,s.status, e.equipmentcode, d.tagvalue2 as tagvalue,
+        select s.equipmentid,s.status, e.equipmentcode, d.electricityvalue as tagvalue,
             s.tagvaluep, s.tagvalueca, s.tagvalueva, s.tagvaluecb, s.tagvaluevb, s.tagvaluecc, s.tagvaluevc
         from tpm_equipment_status as s
         left join tpm_equipment as e
@@ -47,4 +47,4 @@
         where equipmentid = #{equipmentid}
     </select>
 
-</mapper>
+</mapper>