فهرست منبع

+ 动力箱元器件最新指标

chen.cheng 11 ماه پیش
والد
کامیت
57483c40e4
16فایلهای تغییر یافته به همراه1274 افزوده شده و 15 حذف شده
  1. 99 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmBoxElecEqptController.java
  2. 102 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsElecBoxEqptIndexController.java
  3. 177 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmBoxElecEqpt.java
  4. 162 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsElecBoxEqptIndex.java
  5. 61 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmBoxElecEqptMapper.java
  6. 64 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsElecBoxEqptIndexMapper.java
  7. 16 7
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/PowerBoxMapper.java
  8. 61 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmBoxElecEqptService.java
  9. 65 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsElecBoxEqptIndexService.java
  10. 93 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmBoxElecEqptServiceImpl.java
  11. 94 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsElecBoxEqptIndexServiceImpl.java
  12. 12 0
      ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmOpAlarmServiceImpl.java
  13. 94 0
      ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmBoxElecEqptMapper.xml
  14. 108 0
      ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsElecBoxEqptIndexMapper.xml
  15. 11 6
      ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/PowerBoxMapper.xml
  16. 55 2
      ems-cloud/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ObjType.java

+ 99 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmBoxElecEqptController.java

@@ -0,0 +1,99 @@
+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.AdmBoxElecEqpt;
+import com.ruoyi.ems.service.IAdmBoxElecEqptService;
+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-09-03
+ */
+@RestController
+@RequestMapping("/eqpt")
+public class AdmBoxElecEqptController extends BaseController
+{
+    @Autowired
+    private IAdmBoxElecEqptService admBoxElecEqptService;
+
+    /**
+     * 查询动力箱柜电气设备列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(AdmBoxElecEqpt admBoxElecEqpt)
+    {
+        startPage();
+        List<AdmBoxElecEqpt> list = admBoxElecEqptService.selectAdmBoxElecEqptList(admBoxElecEqpt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出动力箱柜电气设备列表
+     */
+    @Log(title = "动力箱柜电气设备", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AdmBoxElecEqpt admBoxElecEqpt)
+    {
+        List<AdmBoxElecEqpt> list = admBoxElecEqptService.selectAdmBoxElecEqptList(admBoxElecEqpt);
+        ExcelUtil<AdmBoxElecEqpt> util = new ExcelUtil<AdmBoxElecEqpt>(AdmBoxElecEqpt.class);
+        util.exportExcel(response, list, "动力箱柜电气设备数据");
+    }
+
+    /**
+     * 获取动力箱柜电气设备详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(admBoxElecEqptService.selectAdmBoxElecEqptById(id));
+    }
+
+    /**
+     * 新增动力箱柜电气设备
+     */
+    @Log(title = "动力箱柜电气设备", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AdmBoxElecEqpt admBoxElecEqpt)
+    {
+        return toAjax(admBoxElecEqptService.insertAdmBoxElecEqpt(admBoxElecEqpt));
+    }
+
+    /**
+     * 修改动力箱柜电气设备
+     */
+    @Log(title = "动力箱柜电气设备", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AdmBoxElecEqpt admBoxElecEqpt)
+    {
+        return toAjax(admBoxElecEqptService.updateAdmBoxElecEqpt(admBoxElecEqpt));
+    }
+
+    /**
+     * 删除动力箱柜电气设备
+     */
+    @Log(title = "动力箱柜电气设备", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(admBoxElecEqptService.deleteAdmBoxElecEqptByIds(ids));
+    }
+}

+ 102 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsElecBoxEqptIndexController.java

@@ -0,0 +1,102 @@
+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.AdmEmsElecBoxEqptIndex;
+import com.ruoyi.ems.service.IAdmEmsElecBoxEqptIndexService;
+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-09-03
+ */
+@RestController
+@RequestMapping("/elecBoxEqptIndex")
+public class AdmEmsElecBoxEqptIndexController extends BaseController {
+    @Autowired
+    private IAdmEmsElecBoxEqptIndexService admEmsElecBoxEqptIndexService;
+
+    /**
+     * 查询动力箱元器件指标列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        startPage();
+        List<AdmEmsElecBoxEqptIndex> list = admEmsElecBoxEqptIndexService
+            .selectAdmEmsElecBoxEqptIndexList(admEmsElecBoxEqptIndex);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/latest/list")
+    public TableDataInfo latestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        startPage();
+        List<AdmEmsElecBoxEqptIndex> list = admEmsElecBoxEqptIndexService
+            .selectAdmEmsElecBoxEqptLatestIndex(admEmsElecBoxEqptIndex);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出动力箱元器件指标列表
+     */
+    @Log(title = "动力箱元器件指标", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        List<AdmEmsElecBoxEqptIndex> list = admEmsElecBoxEqptIndexService
+            .selectAdmEmsElecBoxEqptIndexList(admEmsElecBoxEqptIndex);
+        ExcelUtil<AdmEmsElecBoxEqptIndex> util = new ExcelUtil<AdmEmsElecBoxEqptIndex>(AdmEmsElecBoxEqptIndex.class);
+        util.exportExcel(response, list, "动力箱元器件指标数据");
+    }
+
+    /**
+     * 获取动力箱元器件指标详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(admEmsElecBoxEqptIndexService.selectAdmEmsElecBoxEqptIndexById(id));
+    }
+
+    /**
+     * 新增动力箱元器件指标
+     */
+    @Log(title = "动力箱元器件指标", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        return toAjax(admEmsElecBoxEqptIndexService.insertAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex));
+    }
+
+    /**
+     * 修改动力箱元器件指标
+     */
+    @Log(title = "动力箱元器件指标", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        return toAjax(admEmsElecBoxEqptIndexService.updateAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex));
+    }
+
+    /**
+     * 删除动力箱元器件指标
+     */
+    @Log(title = "动力箱元器件指标", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(admEmsElecBoxEqptIndexService.deleteAdmEmsElecBoxEqptIndexByIds(ids));
+    }
+}

