计量设备管理

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

@@ -1,105 +0,0 @@
-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;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.AdmEmsDevice;
-import com.ruoyi.ems.service.IAdmEmsDeviceService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-
-/**
- * 能源设备Controller
- *
- * @author ruoyi
- * @date 2024-08-07
- */
-@RestController
-@RequestMapping("/device")
-public class AdmEmsDeviceController extends BaseController {
-    @Autowired
-    private IAdmEmsDeviceService admEmsDeviceService;
-
-    /**
-     * 查询能源设备列表
-     */
-    @RequiresPermissions("ems:device:list")
-    @GetMapping("/list")
-    public TableDataInfo list(AdmEmsDevice admEmsDevice) {
-        startPage();
-        List<AdmEmsDevice> list = admEmsDeviceService.selectAdmEmsDeviceList(admEmsDevice);
-        return getDataTable(list);
-    }
-
-//    @RequiresPermissions("ems:device:list")
-//    @GetMapping("/qry/stat")
-//    public TableDataInfo qryDeviceStat() {
-//        List<AdmEmsDevice> list = admEmsDeviceService.selectAdmEmsDeviceList();
-//        return getDataTable(list);
-//    }
-
-    /**
-     * 导出能源设备列表
-     */
-    @RequiresPermissions("ems:device:export")
-    @Log(title = "能源设备", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmEmsDevice admEmsDevice) {
-        List<AdmEmsDevice> list = admEmsDeviceService.selectAdmEmsDeviceList(admEmsDevice);
-        ExcelUtil<AdmEmsDevice> util = new ExcelUtil<AdmEmsDevice>(AdmEmsDevice.class);
-        util.exportExcel(response, list, "能源设备数据");
-    }
-
-    /**
-     * 获取能源设备详细信息
-     */
-    @RequiresPermissions("ems:device:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(admEmsDeviceService.selectAdmEmsDeviceById(id));
-    }
-
-    /**
-     * 新增能源设备
-     */
-    @RequiresPermissions("ems:device:add")
-    @Log(title = "能源设备", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AdmEmsDevice admEmsDevice) {
-        return toAjax(admEmsDeviceService.insertAdmEmsDevice(admEmsDevice));
-    }
-
-    /**
-     * 修改能源设备
-     */
-    @RequiresPermissions("ems:device:edit")
-    @Log(title = "能源设备", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AdmEmsDevice admEmsDevice) {
-        return toAjax(admEmsDeviceService.updateAdmEmsDevice(admEmsDevice));
-    }
-
-    /**
-     * 删除能源设备
-     */
-    @RequiresPermissions("ems:device:remove")
-    @Log(title = "能源设备", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(admEmsDeviceService.deleteAdmEmsDeviceByIds(ids));
-    }
-}

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

@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
  * @date 2024-07-10
  */
 @RestController
