汇报环境改造

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsElecStoreHController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsElecStoreHController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,8 +14,8 @@ 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.AdmEmsElecStoreH;
-import com.ruoyi.ems.service.IAdmEmsElecStoreHService;
+import com.ruoyi.ems.domain.EmsElecStoreH;
+import com.ruoyi.ems.service.IEmsElecStoreHService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -29,21 +28,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  * @date 2024-08-09
  */
 @RestController
-@RequestMapping("/elecStoreH")
-public class AdmEmsElecStoreHController extends BaseController
+@RequestMapping("/elec/store/hour")
+public class EmsElecStoreHController extends BaseController
 {
     @Autowired
-    private IAdmEmsElecStoreHService admEmsElecStoreHService;
+    private IEmsElecStoreHService admEmsElecStoreHService;
 
     /**
      * 查询储能计量-小时列表
      */
     @RequiresPermissions("power-mgr:gs:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsElecStoreH admEmsElecStoreH)
+    public TableDataInfo list(EmsElecStoreH admEmsElecStoreH)
     {
         startPage();
-        List<AdmEmsElecStoreH> list = admEmsElecStoreHService.selectAdmEmsElecStoreHList(admEmsElecStoreH);
+        List<EmsElecStoreH> list = admEmsElecStoreHService.selectEmsElecStoreHList(admEmsElecStoreH);
         return getDataTable(list);
     }
 
@@ -53,10 +52,10 @@ public class AdmEmsElecStoreHController extends BaseController
     @RequiresPermissions("power-mgr:gs:export")
     @Log(title = "储能计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsElecStoreH admEmsElecStoreH)
+    public void export(HttpServletResponse response, EmsElecStoreH admEmsElecStoreH)
     {
-        List<AdmEmsElecStoreH> list = admEmsElecStoreHService.selectAdmEmsElecStoreHList(admEmsElecStoreH);
-        ExcelUtil<AdmEmsElecStoreH> util = new ExcelUtil<AdmEmsElecStoreH>(AdmEmsElecStoreH.class);
+        List<EmsElecStoreH> list = admEmsElecStoreHService.selectEmsElecStoreHList(admEmsElecStoreH);
+        ExcelUtil<EmsElecStoreH> util = new ExcelUtil<EmsElecStoreH>(EmsElecStoreH.class);
         util.exportExcel(response, list, "储能计量-小时数据");
     }
 
@@ -67,7 +66,7 @@ public class AdmEmsElecStoreHController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsElecStoreHService.selectAdmEmsElecStoreHById(id));
+        return success(admEmsElecStoreHService.selectEmsElecStoreHById(id));
     }
 
     /**
@@ -76,9 +75,9 @@ public class AdmEmsElecStoreHController extends BaseController
     @RequiresPermissions("power-mgr:gs:add")
     @Log(title = "储能计量-小时", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsElecStoreH admEmsElecStoreH)
+    public AjaxResult add(@RequestBody EmsElecStoreH admEmsElecStoreH)
     {
-        return toAjax(admEmsElecStoreHService.insertAdmEmsElecStoreH(admEmsElecStoreH));
+        return toAjax(admEmsElecStoreHService.insertEmsElecStoreH(admEmsElecStoreH));
     }
 
     /**
@@ -87,9 +86,9 @@ public class AdmEmsElecStoreHController extends BaseController
     @RequiresPermissions("power-mgr:gs:edit")
     @Log(title = "储能计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsElecStoreH admEmsElecStoreH)
+    public AjaxResult edit(@RequestBody EmsElecStoreH admEmsElecStoreH)
     {
-        return toAjax(admEmsElecStoreHService.updateAdmEmsElecStoreH(admEmsElecStoreH));
+        return toAjax(admEmsElecStoreHService.updateEmsElecStoreH(admEmsElecStoreH));
     }
 
     /**
@@ -100,6 +99,6 @@ public class AdmEmsElecStoreHController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsElecStoreHService.deleteAdmEmsElecStoreHByIds(ids));
+        return toAjax(admEmsElecStoreHService.deleteEmsElecStoreHByIds(ids));
     }
 }

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

@@ -0,0 +1,105 @@
+package com.ruoyi.ems.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+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.EmsFacsUseH;
+import com.ruoyi.ems.service.IEmsFacsUseHService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 用能计量-小时Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-15
+ */
+@RestController
+@RequestMapping("/elec/use/hour")
+public class EmsFacsUseHController extends BaseController
+{
+    @Autowired
+    private IEmsFacsUseHService emsFacsUseHService;
+
+    /**
+     * 查询用能计量-小时列表
+     */
+    @RequiresPermissions("ems:h:list")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsFacsUseH admEmsFacsUseH)
+    {
+        startPage();
+        List<EmsFacsUseH> list = emsFacsUseHService.selectEmsFacsUseHList(admEmsFacsUseH);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用能计量-小时列表
+     */
+    @RequiresPermissions("ems:h:export")
+    @Log(title = "用能计量-小时", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsFacsUseH admEmsFacsUseH)
+    {
+        List<EmsFacsUseH> list = emsFacsUseHService.selectEmsFacsUseHList(admEmsFacsUseH);
+        ExcelUtil<EmsFacsUseH> util = new ExcelUtil<EmsFacsUseH>(EmsFacsUseH.class);
+        util.exportExcel(response, list, "用能计量-小时数据");
+    }
+
+    /**
+     * 获取用能计量-小时详细信息
+     */
+    @RequiresPermissions("ems:h:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(emsFacsUseHService.selectEmsFacsUseHById(id));
+    }
+
+    /**
+     * 新增用能计量-小时
+     */
+    @RequiresPermissions("ems:h:add")
+    @Log(title = "用能计量-小时", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsFacsUseH admEmsFacsUseH)
+    {
+        return toAjax(emsFacsUseHService.insertEmsFacsUseH(admEmsFacsUseH));
+    }
+
+    /**
+     * 修改用能计量-小时
+     */
+    @RequiresPermissions("ems:h:edit")
+    @Log(title = "用能计量-小时", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsFacsUseH admEmsFacsUseH)
+    {
+        return toAjax(emsFacsUseHService.updateEmsFacsUseH(admEmsFacsUseH));
+    }
+
+    /**
+     * 删除用能计量-小时
+     */
+    @RequiresPermissions("ems:h:remove")
+    @Log(title = "用能计量-小时", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emsFacsUseHService.deleteEmsFacsUseHByIds(ids));
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsPgSupplyHController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/EmsPgSupplyHController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.ems.controller;
 
 import java.util.List;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,8 +14,8 @@ 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.AdmEmsPgSupplyH;
-import com.ruoyi.ems.service.IAdmEmsPgSupplyHService;
+import com.ruoyi.ems.domain.EmsPgSupplyH;
+import com.ruoyi.ems.service.IEmsPgSupplyHService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -29,21 +28,21 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
  * @date 2024-08-09
  */
 @RestController
-@RequestMapping("/pgSupplyH")
-public class AdmEmsPgSupplyHController extends BaseController
+@RequestMapping("/pg/supply/hour")
+public class EmsPgSupplyHController extends BaseController
 {
     @Autowired
-    private IAdmEmsPgSupplyHService admEmsPgSupplyHService;
+    private IEmsPgSupplyHService emsPgSupplyHService;
 
     /**
      * 查询电网供应计量-小时列表
      */
     @RequiresPermissions("power-mgr:pg:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmEmsPgSupplyH admEmsPgSupplyH)
+    public TableDataInfo list(EmsPgSupplyH admEmsPgSupplyH)
     {
         startPage();
-        List<AdmEmsPgSupplyH> list = admEmsPgSupplyHService.selectAdmEmsPgSupplyHList(admEmsPgSupplyH);
+        List<EmsPgSupplyH> list = emsPgSupplyHService.selectEmsPgSupplyHList(admEmsPgSupplyH);
         return getDataTable(list);
     }
 
@@ -53,10 +52,10 @@ public class AdmEmsPgSupplyHController extends BaseController
     @RequiresPermissions("power-mgr:pg:export")
     @Log(title = "电网供应计量-小时", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsPgSupplyH admEmsPgSupplyH)
+    public void export(HttpServletResponse response, EmsPgSupplyH admEmsPgSupplyH)
     {
-        List<AdmEmsPgSupplyH> list = admEmsPgSupplyHService.selectAdmEmsPgSupplyHList(admEmsPgSupplyH);
-        ExcelUtil<AdmEmsPgSupplyH> util = new ExcelUtil<AdmEmsPgSupplyH>(AdmEmsPgSupplyH.class);
+        List<EmsPgSupplyH> list = emsPgSupplyHService.selectEmsPgSupplyHList(admEmsPgSupplyH);
+        ExcelUtil<EmsPgSupplyH> util = new ExcelUtil<EmsPgSupplyH>(EmsPgSupplyH.class);
         util.exportExcel(response, list, "电网供应计量-小时数据");
     }
 
@@ -67,7 +66,7 @@ public class AdmEmsPgSupplyHController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(admEmsPgSupplyHService.selectAdmEmsPgSupplyHById(id));
+        return success(emsPgSupplyHService.selectEmsPgSupplyHById(id));
     }
 
     /**
@@ -76,9 +75,9 @@ public class AdmEmsPgSupplyHController extends BaseController
     @RequiresPermissions("power-mgr:pg:add")
     @Log(title = "电网供应计量-小时", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsPgSupplyH admEmsPgSupplyH)
+    public AjaxResult add(@RequestBody EmsPgSupplyH admEmsPgSupplyH)
     {
-        return toAjax(admEmsPgSupplyHService.insertAdmEmsPgSupplyH(admEmsPgSupplyH));
+        return toAjax(emsPgSupplyHService.insertEmsPgSupplyH(admEmsPgSupplyH));
     }
 
     /**
@@ -87,9 +86,9 @@ public class AdmEmsPgSupplyHController extends BaseController
     @RequiresPermissions("power-mgr:pg:edit")
     @Log(title = "电网供应计量-小时", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsPgSupplyH admEmsPgSupplyH)
+    public AjaxResult edit(@RequestBody EmsPgSupplyH admEmsPgSupplyH)
     {
-        return toAjax(admEmsPgSupplyHService.updateAdmEmsPgSupplyH(admEmsPgSupplyH));
+        return toAjax(emsPgSupplyHService.updateEmsPgSupplyH(admEmsPgSupplyH));
     }
 
     /**
@@ -100,6 +99,6 @@ public class AdmEmsPgSupplyHController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(admEmsPgSupplyHService.deleteAdmEmsPgSupplyHByIds(ids));
+        return toAjax(emsPgSupplyHService.deleteEmsPgSupplyHByIds(ids));
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsPvSupplyH.java

@@ -1,5 +1,6 @@
 package com.ruoyi.ems.domain;
 
+import java.sql.Time;
 import java.util.Date;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -45,9 +46,9 @@ public class AdmEmsPvSupplyH extends BaseEntity {
     /**
      * 时间 HH:mm:ss
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间 HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date time;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "时间 HH:mm:ss", width = 30, dateFormat = "HH:mm:ss")
+    private Time time;
 
     /**
      * 时间序列
@@ -117,11 +118,11 @@ public class AdmEmsPvSupplyH extends BaseEntity {
         this.date = date;
     }
 
-    public Date getTime() {
+    public Time getTime() {
         return time;
     }
 
-    public void setTime(Date time) {
+    public void setTime(Time time) {
         this.time = time;
     }
 

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsElecStoreH.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsElecStoreH.java

@@ -1,5 +1,6 @@
 package com.ruoyi.ems.domain;
 
+import java.sql.Time;
 import java.util.Date;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -15,7 +16,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-09
  */
-public class AdmEmsElecStoreH extends BaseEntity {
+public class EmsElecStoreH extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -26,12 +27,13 @@ public class AdmEmsElecStoreH extends BaseEntity {
     /**
      * 园区代码
      */
-    @Excel(name = "园区代码")
     private String areaCode;
 
     @Excel(name = "园区名称")
     private String areaName;
 
+    private String areaShortName;
+
     /**
      * 设施代码
      */
@@ -50,9 +52,9 @@ public class AdmEmsElecStoreH extends BaseEntity {
     /**
      * 时间 HH:mm:ss
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间 HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date time;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "时间 HH:mm:ss", width = 30, dateFormat = "HH:mm:ss")
+    private Time time;
 
     /**
      * 时间序列
@@ -71,84 +73,92 @@ public class AdmEmsElecStoreH extends BaseEntity {
     @Excel(name = "放电电量")
     private Double dischargeElecQuantity;
 
+    public Long getId() {
+        return id;
+    }
+
     public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() {
-        return id;
+    public String getAreaCode() {
+        return areaCode;
     }
 
     public void setAreaCode(String areaCode) {
         this.areaCode = areaCode;
     }
 
-    public String getAreaCode() {
-        return areaCode;
+    public String getAreaName() {
+        return areaName;
     }
 
-    public void setFacsCode(String facsCode) {
-        this.facsCode = facsCode;
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getAreaShortName() {
+        return areaShortName;
+    }
+
+    public void setAreaShortName(String areaShortName) {
+        this.areaShortName = areaShortName;
     }
 
     public String getFacsCode() {
         return facsCode;
     }
 
-    public void setDate(Date date) {
-        this.date = date;
+    public void setFacsCode(String facsCode) {
+        this.facsCode = facsCode;
+    }
+
+    public String getFacsName() {
+        return facsName;
+    }
+
+    public void setFacsName(String facsName) {
+        this.facsName = facsName;
     }
 
     public Date getDate() {
         return date;
     }
 
-    public void setTime(Date time) {
-        this.time = time;
+    public void setDate(Date date) {
+        this.date = date;
     }
 
-    public Date getTime() {
+    public Time getTime() {
         return time;
     }
 
-    public void setTimeIndex(Integer timeIndex) {
-        this.timeIndex = timeIndex;
+    public void setTime(Time time) {
+        this.time = time;
     }
 
     public Integer getTimeIndex() {
         return timeIndex;
     }
 
-    public void setChargeElecQuantity(Double chargeElecQuantity) {
-        this.chargeElecQuantity = chargeElecQuantity;
+    public void setTimeIndex(Integer timeIndex) {
+        this.timeIndex = timeIndex;
     }
 
     public Double getChargeElecQuantity() {
         return chargeElecQuantity;
     }
 
-    public void setDischargeElecQuantity(Double dischargeElecQuantity) {
-        this.dischargeElecQuantity = dischargeElecQuantity;
+    public void setChargeElecQuantity(Double chargeElecQuantity) {
+        this.chargeElecQuantity = chargeElecQuantity;
     }
 
     public Double getDischargeElecQuantity() {
         return dischargeElecQuantity;
     }
 
-    public String getAreaName() {
-        return areaName;
-    }
-
-    public void setAreaName(String areaName) {
-        this.areaName = areaName;
-    }
-
-    public String getFacsName() {
-        return facsName;
-    }
-
-    public void setFacsName(String facsName) {
-        this.facsName = facsName;
+    public void setDischargeElecQuantity(Double dischargeElecQuantity) {
+        this.dischargeElecQuantity = dischargeElecQuantity;
     }
 
     @Override

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsFacsUseH.java

@@ -0,0 +1,200 @@
+package com.ruoyi.ems.domain;
+
+import java.sql.Time;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 用能计量-小时对象 adm_ems_facs_use_h
+ * 
+ * @author ruoyi
+ * @date 2024-08-15
+ */
+public class EmsFacsUseH extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 园区代码 */
+    private String areaCode;
+
+    @Excel(name = "服务区")
+    private String areaName;
+
+    private String areaShortName;
+
+    /** 设施代码 */
+    private String facsCode;
+
+    @Excel(name = "设施代码")
+    private String facsName;
+
+    /** 设施类型 */
+    @Excel(name = "设施类型")
+    private String facsType;
+
+    /** 设施子类 */
+    @Excel(name = "设施子类")
+    private String facsSubtype;
+
+    /** 日期 yyyy-MM-dd */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "日期 yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date date;
+
+    /** 时间 HH:mm:ss */
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "时间 HH:mm:ss", width = 30, dateFormat = "HH:mm:ss")
+    private Time time;
+
+    /** 时间序列 */
+    @Excel(name = "时间序列")
+    private Long timeIndex;
+
+    /** 电表读数 */
+    @Excel(name = "电表读数")
+    private Long elecReading;
+
+    /** 用电量 单位：kW-h（千瓦时） */
+    @Excel(name = "用电量 单位：kW-h", readConverterExp = "千=瓦时")
+    private Long elecQuantity;
+
+    /** 电费 单位: ￥（元） */
+    @Excel(name = "电费 单位: ￥", readConverterExp = "元=")
+    private Long elecCost;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getAreaShortName() {
+        return areaShortName;
+    }
+
+    public void setAreaShortName(String areaShortName) {
+        this.areaShortName = areaShortName;
+    }
+
+    public String getFacsCode() {
+        return facsCode;
+    }
+
+    public void setFacsCode(String facsCode) {
+        this.facsCode = facsCode;
+    }
+
+    public String getFacsName() {
+        return facsName;
+    }
+
+    public void setFacsName(String facsName) {
+        this.facsName = facsName;
+    }
+
+    public String getFacsType() {
+        return facsType;
+    }
+
+    public void setFacsType(String facsType) {
+        this.facsType = facsType;
+    }
+
+    public String getFacsSubtype() {
+        return facsSubtype;
+    }
+
+    public void setFacsSubtype(String facsSubtype) {
+        this.facsSubtype = facsSubtype;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Time getTime() {
+        return time;
+    }
+
+    public void setTime(Time time) {
+        this.time = time;
+    }
+
+    public Long getTimeIndex() {
+        return timeIndex;
+    }
+
+    public void setTimeIndex(Long timeIndex) {
+        this.timeIndex = timeIndex;
+    }
+
+    public Long getElecReading() {
+        return elecReading;
+    }
+
+    public void setElecReading(Long elecReading) {
+        this.elecReading = elecReading;
+    }
+
+    public Long getElecQuantity() {
+        return elecQuantity;
+    }
+
+    public void setElecQuantity(Long elecQuantity) {
+        this.elecQuantity = elecQuantity;
+    }
+
+    public Long getElecCost() {
+        return elecCost;
+    }
+
+    public void setElecCost(Long elecCost) {
+        this.elecCost = elecCost;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("areaCode", getAreaCode())
+            .append("facsCode", getFacsCode())
+            .append("facsType", getFacsType())
+            .append("facsSubtype", getFacsSubtype())
+            .append("date", getDate())
+            .append("time", getTime())
+            .append("timeIndex", getTimeIndex())
+            .append("elecReading", getElecReading())
+            .append("elecQuantity", getElecQuantity())
+            .append("elecCost", getElecCost())
+            .toString();
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsPgSupplyH.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/EmsPgSupplyH.java

@@ -1,5 +1,6 @@
 package com.ruoyi.ems.domain;
 
+import java.sql.Time;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -13,7 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-09
  */
-public class AdmEmsPgSupplyH extends BaseEntity
+public class EmsPgSupplyH extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -24,19 +25,29 @@ public class AdmEmsPgSupplyH extends BaseEntity
     @Excel(name = "园区代码")
     private String areaCode;
 
+    /** 园区名称 */
+    @Excel(name = "服务区")
+    private String areaName;
+
+    /** 园区简称 */
+    private String areaShortName;
+
     /** 设施代码 */
-    @Excel(name = "设施代码")
+
     private String facsCode;
 
+    @Excel(name = "设施")
+    private String facsName;
+
     /** 日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date date;
 
     /** 时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date time;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "时间", width = 30, dateFormat = "HH:mm:ss")
+    private Time time;
 
     /** 时间序列 */
     @Excel(name = "时间序列")
@@ -74,133 +85,142 @@ public class AdmEmsPgSupplyH extends BaseEntity
     @Excel(name = "上网收益", readConverterExp = "元=")
     private Double upElecEarn;
 
-    public void setId(Long id)
-    {
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
-        return id;
+    public String getAreaCode() {
+        return areaCode;
     }
-    public void setAreaCode(String areaCode)
-    {
+
+    public void setAreaCode(String areaCode) {
         this.areaCode = areaCode;
     }
 
-    public String getAreaCode()
-    {
-        return areaCode;
+    public String getAreaName() {
+        return areaName;
     }
-    public void setFacsCode(String facsCode)
-    {
-        this.facsCode = facsCode;
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
     }
 
-    public String getFacsCode()
-    {
+    public String getAreaShortName() {
+        return areaShortName;
+    }
+
+    public void setAreaShortName(String areaShortName) {
+        this.areaShortName = areaShortName;
+    }
+
+    public String getFacsCode() {
         return facsCode;
     }
-    public void setDate(Date date)
-    {
-        this.date = date;
+
+    public void setFacsCode(String facsCode) {
+        this.facsCode = facsCode;
+    }
+
+    public String getFacsName() {
+        return facsName;
+    }
+
+    public void setFacsName(String facsName) {
+        this.facsName = facsName;
     }
 
-    public Date getDate()
-    {
+    public Date getDate() {
         return date;
     }
-    public void setTime(Date time)
-    {
-        this.time = time;
+
+    public void setDate(Date date) {
+        this.date = date;
     }
 
-    public Date getTime()
-    {
+    public Time getTime() {
         return time;
     }
-    public void setTimeIndex(Integer timeIndex)
-    {
-        this.timeIndex = timeIndex;
+
+    public void setTime(Time time) {
+        this.time = time;
     }
 
-    public Integer getTimeIndex()
-    {
+    public Integer getTimeIndex() {
         return timeIndex;
     }
-    public void setMeterType(Integer meterType)
-    {
-        this.meterType = meterType;
+
+    public void setTimeIndex(Integer timeIndex) {
+        this.timeIndex = timeIndex;
     }
 
-    public Integer getMeterType()
-    {
+    public Integer getMeterType() {
         return meterType;
     }
-    public void setMeterUnitPrice(Double meterUnitPrice)
-    {
-        this.meterUnitPrice = meterUnitPrice;
+
+    public void setMeterType(Integer meterType) {
+        this.meterType = meterType;
     }
 
-    public Double getMeterUnitPrice()
-    {
+    public Double getMeterUnitPrice() {
         return meterUnitPrice;
     }
-    public void setUseElecReading(Double useElecReading)
-    {
-        this.useElecReading = useElecReading;
+
+    public void setMeterUnitPrice(Double meterUnitPrice) {
+        this.meterUnitPrice = meterUnitPrice;
     }
 
-    public Double getUseElecReading()
-    {
+    public Double getUseElecReading() {
         return useElecReading;
     }
-    public void setUseElecQuantity(Double useElecQuantity)
-    {
-        this.useElecQuantity = useElecQuantity;
+
+    public void setUseElecReading(Double useElecReading) {
+        this.useElecReading = useElecReading;
     }
 
-    public Double getUseElecQuantity()
-    {
+    public Double getUseElecQuantity() {
         return useElecQuantity;
     }
-    public void setUseElecCost(Double useElecCost)
-    {
-        this.useElecCost = useElecCost;
+
+    public void setUseElecQuantity(Double useElecQuantity) {
+        this.useElecQuantity = useElecQuantity;
     }
 
-    public Double getUseElecCost()
-    {
+    public Double getUseElecCost() {
         return useElecCost;
     }
-    public void setUpElecReading(Double upElecReading)
-    {
-        this.upElecReading = upElecReading;
+
+    public void setUseElecCost(Double useElecCost) {
+        this.useElecCost = useElecCost;
     }
 
-    public Double getUpElecReading()
-    {
+    public Double getUpElecReading() {
         return upElecReading;
     }
-    public void setUpElecQuantity(Double upElecQuantity)
-    {
-        this.upElecQuantity = upElecQuantity;
+
+    public void setUpElecReading(Double upElecReading) {
+        this.upElecReading = upElecReading;
     }
 
-    public Double getUpElecQuantity()
-    {
+    public Double getUpElecQuantity() {
         return upElecQuantity;
     }
-    public void setUpElecEarn(Double upElecEarn)
-    {
-        this.upElecEarn = upElecEarn;
+
+    public void setUpElecQuantity(Double upElecQuantity) {
+        this.upElecQuantity = upElecQuantity;
     }
 
-    public Double getUpElecEarn()
-    {
+    public Double getUpElecEarn() {
         return upElecEarn;
     }
 
+    public void setUpElecEarn(Double upElecEarn) {
+        this.upElecEarn = upElecEarn;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsElecStoreHMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsElecStoreHMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecStoreH;
+import com.ruoyi.ems.domain.EmsElecStoreH;
 
 /**
  * 储能计量-小时Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsElecStoreH;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface AdmEmsElecStoreHMapper 
+public interface EmsElecStoreHMapper
 {
     /**
      * 查询储能计量-小时
@@ -17,7 +17,7 @@ public interface AdmEmsElecStoreHMapper
      * @param id 储能计量-小时主键
      * @return 储能计量-小时
      */
-    public AdmEmsElecStoreH selectAdmEmsElecStoreHById(Long id);
+     EmsElecStoreH selectEmsElecStoreHById(Long id);
 
     /**
      * 查询储能计量-小时列表
@@ -25,7 +25,7 @@ public interface AdmEmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 储能计量-小时集合
      */
-    public List<AdmEmsElecStoreH> selectAdmEmsElecStoreHList(AdmEmsElecStoreH admEmsElecStoreH);
+     List<EmsElecStoreH> selectEmsElecStoreHList(EmsElecStoreH admEmsElecStoreH);
 
     /**
      * 新增储能计量-小时
@@ -33,7 +33,7 @@ public interface AdmEmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-    public int insertAdmEmsElecStoreH(AdmEmsElecStoreH admEmsElecStoreH);
+     int insertEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
 
     /**
      * 修改储能计量-小时
@@ -41,7 +41,7 @@ public interface AdmEmsElecStoreHMapper
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-    public int updateAdmEmsElecStoreH(AdmEmsElecStoreH admEmsElecStoreH);
+     int updateEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
 
     /**
      * 删除储能计量-小时
@@ -49,7 +49,7 @@ public interface AdmEmsElecStoreHMapper
      * @param id 储能计量-小时主键
      * @return 结果
      */
-    public int deleteAdmEmsElecStoreHById(Long id);
+     int deleteEmsElecStoreHById(Long id);
 
     /**
      * 批量删除储能计量-小时
@@ -57,5 +57,5 @@ public interface AdmEmsElecStoreHMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsElecStoreHByIds(Long[] ids);
+     int deleteEmsElecStoreHByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsFacsUseHMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.ems.mapper;
+
+import com.ruoyi.ems.domain.EmsFacsUseH;
+
+import java.util.List;
+
+/**
+ * 用能计量-小时Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-15
+ */
+public interface EmsFacsUseHMapper
+{
+    /**
+     * 查询用能计量-小时
+     * 
+     * @param id 用能计量-小时主键
+     * @return 用能计量-小时
+     */
+     EmsFacsUseH selectEmsFacsUseHById(Long id);
+
+    /**
+     * 查询用能计量-小时列表
+     * 
+     * @param admEmsFacsUseH 用能计量-小时
+     * @return 用能计量-小时集合
+     */
+     List<EmsFacsUseH> selectEmsFacsUseHList(EmsFacsUseH admEmsFacsUseH);
+
+    /**
+     * 新增用能计量-小时
+     * 
+     * @param admEmsFacsUseH 用能计量-小时
+     * @return 结果
+     */
+     int insertEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+
+    /**
+     * 修改用能计量-小时
+     * 
+     * @param admEmsFacsUseH 用能计量-小时
+     * @return 结果
+     */
+     int updateEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+
+    /**
+     * 删除用能计量-小时
+     * 
+     * @param id 用能计量-小时主键
+     * @return 结果
+     */
+     int deleteEmsFacsUseHById(Long id);
+
+    /**
+     * 批量删除用能计量-小时
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteEmsFacsUseHByIds(Long[] ids);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsPgSupplyHMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/EmsPgSupplyHMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.mapper;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsPgSupplyH;
+import com.ruoyi.ems.domain.EmsPgSupplyH;
 
 /**
  * 电网供应计量-小时Mapper接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsPgSupplyH;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface AdmEmsPgSupplyHMapper 
+public interface EmsPgSupplyHMapper
 {
     /**
      * 查询电网供应计量-小时
@@ -17,7 +17,7 @@ public interface AdmEmsPgSupplyHMapper
      * @param id 电网供应计量-小时主键
      * @return 电网供应计量-小时
      */
-    public AdmEmsPgSupplyH selectAdmEmsPgSupplyHById(Long id);
+     EmsPgSupplyH selectEmsPgSupplyHById(Long id);
 
     /**
      * 查询电网供应计量-小时列表
@@ -25,7 +25,7 @@ public interface AdmEmsPgSupplyHMapper
      * @param admEmsPgSupplyH 电网供应计量-小时
      * @return 电网供应计量-小时集合
      */
-    public List<AdmEmsPgSupplyH> selectAdmEmsPgSupplyHList(AdmEmsPgSupplyH admEmsPgSupplyH);
+     List<EmsPgSupplyH> selectEmsPgSupplyHList(EmsPgSupplyH admEmsPgSupplyH);
 
     /**
      * 新增电网供应计量-小时
@@ -33,7 +33,7 @@ public interface AdmEmsPgSupplyHMapper
      * @param admEmsPgSupplyH 电网供应计量-小时
      * @return 结果
      */
-    public int insertAdmEmsPgSupplyH(AdmEmsPgSupplyH admEmsPgSupplyH);
+     int insertEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
 
     /**
      * 修改电网供应计量-小时
@@ -41,7 +41,7 @@ public interface AdmEmsPgSupplyHMapper
      * @param admEmsPgSupplyH 电网供应计量-小时
      * @return 结果
      */
-    public int updateAdmEmsPgSupplyH(AdmEmsPgSupplyH admEmsPgSupplyH);
+     int updateEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
 
     /**
      * 删除电网供应计量-小时
@@ -49,7 +49,7 @@ public interface AdmEmsPgSupplyHMapper
      * @param id 电网供应计量-小时主键
      * @return 结果
      */
-    public int deleteAdmEmsPgSupplyHById(Long id);
+     int deleteEmsPgSupplyHById(Long id);
 
     /**
      * 批量删除电网供应计量-小时
@@ -57,5 +57,5 @@ public interface AdmEmsPgSupplyHMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteAdmEmsPgSupplyHByIds(Long[] ids);
+     int deleteEmsPgSupplyHByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsElecStoreHService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsElecStoreHService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsElecStoreH;
+import com.ruoyi.ems.domain.EmsElecStoreH;
 
 /**
  * 储能计量-小时Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsElecStoreH;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface IAdmEmsElecStoreHService 
+public interface IEmsElecStoreHService
 {
     /**
      * 查询储能计量-小时
@@ -17,7 +17,7 @@ public interface IAdmEmsElecStoreHService
      * @param id 储能计量-小时主键
      * @return 储能计量-小时
      */
-    public AdmEmsElecStoreH selectAdmEmsElecStoreHById(Long id);
+     EmsElecStoreH selectEmsElecStoreHById(Long id);
 
     /**
      * 查询储能计量-小时列表
@@ -25,7 +25,7 @@ public interface IAdmEmsElecStoreHService
      * @param admEmsElecStoreH 储能计量-小时
      * @return 储能计量-小时集合
      */
-    public List<AdmEmsElecStoreH> selectAdmEmsElecStoreHList(AdmEmsElecStoreH admEmsElecStoreH);
+     List<EmsElecStoreH> selectEmsElecStoreHList(EmsElecStoreH admEmsElecStoreH);
 
     /**
      * 新增储能计量-小时
@@ -33,7 +33,7 @@ public interface IAdmEmsElecStoreHService
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-    public int insertAdmEmsElecStoreH(AdmEmsElecStoreH admEmsElecStoreH);
+     int insertEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
 
     /**
      * 修改储能计量-小时
@@ -41,7 +41,7 @@ public interface IAdmEmsElecStoreHService
      * @param admEmsElecStoreH 储能计量-小时
      * @return 结果
      */
-    public int updateAdmEmsElecStoreH(AdmEmsElecStoreH admEmsElecStoreH);
+     int updateEmsElecStoreH(EmsElecStoreH admEmsElecStoreH);
 
     /**
      * 批量删除储能计量-小时
@@ -49,7 +49,7 @@ public interface IAdmEmsElecStoreHService
      * @param ids 需要删除的储能计量-小时主键集合
      * @return 结果
      */
-    public int deleteAdmEmsElecStoreHByIds(Long[] ids);
+     int deleteEmsElecStoreHByIds(Long[] ids);
 
     /**
      * 删除储能计量-小时信息
@@ -57,5 +57,5 @@ public interface IAdmEmsElecStoreHService
      * @param id 储能计量-小时主键
      * @return 结果
      */
-    public int deleteAdmEmsElecStoreHById(Long id);
+     int deleteEmsElecStoreHById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsFacsUseHService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.ems.service;
+
+import com.ruoyi.ems.domain.EmsFacsUseH;
+
+import java.util.List;
+
+/**
+ * 用能计量-小时Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-15
+ */
+public interface IEmsFacsUseHService
+{
+    /**
+     * 查询用能计量-小时
+     * 
+     * @param id 用能计量-小时主键
+     * @return 用能计量-小时
+     */
+     EmsFacsUseH selectEmsFacsUseHById(Long id);
+
+    /**
+     * 查询用能计量-小时列表
+     * 
+     * @param admEmsFacsUseH 用能计量-小时
+     * @return 用能计量-小时集合
+     */
+     List<EmsFacsUseH> selectEmsFacsUseHList(EmsFacsUseH admEmsFacsUseH);
+
+    /**
+     * 新增用能计量-小时
+     * 
+     * @param admEmsFacsUseH 用能计量-小时
+     * @return 结果
+     */
+     int insertEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+
+    /**
+     * 修改用能计量-小时
+     * 
+     * @param admEmsFacsUseH 用能计量-小时
+     * @return 结果
+     */
+     int updateEmsFacsUseH(EmsFacsUseH admEmsFacsUseH);
+
+    /**
+     * 批量删除用能计量-小时
+     * 
+     * @param ids 需要删除的用能计量-小时主键集合
+     * @return 结果
+     */
+     int deleteEmsFacsUseHByIds(Long[] ids);
+
+    /**
+     * 删除用能计量-小时信息
+     * 
+     * @param id 用能计量-小时主键
+     * @return 结果
+     */
+     int deleteEmsFacsUseHById(Long id);
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsPgSupplyHService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IEmsPgSupplyHService.java

@@ -1,7 +1,7 @@
 package com.ruoyi.ems.service;
 
 import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsPgSupplyH;
+import com.ruoyi.ems.domain.EmsPgSupplyH;
 
 /**
  * 电网供应计量-小时Service接口
@@ -9,7 +9,7 @@ import com.ruoyi.ems.domain.AdmEmsPgSupplyH;
  * @author ruoyi
  * @date 2024-08-09
  */
-public interface IAdmEmsPgSupplyHService 
+public interface IEmsPgSupplyHService
 {
     /**
      * 查询电网供应计量-小时
@@ -17,7 +17,7 @@ public interface IAdmEmsPgSupplyHService
      * @param id 电网供应计量-小时主键
      * @return 电网供应计量-小时
      */
-    public AdmEmsPgSupplyH selectAdmEmsPgSupplyHById(Long id);
+     EmsPgSupplyH selectEmsPgSupplyHById(Long id);
 
     /**
      * 查询电网供应计量-小时列表
@@ -25,7 +25,7 @@ public interface IAdmEmsPgSupplyHService
      * @param admEmsPgSupplyH 电网供应计量-小时
      * @return 电网供应计量-小时集合
      */
-    public List<AdmEmsPgSupplyH> selectAdmEmsPgSupplyHList(AdmEmsPgSupplyH admEmsPgSupplyH);
+     List<EmsPgSupplyH> selectEmsPgSupplyHList(EmsPgSupplyH admEmsPgSupplyH);
 
     /**
      * 新增电网供应计量-小时
@@ -33,7 +33,7 @@ public interface IAdmEmsPgSupplyHService
      * @param admEmsPgSupplyH 电网供应计量-小时
      * @return 结果
      */
-    public int insertAdmEmsPgSupplyH(AdmEmsPgSupplyH admEmsPgSupplyH);
+     int insertEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
 
     /**
      * 修改电网供应计量-小时
@@ -41,7 +41,7 @@ public interface IAdmEmsPgSupplyHService
      * @param admEmsPgSupplyH 电网供应计量-小时
      * @return 结果
      */
-    public int updateAdmEmsPgSupplyH(AdmEmsPgSupplyH admEmsPgSupplyH);
+     int updateEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH);
 
     /**
      * 批量删除电网供应计量-小时
@@ -49,7 +49,7 @@ public interface IAdmEmsPgSupplyHService
      * @param ids 需要删除的电网供应计量-小时主键集合
      * @return 结果
      */
-    public int deleteAdmEmsPgSupplyHByIds(Long[] ids);
+     int deleteEmsPgSupplyHByIds(Long[] ids);
 
     /**
      * 删除电网供应计量-小时信息
@@ -57,5 +57,5 @@ public interface IAdmEmsPgSupplyHService
      * @param id 电网供应计量-小时主键
      * @return 结果
      */
-    public int deleteAdmEmsPgSupplyHById(Long id);
+     int deleteEmsPgSupplyHById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsElecStoreHServiceImpl.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsElecStoreHServiceImpl.java

@@ -3,9 +3,9 @@ package com.ruoyi.ems.service.impl;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsElecStoreHMapper;
-import com.ruoyi.ems.domain.AdmEmsElecStoreH;
-import com.ruoyi.ems.service.IAdmEmsElecStoreHService;
+import com.ruoyi.ems.mapper.EmsElecStoreHMapper;
+import com.ruoyi.ems.domain.EmsElecStoreH;
+import com.ruoyi.ems.service.IEmsElecStoreHService;
 
 /**
  * 储能计量-小时Service业务层处理
@@ -14,10 +14,10 @@ import com.ruoyi.ems.service.IAdmEmsElecStoreHService;
  * @date 2024-08-09
  */
 @Service
-public class AdmEmsElecStoreHServiceImpl implements IAdmEmsElecStoreHService 
+public class EmsElecStoreHServiceImpl implements IEmsElecStoreHService
 {
     @Autowired
-    private AdmEmsElecStoreHMapper admEmsElecStoreHMapper;
+    private EmsElecStoreHMapper emsElecStoreHMapper;
 
     /**
      * 查询储能计量-小时
@@ -26,9 +26,9 @@ public class AdmEmsElecStoreHServiceImpl implements IAdmEmsElecStoreHService
      * @return 储能计量-小时
      */
     @Override
-    public AdmEmsElecStoreH selectAdmEmsElecStoreHById(Long id)
+    public EmsElecStoreH selectEmsElecStoreHById(Long id)
     {
-        return admEmsElecStoreHMapper.selectAdmEmsElecStoreHById(id);
+        return emsElecStoreHMapper.selectEmsElecStoreHById(id);
     }
 
     /**
@@ -38,9 +38,9 @@ public class AdmEmsElecStoreHServiceImpl implements IAdmEmsElecStoreHService
      * @return 储能计量-小时
      */
     @Override
-    public List<AdmEmsElecStoreH> selectAdmEmsElecStoreHList(AdmEmsElecStoreH admEmsElecStoreH)
+    public List<EmsElecStoreH> selectEmsElecStoreHList(EmsElecStoreH admEmsElecStoreH)
     {
-        return admEmsElecStoreHMapper.selectAdmEmsElecStoreHList(admEmsElecStoreH);
+        return emsElecStoreHMapper.selectEmsElecStoreHList(admEmsElecStoreH);
     }
 
     /**
@@ -50,9 +50,9 @@ public class AdmEmsElecStoreHServiceImpl implements IAdmEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int insertAdmEmsElecStoreH(AdmEmsElecStoreH admEmsElecStoreH)
+    public int insertEmsElecStoreH(EmsElecStoreH admEmsElecStoreH)
     {
-        return admEmsElecStoreHMapper.insertAdmEmsElecStoreH(admEmsElecStoreH);
+        return emsElecStoreHMapper.insertEmsElecStoreH(admEmsElecStoreH);
     }
 
     /**
@@ -62,9 +62,9 @@ public class AdmEmsElecStoreHServiceImpl implements IAdmEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int updateAdmEmsElecStoreH(AdmEmsElecStoreH admEmsElecStoreH)
+    public int updateEmsElecStoreH(EmsElecStoreH admEmsElecStoreH)
     {
-        return admEmsElecStoreHMapper.updateAdmEmsElecStoreH(admEmsElecStoreH);
+        return emsElecStoreHMapper.updateEmsElecStoreH(admEmsElecStoreH);
     }
 
     /**
@@ -74,9 +74,9 @@ public class AdmEmsElecStoreHServiceImpl implements IAdmEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int deleteAdmEmsElecStoreHByIds(Long[] ids)
+    public int deleteEmsElecStoreHByIds(Long[] ids)
     {
-        return admEmsElecStoreHMapper.deleteAdmEmsElecStoreHByIds(ids);
+        return emsElecStoreHMapper.deleteEmsElecStoreHByIds(ids);
     }
 
     /**
@@ -86,8 +86,8 @@ public class AdmEmsElecStoreHServiceImpl implements IAdmEmsElecStoreHService
      * @return 结果
      */
     @Override
-    public int deleteAdmEmsElecStoreHById(Long id)
+    public int deleteEmsElecStoreHById(Long id)
     {
-        return admEmsElecStoreHMapper.deleteAdmEmsElecStoreHById(id);
+        return emsElecStoreHMapper.deleteEmsElecStoreHById(id);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsFacsUseHServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.ems.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.ems.domain.EmsFacsUseH;
+import com.ruoyi.ems.mapper.EmsFacsUseHMapper;
+import com.ruoyi.ems.service.IEmsFacsUseHService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用能计量-小时Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-15
+ */
+@Service
+public class EmsFacsUseHServiceImpl implements IEmsFacsUseHService
+{
+    @Autowired
+    private EmsFacsUseHMapper emsFacsUseHMapper;
+
+    /**
+     * 查询用能计量-小时
+     * 
+     * @param id 用能计量-小时主键
+     * @return 用能计量-小时
+     */
+    @Override
+    public EmsFacsUseH selectEmsFacsUseHById(Long id)
+    {
+        return emsFacsUseHMapper.selectEmsFacsUseHById(id);
+    }
+
+    /**
+     * 查询用能计量-小时列表
+     * 
+     * @param EmsFacsUseH 用能计量-小时
+     * @return 用能计量-小时
+     */
+    @Override
+    public List<EmsFacsUseH> selectEmsFacsUseHList(EmsFacsUseH EmsFacsUseH)
+    {
+        return emsFacsUseHMapper.selectEmsFacsUseHList(EmsFacsUseH);
+    }
+
+    /**
+     * 新增用能计量-小时
+     * 
+     * @param EmsFacsUseH 用能计量-小时
+     * @return 结果
+     */
+    @Override
+    public int insertEmsFacsUseH(EmsFacsUseH EmsFacsUseH)
+    {
+        return emsFacsUseHMapper.insertEmsFacsUseH(EmsFacsUseH);
+    }
+
+    /**
+     * 修改用能计量-小时
+     * 
+     * @param EmsFacsUseH 用能计量-小时
+     * @return 结果
+     */
+    @Override
+    public int updateEmsFacsUseH(EmsFacsUseH EmsFacsUseH)
+    {
+        return emsFacsUseHMapper.updateEmsFacsUseH(EmsFacsUseH);
+    }
+
+    /**
+     * 批量删除用能计量-小时
+     * 
+     * @param ids 需要删除的用能计量-小时主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsFacsUseHByIds(Long[] ids)
+    {
+        return emsFacsUseHMapper.deleteEmsFacsUseHByIds(ids);
+    }
+
+    /**
+     * 删除用能计量-小时信息
+     * 
+     * @param id 用能计量-小时主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsFacsUseHById(Long id)
+    {
+        return emsFacsUseHMapper.deleteEmsFacsUseHById(id);
+    }
+}

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsPgSupplyHServiceImpl.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/EmsPgSupplyHServiceImpl.java

@@ -3,9 +3,9 @@ package com.ruoyi.ems.service.impl;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsPgSupplyHMapper;
-import com.ruoyi.ems.domain.AdmEmsPgSupplyH;
-import com.ruoyi.ems.service.IAdmEmsPgSupplyHService;
+import com.ruoyi.ems.mapper.EmsPgSupplyHMapper;
+import com.ruoyi.ems.domain.EmsPgSupplyH;
+import com.ruoyi.ems.service.IEmsPgSupplyHService;
 
 /**
  * 电网供应计量-小时Service业务层处理
@@ -14,10 +14,10 @@ import com.ruoyi.ems.service.IAdmEmsPgSupplyHService;
  * @date 2024-08-09
  */
 @Service
-public class AdmEmsPgSupplyHServiceImpl implements IAdmEmsPgSupplyHService 
+public class EmsPgSupplyHServiceImpl implements IEmsPgSupplyHService
 {
     @Autowired
-    private AdmEmsPgSupplyHMapper admEmsPgSupplyHMapper;
+    private EmsPgSupplyHMapper emsPgSupplyHMapper;
 
     /**
      * 查询电网供应计量-小时
@@ -26,9 +26,9 @@ public class AdmEmsPgSupplyHServiceImpl implements IAdmEmsPgSupplyHService
      * @return 电网供应计量-小时
      */
     @Override
-    public AdmEmsPgSupplyH selectAdmEmsPgSupplyHById(Long id)
+    public EmsPgSupplyH selectEmsPgSupplyHById(Long id)
     {
-        return admEmsPgSupplyHMapper.selectAdmEmsPgSupplyHById(id);
+        return emsPgSupplyHMapper.selectEmsPgSupplyHById(id);
     }
 
     /**
@@ -38,9 +38,9 @@ public class AdmEmsPgSupplyHServiceImpl implements IAdmEmsPgSupplyHService
      * @return 电网供应计量-小时
      */
     @Override
-    public List<AdmEmsPgSupplyH> selectAdmEmsPgSupplyHList(AdmEmsPgSupplyH admEmsPgSupplyH)
+    public List<EmsPgSupplyH> selectEmsPgSupplyHList(EmsPgSupplyH admEmsPgSupplyH)
     {
-        return admEmsPgSupplyHMapper.selectAdmEmsPgSupplyHList(admEmsPgSupplyH);
+        return emsPgSupplyHMapper.selectEmsPgSupplyHList(admEmsPgSupplyH);
     }
 
     /**
@@ -50,9 +50,9 @@ public class AdmEmsPgSupplyHServiceImpl implements IAdmEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int insertAdmEmsPgSupplyH(AdmEmsPgSupplyH admEmsPgSupplyH)
+    public int insertEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH)
     {
-        return admEmsPgSupplyHMapper.insertAdmEmsPgSupplyH(admEmsPgSupplyH);
+        return emsPgSupplyHMapper.insertEmsPgSupplyH(admEmsPgSupplyH);
     }
 
     /**
@@ -62,9 +62,9 @@ public class AdmEmsPgSupplyHServiceImpl implements IAdmEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int updateAdmEmsPgSupplyH(AdmEmsPgSupplyH admEmsPgSupplyH)
+    public int updateEmsPgSupplyH(EmsPgSupplyH admEmsPgSupplyH)
     {
-        return admEmsPgSupplyHMapper.updateAdmEmsPgSupplyH(admEmsPgSupplyH);
+        return emsPgSupplyHMapper.updateEmsPgSupplyH(admEmsPgSupplyH);
     }
 
     /**
@@ -74,9 +74,9 @@ public class AdmEmsPgSupplyHServiceImpl implements IAdmEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int deleteAdmEmsPgSupplyHByIds(Long[] ids)
+    public int deleteEmsPgSupplyHByIds(Long[] ids)
     {
-        return admEmsPgSupplyHMapper.deleteAdmEmsPgSupplyHByIds(ids);
+        return emsPgSupplyHMapper.deleteEmsPgSupplyHByIds(ids);
     }
 
     /**
@@ -86,8 +86,8 @@ public class AdmEmsPgSupplyHServiceImpl implements IAdmEmsPgSupplyHService
      * @return 结果
      */
     @Override
-    public int deleteAdmEmsPgSupplyHById(Long id)
+    public int deleteEmsPgSupplyHById(Long id)
     {
-        return admEmsPgSupplyHMapper.deleteAdmEmsPgSupplyHById(id);
+        return emsPgSupplyHMapper.deleteEmsPgSupplyHById(id);
     }
 }

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsElecStoreHMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsElecStoreHMapper.xml

@@ -2,12 +2,15 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsElecStoreHMapper">
+<mapper namespace="com.ruoyi.ems.mapper.EmsElecStoreHMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsElecStoreH" id="AdmEmsElecStoreHResult">
+    <resultMap type="com.ruoyi.ems.domain.EmsElecStoreH" id="EmsElecStoreHResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
+        <result property="areaName"       column="area_name"    />
+        <result property="areaShortName"  column="area_short_name"    />
         <result property="facsCode"    column="facs_code"    />
+        <result property="facsName"    column="facs_name"    />
         <result property="date"    column="date"    />
         <result property="time"    column="time"    />
         <result property="timeIndex"    column="time_index"    />
@@ -15,41 +18,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dischargeElecQuantity"    column="discharge_elec_quantity"    />
     </resultMap>
 
-    <sql id="selectAdmEmsElecStoreHVo">
+    <sql id="selectEmsElecStoreHVo">
         SELECT
-            store.id,
-            store.area_code,
+            st.id,
+            st.area_code,
             area.area_name,
+            area.short_name as area_short_name,
             facs.facs_name,
-            store.facs_code,
-            DATE,
-            TIME,
-            time_index,
-            charge_elec_quantity,
-            discharge_elec_quantity
+            st.facs_code,
+            st.`date`,
+            st.`time`,
+            st.time_index,
+            st.charge_elec_quantity,
+            st.discharge_elec_quantity
         FROM
-            adm_ems_elec_store_h store
-            INNER JOIN adm_ems_facs facs ON store.facs_code = facs.facs_code
-            INNER JOIN adm_service_area area ON store.area_code = area.area_code
+            adm_ems_elec_store_h st
+            LEFT JOIN adm_ems_facs facs ON st.facs_code = facs.facs_code
+            LEFT JOIN adm_service_area area ON st.area_code = area.area_code
     </sql>
 
-    <select id="selectAdmEmsElecStoreHList" parameterType="com.ruoyi.ems.domain.AdmEmsElecStoreH" resultType="com.ruoyi.ems.domain.AdmEmsElecStoreH">
-        <include refid="selectAdmEmsElecStoreHVo"/>
+    <select id="selectEmsElecStoreHList" parameterType="com.ruoyi.ems.domain.EmsElecStoreH" resultMap="EmsElecStoreHResult">
+        <include refid="selectEmsElecStoreHVo"/>
         <where>
-            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
-            <if test="facsCode != null  and facsCode != ''"> and facs_code = #{facsCode}</if>
-            <if test="date != null "> and date = #{date}</if>
-            <if test="chargeElecQuantity != null "> and charge_elec_quantity = #{chargeElecQuantity}</if>
-            <if test="dischargeElecQuantity != null "> and discharge_elec_quantity = #{dischargeElecQuantity}</if>
+            <if test="areaCode != null  and areaCode != ''"> and st.area_code = #{areaCode}</if>
+            <if test="facsCode != null  and facsCode != ''"> and st.facs_code = #{facsCode}</if>
+            <if test="date != null "> and st.`date` = #{date}</if>
+            <if test="chargeElecQuantity != null "> and st.charge_elec_quantity = #{chargeElecQuantity}</if>
+            <if test="dischargeElecQuantity != null "> and st.discharge_elec_quantity = #{dischargeElecQuantity}</if>
         </where>
     </select>
 
-    <select id="selectAdmEmsElecStoreHById" parameterType="Long" resultType="com.ruoyi.ems.domain.AdmEmsElecStoreH">
-        <include refid="selectAdmEmsElecStoreHVo"/>
-        where id = #{id}
+    <select id="selectEmsElecStoreHById" parameterType="Long" resultMap="EmsElecStoreHResult">
+        <include refid="selectEmsElecStoreHVo"/>
+        where st.id = #{id}
     </select>
 
-    <insert id="insertAdmEmsElecStoreH" parameterType="com.ruoyi.ems.domain.AdmEmsElecStoreH" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertEmsElecStoreH" parameterType="com.ruoyi.ems.domain.EmsElecStoreH" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_elec_store_h
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -71,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmEmsElecStoreH" parameterType="com.ruoyi.ems.domain.AdmEmsElecStoreH">
+    <update id="updateEmsElecStoreH" parameterType="com.ruoyi.ems.domain.EmsElecStoreH">
         update adm_ems_elec_store_h
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -85,11 +89,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsElecStoreHById" parameterType="Long">
+    <delete id="deleteEmsElecStoreHById" parameterType="Long">
         delete from adm_ems_elec_store_h where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsElecStoreHByIds" parameterType="String">
+    <delete id="deleteEmsElecStoreHByIds" parameterType="String">
         delete from adm_ems_elec_store_h where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsFacsUseHMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.ems.mapper.EmsFacsUseHMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.EmsFacsUseH" id="emsFacsUseHResult">
+        <result property="id"    column="id"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="areaName"    column="area_name"    />
+        <result property="areaShortName"    column="area_short_name"    />
+        <result property="facsCode"    column="facs_code"    />
+        <result property="facsName"    column="facs_name"    />
+        <result property="facsType"    column="facs_type"    />
+        <result property="facsSubtype"    column="facs_subtype"    />
+        <result property="date"    column="date"    />
+        <result property="time"    column="time"    />
+        <result property="timeIndex"    column="time_index"    />
+        <result property="elecReading"    column="elec_reading"    />
+        <result property="elecQuantity"    column="elec_quantity"    />
+        <result property="elecCost"    column="elec_cost"    />
+    </resultMap>
+
+    <sql id="selectEmsFacsUseHVo">
+        select
+            u.id, u.area_code, a.area_name, a.short_name as area_short_name, u.facs_code, f.facs_name, u.facs_type, u.facs_subtype, u.`date`, u.`time`, u.time_index, u.elec_reading, u.elec_quantity, u.elec_cost
+        from adm_ems_facs_use_h u
+            LEFT JOIN adm_service_area a ON u.`area_code` = a.`area_code`
+            LEFT JOIN adm_ems_facs f ON u.`facs_code` = f.`facs_code`
+    </sql>
+
+    <select id="selectEmsFacsUseHList" parameterType="com.ruoyi.ems.domain.EmsFacsUseH" resultMap="emsFacsUseHResult">
+        <include refid="selectEmsFacsUseHVo"/>
+        <where>  
+            <if test="areaCode != null  and areaCode != ''"> and u.area_code = #{areaCode}</if>
+            <if test="facsCode != null  and facsCode != ''"> and u.facs_code = #{facsCode}</if>
+            <if test="facsType != null  and facsType != ''"> and u.facs_type = #{facsType}</if>
+            <if test="facsSubtype != null  and facsSubtype != ''"> and u.facs_subtype = #{facsSubtype}</if>
+            <if test="date != null "> and u.`date` = #{date}</if>
+            <if test="time != null "> and u.`time` = #{time}</if>
+            <if test="timeIndex != null "> and u.time_index = #{timeIndex}</if>
+            <if test="elecReading != null "> and u.elec_reading = #{elecReading}</if>
+            <if test="elecQuantity != null "> and u.elec_quantity = #{elecQuantity}</if>
+            <if test="elecCost != null "> and u.elec_cost = #{elecCost}</if>
+        </where>
+    </select>
+    
+    <select id="selectEmsFacsUseHById" parameterType="Long" resultMap="emsFacsUseHResult">
+        <include refid="selectEmsFacsUseHVo"/>
+        where u.`id` = #{id}
+    </select>
+        
+    <insert id="insertEmsFacsUseH" parameterType="com.ruoyi.ems.domain.EmsFacsUseH" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_facs_use_h
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">area_code,</if>
+            <if test="facsCode != null and facsCode != ''">facs_code,</if>
+            <if test="facsType != null and facsType != ''">facs_type,</if>
+            <if test="facsSubtype != null and facsSubtype != ''">facs_subtype,</if>
+            <if test="date != null">date,</if>
+            <if test="time != null">time,</if>
+            <if test="timeIndex != null">time_index,</if>
+            <if test="elecReading != null">elec_reading,</if>
+            <if test="elecQuantity != null">elec_quantity,</if>
+            <if test="elecCost != null">elec_cost,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
+            <if test="facsCode != null and facsCode != ''">#{facsCode},</if>
+            <if test="facsType != null and facsType != ''">#{facsType},</if>
+            <if test="facsSubtype != null and facsSubtype != ''">#{facsSubtype},</if>
+            <if test="date != null">#{date},</if>
+            <if test="time != null">#{time},</if>
+            <if test="timeIndex != null">#{timeIndex},</if>
+            <if test="elecReading != null">#{elecReading},</if>
+            <if test="elecQuantity != null">#{elecQuantity},</if>
+            <if test="elecCost != null">#{elecCost},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEmsFacsUseH" parameterType="com.ruoyi.ems.domain.EmsFacsUseH">
+        update adm_ems_facs_use_h
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
+            <if test="facsCode != null and facsCode != ''">facs_code = #{facsCode},</if>
+            <if test="facsType != null and facsType != ''">facs_type = #{facsType},</if>
+            <if test="facsSubtype != null and facsSubtype != ''">facs_subtype = #{facsSubtype},</if>
+            <if test="date != null">date = #{date},</if>
+            <if test="time != null">time = #{time},</if>
+            <if test="timeIndex != null">time_index = #{timeIndex},</if>
+            <if test="elecReading != null">elec_reading = #{elecReading},</if>
+            <if test="elecQuantity != null">elec_quantity = #{elecQuantity},</if>
+            <if test="elecCost != null">elec_cost = #{elecCost},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmsFacsUseHById" parameterType="Long">
+        delete from adm_ems_facs_use_h where id = #{id}
+    </delete>
+
+    <delete id="deleteEmsFacsUseHByIds" parameterType="String">
+        delete from adm_ems_facs_use_h where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsPgSupplyHMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/EmsPgSupplyHMapper.xml

@@ -2,12 +2,15 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmEmsPgSupplyHMapper">
+<mapper namespace="com.ruoyi.ems.mapper.EmsPgSupplyHMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsPgSupplyH" id="AdmEmsPgSupplyHResult">
+    <resultMap type="com.ruoyi.ems.domain.EmsPgSupplyH" id="EmsPgSupplyHResult">
         <result property="id"    column="id"    />
         <result property="areaCode"    column="area_code"    />
+        <result property="areaName"    column="area_name"    />
+        <result property="areaShortName"    column="area_short_name"    />
         <result property="facsCode"    column="facs_code"    />
+        <result property="facsName"    column="facs_name"    />
         <result property="date"    column="date"    />
         <result property="time"    column="time"    />
         <result property="timeIndex"    column="time_index"    />
@@ -21,35 +24,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="upElecEarn"    column="up_elec_earn"    />
     </resultMap>
 
-    <sql id="selectAdmEmsPgSupplyHVo">
-        select id, area_code, facs_code, date, time, time_index, meter_type, meter_unit_price, use_elec_reading, use_elec_quantity, use_elec_cost, up_elec_reading, up_elec_quantity, up_elec_earn from adm_ems_pg_supply_h
+    <sql id="selectEmsPgSupplyHVo">
+        select
+            pg.`id`, pg.`area_code`, a.`area_name`, a.`short_name` as area_short_name, pg.`facs_code`, f.`facs_name`, pg.`date`, pg.`time`, pg.`time_index`, pg.`meter_type`, pg.`meter_unit_price`, pg.`use_elec_reading`, pg.`use_elec_quantity`, pg.`use_elec_cost`, pg.`up_elec_reading`, pg.`up_elec_quantity`, pg.`up_elec_earn`
+        from adm_ems_pg_supply_h pg
+            LEFT JOIN adm_service_area a ON pg.`area_code` = a.`area_code`
+            LEFT JOIN adm_ems_facs f ON pg.`facs_code` = f.`facs_code`
     </sql>
 
-    <select id="selectAdmEmsPgSupplyHList" parameterType="com.ruoyi.ems.domain.AdmEmsPgSupplyH" resultMap="AdmEmsPgSupplyHResult">
-        <include refid="selectAdmEmsPgSupplyHVo"/>
+    <select id="selectEmsPgSupplyHList" parameterType="com.ruoyi.ems.domain.EmsPgSupplyH" resultMap="EmsPgSupplyHResult">
+        <include refid="selectEmsPgSupplyHVo"/>
         <where>
-            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
-            <if test="facsCode != null  and facsCode != ''"> and facs_code = #{facsCode}</if>
-            <if test="date != null "> and date = #{date}</if>
-            <if test="time != null "> and time = #{time}</if>
-            <if test="timeIndex != null "> and time_index = #{timeIndex}</if>
-            <if test="meterType != null "> and meter_type = #{meterType}</if>
-            <if test="meterUnitPrice != null "> and meter_unit_price = #{meterUnitPrice}</if>
-            <if test="useElecReading != null "> and use_elec_reading = #{useElecReading}</if>
-            <if test="useElecQuantity != null "> and use_elec_quantity = #{useElecQuantity}</if>
-            <if test="useElecCost != null "> and use_elec_cost = #{useElecCost}</if>
-            <if test="upElecReading != null "> and up_elec_reading = #{upElecReading}</if>
-            <if test="upElecQuantity != null "> and up_elec_quantity = #{upElecQuantity}</if>
-            <if test="upElecEarn != null "> and up_elec_earn = #{upElecEarn}</if>
+            <if test="areaCode != null  and areaCode != ''"> and pg.`area_code` = #{areaCode}</if>
+            <if test="facsCode != null  and facsCode != ''"> and pg.`facs_code` = #{facsCode}</if>
+            <if test="date != null "> and pg.`date` = #{date}</if>
+            <if test="time != null "> and pg.`time` = #{time}</if>
+            <if test="timeIndex != null "> and pg.`time_index` = #{timeIndex}</if>
+            <if test="meterType != null "> and pg.`meter_type` = #{meterType}</if>
+            <if test="meterUnitPrice != null "> and pg.`meter_unit_price` = #{meterUnitPrice}</if>
+            <if test="useElecReading != null "> and pg.`use_elec_reading` = #{useElecReading}</if>
+            <if test="useElecQuantity != null "> and pg.`use_elec_quantity` = #{useElecQuantity}</if>
+            <if test="useElecCost != null "> and pg.`use_elec_cost` = #{useElecCost}</if>
+            <if test="upElecReading != null "> and pg.`up_elec_reading` = #{upElecReading}</if>
+            <if test="upElecQuantity != null "> and pg.`up_elec_quantity` = #{upElecQuantity}</if>
+            <if test="upElecEarn != null "> and pg.`up_elec_earn` = #{upElecEarn}</if>
         </where>
     </select>
 
-    <select id="selectAdmEmsPgSupplyHById" parameterType="Long" resultMap="AdmEmsPgSupplyHResult">
-        <include refid="selectAdmEmsPgSupplyHVo"/>
-        where id = #{id}
+    <select id="selectEmsPgSupplyHById" parameterType="Long" resultMap="EmsPgSupplyHResult">
+        <include refid="selectEmsPgSupplyHVo"/>
+        where pg.`id` = #{id}
     </select>
 
-    <insert id="insertAdmEmsPgSupplyH" parameterType="com.ruoyi.ems.domain.AdmEmsPgSupplyH" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertEmsPgSupplyH" parameterType="com.ruoyi.ems.domain.EmsPgSupplyH" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_pg_supply_h
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code,</if>
@@ -83,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdmEmsPgSupplyH" parameterType="com.ruoyi.ems.domain.AdmEmsPgSupplyH">
+    <update id="updateEmsPgSupplyH" parameterType="com.ruoyi.ems.domain.EmsPgSupplyH">
         update adm_ems_pg_supply_h
         <trim prefix="SET" suffixOverrides=",">
             <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
@@ -103,11 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmEmsPgSupplyHById" parameterType="Long">
+    <delete id="deleteEmsPgSupplyHById" parameterType="Long">
         delete from adm_ems_pg_supply_h where id = #{id}
     </delete>
 
-    <delete id="deleteAdmEmsPgSupplyHByIds" parameterType="String">
+    <delete id="deleteEmsPgSupplyHByIds" parameterType="String">
         delete from adm_ems_pg_supply_h where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

ems-cloud/sql/ems_sys.sql

@@ -174,7 +174,7 @@ insert into sys_menu values ('101',  '主路光伏',       '1',   '2',   'hp-vie
 
 insert into sys_menu values ('102',  '源网',            '2',    '1',  'strategy-pg',        'mgr/powergrid',             '', 1, 0, 'C', '0', '0',   'power-mgr:pg',           'powergrid',      'admin', sysdate(), '', null, '源网协调');
 insert into sys_menu values ('103',  '储能',            '2',    '2',  'strategy-gs',        'mgr/powerstore',            '', 1, 0, 'C', '0', '0',   'power-mgr:gs',           'powerstore',     'admin', sysdate(), '', null, '网储互动');
-insert into sys_menu values ('104',  '负荷',            '2',    '3',  'strategy-pl',        'mgr/powerload',             '', 1, 0, 'C', '0', '0',   'power-mgr:pl',           'powerload',      'admin', sysdate(), '', null, '源荷互动');
+insert into sys_menu values ('104',  '负荷',            '2',    '3',  'strategy-use',       'mgr/poweruse',              '', 1, 0, 'C', '0', '0',   'power-mgr:use',           'powerload',      'admin', sysdate(), '', null, '源荷互动');
 insert into sys_menu values ('105',  '调度',           '2',    '4',  'strategy-mgr',       'mgr/strategy',              '', 1, 0, 'C', '0', '0',   'power-mgr:strategy',     'strategy',       'admin', sysdate(), '', null, '管能策略');
 
 insert into sys_menu values ('106',  '产能分析',       '3',    '1',  'power-prod',         'analysis/power/prod',       '', 1, 0, 'C', '0', '0',    'analysis:power:prod',    'energyprod',     'admin', sysdate(), '', null, '产能分析');
@@ -187,7 +187,7 @@ insert into sys_menu values ('111',  '数据报表',       '3',    '6',  'analys
 insert into sys_menu values ('112',  '碳排计量',       '4',    '1',  'ca-emission',        'ca/emission',            '', 1, 0, 'C', '0', '0',   'ca-analysis:emission',   'caemission',     'admin', sysdate(), '', null, '碳排分析');
 insert into sys_menu values ('113',  '碳汇测算',       '4',    '2',  'ca-sink',            'ca/sink',                '', 1, 0, 'C', '0', '0',   'ca-analysis:sink',       'casink',         'admin', sysdate(), '', null, '碳汇分析');
 
-insert into sys_menu values ('114',  '设备状态',       '5',    '1',  'device-list',        'device/list',            '', 1, 0, 'C', '0', '0',   'device:status',          'devicestatus',   'admin', sysdate(), '', null, '设备状态');
+insert into sys_menu values ('114',  '设备状态',       '5',    '1',  'device-state',        'devmgr/state',           '', 1, 0, 'C', '0', '0',  'device:status',          'devicestatus',   'admin', sysdate(), '', null, '设备状态');
 insert into sys_menu values ('115',  '设备台账',       '5',    '2',  'device-el',          'device/el',              '', 1, 0, 'C', '0', '0',   'device:el',              'excel',       'admin', sysdate(), '', null, '设备台账');
 insert into sys_menu values ('116',  '设备告警',       '5',    '3',  'analysis-warn',      'analysis/device/warn',   '', 1, 0, 'C', '0', '0',   'analysis:device',        'deviceanalyze',  'admin', sysdate(), '', null, '设备分析');
 
@@ -236,8 +236,8 @@ insert into sys_menu values ('1112',  '告警报表',   '111', '3',  'statement-
 insert into sys_menu values ('1113',  '自定义',     '111', '4',  'statement-warn',    'analysis/statement/custom',   '', 1, 0, 'C', '0', '0',   'analysis:statement:custom',    'statement-zdy',   'admin', sysdate(), '', null, '自定义报表');
 -- 业务配置菜单
 insert into sys_menu values ('1210',  '服务区',     '121', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
-insert into sys_menu values ('1211',  '建筑配置',   '121', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
-insert into sys_menu values ('1212',  '区块配置',   '121', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
+insert into sys_menu values ('1211',  '地块配置',   '121', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
+insert into sys_menu values ('1212',  '区域配置',   '121', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
 insert into sys_menu values ('1220',  '设施分类',   '122', '1',  'basecfg-facstype',       'basecfg/facstype/index',     '', 1, 0, 'C', '0', '0',   'basecfg:facstype:list',        'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
 insert into sys_menu values ('1221',  '能源设施',   '122', '2',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
 insert into sys_menu values ('1222',  '能流关系',   '122', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');