+ 177 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmBoxElecEqpt.java

@@ -0,0 +1,177 @@
+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_box_elec_eqpt
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public class AdmBoxElecEqpt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 箱柜代码 */
+    @Excel(name = "箱柜代码")
+    private String boxCode;
+
+    /** 电气编码 */
+    @Excel(name = "电气编码")
+    private String eqptCode;
+
+    /** 外部系统编码 */
+    @Excel(name = "外部系统编码")
+    private String extEqptCode;
+
+    /** 电气符号代码 */
+    @Excel(name = "电气符号代码")
+    private String eqptType;
+
+    /** 电气型号 */
+    @Excel(name = "电气型号")
+    private String eqptSpec;
+
+    /** 额定电压 */
+    @Excel(name = "额定电压")
+    private Integer ratedVoltage;
+
+    /** 额定电流 */
+    @Excel(name = "额定电流")
+    private Integer ratedCurrent;
+
+    /** 祖籍列表 */
+    @Excel(name = "祖籍列表")
+    private String ancestors;
+
+    /** 上级电气件 */
+    @Excel(name = "上级电气件")
+    private String parentEqpt;
+
+    /** 下级支路 */
+    @Excel(name = "下级支路")
+    private String subCircuit;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setBoxCode(String boxCode) 
+    {
+        this.boxCode = boxCode;
+    }
+
+    public String getBoxCode() 
+    {
+        return boxCode;
+    }
+    public void setEqptCode(String eqptCode) 
+    {
+        this.eqptCode = eqptCode;
+    }
+
+    public String getEqptCode() 
+    {
+        return eqptCode;
+    }
+    public void setExtEqptCode(String extEqptCode) 
+    {
+        this.extEqptCode = extEqptCode;
+    }
+
+    public String getExtEqptCode() 
+    {
+        return extEqptCode;
+    }
+    public void setEqptType(String eqptType) 
+    {
+        this.eqptType = eqptType;
+    }
+
+    public String getEqptType() 
+    {
+        return eqptType;
+    }
+    public void setEqptSpec(String eqptSpec) 
+    {
+        this.eqptSpec = eqptSpec;
+    }
+
+    public String getEqptSpec() 
+    {
+        return eqptSpec;
+    }
+    public void setRatedVoltage(Integer ratedVoltage) 
+    {
+        this.ratedVoltage = ratedVoltage;
+    }
+
+    public Integer getRatedVoltage() 
+    {
+        return ratedVoltage;
+    }
+    public void setRatedCurrent(Integer ratedCurrent) 
+    {
+        this.ratedCurrent = ratedCurrent;
+    }
+
+    public Integer getRatedCurrent() 
+    {
+        return ratedCurrent;
+    }
+    public void setAncestors(String ancestors) 
+    {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors() 
+    {
+        return ancestors;
+    }
+    public void setParentEqpt(String parentEqpt) 
+    {
+        this.parentEqpt = parentEqpt;
+    }
+
+    public String getParentEqpt() 
+    {
+        return parentEqpt;
+    }
+    public void setSubCircuit(String subCircuit) 
+    {
+        this.subCircuit = subCircuit;
+    }
+
+    public String getSubCircuit() 
+    {
+        return subCircuit;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("boxCode", getBoxCode())
+            .append("eqptCode", getEqptCode())
+            .append("extEqptCode", getExtEqptCode())
+            .append("eqptType", getEqptType())
+            .append("eqptSpec", getEqptSpec())
+            .append("ratedVoltage", getRatedVoltage())
+            .append("ratedCurrent", getRatedCurrent())
+            .append("ancestors", getAncestors())
+            .append("parentEqpt", getParentEqpt())
+            .append("subCircuit", getSubCircuit())
+            .toString();
+    }
+}

+ 162 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsElecBoxEqptIndex.java