-@RequestMapping("/basecfg/device")
+@RequestMapping("/device")
 public class DeviceController extends BaseController
 {
     @Autowired
@@ -54,7 +54,7 @@ public class DeviceController extends BaseController
     /**
      * 查询能源设备列表
      */
-    @RequiresPermissions("basecfg:device:list")
+    @RequiresPermissions("ems:device:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsDevice emsDevice)
     {
@@ -116,7 +116,7 @@ public class DeviceController extends BaseController
     /**
      * 导出能源设备列表
      */
-    @RequiresPermissions("basecfg:device:export")
+    @RequiresPermissions("ems:device:export")
     @Log(title = "能源设备", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsDevice emsDevice)
@@ -129,7 +129,7 @@ public class DeviceController extends BaseController
     /**
      * 获取能源设备详细信息
      */
-    @RequiresPermissions("basecfg:device:query")
+    @RequiresPermissions("ems:device:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -139,7 +139,7 @@ public class DeviceController extends BaseController
     /**
      * 新增能源设备
      */
-    @RequiresPermissions("basecfg:device:add")
+    @RequiresPermissions("ems:device:add")
     @Log(title = "能源设备", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EmsDevice emsDevice)
@@ -150,7 +150,7 @@ public class DeviceController extends BaseController
     /**
      * 修改能源设备
      */
-    @RequiresPermissions("basecfg:device:edit")
+    @RequiresPermissions("ems:device:edit")
     @Log(title = "能源设备", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EmsDevice emsDevice)
@@ -161,7 +161,7 @@ public class DeviceController extends BaseController
     /**
      * 删除能源设备
      */
-    @RequiresPermissions("basecfg:device:remove")
+    @RequiresPermissions("ems:device:remove")
     @Log(title = "能源设备", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -0,0 +1,98 @@
+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.MeterDevice;
+import com.ruoyi.ems.service.IMeterDeviceService;
+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-08
+ */
+@RestController
+@RequestMapping("/meterDevice")
+public class MeterDeviceController extends BaseController {
+    @Autowired
+    private IMeterDeviceService meterDeviceService;
+
+    /**
+     * 查询计量设备列表
+     */
+    @RequiresPermissions("ems:meterdevc:list")
+    @GetMapping("/list")
+    public TableDataInfo list(MeterDevice meterDevice) {
+        startPage();
+        List<MeterDevice> list = meterDeviceService.selectMeterDeviceList(meterDevice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出计量设备列表
+     */
+    @RequiresPermissions("ems:device:export")
+    @Log(title = "计量设备", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MeterDevice meterDevice) {
+        List<MeterDevice> list = meterDeviceService.selectMeterDeviceList(meterDevice);
+        ExcelUtil<MeterDevice> util = new ExcelUtil<MeterDevice>(MeterDevice.class);
+        util.exportExcel(response, list, "计量设备数据");
+    }
+
+    /**
+     * 获取计量设备详细信息
+     */
+    @RequiresPermissions("ems:device:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(meterDeviceService.selectMeterDeviceById(id));
+    }
+
+    /**
+     * 新增计量设备
+     */
+    @RequiresPermissions("ems:device:add")
+    @Log(title = "计量设备", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MeterDevice meterDevice) {
+        return toAjax(meterDeviceService.insertMeterDevice(meterDevice));
+    }
+
+    /**
+     * 修改计量设备
+     */
+    @RequiresPermissions("ems:device:edit")
+    @Log(title = "计量设备", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MeterDevice meterDevice) {
+        return toAjax(meterDeviceService.updateMeterDevice(meterDevice));
+    }
+
+    /**
+     * 删除计量设备
+     */
+    @RequiresPermissions("ems:device:remove")
+    @Log(title = "计量设备", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(meterDeviceService.deleteMeterDeviceByIds(ids));
+    }
+}

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

@@ -1,137 +0,0 @@
-package com.ruoyi.ems.domain;
-
-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_device
- * 
- * @author ruoyi
- * @date 2024-08-07
- */
-public class AdmEmsDevice extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 设备代码 */
-    @Excel(name = "设备代码")
-    private String deviceCode;
-
-    /** 设备名称 */
-    @Excel(name = "设备名称")
-    private String deviceName;
-
-    /** 设备类型 */
-    @Excel(name = "设备类型")
-    private Integer deviceType;
-
-    /** 设备状态 */
-    @Excel(name = "设备状态")
-    private Integer deviceStatus;
-
-    /** 设备类型 */
-    @Excel(name = "设备类型")
-    private String areaType;
-
-    /** 归属区域代码 */
-    @Excel(name = "归属区域代码")
-    private String refArea;
-
-    /** 归属设施代码 */
-    @Excel(name = "归属设施代码")
-    private String refFacs;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setDeviceCode(String deviceCode) 
-    {
-        this.deviceCode = deviceCode;
-    }
-
-    public String getDeviceCode() 
-    {
-        return deviceCode;
-    }
-    public void setDeviceName(String deviceName) 
-    {
-        this.deviceName = deviceName;
-    }
-
-    public String getDeviceName() 
-    {
-        return deviceName;
-    }
-    public void setDeviceType(Integer deviceType) 
-    {
-        this.deviceType = deviceType;
-    }
-
-    public Integer getDeviceType() 
-    {
-        return deviceType;
-    }
-    public void setDeviceStatus(Integer deviceStatus) 
-    {
-        this.deviceStatus = deviceStatus;
-    }
-
-    public Integer getDeviceStatus() 
-    {
-        return deviceStatus;
-    }
-    public void setAreaType(String areaType) 
-    {
-        this.areaType = areaType;
-    }
-
-    public String getAreaType() 
-    {
-        return areaType;
-    }
-    public void setRefArea(String refArea) 
-    {
-        this.refArea = refArea;
-    }
-
-    public String getRefArea() 
-    {
-        return refArea;
-    }
-    public void setRefFacs(String refFacs) 
-    {
-        this.refFacs = refFacs;
-    }
-
-    public String getRefFacs() 
-    {
-        return refFacs;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("deviceCode", getDeviceCode())
-            .append("deviceName", getDeviceName())
-            .append("deviceType", getDeviceType())
-            .append("deviceStatus", getDeviceStatus())
-            .append("areaType", getAreaType())
-            .append("refArea", getRefArea())
-            .append("refFacs", getRefFacs())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -0,0 +1,149 @@
+package com.ruoyi.ems.domain;
+
+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_meter_device
+ * 
+ * @author ruoyi
+ * @date 2024-08-08
+ */
+public class MeterDevice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 设备代码 */
+    @Excel(name = "设备代码")
+    private String deviceCode;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 计量介质 */
+    @Excel(name = "计量介质")
+    private String meterCls;
+
+    /** 计量对象类型 1-区块 2-设备 */
+    @Excel(name = "计量对象类型 1-区块 2-设备")
+    private Long meterObjType;
+
+    /** 计量对象编码 */
+    @Excel(name = "计量对象编码")
+    private String objCode;
+
+    /** 采集周期 */
+    @Excel(name = "采集周期")
+    private Long colCycle;
+
+    /** 采集方式 */
+    @Excel(name = "采集方式")
+    private Long colMode;
+
+    /** 规格描述 */
+    @Excel(name = "规格描述")
+    private String specDesc;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDeviceCode(String deviceCode) 
+    {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceCode() 
+    {
+        return deviceCode;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setMeterCls(String meterCls) 
+    {
+        this.meterCls = meterCls;
+    }
+
+    public String getMeterCls() 
+    {
+        return meterCls;
+    }
+    public void setMeterObjType(Long meterObjType) 
+    {
+        this.meterObjType = meterObjType;
+    }
+
+    public Long getMeterObjType() 
+    {
+        return meterObjType;
+    }
+    public void setObjCode(String objCode) 
+    {
+        this.objCode = objCode;
+    }
+
+    public String getObjCode() 
+    {
+        return objCode;
+    }
+    public void setColCycle(Long colCycle) 
+    {
+        this.colCycle = colCycle;
+    }
+
+    public Long getColCycle() 
+    {
+        return colCycle;
+    }
+    public void setColMode(Long colMode) 
+    {
+        this.colMode = colMode;
+    }
+
+    public Long getColMode() 
+    {
+        return colMode;
+    }
+    public void setSpecDesc(String specDesc) 
+    {
+        this.specDesc = specDesc;
+    }
+
+    public String getSpecDesc() 
+    {
+        return specDesc;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("deviceCode", getDeviceCode())
+            .append("deviceName", getDeviceName())
+            .append("meterCls", getMeterCls())
+            .append("meterObjType", getMeterObjType())
+            .append("objCode", getObjCode())
+            .append("colCycle", getColCycle())
+            .append("colMode", getColMode())
+            .append("specDesc", getSpecDesc())
+            .toString();
+    }
+}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsDevice;
-
-/**
- * 能源设备Mapper接口
- * 
- * @author ruoyi
- * @date 2024-08-07
- */
-public interface AdmEmsDeviceMapper 
-{
-    /**
-     * 查询能源设备
-     * 
-     * @param id 能源设备主键
-     * @return 能源设备
-     */
-    public AdmEmsDevice selectAdmEmsDeviceById(Long id);
-
-    /**
-     * 查询能源设备列表
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 能源设备集合
-     */
-    public List<AdmEmsDevice> selectAdmEmsDeviceList(AdmEmsDevice admEmsDevice);
-
-    /**
-     * 新增能源设备
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 结果
-     */
-    public int insertAdmEmsDevice(AdmEmsDevice admEmsDevice);
-
-    /**
-     * 修改能源设备
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 结果
-     */
-    public int updateAdmEmsDevice(AdmEmsDevice admEmsDevice);
-
-    /**
-     * 删除能源设备
-     * 
-     * @param id 能源设备主键
-     * @return 结果
-     */
-    public int deleteAdmEmsDeviceById(Long id);
-
-    /**
-     * 批量删除能源设备
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsDeviceByIds(Long[] ids);
-}

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

@@ -0,0 +1,60 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.MeterDevice;
+
+/**
+ * 计量设备Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-08-08
+ */
+public interface MeterDeviceMapper {
+    /**
+     * 查询计量设备
+     *
+     * @param id 计量设备主键
+     * @return 计量设备
+     */
+    MeterDevice selectMeterDeviceById(Long id);
+
+    /**
+     * 查询计量设备列表
+     *
+     * @param meterDevice 计量设备
+     * @return 计量设备集合
+     */
+    List<MeterDevice> selectMeterDeviceList(MeterDevice meterDevice);
+
+    /**
+     * 新增计量设备
+     *
+     * @param meterDevice 计量设备
+     * @return 结果
+     */
+    int insertMeterDevice(MeterDevice meterDevice);
+
+    /**
+     * 修改计量设备
+     *
+     * @param meterDevice 计量设备
+     * @return 结果
+     */
+    int updateMeterDevice(MeterDevice meterDevice);
+
+    /**
+     * 删除计量设备
+     *
+     * @param id 计量设备主键
+     * @return 结果
+     */
+    int deleteMeterDeviceById(Long id);
+
+    /**
+     * 批量删除计量设备
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteMeterDeviceByIds(Long[] ids);
+}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.ems.service;
-
-import java.util.List;
-import com.ruoyi.ems.domain.AdmEmsDevice;
-
-/**
- * 能源设备Service接口
- * 
- * @author ruoyi
- * @date 2024-08-07
- */
-public interface IAdmEmsDeviceService 
-{
-    /**
-     * 查询能源设备
-     * 
-     * @param id 能源设备主键
-     * @return 能源设备
-     */
-    public AdmEmsDevice selectAdmEmsDeviceById(Long id);
-
-    /**
-     * 查询能源设备列表
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 能源设备集合
-     */
-    public List<AdmEmsDevice> selectAdmEmsDeviceList(AdmEmsDevice admEmsDevice);
-
-    /**
-     * 新增能源设备
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 结果
-     */
-    public int insertAdmEmsDevice(AdmEmsDevice admEmsDevice);
-
-    /**
-     * 修改能源设备
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 结果
-     */
-    public int updateAdmEmsDevice(AdmEmsDevice admEmsDevice);
-
-    /**
-     * 批量删除能源设备
-     * 
-     * @param ids 需要删除的能源设备主键集合
-     * @return 结果
-     */
-    public int deleteAdmEmsDeviceByIds(Long[] ids);
-
-    /**
-     * 删除能源设备信息
-     * 
-     * @param id 能源设备主键
-     * @return 结果
-     */
-    public int deleteAdmEmsDeviceById(Long id);
-}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.ems.service;
+
+import com.ruoyi.ems.domain.MeterDevice;
+
+import java.util.List;
+
+/**
+ * 计量设备Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-08
+ */
+public interface IMeterDeviceService
+{
+    /**
+     * 查询计量设备
+     * 
+     * @param id 计量设备主键
+     * @return 计量设备
+     */
+    MeterDevice selectMeterDeviceById(Long id);
+
+    /**
+     * 查询计量设备列表
+     * 
+     * @param meterDevice 计量设备
+     * @return 计量设备集合
+     */
+     List<MeterDevice> selectMeterDeviceList(MeterDevice meterDevice);
+
+    /**
+     * 新增计量设备
+     * 
+     * @param meterDevice 计量设备
+     * @return 结果
+     */
+     int insertMeterDevice(MeterDevice meterDevice);
+
+    /**
+     * 修改计量设备
+     * 
+     * @param meterDevice 计量设备
+     * @return 结果
+     */
+     int updateMeterDevice(MeterDevice meterDevice);
+
+    /**
+     * 批量删除计量设备
+     * 
+     * @param ids 需要删除的计量设备主键集合
+     * @return 结果
+     */
+     int deleteMeterDeviceByIds(Long[] ids);
+
+    /**
+     * 删除计量设备信息
+     * 
+     * @param id 计量设备主键
+     * @return 结果
+     */
+     int deleteMeterDeviceById(Long id);
+}

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

@@ -1,96 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.core.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ems.mapper.AdmEmsDeviceMapper;
-import com.ruoyi.ems.domain.AdmEmsDevice;
-import com.ruoyi.ems.service.IAdmEmsDeviceService;
-
-/**
- * 能源设备Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-08-07
- */
-@Service
-public class AdmEmsDeviceServiceImpl implements IAdmEmsDeviceService 
-{
-    @Autowired
-    private AdmEmsDeviceMapper admEmsDeviceMapper;
-
-    /**
-     * 查询能源设备
-     * 
-     * @param id 能源设备主键
-     * @return 能源设备
-     */
-    @Override
-    public AdmEmsDevice selectAdmEmsDeviceById(Long id)
-    {
-        return admEmsDeviceMapper.selectAdmEmsDeviceById(id);
-    }
-
-    /**
-     * 查询能源设备列表
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 能源设备
-     */
-    @Override
-    public List<AdmEmsDevice> selectAdmEmsDeviceList(AdmEmsDevice admEmsDevice)
-    {
-        return admEmsDeviceMapper.selectAdmEmsDeviceList(admEmsDevice);
-    }
-
-    /**
-     * 新增能源设备
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 结果
-     */
-    @Override
-    public int insertAdmEmsDevice(AdmEmsDevice admEmsDevice)
-    {
-        admEmsDevice.setCreateTime(DateUtils.getNowDate());
-        return admEmsDeviceMapper.insertAdmEmsDevice(admEmsDevice);
-    }
-
-    /**
-     * 修改能源设备
-     * 
-     * @param admEmsDevice 能源设备
-     * @return 结果
-     */
-    @Override
-    public int updateAdmEmsDevice(AdmEmsDevice admEmsDevice)
-    {
-        admEmsDevice.setUpdateTime(DateUtils.getNowDate());
-        return admEmsDeviceMapper.updateAdmEmsDevice(admEmsDevice);
-    }
-
-    /**
-     * 批量删除能源设备
-     * 
-     * @param ids 需要删除的能源设备主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsDeviceByIds(Long[] ids)
-    {
-        return admEmsDeviceMapper.deleteAdmEmsDeviceByIds(ids);
-    }
-
-    /**
-     * 删除能源设备信息
-     * 
-     * @param id 能源设备主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmEmsDeviceById(Long id)
-    {
-        return admEmsDeviceMapper.deleteAdmEmsDeviceById(id);
-    }
-}

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

@@ -0,0 +1,87 @@
+package com.ruoyi.ems.service.impl;
+
+import com.ruoyi.ems.domain.MeterDevice;
+import com.ruoyi.ems.mapper.MeterDeviceMapper;
+import com.ruoyi.ems.service.IMeterDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 计量设备Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-08-08
+ */
+@Service
+public class MeterDeviceServiceImpl implements IMeterDeviceService {
+    @Autowired
+    private MeterDeviceMapper meterDeviceMapper;
+
+    /**
+     * 查询计量设备
+     *
+     * @param id 计量设备主键
+     * @return 计量设备
+     */
+    @Override
+    public MeterDevice selectMeterDeviceById(Long id) {
+        return meterDeviceMapper.selectMeterDeviceById(id);
+    }
+
+    /**
+     * 查询计量设备列表
+     *
+     * @param meterDevice 计量设备
+     * @return 计量设备
+     */
+    @Override
+    public List<MeterDevice> selectMeterDeviceList(MeterDevice meterDevice) {
+        return meterDeviceMapper.selectMeterDeviceList(meterDevice);
+    }
+
+    /**
+     * 新增计量设备
+     *
+     * @param meterDevice 计量设备
+     * @return 结果
+     */
+    @Override
+    public int insertMeterDevice(MeterDevice meterDevice) {
+        return meterDeviceMapper.insertMeterDevice(meterDevice);
+    }
+
+    /**
+     * 修改计量设备
+     *
+     * @param meterDevice 计量设备
+     * @return 结果
+     */
+    @Override
+    public int updateMeterDevice(MeterDevice meterDevice) {
+        return meterDeviceMapper.updateMeterDevice(meterDevice);
+    }
+
+    /**
+     * 批量删除计量设备
+     *
+     * @param ids 需要删除的计量设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeterDeviceByIds(Long[] ids) {
+        return meterDeviceMapper.deleteMeterDeviceByIds(ids);
+    }
+
+    /**
+     * 删除计量设备信息
+     *
+     * @param id 计量设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteMeterDeviceById(Long id) {
+        return meterDeviceMapper.deleteMeterDeviceById(id);
+    }
+}

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

@@ -1,94 +0,0 @@
-<?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.AdmEmsDeviceMapper">
-
-    <resultMap type="com.ruoyi.ems.domain.AdmEmsDevice" id="AdmEmsDeviceResult">
-        <result property="id"    column="id"    />
-        <result property="deviceCode"    column="device_code"    />
-        <result property="deviceName"    column="device_name"    />
-        <result property="deviceType"    column="device_type"    />
-        <result property="deviceStatus"    column="device_status"    />
-        <result property="areaType"    column="area_type"    />
-        <result property="refArea"    column="ref_area"    />
-        <result property="refFacs"    column="ref_facs"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectAdmEmsDeviceVo">
-        select id, device_code, device_name, device_type, device_status, area_type, ref_area, ref_facs, create_time, update_time from adm_ems_device
-    </sql>
-
-    <select id="selectAdmEmsDeviceList" parameterType="com.ruoyi.ems.domain.AdmEmsDevice" resultMap="AdmEmsDeviceResult">
-        <include refid="selectAdmEmsDeviceVo"/>
-        <where>
-            <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
-            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
-            <if test="deviceType != null "> and device_type = #{deviceType}</if>
-            <if test="deviceStatus != null "> and device_status = #{deviceStatus}</if>
-            <if test="areaType != null  and areaType != ''"> and area_type = #{areaType}</if>
-            <if test="refArea != null  and refArea != ''"> and ref_area = #{refArea}</if>
-            <if test="refFacs != null  and refFacs != ''"> and ref_facs = #{refFacs}</if>
-        </where>
-    </select>
-
-    <select id="selectAdmEmsDeviceById" parameterType="Long" resultMap="AdmEmsDeviceResult">
-        <include refid="selectAdmEmsDeviceVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertAdmEmsDevice" parameterType="com.ruoyi.ems.domain.AdmEmsDevice" useGeneratedKeys="true" keyProperty="id">
-        insert into adm_ems_device
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="deviceCode != null and deviceCode != ''">device_code,</if>
-            <if test="deviceName != null and deviceName != ''">device_name,</if>
-            <if test="deviceType != null">device_type,</if>
-            <if test="deviceStatus != null">device_status,</if>
-            <if test="areaType != null">area_type,</if>
-            <if test="refArea != null">ref_area,</if>
-            <if test="refFacs != null">ref_facs,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
-            <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
-            <if test="deviceType != null">#{deviceType},</if>
-            <if test="deviceStatus != null">#{deviceStatus},</if>
-            <if test="areaType != null">#{areaType},</if>
-            <if test="refArea != null">#{refArea},</if>
-            <if test="refFacs != null">#{refFacs},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateAdmEmsDevice" parameterType="com.ruoyi.ems.domain.AdmEmsDevice">
-        update adm_ems_device
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
-            <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
-            <if test="deviceType != null">device_type = #{deviceType},</if>
-            <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
-            <if test="areaType != null">area_type = #{areaType},</if>
-            <if test="refArea != null">ref_area = #{refArea},</if>
-            <if test="refFacs != null">ref_facs = #{refFacs},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAdmEmsDeviceById" parameterType="Long">
-        delete from adm_ems_device where id = #{id}
-    </delete>
-
-    <delete id="deleteAdmEmsDeviceByIds" parameterType="String">
-        delete from adm_ems_device 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/MeterDeviceMapper.xml

@@ -0,0 +1,91 @@
+<?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.MeterDeviceMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.MeterDevice" id="meterDeviceResult">
+        <result property="id"    column="id"    />
+        <result property="deviceCode"    column="device_code"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="meterCls"    column="meter_cls"    />
+        <result property="meterObjType"    column="meter_obj_type"    />
+        <result property="objCode"    column="obj_code"    />
+        <result property="colCycle"    column="col_cycle"    />
+        <result property="colMode"    column="col_mode"    />
+        <result property="specDesc"    column="spec_desc"    />
+    </resultMap>
+
+    <sql id="selectMeterDeviceVo">
+        select id, device_code, device_name, meter_cls, meter_obj_type, obj_code, col_cycle, col_mode, spec_desc from adm_meter_device
+    </sql>
+
+    <select id="selectMeterDeviceList" parameterType="com.ruoyi.ems.domain.MeterDevice" resultMap="meterDeviceResult">
+        <include refid="selectMeterDeviceVo"/>
+        <where>  
+            <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="meterCls != null  and meterCls != ''"> and meter_cls = #{meterCls}</if>
+            <if test="meterObjType != null "> and meter_obj_type = #{meterObjType}</if>
+            <if test="objCode != null  and objCode != ''"> and obj_code = #{objCode}</if>
+            <if test="colCycle != null "> and col_cycle = #{colCycle}</if>
+            <if test="colMode != null "> and col_mode = #{colMode}</if>
+            <if test="specDesc != null  and specDesc != ''"> and spec_desc = #{specDesc}</if>
+        </where>
+    </select>
+    
+    <select id="selectMeterDeviceById" parameterType="Long" resultMap="meterDeviceResult">
+        <include refid="selectMeterDeviceVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertMeterDevice" parameterType="com.ruoyi.ems.domain.MeterDevice" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_meter_device
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">device_code,</if>
+            <if test="deviceName != null and deviceName != ''">device_name,</if>
+            <if test="meterCls != null and meterCls != ''">meter_cls,</if>
+            <if test="meterObjType != null">meter_obj_type,</if>
+            <if test="objCode != null and objCode != ''">obj_code,</if>
+            <if test="colCycle != null">col_cycle,</if>
+            <if test="colMode != null">col_mode,</if>
+            <if test="specDesc != null">spec_desc,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
+            <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
+            <if test="meterCls != null and meterCls != ''">#{meterCls},</if>
+            <if test="meterObjType != null">#{meterObjType},</if>
+            <if test="objCode != null and objCode != ''">#{objCode},</if>
+            <if test="colCycle != null">#{colCycle},</if>
+            <if test="colMode != null">#{colMode},</if>
+            <if test="specDesc != null">#{specDesc},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMeterDevice" parameterType="com.ruoyi.ems.domain.MeterDevice">
+        update adm_meter_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">device_code = #{deviceCode},</if>
+            <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
+            <if test="meterCls != null and meterCls != ''">meter_cls = #{meterCls},</if>
+            <if test="meterObjType != null">meter_obj_type = #{meterObjType},</if>
+            <if test="objCode != null and objCode != ''">obj_code = #{objCode},</if>
+            <if test="colCycle != null">col_cycle = #{colCycle},</if>
+            <if test="colMode != null">col_mode = #{colMode},</if>
+            <if test="specDesc != null">spec_desc = #{specDesc},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteMeterDeviceById" parameterType="Long">
+        delete from adm_meter_device where id = #{id}
+    </delete>
+
+    <delete id="deleteMeterDeviceByIds" parameterType="String">
+        delete from adm_meter_device where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ems-cloud/sql/ems_sys.sql

@@ -212,7 +212,7 @@ insert into sys_menu values ('189',  '代码生成',       '99',   '2',  'gen',
 -- 三级菜单
 insert into sys_menu values ('500',  '操作日志', '198', '1',  'operlog',           'system/operlog/index',       '', 1, 0, 'C', '0', '0',    'system:operlog:list',          'form',          'admin', sysdate(), '', null, '操作日志菜单');
 insert into sys_menu values ('501',  '登录日志', '198', '2',  'logininfor',        'system/logininfor/index',    '', 1, 0, 'C', '0', '0',    'system:logininfor:list',       'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
-insert into sys_menu values ('510',  '设备指标', '109', '1',  'device-index',      'analysis/device/index',      '', 1, 0, 'C', '0', '0',    'analysis:device:index',        'deviceindex',   'admin', sysdate(), '', null, '设备状态');
+insert into sys_menu values ('510',  '设备指标', '109', '1',  'device-index',      'ems/device/index',           '', 1, 0, 'C', '0', '0',    'analysis:device:index',        'deviceindex',   'admin', sysdate(), '', null, '设备状态');
 insert into sys_menu values ('511',  '告警分析', '109', '2',  'device-warn',       'analysis/device/warn',       '', 1, 0, 'C', '0', '0',    'analysis:device:warn',         'warn',          'admin', sysdate(), '', null, '告警分析');
 insert into sys_menu values ('520',  '产能分析', '110', '1',  'power-prod',        'analysis/power/prod',        '', 1, 0, 'C', '0', '0',    'analysis:power:prod',          'energyprod',     'admin', sysdate(), '', null, '产能分析');
 insert into sys_menu values ('521',  '储能分析', '110', '2',  'power-store',       'analysis/power/store',       '', 1, 0, 'C', '0', '0',    'analysis:power:store',         'energystore',    'admin', sysdate(), '', null, '储能分析');
@@ -231,7 +231,7 @@ insert into sys_menu values ('538',  '能源设施',   '124', '2',  'basecfg-fac
 insert into sys_menu values ('539',  '能流关系',   '124', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
 insert into sys_menu values ('540',  '用能设备',   '124', '4',  'basecfg-devccfg',        'basecfg/device/index',       '', 1, 0, 'C', '0', '0',   'basecfg:device:list',          'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
 insert into sys_menu values ('541',  '国网电价',   '125', '1',  'basecfg-electricity',    'basecfg/electricity/index',   '', 1, 0, 'C', '0', '0',  'basecfg:electricity:list',     'cfgwrite',   'admin', sysdate(), '', null, '电价属性');
-insert into sys_menu values ('542',  '计量设备',   '125', '2',  'basecfg-meterdevc',      'basecfg/meterdevc/index',     '', 1, 0, 'C', '0', '0',  'basecfg:meterdevc:list',       'cfgwrite',   'admin', sysdate(), '', null, '核算配置');
+insert into sys_menu values ('542',  '计量设备',   '125', '2',  'basecfg-meterdevc',      'basecfg/meterdevc/index',     '', 1, 0, 'C', '0', '0',  'ems:meterdevc:list',           'cfgwrite',   'admin', sysdate(), '', null, '计量设备');
 insert into sys_menu values ('543',  '碳核算',     '125', '3',  'basecfg-cacfg',          'basecfg/cacfg/index',        '', 1, 0, 'C', '0', '0',   'basecfg:cacfg:list',           'cfgwrite',   'admin', sysdate(), '', null, '碳排因子');