@@ -0,0 +1,162 @@
+package com.ruoyi.ems.domain;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 动力箱元器件指标对象 adm_ems_elec_box_eqpt_index
+ *
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public class AdmEmsElecBoxEqptIndex extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    private Long id;
+
+    /**
+     * 箱体代码
+     */
+    @Excel(name = "箱体代码")
+    private String boxCode;
+
+    /**
+     * 元件代码
+     */
+    @Excel(name = "元件代码")
+    private String eqptCode;
+
+    /**
+     * 服务区代码
+     */
+    @Excel(name = "服务区代码")
+    private String areaCode;
+
+    /**
+     * 日期
+     */
+    @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;
+
+    /**
+     * 电压(伏)
+     */
+    @Excel(name = "电压", readConverterExp = "伏=")
+    private Double voltage;
+
+    /**
+     * 电流(安培)
+     */
+    @Excel(name = "电流", readConverterExp = "安=培")
+    private Double current;
+
+    /**
+     * 功率(千瓦)
+     */
+    @Excel(name = "功率", readConverterExp = "千=瓦")
+    private Double power;
+
+    private String eqptSpec;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setBoxCode(String boxCode) {
+        this.boxCode = boxCode;
+    }
+
+    public String getBoxCode() {
+        return boxCode;
+    }
+
+    public void setEqptCode(String eqptCode) {
+        this.eqptCode = eqptCode;
+    }
+
+    public String getEqptCode() {
+        return eqptCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setVoltage(Double voltage) {
+        this.voltage = voltage;
+    }
+
+    public Double getVoltage() {
+        return voltage;
+    }
+
+    public void setCurrent(Double current) {
+        this.current = current;
+    }
+
+    public Double getCurrent() {
+        return current;
+    }
+
+    public void setPower(Double power) {
+        this.power = power;
+    }
+
+    public Double getPower() {
+        return power;
+    }
+
+    public String getEqptSpec() {
+        return eqptSpec;
+    }
+
+    public void setEqptSpec(String eqptSpec) {
+        this.eqptSpec = eqptSpec;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("boxCode", getBoxCode()).append("eqptCode", getEqptCode()).append("areaCode", getAreaCode()).append("date", getDate()).append("time", getTime()).append("voltage", getVoltage()).append("current", getCurrent()).append("power", getPower()).toString();
+    }
+}

+ 61 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmBoxElecEqptMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmBoxElecEqpt;
+
+/**
+ * 动力箱柜电气设备Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public interface AdmBoxElecEqptMapper 
+{
+    /**
+     * 查询动力箱柜电气设备
+     * 
+     * @param id 动力箱柜电气设备主键
+     * @return 动力箱柜电气设备
+     */
+    public AdmBoxElecEqpt selectAdmBoxElecEqptById(Long id);
+
+    /**
+     * 查询动力箱柜电气设备列表
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 动力箱柜电气设备集合
+     */
+    public List<AdmBoxElecEqpt> selectAdmBoxElecEqptList(AdmBoxElecEqpt admBoxElecEqpt);
+
+    /**
+     * 新增动力箱柜电气设备
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 结果
+     */
+    public int insertAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
+
+    /**
+     * 修改动力箱柜电气设备
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 结果
+     */
+    public int updateAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
+
+    /**
+     * 删除动力箱柜电气设备
+     * 
+     * @param id 动力箱柜电气设备主键
+     * @return 结果
+     */
+    public int deleteAdmBoxElecEqptById(Long id);
+
+    /**
+     * 批量删除动力箱柜电气设备
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAdmBoxElecEqptByIds(Long[] ids);
+}

+ 64 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsElecBoxEqptIndexMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.ems.mapper;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex;
+
+/**
+ * 动力箱元器件指标Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public interface AdmEmsElecBoxEqptIndexMapper
+{
+    /**
+     * 查询动力箱元器件指标
+     *
+     * @param id 动力箱元器件指标主键
+     * @return 动力箱元器件指标
+     */
+    public AdmEmsElecBoxEqptIndex selectAdmEmsElecBoxEqptIndexById(Long id);
+
+    /**
+     * 查询动力箱元器件指标列表
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 动力箱元器件指标集合
+     */
+    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptIndexList(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+
+    List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptLatestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+    /**
+     * 新增动力箱元器件指标
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 结果
+     */
+    public int insertAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+    /**
+     * 修改动力箱元器件指标
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 结果
+     */
+    public int updateAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+    /**
+     * 删除动力箱元器件指标
+     *
+     * @param id 动力箱元器件指标主键
+     * @return 结果
+     */
+    public int deleteAdmEmsElecBoxEqptIndexById(Long id);
+
+    /**
+     * 批量删除动力箱元器件指标
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAdmEmsElecBoxEqptIndexByIds(Long[] ids);
+}

+ 16 - 7
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/PowerBoxMapper.java

@@ -5,7 +5,7 @@ import com.ruoyi.ems.domain.PowerBox;
 
 /**
  * 动力箱柜Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2024-08-20
  */
@@ -13,7 +13,7 @@ public interface PowerBoxMapper
 {
     /**
      * 查询动力箱柜
-     * 
+     *
      * @param id 动力箱柜主键
      * @return 动力箱柜
      */
@@ -21,15 +21,24 @@ public interface PowerBoxMapper
 
     /**
      * 查询动力箱柜列表
-     * 
+     *
      * @param powerBox 动力箱柜
      * @return 动力箱柜集合
      */
      List<PowerBox> selectPowerBoxList(PowerBox powerBox);
 
     /**
+     * Select power box by code power box.
+     *
+     * @param boxCode the box code
+     * @return the power box
+     * @author chen.cheng
+     */
+    PowerBox selectPowerBoxByCode(String boxCode);
+
+    /**
      * 新增动力箱柜
-     * 
+     *
      * @param powerBox 动力箱柜
      * @return 结果
      */
@@ -37,7 +46,7 @@ public interface PowerBoxMapper
 
     /**
      * 修改动力箱柜
-     * 
+     *
      * @param powerBox 动力箱柜
      * @return 结果
      */
@@ -45,7 +54,7 @@ public interface PowerBoxMapper
 
     /**
      * 删除动力箱柜
-     * 
+     *
      * @param id 动力箱柜主键
      * @return 结果
      */
@@ -53,7 +62,7 @@ public interface PowerBoxMapper
 
     /**
      * 批量删除动力箱柜
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

+ 61 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmBoxElecEqptService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmBoxElecEqpt;
+
+/**
+ * 动力箱柜电气设备Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public interface IAdmBoxElecEqptService 
+{
+    /**
+     * 查询动力箱柜电气设备
+     * 
+     * @param id 动力箱柜电气设备主键
+     * @return 动力箱柜电气设备
+     */
+    public AdmBoxElecEqpt selectAdmBoxElecEqptById(Long id);
+
+    /**
+     * 查询动力箱柜电气设备列表
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 动力箱柜电气设备集合
+     */
+    public List<AdmBoxElecEqpt> selectAdmBoxElecEqptList(AdmBoxElecEqpt admBoxElecEqpt);
+
+    /**
+     * 新增动力箱柜电气设备
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 结果
+     */
+    public int insertAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
+
+    /**
+     * 修改动力箱柜电气设备
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 结果
+     */
+    public int updateAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt);
+
+    /**
+     * 批量删除动力箱柜电气设备
+     * 
+     * @param ids 需要删除的动力箱柜电气设备主键集合
+     * @return 结果
+     */
+    public int deleteAdmBoxElecEqptByIds(Long[] ids);
+
+    /**
+     * 删除动力箱柜电气设备信息
+     * 
+     * @param id 动力箱柜电气设备主键
+     * @return 结果
+     */
+    public int deleteAdmBoxElecEqptById(Long id);
+}

+ 65 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsElecBoxEqptIndexService.java

@@ -0,0 +1,65 @@
+package com.ruoyi.ems.service;
+
+import java.util.List;
+import com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex;
+
+/**
+ * 动力箱元器件指标Service接口
+ *
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+public interface IAdmEmsElecBoxEqptIndexService
+{
+    /**
+     * 查询动力箱元器件指标
+     *
+     * @param id 动力箱元器件指标主键
+     * @return 动力箱元器件指标
+     */
+    public AdmEmsElecBoxEqptIndex selectAdmEmsElecBoxEqptIndexById(Long id);
+
+    /**
+     * 查询动力箱元器件指标列表
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 动力箱元器件指标集合
+     */
+    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptIndexList(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+    List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptLatestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+    /**
+     * 新增动力箱元器件指标
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 结果
+     */
+    public int insertAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+    /**
+     * 修改动力箱元器件指标
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 结果
+     */
+    public int updateAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex);
+
+    /**
+     * 批量删除动力箱元器件指标
+     *
+     * @param ids 需要删除的动力箱元器件指标主键集合
+     * @return 结果
+     */
+    public int deleteAdmEmsElecBoxEqptIndexByIds(Long[] ids);
+
+    /**
+     * 删除动力箱元器件指标信息
+     *
+     * @param id 动力箱元器件指标主键
+     * @return 结果
+     */
+    public int deleteAdmEmsElecBoxEqptIndexById(Long id);
+
+
+}

+ 93 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmBoxElecEqptServiceImpl.java

@@ -0,0 +1,93 @@
+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.AdmBoxElecEqptMapper;
+import com.ruoyi.ems.domain.AdmBoxElecEqpt;
+import com.ruoyi.ems.service.IAdmBoxElecEqptService;
+
+/**
+ * 动力箱柜电气设备Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+@Service
+public class AdmBoxElecEqptServiceImpl implements IAdmBoxElecEqptService 
+{
+    @Autowired
+    private AdmBoxElecEqptMapper admBoxElecEqptMapper;
+
+    /**
+     * 查询动力箱柜电气设备
+     * 
+     * @param id 动力箱柜电气设备主键
+     * @return 动力箱柜电气设备
+     */
+    @Override
+    public AdmBoxElecEqpt selectAdmBoxElecEqptById(Long id)
+    {
+        return admBoxElecEqptMapper.selectAdmBoxElecEqptById(id);
+    }
+
+    /**
+     * 查询动力箱柜电气设备列表
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 动力箱柜电气设备
+     */
+    @Override
+    public List<AdmBoxElecEqpt> selectAdmBoxElecEqptList(AdmBoxElecEqpt admBoxElecEqpt)
+    {
+        return admBoxElecEqptMapper.selectAdmBoxElecEqptList(admBoxElecEqpt);
+    }
+
+    /**
+     * 新增动力箱柜电气设备
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 结果
+     */
+    @Override
+    public int insertAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt)
+    {
+        return admBoxElecEqptMapper.insertAdmBoxElecEqpt(admBoxElecEqpt);
+    }
+
+    /**
+     * 修改动力箱柜电气设备
+     * 
+     * @param admBoxElecEqpt 动力箱柜电气设备
+     * @return 结果
+     */
+    @Override
+    public int updateAdmBoxElecEqpt(AdmBoxElecEqpt admBoxElecEqpt)
+    {
+        return admBoxElecEqptMapper.updateAdmBoxElecEqpt(admBoxElecEqpt);
+    }
+
+    /**
+     * 批量删除动力箱柜电气设备
+     * 
+     * @param ids 需要删除的动力箱柜电气设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmBoxElecEqptByIds(Long[] ids)
+    {
+        return admBoxElecEqptMapper.deleteAdmBoxElecEqptByIds(ids);
+    }
+
+    /**
+     * 删除动力箱柜电气设备信息
+     * 
+     * @param id 动力箱柜电气设备主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmBoxElecEqptById(Long id)
+    {
+        return admBoxElecEqptMapper.deleteAdmBoxElecEqptById(id);
+    }
+}

+ 94 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsElecBoxEqptIndexServiceImpl.java

@@ -0,0 +1,94 @@
+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.domain.AdmEmsElecBoxEqptIndex;
+import com.ruoyi.ems.mapper.AdmEmsElecBoxEqptIndexMapper;
+import com.ruoyi.ems.service.IAdmEmsElecBoxEqptIndexService;
+
+/**
+ * 动力箱元器件指标Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-09-03
+ */
+@Service
+public class AdmEmsElecBoxEqptIndexServiceImpl implements IAdmEmsElecBoxEqptIndexService {
+    @Autowired
+    private AdmEmsElecBoxEqptIndexMapper admEmsElecBoxEqptIndexMapper;
+
+    /**
+     * 查询动力箱元器件指标
+     *
+     * @param id 动力箱元器件指标主键
+     * @return 动力箱元器件指标
+     */
+    @Override
+    public AdmEmsElecBoxEqptIndex selectAdmEmsElecBoxEqptIndexById(Long id) {
+        return admEmsElecBoxEqptIndexMapper.selectAdmEmsElecBoxEqptIndexById(id);
+    }
+
+    /**
+     * 查询动力箱元器件指标列表
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 动力箱元器件指标
+     */
+    @Override
+    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptIndexList(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        return admEmsElecBoxEqptIndexMapper.selectAdmEmsElecBoxEqptIndexList(admEmsElecBoxEqptIndex);
+    }
+
+
+    @Override
+    public List<AdmEmsElecBoxEqptIndex> selectAdmEmsElecBoxEqptLatestIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        return admEmsElecBoxEqptIndexMapper.selectAdmEmsElecBoxEqptLatestIndex(admEmsElecBoxEqptIndex);
+    }
+
+    /**
+     * 新增动力箱元器件指标
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 结果
+     */
+    @Override
+    public int insertAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        return admEmsElecBoxEqptIndexMapper.insertAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex);
+    }
+
+    /**
+     * 修改动力箱元器件指标
+     *
+     * @param admEmsElecBoxEqptIndex 动力箱元器件指标
+     * @return 结果
+     */
+    @Override
+    public int updateAdmEmsElecBoxEqptIndex(AdmEmsElecBoxEqptIndex admEmsElecBoxEqptIndex) {
+        return admEmsElecBoxEqptIndexMapper.updateAdmEmsElecBoxEqptIndex(admEmsElecBoxEqptIndex);
+    }
+
+    /**
+     * 批量删除动力箱元器件指标
+     *
+     * @param ids 需要删除的动力箱元器件指标主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmEmsElecBoxEqptIndexByIds(Long[] ids) {
+        return admEmsElecBoxEqptIndexMapper.deleteAdmEmsElecBoxEqptIndexByIds(ids);
+    }
+
+    /**
+     * 删除动力箱元器件指标信息
+     *
+     * @param id 动力箱元器件指标主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdmEmsElecBoxEqptIndexById(Long id) {
+        return admEmsElecBoxEqptIndexMapper.deleteAdmEmsElecBoxEqptIndexById(id);
+    }
+}

+ 12 - 0
ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmOpAlarmServiceImpl.java

@@ -15,11 +15,13 @@ import com.ruoyi.ems.domain.Area;
 import com.ruoyi.ems.domain.AreaBuildingZoning;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.EmsFacs;
+import com.ruoyi.ems.domain.PowerBox;
 import com.ruoyi.ems.mapper.AdmOpAlarmMapper;
 import com.ruoyi.ems.mapper.AreaBuildingZoningMapper;
 import com.ruoyi.ems.mapper.AreaMapper;
 import com.ruoyi.ems.mapper.EmsDeviceMapper;
 import com.ruoyi.ems.mapper.EmsFacsMapper;
+import com.ruoyi.ems.mapper.PowerBoxMapper;
 import com.ruoyi.ems.service.IAdmOpAlarmService;
 
 /**
@@ -45,6 +47,9 @@ public class AdmOpAlarmServiceImpl implements IAdmOpAlarmService {
     @Autowired
     private EmsDeviceMapper emsDeviceMapper;
 
+    @Autowired
+    private PowerBoxMapper powerBoxMapper;
+
     /**
      * 查询能源设施告警
      *
@@ -183,6 +188,13 @@ public class AdmOpAlarmServiceImpl implements IAdmOpAlarmService {
             }
             return emsDevice.getDeviceName();
         }
+        if (ObjType.POWER_BOX.getCode().equals(objType)) {
+            PowerBox powerBox = powerBoxMapper.selectPowerBoxByCode(objCode);
+            if (ObjectUtils.isEmpty(powerBox)) {
+                return StringUtils.EMPTY;
+            }
+            return String.format("%s(%s)", powerBox.getLocation(), powerBox.getAreaName());
+        }
         return StringUtils.EMPTY;
     }
 }

+ 94 - 0
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmBoxElecEqptMapper.xml

@@ -0,0 +1,94 @@
+<?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.AdmBoxElecEqptMapper">
+
+    <resultMap type="com.ruoyi.ems.domain.AdmBoxElecEqpt" id="AdmBoxElecEqptResult">
+        <result property="id"    column="id"    />
+        <result property="boxCode"    column="box_code"    />
+        <result property="eqptCode"    column="eqpt_code"    />
+        <result property="extEqptCode"    column="ext_eqpt_code"    />
+        <result property="eqptType"    column="eqpt_type"    />
+        <result property="eqptSpec"    column="eqpt_spec"    />
+        <result property="ratedVoltage"    column="rated_voltage"    />
+        <result property="ratedCurrent"    column="rated_current"    />
+        <result property="ancestors"    column="ancestors"    />
+        <result property="parentEqpt"    column="parent_eqpt"    />
+        <result property="subCircuit"    column="sub_circuit"    />
+    </resultMap>
+
+    <sql id="selectAdmBoxElecEqptVo">
+        select id, box_code, eqpt_code, ext_eqpt_code, eqpt_type, eqpt_spec, rated_voltage, rated_current, ancestors, parent_eqpt, sub_circuit from adm_box_elec_eqpt
+    </sql>
+
+    <select id="selectAdmBoxElecEqptList" parameterType="com.ruoyi.ems.domain.AdmBoxElecEqpt" resultMap="AdmBoxElecEqptResult">
+        <include refid="selectAdmBoxElecEqptVo"/>
+        <where>
+            <if test="boxCode != null  and boxCode != ''"> and box_code = #{boxCode}</if>
+            <if test="eqptCode != null  and eqptCode != ''"> and eqpt_code = #{eqptCode}</if>
+        </where>
+    </select>
+
+
+    <select id="selectAdmBoxElecEqptById" parameterType="Long" resultMap="AdmBoxElecEqptResult">
+        <include refid="selectAdmBoxElecEqptVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAdmBoxElecEqpt" parameterType="com.ruoyi.ems.domain.AdmBoxElecEqpt" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_box_elec_eqpt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="boxCode != null and boxCode != ''">box_code,</if>
+            <if test="eqptCode != null and eqptCode != ''">eqpt_code,</if>
+            <if test="extEqptCode != null">ext_eqpt_code,</if>
+            <if test="eqptType != null">eqpt_type,</if>
+            <if test="eqptSpec != null">eqpt_spec,</if>
+            <if test="ratedVoltage != null">rated_voltage,</if>
+            <if test="ratedCurrent != null">rated_current,</if>
+            <if test="ancestors != null">ancestors,</if>
+            <if test="parentEqpt != null">parent_eqpt,</if>
+            <if test="subCircuit != null">sub_circuit,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="boxCode != null and boxCode != ''">#{boxCode},</if>
+            <if test="eqptCode != null and eqptCode != ''">#{eqptCode},</if>
+            <if test="extEqptCode != null">#{extEqptCode},</if>
+            <if test="eqptType != null">#{eqptType},</if>
+            <if test="eqptSpec != null">#{eqptSpec},</if>
+            <if test="ratedVoltage != null">#{ratedVoltage},</if>
+            <if test="ratedCurrent != null">#{ratedCurrent},</if>
+            <if test="ancestors != null">#{ancestors},</if>
+            <if test="parentEqpt != null">#{parentEqpt},</if>
+            <if test="subCircuit != null">#{subCircuit},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAdmBoxElecEqpt" parameterType="com.ruoyi.ems.domain.AdmBoxElecEqpt">
+        update adm_box_elec_eqpt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="boxCode != null and boxCode != ''">box_code = #{boxCode},</if>
+            <if test="eqptCode != null and eqptCode != ''">eqpt_code = #{eqptCode},</if>
+            <if test="extEqptCode != null">ext_eqpt_code = #{extEqptCode},</if>
+            <if test="eqptType != null">eqpt_type = #{eqptType},</if>
+            <if test="eqptSpec != null">eqpt_spec = #{eqptSpec},</if>
+            <if test="ratedVoltage != null">rated_voltage = #{ratedVoltage},</if>
+            <if test="ratedCurrent != null">rated_current = #{ratedCurrent},</if>
+            <if test="ancestors != null">ancestors = #{ancestors},</if>
+            <if test="parentEqpt != null">parent_eqpt = #{parentEqpt},</if>
+            <if test="subCircuit != null">sub_circuit = #{subCircuit},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAdmBoxElecEqptById" parameterType="Long">
+        delete from adm_box_elec_eqpt where id = #{id}
+    </delete>
+
+    <delete id="deleteAdmBoxElecEqptByIds" parameterType="String">
+        delete from adm_box_elec_eqpt where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 108 - 0
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsElecBoxEqptIndexMapper.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.AdmEmsElecBoxEqptIndexMapper">
+
+    <resultMap type="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex" id="AdmEmsElecBoxEqptIndexResult">
+        <result property="id" column="id"/>
+        <result property="boxCode" column="box_code"/>
+        <result property="eqptCode" column="eqpt_code"/>
+        <result property="areaCode" column="area_code"/>
+        <result property="date" column="date"/>
+        <result property="time" column="time"/>
+        <result property="voltage" column="voltage"/>
+        <result property="current" column="current"/>
+        <result property="power" column="power"/>
+        <result property="eqptSpec" column="eqpt_spec"/>
+    </resultMap>
+
+    <select id="selectAdmEmsElecBoxEqptLatestIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex"
+            resultMap="AdmEmsElecBoxEqptIndexResult">
+        WITH rowIndex AS (SELECT *, ROW_NUMBER() over ( PARTITION BY eqpt_code ORDER BY TIME DESC ) AS rowNum
+                          FROM `adm_ems_elec_box_eqpt_index`
+                          WHERE box_code = #{boxCode})
+        SELECT
+            latestIndex.*,
+            elecEqpt.eqpt_spec
+        FROM
+            rowIndex latestIndex
+                INNER JOIN adm_box_elec_eqpt elecEqpt ON latestIndex.eqpt_code = elecEqpt.eqpt_code
+        WHERE
+            rowNum =1
+    </select>
+
+
+    <select id="selectAdmEmsElecBoxEqptIndexList" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex"
+            resultMap="AdmEmsElecBoxEqptIndexResult">
+        <include refid="selectAdmEmsElecBoxEqptIndexVo"/>
+        <where>
+            <if test="boxCode != null  and boxCode != ''">and box_code = #{boxCode}</if>
+            <if test="eqptCode != null  and eqptCode != ''">and eqpt_code = #{eqptCode}</if>
+            <if test="areaCode != null  and areaCode != ''">and area_code = #{areaCode}</if>
+        </where>
+    </select>
+
+    <sql id="selectAdmEmsElecBoxEqptIndexVo">
+        select id, box_code, eqpt_code, area_code, date, time, voltage, current, power
+        from adm_ems_elec_box_eqpt_index
+    </sql>
+
+    <select id="selectAdmEmsElecBoxEqptIndexById" parameterType="Long" resultMap="AdmEmsElecBoxEqptIndexResult">
+        <include refid="selectAdmEmsElecBoxEqptIndexVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAdmEmsElecBoxEqptIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_elec_box_eqpt_index
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="boxCode != null and boxCode != ''">box_code,</if>
+            <if test="eqptCode != null and eqptCode != ''">eqpt_code,</if>
+            <if test="areaCode != null and areaCode != ''">area_code,</if>
+            <if test="date != null">date,</if>
+            <if test="time != null">time,</if>
+            <if test="voltage != null">voltage,</if>
+            <if test="current != null">current,</if>
+            <if test="power != null">power,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="boxCode != null and boxCode != ''">#{boxCode},</if>
+            <if test="eqptCode != null and eqptCode != ''">#{eqptCode},</if>
+            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
+            <if test="date != null">#{date},</if>
+            <if test="time != null">#{time},</if>
+            <if test="voltage != null">#{voltage},</if>
+            <if test="current != null">#{current},</if>
+            <if test="power != null">#{power},</if>
+        </trim>
+    </insert>
+
+    <update id="updateAdmEmsElecBoxEqptIndex" parameterType="com.ruoyi.ems.domain.AdmEmsElecBoxEqptIndex">
+        update adm_ems_elec_box_eqpt_index
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="boxCode != null and boxCode != ''">box_code = #{boxCode},</if>
+            <if test="eqptCode != null and eqptCode != ''">eqpt_code = #{eqptCode},</if>
+            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
+            <if test="date != null">date = #{date},</if>
+            <if test="time != null">time = #{time},</if>
+            <if test="voltage != null">voltage = #{voltage},</if>
+            <if test="current != null">current = #{current},</if>
+            <if test="power != null">power = #{power},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAdmEmsElecBoxEqptIndexById" parameterType="Long">
+        delete
+        from adm_ems_elec_box_eqpt_index
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteAdmEmsElecBoxEqptIndexByIds" parameterType="String">
+        delete from adm_ems_elec_box_eqpt_index where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 11 - 6
ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/PowerBoxMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ems.mapper.PowerBoxMapper">
-    
+
     <resultMap type="com.ruoyi.ems.domain.PowerBox" id="powerBoxResult">
         <result property="id"    column="id"    />
         <result property="boxCode"    column="box_code"    />
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPowerBoxList" parameterType="com.ruoyi.ems.domain.PowerBox" resultMap="powerBoxResult">
         <include refid="selectPowerBoxVo"/>
-        <where>  
+        <where>
             <if test="boxCode != null  and boxCode != ''"> and pb.box_code = #{boxCode}</if>
             <if test="boxType != null "> and pb.box_type = #{boxType}</if>
             <if test="areaCode != null  and areaCode != ''"> and pb.area_code = #{areaCode}</if>
@@ -36,12 +36,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gatewayPort != null "> and pb.gateway_port = #{gatewayPort}</if>
         </where>
     </select>
-    
+
     <select id="selectPowerBoxById" parameterType="Long" resultMap="powerBoxResult">
         <include refid="selectPowerBoxVo"/>
         where pb.id = #{id}
     </select>
-        
+
+    <select id="selectPowerBoxByCode" parameterType="String" resultMap="powerBoxResult">
+        <include refid="selectPowerBoxVo"/>
+        where pb.box_code = #{boxCode}
+    </select>
+
     <insert id="insertPowerBox" parameterType="com.ruoyi.ems.domain.PowerBox" useGeneratedKeys="true" keyProperty="id">
         insert into adm_power_box
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -83,9 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deletePowerBoxByIds" parameterType="String">
-        delete from adm_power_box where id in 
+        delete from adm_power_box where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

+ 55 - 2
ems-cloud/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ObjType.java

@@ -7,23 +7,76 @@ package com.ruoyi.common.core.enums;
  */
 public enum ObjType {
     /**
-     * 0:园区,1:区块,2:设施,3:设备
+     * 0:园区,1:区块,2:设施,3:设备,4:配电柜
      */
-    AREA(0, "园区"), ZONE(1, "区块"), FACS(2, "设施"), DEVICE(3, "设备");
+    AREA(0, "园区"),
+    /**
+     * Zone obj type.
+     *
+     * @author chen.cheng
+     */
+    ZONE(1, "区块"),
+    /**
+     * Facs obj type.
+     *
+     * @author chen.cheng
+     */
+    FACS(2, "设施"),
+    /**
+     * Device obj type.
+     *
+     * @author chen.cheng
+     */
+    DEVICE(3, "设备"),
+    /**
+     * Power box obj type.
+     *
+     * @author chen.cheng
+     */
+    POWER_BOX(4, "配电柜");
 
+    /**
+     * The Code.
+     *
+     * @author chen.cheng
+     */
     private final Integer code;
 
+    /**
+     * The Info.
+     *
+     * @author chen.cheng
+     */
     private final String info;
 
+    /**
+     * Instantiates a new Obj type.
+     *
+     * @param code the code
+     * @param info the info
+     * @author chen.cheng
+     */
     ObjType(Integer code, String info) {
         this.code = code;
         this.info = info;
     }
 
+    /**
+     * Gets code.
+     *
+     * @return the code
+     * @author chen.cheng
+     */
     public Integer getCode() {
         return code;
     }
 
+    /**
+     * Gets info.
+     *
+     * @return the info
+     * @author chen.cheng
+     */
     public String getInfo() {
         return info;
     }