后端改造

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

@@ -39,10 +39,10 @@ public class EmsDeviceRbookController extends BaseController
      */
     @RequiresPermissions("ems:rbook:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsDeviceRbook admEmsDeviceRbook)
+    public TableDataInfo list(EmsDeviceRbook rbook)
     {
         startPage();
-        List<EmsDeviceRbook> list = admEmsDeviceRbookService.selectDeviceRbookList(admEmsDeviceRbook);
+        List<EmsDeviceRbook> list = admEmsDeviceRbookService.selectDeviceRbookList(rbook);
         return getDataTable(list);
     }
 
@@ -52,9 +52,9 @@ public class EmsDeviceRbookController extends BaseController
     @RequiresPermissions("ems:rbook:export")
     @Log(title = "设备台账", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, EmsDeviceRbook admEmsDeviceRbook)
+    public void export(HttpServletResponse response, EmsDeviceRbook rbook)
     {
-        List<EmsDeviceRbook> list = admEmsDeviceRbookService.selectDeviceRbookList(admEmsDeviceRbook);
+        List<EmsDeviceRbook> list = admEmsDeviceRbookService.selectDeviceRbookList(rbook);
         ExcelUtil<EmsDeviceRbook> util = new ExcelUtil<EmsDeviceRbook>(EmsDeviceRbook.class);
         util.exportExcel(response, list, "设备台账数据");
     }
@@ -75,9 +75,9 @@ public class EmsDeviceRbookController extends BaseController
     @RequiresPermissions("ems:rbook:add")
     @Log(title = "设备台账", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody EmsDeviceRbook admEmsDeviceRbook)
+    public AjaxResult add(@RequestBody EmsDeviceRbook rbook)
     {
-        return toAjax(admEmsDeviceRbookService.insertDeviceRbook(admEmsDeviceRbook));
+        return toAjax(admEmsDeviceRbookService.insertDeviceRbook(rbook));
     }
 
     /**
@@ -86,9 +86,9 @@ public class EmsDeviceRbookController extends BaseController
     @RequiresPermissions("ems:rbook:edit")
     @Log(title = "设备台账", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody EmsDeviceRbook admEmsDeviceRbook)
+    public AjaxResult edit(@RequestBody EmsDeviceRbook rbook)
     {
-        return toAjax(admEmsDeviceRbookService.updateDeviceRbook(admEmsDeviceRbook));
+        return toAjax(admEmsDeviceRbookService.updateDeviceRbook(rbook));
     }
 
     /**

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmOpInspectionTaskController.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/OpInspectionPlanController.java

@@ -22,29 +22,29 @@ 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.AdmOpInspectionTask;
-import com.ruoyi.ems.service.IAdmOpInspectionTaskService;
+import com.ruoyi.ems.domain.OpInspectionTask;
+import com.ruoyi.ems.service.IOpInspectionPlanService;
 
 /**
- * 巡检任务Controller
+ * 巡检计划Controller
  *
  * @author ruoyi
  * @date 2024-08-29
  */
 @RestController
-@RequestMapping("/inspectionTask")
-public class AdmOpInspectionTaskController extends BaseController {
+@RequestMapping("/inspectionPlan")
+public class OpInspectionPlanController extends BaseController {
     @Autowired
-    private IAdmOpInspectionTaskService inspectionTaskService;
+    private IOpInspectionPlanService inspectionTaskService;
 
     /**
      * 查询巡检任务列表
      */
     @RequiresPermissions("ems:inspection-task:list")
     @GetMapping("/list")
-    public TableDataInfo list(AdmOpInspectionTask inspectionTask) {
+    public TableDataInfo list(OpInspectionTask inspectionTask) {
         startPage();
-        List<AdmOpInspectionTask> list = inspectionTaskService.selectAdmOpInspectionTaskList(inspectionTask);
+        List<OpInspectionTask> list = inspectionTaskService.selectOpInspectionPlanList(inspectionTask);
         return getDataTable(list);
     }
 
@@ -54,9 +54,9 @@ public class AdmOpInspectionTaskController extends BaseController {
     @RequiresPermissions("ems:inspection-task:export")
     @Log(title = "巡检任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmOpInspectionTask inspectionTask) {
-        List<AdmOpInspectionTask> list = inspectionTaskService.selectAdmOpInspectionTaskList(inspectionTask);
-        ExcelUtil<AdmOpInspectionTask> util = new ExcelUtil<AdmOpInspectionTask>(AdmOpInspectionTask.class);
+    public void export(HttpServletResponse response, OpInspectionTask inspectionTask) {
+        List<OpInspectionTask> list = inspectionTaskService.selectOpInspectionPlanList(inspectionTask);
+        ExcelUtil<OpInspectionTask> util = new ExcelUtil<OpInspectionTask>(OpInspectionTask.class);
         util.exportExcel(response, list, "巡检任务数据");
     }
 
@@ -66,7 +66,7 @@ public class AdmOpInspectionTaskController extends BaseController {
     @RequiresPermissions("ems:inspection-task:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(inspectionTaskService.selectAdmOpInspectionTaskById(id));
+        return success(inspectionTaskService.selectOpInspectionPlanById(id));
     }
 
     /**
@@ -75,9 +75,9 @@ public class AdmOpInspectionTaskController extends BaseController {
     @RequiresPermissions("ems:inspection-task:add")
     @Log(title = "巡检任务", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdmOpInspectionTask inspectionTask) {
+    public AjaxResult add(@RequestBody OpInspectionTask inspectionTask) {
         inspectionTask.setTaskCode(Seq.getId());
-        return toAjax(inspectionTaskService.insertAdmOpInspectionTask(inspectionTask));
+        return toAjax(inspectionTaskService.insertOpInspectionPlan(inspectionTask));
     }
 
     /**
@@ -86,8 +86,8 @@ public class AdmOpInspectionTaskController extends BaseController {
     @RequiresPermissions("ems:inspection-task:edit")
     @Log(title = "巡检任务", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody AdmOpInspectionTask inspectionTask) {
-        return toAjax(inspectionTaskService.updateAdmOpInspectionTask(inspectionTask));
+    public AjaxResult edit(@RequestBody OpInspectionTask inspectionTask) {
+        return toAjax(inspectionTaskService.updateOpInspectionPlan(inspectionTask));
     }
 
     /**
@@ -97,6 +97,6 @@ public class AdmOpInspectionTaskController extends BaseController {
     @Log(title = "巡检任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(inspectionTaskService.deleteAdmOpInspectionTaskByIds(ids));
+        return toAjax(inspectionTaskService.deleteOpInspectionPlanByIds(ids));
     }
 }

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

@@ -24,9 +24,13 @@ public class AdmOpAlarm extends BaseEntity
     private Long id;
 
     /** 园区代码 */
-    @Excel(name = "园区代码")
     private String areaCode;
 
+    @Excel(name = "园区名称")
+    private String areaName;
+
+    private String areaShortName;
+
     /** 对象类型 */
     @Excel(name = "对象类型")
     private Integer objType;
@@ -89,6 +93,23 @@ public class AdmOpAlarm extends BaseEntity
     {
         return 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 void setObjType(Integer objType)
     {
         this.objType = objType;

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

@@ -18,6 +18,11 @@ public class AdmOpAlarmPolicy extends BaseEntity
     /** 序号 */
     private Long id;
 
+    private String areaCode;
+
+    @Excel(name = "对象名称")
+    private String areaName;
+
     /** 策略代码 */
     @Excel(name = "策略代码")
     private String policyCode;
@@ -63,7 +68,24 @@ public class AdmOpAlarmPolicy extends BaseEntity
     {
         return id;
     }
-    public void setPolicyCode(String policyCode) 
+
+    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 void setPolicyCode(String policyCode)
     {
         this.policyCode = policyCode;
     }

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

@@ -27,6 +27,9 @@ public class EmsDeviceRbook extends BaseEntity
     /** 区域编号 */
     private String areaCode;
 
+    @Excel(name = "对象名称")
+    private String areaName;
+
     /** 对象类型 1：设施 2：设备 */
     @Excel(name = "对象类型 1：设施 2：设备")
     private Long objType;
@@ -87,6 +90,14 @@ public class EmsDeviceRbook extends BaseEntity
         this.areaCode = areaCode;
     }
 
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
     public void setObjType(Long objType)
     {
         this.objType = objType;

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmOpInspectionTask.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/OpInspectionTask.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ems.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -13,168 +14,182 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-08-29
  */
-public class AdmOpInspectionTask extends BaseEntity
-{
+public class OpInspectionTask extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 序号 */
+    /**
+     * 序号
+     */
     private Long id;
 
-    /** 任务代码 */
+    /**
+     * 区域代码
+     */
+    private String areaCode;
+
+    /**
+     * 任务代码
+     */
     @Excel(name = "任务代码")
     private String taskCode;
 
-    /** 任务名称 */
+    /**
+     * 任务名称
+     */
     @Excel(name = "任务名称")
     private String taskName;
 
-    /** 任务类型 */
+    /**
+     * 任务类型
+     */
     @Excel(name = "任务类型")
     private Integer taskType;
 
-    /** 任务状态 */
+    /**
+     * 任务状态
+     */
     @Excel(name = "任务状态")
     private Integer taskStatus;
 
-    /** 开始时间 */
+    /**
+     * 开始时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startTime;
 
-    /** 结束时间 */
+    /**
+     * 结束时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endTime;
 
-    /** 执行人 */
+    /**
+     * 执行人
+     */
     @Excel(name = "执行人")
     private String executor;
 
-    /** 巡检对象 */
+    /**
+     * 巡检对象
+     */
     @Excel(name = "巡检对象")
     private Integer objType;
 
-    /** 选择巡检对象 */
+    /**
+     * 选择巡检对象
+     */
     private String objCode;
 
-    /** 对象名称 */
+    /**
+     * 对象名称
+     */
     @Excel(name = "对象名称")
     private String objName;
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
-    public void setTaskCode(String taskCode)
-    {
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public void setTaskCode(String taskCode) {
         this.taskCode = taskCode;
     }
 
-    public String getTaskCode()
-    {
+    public String getTaskCode() {
         return taskCode;
     }
-    public void setTaskName(String taskName)
-    {
+
+    public void setTaskName(String taskName) {
         this.taskName = taskName;
     }
 
-    public String getTaskName()
-    {
+    public String getTaskName() {
         return taskName;
     }
-    public void setTaskType(Integer taskType)
-    {
+
+    public void setTaskType(Integer taskType) {
         this.taskType = taskType;
     }
 
-    public Integer getTaskType()
-    {
+    public Integer getTaskType() {
         return taskType;
     }
-    public void setTaskStatus(Integer taskStatus)
-    {
+
+    public void setTaskStatus(Integer taskStatus) {
         this.taskStatus = taskStatus;
     }
 
-    public Integer getTaskStatus()
-    {
+    public Integer getTaskStatus() {
         return taskStatus;
     }
-    public void setStartTime(Date startTime)
-    {
+
+    public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
 
-    public Date getStartTime()
-    {
+    public Date getStartTime() {
         return startTime;
     }
-    public void setEndTime(Date endTime)
-    {
+
+    public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
 
-    public Date getEndTime()
-    {
+    public Date getEndTime() {
         return endTime;
     }
-    public void setExecutor(String executor)
-    {
+
+    public void setExecutor(String executor) {
         this.executor = executor;
     }
 
-    public String getExecutor()
-    {
+    public String getExecutor() {
         return executor;
     }
-    public void setObjType(Integer objType)
-    {
+
+    public void setObjType(Integer objType) {
         this.objType = objType;
     }
 
-    public Integer getObjType()
-    {
+    public Integer getObjType() {
         return objType;
     }
-    public void setObjCode(String objCode)
-    {
+
+    public void setObjCode(String objCode) {
         this.objCode = objCode;
     }
 
-    public String getObjCode()
-    {
+    public String getObjCode() {
         return objCode;
     }
-    public void setObjName(String objName)
-    {
+
+    public void setObjName(String objName) {
         this.objName = objName;
     }
 
-    public String getObjName()
-    {
+    public String getObjName() {
         return objName;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("taskCode", getTaskCode())
-            .append("taskName", getTaskName())
-            .append("taskType", getTaskType())
-            .append("taskStatus", getTaskStatus())
-            .append("startTime", getStartTime())
-            .append("endTime", getEndTime())
-            .append("executor", getExecutor())
-            .append("objType", getObjType())
-            .append("objCode", getObjCode())
-            .append("objName", getObjName())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())
+            .append("taskCode", getTaskCode()).append("taskName", getTaskName()).append("taskType", getTaskType())
+            .append("taskStatus", getTaskStatus()).append("startTime", getStartTime()).append("endTime", getEndTime())
+            .append("executor", getExecutor()).append("objType", getObjType()).append("objCode", getObjCode())
+            .append("objName", getObjName()).toString();
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmOpInspectionTaskMapper.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/OpInspectionPlanMapper.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.mapper;
 
 import java.util.List;
 
-import com.ruoyi.ems.domain.AdmOpInspectionTask;
+import com.ruoyi.ems.domain.OpInspectionTask;
 
 /**
  * 巡检任务Mapper接口
@@ -10,14 +10,14 @@ import com.ruoyi.ems.domain.AdmOpInspectionTask;
  * @author ruoyi
  * @date 2024-08-29
  */
-public interface AdmOpInspectionTaskMapper {
+public interface OpInspectionPlanMapper {
     /**
      * 查询巡检任务
      *
      * @param id 巡检任务主键
      * @return 巡检任务
      */
-    AdmOpInspectionTask selectAdmOpInspectionTaskById(Long id);
+    OpInspectionTask selectOpInspectionPlanById(Long id);
 
     /**
      * 查询巡检任务列表
@@ -25,7 +25,7 @@ public interface AdmOpInspectionTaskMapper {
      * @param inspectionTask 巡检任务
      * @return 巡检任务集合
      */
-    List<AdmOpInspectionTask> selectAdmOpInspectionTaskList(AdmOpInspectionTask inspectionTask);
+    List<OpInspectionTask> selectOpInspectionPlanList(OpInspectionTask inspectionTask);
 
     /**
      * 新增巡检任务
@@ -33,7 +33,7 @@ public interface AdmOpInspectionTaskMapper {
      * @param inspectionTask 巡检任务
      * @return 结果
      */
-    int insertAdmOpInspectionTask(AdmOpInspectionTask inspectionTask);
+    int insertOpInspectionPlan(OpInspectionTask inspectionTask);
 
     /**
      * 修改巡检任务
@@ -41,7 +41,7 @@ public interface AdmOpInspectionTaskMapper {
      * @param inspectionTask 巡检任务
      * @return 结果
      */
-    int updateAdmOpInspectionTask(AdmOpInspectionTask inspectionTask);
+    int updateOpInspectionPlan(OpInspectionTask inspectionTask);
 
     /**
      * 删除巡检任务
@@ -49,7 +49,7 @@ public interface AdmOpInspectionTaskMapper {
      * @param id 巡检任务主键
      * @return 结果
      */
-    int deleteAdmOpInspectionTaskById(Long id);
+    int deleteOpInspectionPlanById(Long id);
 
     /**
      * 批量删除巡检任务
@@ -57,5 +57,5 @@ public interface AdmOpInspectionTaskMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteAdmOpInspectionTaskByIds(Long[] ids);
+    int deleteOpInspectionPlanByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmOpInspectionTaskService.java → ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IOpInspectionPlanService.java

@@ -2,7 +2,7 @@ package com.ruoyi.ems.service;
 
 import java.util.List;
 
-import com.ruoyi.ems.domain.AdmOpInspectionTask;
+import com.ruoyi.ems.domain.OpInspectionTask;
 
 /**
  * 巡检任务Service接口
@@ -10,38 +10,38 @@ import com.ruoyi.ems.domain.AdmOpInspectionTask;
  * @author ruoyi
  * @date 2024-08-29
  */
-public interface IAdmOpInspectionTaskService {
+public interface IOpInspectionPlanService {
     /**
      * 查询巡检任务
      *
      * @param id 巡检任务主键
      * @return 巡检任务
      */
-    AdmOpInspectionTask selectAdmOpInspectionTaskById(Long id);
+    OpInspectionTask selectOpInspectionPlanById(Long id);
 
     /**
      * 查询巡检任务列表
      *
-     * @param admOpInspectionTask 巡检任务
+     * @param opInspectionTask 巡检任务
      * @return 巡检任务集合
      */
-    List<AdmOpInspectionTask> selectAdmOpInspectionTaskList(AdmOpInspectionTask admOpInspectionTask);
+    List<OpInspectionTask> selectOpInspectionPlanList(OpInspectionTask opInspectionTask);
 
     /**
      * 新增巡检任务
      *
-     * @param admOpInspectionTask 巡检任务
+     * @param opInspectionTask 巡检任务
      * @return 结果
      */
-    int insertAdmOpInspectionTask(AdmOpInspectionTask admOpInspectionTask);
+    int insertOpInspectionPlan(OpInspectionTask opInspectionTask);
 
     /**
      * 修改巡检任务
      *
-     * @param admOpInspectionTask 巡检任务
+     * @param opInspectionTask 巡检任务
      * @return 结果
      */
-    int updateAdmOpInspectionTask(AdmOpInspectionTask admOpInspectionTask);
+    int updateOpInspectionPlan(OpInspectionTask opInspectionTask);
 
     /**
      * 批量删除巡检任务
@@ -49,7 +49,7 @@ public interface IAdmOpInspectionTaskService {
      * @param ids 需要删除的巡检任务主键集合
      * @return 结果
      */
-    int deleteAdmOpInspectionTaskByIds(Long[] ids);
+    int deleteOpInspectionPlanByIds(Long[] ids);
 
     /**
      * 删除巡检任务信息
@@ -57,5 +57,5 @@ public interface IAdmOpInspectionTaskService {
      * @param id 巡检任务主键
      * @return 结果
      */
-    int deleteAdmOpInspectionTaskById(Long id);
+    int deleteOpInspectionPlanById(Long id);
 }

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

@@ -1,87 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import com.ruoyi.ems.domain.AdmOpInspectionTask;
-import com.ruoyi.ems.mapper.AdmOpInspectionTaskMapper;
-import com.ruoyi.ems.service.IAdmOpInspectionTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 巡检任务Service业务层处理
- *
- * @author ruoyi
- * @date 2024-08-29
- */
-@Service
-public class AdmOpInspectionTaskServiceImpl implements IAdmOpInspectionTaskService {
-    @Autowired
-    private AdmOpInspectionTaskMapper admOpInspectionTaskMapper;
-
-    /**
-     * 查询巡检任务
-     *
-     * @param id 巡检任务主键
-     * @return 巡检任务
-     */
-    @Override
-    public AdmOpInspectionTask selectAdmOpInspectionTaskById(Long id) {
-        return admOpInspectionTaskMapper.selectAdmOpInspectionTaskById(id);
-    }
-
-    /**
-     * 查询巡检任务列表
-     *
-     * @param admOpInspectionTask 巡检任务
-     * @return 巡检任务
-     */
-    @Override
-    public List<AdmOpInspectionTask> selectAdmOpInspectionTaskList(AdmOpInspectionTask admOpInspectionTask) {
-        return admOpInspectionTaskMapper.selectAdmOpInspectionTaskList(admOpInspectionTask);
-    }
-
-    /**
-     * 新增巡检任务
-     *
-     * @param admOpInspectionTask 巡检任务
-     * @return 结果
-     */
-    @Override
-    public int insertAdmOpInspectionTask(AdmOpInspectionTask admOpInspectionTask) {
-        return admOpInspectionTaskMapper.insertAdmOpInspectionTask(admOpInspectionTask);
-    }
-
-    /**
-     * 修改巡检任务
-     *
-     * @param admOpInspectionTask 巡检任务
-     * @return 结果
-     */
-    @Override
-    public int updateAdmOpInspectionTask(AdmOpInspectionTask admOpInspectionTask) {
-        return admOpInspectionTaskMapper.updateAdmOpInspectionTask(admOpInspectionTask);
-    }
-
-    /**
-     * 批量删除巡检任务
-     *
-     * @param ids 需要删除的巡检任务主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmOpInspectionTaskByIds(Long[] ids) {
-        return admOpInspectionTaskMapper.deleteAdmOpInspectionTaskByIds(ids);
-    }
-
-    /**
-     * 删除巡检任务信息
-     *
-     * @param id 巡检任务主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmOpInspectionTaskById(Long id) {
-        return admOpInspectionTaskMapper.deleteAdmOpInspectionTaskById(id);
-    }
-}

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

@@ -44,7 +44,7 @@ public class EmsDeviceRbookServiceImpl implements IEmsDeviceRbookService {
     /**
      * 新增设备台账
      *
-     * @param DeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 结果
      */
     @Override
@@ -55,7 +55,7 @@ public class EmsDeviceRbookServiceImpl implements IEmsDeviceRbookService {
     /**
      * 修改设备台账
      *
-     * @param DeviceRbook 设备台账
+     * @param deviceRbook 设备台账
      * @return 结果
      */
     @Override

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

@@ -0,0 +1,87 @@
+package com.ruoyi.ems.service.impl;
+
+import com.ruoyi.ems.domain.OpInspectionTask;
+import com.ruoyi.ems.mapper.OpInspectionPlanMapper;
+import com.ruoyi.ems.service.IOpInspectionPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 巡检任务Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-08-29
+ */
+@Service
+public class OpInspectionPlanServiceImpl implements IOpInspectionPlanService {
+    @Autowired
+    private OpInspectionPlanMapper inspectionPlanMapper;
+
+    /**
+     * 查询巡检任务
+     *
+     * @param id 巡检任务主键
+     * @return 巡检任务
+     */
+    @Override
+    public OpInspectionTask selectOpInspectionPlanById(Long id) {
+        return inspectionPlanMapper.selectOpInspectionPlanById(id);
+    }
+
+    /**
+     * 查询巡检任务列表
+     *
+     * @param opInspectionPlan 巡检任务
+     * @return 巡检任务
+     */
+    @Override
+    public List<OpInspectionTask> selectOpInspectionPlanList(OpInspectionTask opInspectionPlan) {
+        return inspectionPlanMapper.selectOpInspectionPlanList(opInspectionPlan);
+    }
+
+    /**
+     * 新增巡检任务
+     *
+     * @param opInspectionPlan 巡检任务
+     * @return 结果
+     */
+    @Override
+    public int insertOpInspectionPlan(OpInspectionTask opInspectionPlan) {
+        return inspectionPlanMapper.insertOpInspectionPlan(opInspectionPlan);
+    }
+
+    /**
+     * 修改巡检任务
+     *
+     * @param opInspectionPlan 巡检任务
+     * @return 结果
+     */
+    @Override
+    public int updateOpInspectionPlan(OpInspectionTask opInspectionPlan) {
+        return inspectionPlanMapper.updateOpInspectionPlan(opInspectionPlan);
+    }
+
+    /**
+     * 批量删除巡检任务
+     *
+     * @param ids 需要删除的巡检任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOpInspectionPlanByIds(Long[] ids) {
+        return inspectionPlanMapper.deleteOpInspectionPlanByIds(ids);
+    }
+
+    /**
+     * 删除巡检任务信息
+     *
+     * @param id 巡检任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOpInspectionPlanById(Long id) {
+        return inspectionPlanMapper.deleteOpInspectionPlanById(id);
+    }
+}

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

@@ -7,6 +7,8 @@
     <resultMap type="com.ruoyi.ems.domain.AdmOpAlarm" id="AdmOpAlarmResult">
         <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="objType" column="obj_type"/>
         <result property="objCode" column="obj_code"/>
         <result property="alarmDate" column="alarm_date"/>
@@ -20,41 +22,35 @@
         <result property="alarmState" column="alarm_state"/>
     </resultMap>
 
-    <sql id="selectAdmOpAlarmVo">
-        select alarm.id,
-               alarm.area_code,
-               alarm.obj_type,
-               alarm.obj_code,
-               alarm.alarm_date,
-               alarm.alarm_time,
-               alarm.alarm_code,
-               alarm.alarm_msg,
-               alarm.alarm_type,
-               alarm.alarm_state,
-               alarm.obj_name,
-               sub.system_name sub_system_name,
-               alarm.system_code
-        from adm_op_alarm alarm
-                 left join adm_ems_subsystem sub on sub.system_code = alarm.system_code
+    <sql id="selectOpAlarmVo">
+        select
+            id, area_code, obj_type, obj_code, alarm_date, alarm_time, alarm_code, alarm_msg, alarm_type, alarm_state, obj_name, system_code
+        from
+            adm_op_alarm alarm
     </sql>
 
     <select id="selectAdmOpAlarmList" parameterType="com.ruoyi.ems.domain.AdmOpAlarm" resultMap="AdmOpAlarmResult">
-        <include refid="selectAdmOpAlarmVo"/>
+        select
+            alarm.id, alarm.area_code, a.area_name, a.short_name as area_short_name, alarm.obj_type, alarm.obj_code, alarm.alarm_date, alarm.alarm_time, alarm.alarm_code, alarm.alarm_msg, alarm.alarm_type, alarm.alarm_state, alarm.obj_name, sub.system_name sub_system_name, alarm.system_code
+        from
+            adm_op_alarm alarm
+            left join adm_ems_subsystem sub on sub.system_code = alarm.system_code
+            left join adm_area a on alarm.area_code = a.area_code
         <where>
-            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and area_code = #{areaCode}</if>
-            <if test="objType != null ">and obj_type = #{objType}</if>
-            <if test="objCode != null  and objCode != ''">and obj_code = #{objCode}</if>
-            <if test="alarmCode != null  and alarmCode != ''">and alarm_code = #{alarmCode}</if>
+            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and alarm.area_code = #{areaCode}</if>
+            <if test="objType != null ">and alarm.obj_type = #{objType}</if>
+            <if test="objCode != null  and objCode != ''">and alarm.obj_code = #{objCode}</if>
+            <if test="alarmCode != null  and alarmCode != ''">and alarm.alarm_code = #{alarmCode}</if>
             <if test="objName !=null and objName!=''">and alarm.obj_name like concat('%', #{objName}, '%')</if>
             <if test="systemCode !=null and systemCode != ''">and alarm.system_code = #{systemCode}</if>
-            <if test="alarmMsg != null  and alarmMsg != ''">and alarm_msg like concat('%', #{alarmMsg}, '%')</if>
-            <if test="alarmType != null ">and alarm_type = #{alarmType}</if>
-            <if test="alarmState != null ">and alarm_state = #{alarmState}</if>
+            <if test="alarmMsg != null  and alarmMsg != ''">and alarm.alarm_msg like concat('%', #{alarmMsg}, '%')</if>
+            <if test="alarmType != null ">and alarm.alarm_type = #{alarmType}</if>
+            <if test="alarmState != null ">and alarm.alarm_state = #{alarmState}</if>
             <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
-                and alarm_time &gt;= #{startRecTime} and alarm_time &lt;= #{endRecTime}
+                and alarm.alarm_time &gt;= #{startRecTime} and alarm.alarm_time &lt;= #{endRecTime}
             </if>
             <if test="alarmStateList != null and alarmStateList.size() > 0">
-                and alarm_state in
+                and alarm.alarm_state in
                 <foreach collection="alarmStateList" item="alarmState" open="(" close=")" separator=",">
                     #{alarmState}
                 </foreach>
@@ -64,7 +60,7 @@
     </select>
 
     <select id="selectAdmOpAlarmById" parameterType="Long" resultMap="AdmOpAlarmResult">
-        <include refid="selectAdmOpAlarmVo"/>
+        <include refid="selectOpAlarmVo"/>
         where alarm.id = #{id}
     </select>
 

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

@@ -6,15 +6,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.ems.domain.AdmOpAlarmPolicy" id="AdmOpAlarmPolicyResult">
         <result property="id"    column="id"    />
-        <result property="policyCode"    column="policy_code"    />
-        <result property="policyName"    column="policy_name"    />
-        <result property="alarmObjType"    column="alarm_obj_type"    />
-        <result property="alarmObjIndex"    column="alarm_obj_index"    />
-        <result property="alarmRuleType"    column="alarm_rule_type"    />
-        <result property="alarmThresholdValue"    column="alarm_threshold_value"    />
-        <result property="alarmCode"    column="alarm_code"    />
-        <result property="alarmMsg"    column="alarm_msg"    />
-        <result property="alarmType"    column="alarm_type"    />
+        <result property="areaCode"             column="area_code"    />
+        <result property="areaName"             column="area_name"    />
+        <result property="policyCode"           column="policy_code"    />
+        <result property="policyName"           column="policy_name"    />
+        <result property="alarmObjType"         column="alarm_obj_type"    />
+        <result property="alarmObjIndex"        column="alarm_obj_index"    />
+        <result property="alarmRuleType"        column="alarm_rule_type"    />
+        <result property="alarmThresholdValue"  column="alarm_threshold_value"    />
+        <result property="alarmCode"            column="alarm_code"    />
+        <result property="alarmMsg"             column="alarm_msg"    />
+        <result property="alarmType"            column="alarm_type"    />
     </resultMap>
 
     <sql id="selectAdmOpAlarmPolicyVo">
@@ -22,12 +24,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectAdmOpAlarmPolicyList" parameterType="com.ruoyi.ems.domain.AdmOpAlarmPolicy" resultMap="AdmOpAlarmPolicyResult">
-        <include refid="selectAdmOpAlarmPolicyVo"/>
+        select
+            p.id, p.area_code, a.area_name, p.policy_code, p.policy_name, p.alarm_obj_type, p.alarm_obj_index, p.alarm_rule_type, p.alarm_threshold_value, p.alarm_code, p.alarm_msg, p.alarm_type
+        from adm_op_alarm_policy p
+            left join adm_area a on p.area_code = a.area_code
         <where>
-            <if test="policyName != null  and policyName != ''"> and policy_name like concat('%', #{policyName}, '%')</if>
-            <if test="alarmObjType != null "> and alarm_obj_type = #{alarmObjType}</if>
-            <if test="alarmCode != null  and alarmCode != ''"> and alarm_code = #{alarmCode}</if>
-            <if test="alarmType != null "> and alarm_type = #{alarmType}</if>
+            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and p.area_code= #{areaCode}</if>
+            <if test="alarmObjType != null "> and p.alarm_obj_type = #{alarmObjType}</if>
+            <if test="alarmCode != null  and alarmCode != ''"> and p.alarm_code = #{alarmCode}</if>
+            <if test="alarmType != null "> and p.alarm_type = #{alarmType}</if>
+            <if test="policyName != null and policyName != ''"> and p.policy_name like concat('%', #{policyName}, '%')</if>
         </where>
     </select>
 
@@ -39,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAdmOpAlarmPolicy" parameterType="com.ruoyi.ems.domain.AdmOpAlarmPolicy" useGeneratedKeys="true" keyProperty="id">
         insert into adm_op_alarm_policy
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">area_code,</if>
             <if test="policyCode != null and policyCode != ''">policy_code,</if>
             <if test="policyName != null and policyName != ''">policy_name,</if>
             <if test="alarmObjType != null">alarm_obj_type,</if>
@@ -50,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alarmType != null">alarm_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
             <if test="policyCode != null and policyCode != ''">#{policyCode},</if>
             <if test="policyName != null and policyName != ''">#{policyName},</if>
             <if test="alarmObjType != null">#{alarmObjType},</if>
@@ -65,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAdmOpAlarmPolicy" parameterType="com.ruoyi.ems.domain.AdmOpAlarmPolicy">
         update adm_op_alarm_policy
         <trim prefix="SET" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
             <if test="policyCode != null and policyCode != ''">policy_code = #{policyCode},</if>
             <if test="policyName != null and policyName != ''">policy_name = #{policyName},</if>
             <if test="alarmObjType != null">alarm_obj_type = #{alarmObjType},</if>

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

@@ -7,6 +7,7 @@
         <result property="id" column="id"/>
         <result property="recordCode" column="record_code"/>
         <result property="areaCode" column="area_code"/>
+        <result property="areaName" column="area_name"/>
         <result property="objType" column="obj_type"/>
         <result property="objCode" column="obj_code"/>
         <result property="objName" column="obj_name"/>
@@ -35,12 +36,16 @@
         from adm_ems_device_rbook
     </sql>
     <select id="selectDeviceRbookList" parameterType="com.ruoyi.ems.domain.EmsDeviceRbook" resultMap="deviceRbookResult">
-        <include refid="selectDeviceRbookVo"/>
+        select
+            r.id, r.record_code, r.area_code, a.area_name, r.obj_type, r.obj_code, r.obj_name, r.record_time, r.ins_location, r.maintain_title, r.maintain_content, r.maintain_person, r.create_time, r.update_time
+        from adm_ems_device_rbook r
+            left join adm_area a on r.area_code = a.area_code
         <where>
-            <if test="objType != null "> and obj_type = #{objType}</if>
-            <if test="objName != null and objName != ''"> and obj_name like concat('%', #{objName}, '%')</if>
+            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and r.area_code= #{areaCode}</if>
+            <if test="objType != null "> and r.obj_type = #{objType}</if>
+            <if test="objName != null and objName != ''"> and r.obj_name like concat('%', #{objName}, '%')</if>
             <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
-                and record_time &gt;= #{startRecTime} and record_time &lt;= #{endRecTime}
+                and r.record_time &gt;= #{startRecTime} and r.record_time &lt;= #{endRecTime}
             </if>
         </where>
     </select>

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmOpInspectionTaskMapper.xml → ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/OpInspectionPlanMapper.xml

@@ -2,10 +2,11 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.ems.mapper.AdmOpInspectionTaskMapper">
+<mapper namespace="com.ruoyi.ems.mapper.OpInspectionPlanMapper">
 
-    <resultMap type="com.ruoyi.ems.domain.AdmOpInspectionTask" id="AdmOpInspectionTaskResult">
+    <resultMap type="com.ruoyi.ems.domain.OpInspectionTask" id="OpInspectionPlanResult">
         <result property="id" column="id"/>
+        <result property="areaCode" column="area_code"/>
         <result property="taskCode" column="task_code"/>
         <result property="taskName" column="task_name"/>
         <result property="taskType" column="task_type"/>
@@ -18,62 +19,60 @@
         <result property="objName" column="obj_name"/>
     </resultMap>
 
-    <sql id="selectAdmOpInspectionTaskVo">
+    <sql id="selectOpInspectionPlanVo">
         select id,
+               area_code,
                task_code,
                task_name,
                task_type,
-               task_status,
                start_time,
-               end_time,
                executor,
                obj_type,
                obj_code,
                obj_name
-        from adm_op_inspection_task
+        from adm_op_inspection_plan
     </sql>
 
-    <select id="selectAdmOpInspectionTaskList" parameterType="com.ruoyi.ems.domain.AdmOpInspectionTask"
-            resultMap="AdmOpInspectionTaskResult">
-        <include refid="selectAdmOpInspectionTaskVo"/>
+    <select id="selectOpInspectionPlanList" parameterType="com.ruoyi.ems.domain.OpInspectionTask"
+            resultMap="OpInspectionPlanResult">
+        <include refid="selectOpInspectionPlanVo"/>
         <where>
-            <if test="taskCode != null  and taskCode != ''">and task_code = #{taskCode}</if>
-            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="areaCode != null and areaCode != ''">and area_code = #{areaCode}</if>
+            <if test="taskCode != null and taskCode != ''">and task_code = #{taskCode}</if>
             <if test="taskType != null ">and task_type = #{taskType}</if>
-            <if test="taskStatus != null ">and task_status = #{taskStatus}</if>
             <if test="executor != null  and executor != ''">and executor = #{executor}</if>
             <if test="objType != null ">and obj_type = #{objType}</if>
+            <if test="objCode != null and objCode != ''">and obj_code = #{objCode}</if>
+            <if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
             <if test="objName != null  and objName != ''">and obj_name like concat('%', #{objName}, '%')</if>
         </where>
     </select>
 
-    <select id="selectAdmOpInspectionTaskById" parameterType="Long" resultMap="AdmOpInspectionTaskResult">
-        <include refid="selectAdmOpInspectionTaskVo"/>
+    <select id="selectOpInspectionPlanById" parameterType="Long" resultMap="OpInspectionPlanResult">
+        <include refid="selectOpInspectionPlanVo"/>
         where id = #{id}
     </select>
 
-    <insert id="insertAdmOpInspectionTask" parameterType="com.ruoyi.ems.domain.AdmOpInspectionTask"
+    <insert id="insertOpInspectionPlan" parameterType="com.ruoyi.ems.domain.OpInspectionTask"
             useGeneratedKeys="true" keyProperty="id">
-        insert into adm_op_inspection_task
+        insert into adm_op_inspection_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">area_code,</if>
             <if test="taskCode != null and taskCode != ''">task_code,</if>
             <if test="taskName != null and taskName != ''">task_name,</if>
             <if test="taskType != null">task_type,</if>
-            <if test="taskStatus != null">task_status,</if>
             <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
             <if test="executor != null">executor,</if>
             <if test="objType != null">obj_type,</if>
             <if test="objCode != null and objCode != ''">obj_code,</if>
             <if test="objName != null">obj_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">area_code,</if>
             <if test="taskCode != null and taskCode != ''">#{taskCode},</if>
             <if test="taskName != null and taskName != ''">#{taskName},</if>
             <if test="taskType != null">#{taskType},</if>
-            <if test="taskStatus != null">#{taskStatus},</if>
             <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
             <if test="executor != null">#{executor},</if>
             <if test="objType != null">#{objType},</if>
             <if test="objCode != null and objCode != ''">#{objCode},</if>
@@ -81,15 +80,14 @@
         </trim>
     </insert>
 
-    <update id="updateAdmOpInspectionTask" parameterType="com.ruoyi.ems.domain.AdmOpInspectionTask">
-        update adm_op_inspection_task
+    <update id="updateOpInspectionPlan" parameterType="com.ruoyi.ems.domain.OpInspectionTask">
+        update adm_op_inspection_plan
         <trim prefix="SET" suffixOverrides=",">
+            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
             <if test="taskCode != null and taskCode != ''">task_code = #{taskCode},</if>
             <if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
             <if test="taskType != null">task_type = #{taskType},</if>
-            <if test="taskStatus != null">task_status = #{taskStatus},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
             <if test="executor != null">executor = #{executor},</if>
             <if test="objType != null">obj_type = #{objType},</if>
             <if test="objCode != null and objCode != ''">obj_code = #{objCode},</if>
@@ -98,14 +96,14 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteAdmOpInspectionTaskById" parameterType="Long">
+    <delete id="deleteOpInspectionPlanById" parameterType="Long">
         delete
-        from adm_op_inspection_task
+        from adm_op_inspection_plan
         where id = #{id}
     </delete>
 
-    <delete id="deleteAdmOpInspectionTaskByIds" parameterType="String">
-        delete from adm_op_inspection_task where id in
+    <delete id="deleteOpInspectionPlanByIds" parameterType="String">
+        delete from adm_op_inspection_plan where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ems-cloud/sql/ems_init_data.sql

@@ -666,7 +666,7 @@ INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`
 INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202409', 465, '2024-08-31', 612, '2024-09-30', 7350, NULL, NULL);
 INSERT INTO adm_meter_reading (`device_code`, `area_code`, `year`, `meter_month`, `last_reading`, `last_time`, `meter_reading`, `meter_time`, `increase`, `create_time`, `update_time`) VALUES ('J-D-B-Z120', '321283124S3001', '2024', '202410', 612, '2024-08-31', 758, '2024-09-30', 7300, NULL, NULL);
 
--- -- 电网计量指标数据 Mock
+-- 电网计量指标数据 Mock
 -- INSERT INTO adm_ems_pg_supply_h (area_code, facs_code, record_time, `date`, `time`, time_index, meter_type, meter_unit_price, use_elec_quantity, use_elec_cost) VALUES ('321283124S3001', 'W201', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, 0, 0.75, FLOOR(50 + (RAND() * (150 - 50 + 1))), FLOOR(RAND() * (100 - 1 + 1)) + 1);
 
 -- 光伏指标数据 Mock
@@ -699,22 +699,22 @@ INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_ti
 INSERT INTO `adm_ems_obj_use_h` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `elec_quantity`) VALUES ('321283124S3002', 2, 'Z220', CONCAT(CURDATE(), ' ', LPAD(HOUR(NOW()), 2, '0'), ':00:00'), CURDATE(), CONCAT(LPAD(HOUR(NOW()), 2, '0'), ':00:00'), HOUR(NOW()) + 1, FLOOR((RAND() * 100)));
 
 -- 电力负荷数据
----- 储能负荷
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'C101', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'C102', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+-- 储能负荷
+-- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'C101', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+-- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'C102', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
 
----- 变压器负荷
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 3, 'D-B-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 3, 'D-N-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+-- 变压器负荷
+-- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 3, 'D-B-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+-- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 3, 'D-N-1001', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
 
----- 空调负荷
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'Z120', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
---INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'Z220', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+-- 空调负荷
+-- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3001', 2, 'Z120', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
+-- INSERT INTO `adm_ems_elec_load_index_15min` (`area_code`, `obj_type`, `obj_code`, `record_time`, `date`, `time`, `time_index`, `ua`, `ub`, `uc`, `la`, `lb`, `lc`, `p`, `pa`, `pb`, `pc`, `q`, `qa`, `qb`, `qc`, `pf`) VALUES ('321283124S3002', 2, 'Z220', DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d %H:%i:00'), DATE_FORMAT(CURRENT_TIME, '%Y-%m-%d'), DATE_FORMAT(CURRENT_TIME, '%H:%i:00'), FLOOR((HOUR(NOW()) * 60 + MINUTE(NOW())) / 15) + 1, 380, 380, 380, FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 20) , FLOOR(RAND() * 5000) , FLOOR(RAND() * 1000) , FLOOR(RAND() * 1000), FLOOR(RAND() * 1000), 500, 200, 150, 150, FLOOR(RAND() * 100));
 
 
 -- 台账数据
-INSERT INTO `adm_ems_device_rbook` (`record_code`, `obj_type`, `obj_code`, `obj_name`, `record_time`, `ins_location`, `maintain_title`, `maintain_content`, `maintain_person`) VALUES ('TZ-20240901001', 1, 'W201', '北区-电网', '2024-09-01 10:32:00', '北区-广场', '北区广场变压器维护', '执行例行维护', '李大航');
-INSERT INTO `adm_ems_device_rbook` (`record_code`, `obj_type`, `obj_code`, `obj_name`, `record_time`, `ins_location`, `maintain_title`, `maintain_content`, `maintain_person`) VALUES ('TZ-20240901002', 2, 'Z010-R101-001', '北区-开水炉', '2024-09-10 17:34:56', '北区/综合楼/一楼开水间', '开水炉除垢', '执行开水炉除垢', '王凯');
+INSERT INTO `adm_ems_device_rbook` (`record_code`, `area_code`, `obj_type`, `obj_code`, `obj_name`, `record_time`, `ins_location`, `maintain_title`, `maintain_content`, `maintain_person`) VALUES ('TZ-20240901001', '321283124S3001', 1, 'W201', '北区-电网', '2024-09-01 10:32:00', '北区-广场', '北区广场变压器维护', '执行例行维护', '李大航');
+INSERT INTO `adm_ems_device_rbook` (`record_code`, `area_code`, `obj_type`, `obj_code`, `obj_name`, `record_time`, `ins_location`, `maintain_title`, `maintain_content`, `maintain_person`) VALUES ('TZ-20240901002', '321283124S3001', 2, 'Z010-R101-001', '北区-开水炉', '2024-09-10 17:34:56', '北区/综合楼/一楼开水间', '开水炉除垢', '执行开水炉除垢', '王凯');
 
 -- 告警数据
 INSERT INTO `adm_op_alarm` (`area_code`, `system_code`, `obj_type`, `obj_code`, `obj_name`, `alarm_date`, `alarm_time`, `alarm_code`, `alarm_msg`, `alarm_type`, `alarm_state`) VALUES ('321283124S3001', 'SYS_GF', 1, 'B-107', '特色小吃', '2024-11-14', '2024-11-14 09:12:23', '00001', '北区光伏告警', 1, 2);

ems-cloud/sql/ems_server.sql

@@ -841,24 +841,24 @@ create table adm_op_alarm  (
 
 
 -- ----------------------------
--- 巡检任务表
+-- 巡检计划表
 -- ----------------------------
-drop table if exists adm_op_inspection_task;
-create table adm_op_inspection_task (
+drop table if exists adm_op_inspection_plan;
+create table adm_op_inspection_plan (
   `id`              bigint(20)      not null auto_increment      comment '序号',
+  `area_code`       varchar(32)     not null                     comment '园区代码',
   `task_code`       varchar(64)     not null                     comment '任务代码',
   `task_name`       varchar(16)     not null                     comment '任务名称',
   `task_type`       int             default null                 comment '任务类型 1：自动，2：手动',
-  `task_status`     int             default null                 comment '任务名称 0：未执行 1：执行中 2：已完成',
   `start_time`      datetime        default null                 comment '开始时间',
-  `end_time`        datetime        default null                 comment '结束时间',
   `executor`        varchar(32)     default null                 comment '执行人',
   `obj_type`        int             default null                 comment '0：园区，1：区块，2：设施',
   `obj_code`        varchar(16)     default null                 comment '对象编码',
   `obj_name`        varchar(64)     default null                 comment '对象名称',
   primary key (`id`),
-  unique key ux_op_inspection_task_code(`task_code`)
-) engine=innodb auto_increment=1 comment = '巡检任务表';
+  unique key ux_op_inspection_plan_code(`task_code`),
+  key ux_op_inspection_plan(`area_code`)
+) engine=innodb auto_increment=1 comment = '巡检计划表';
 
 
 -- ----------------------------

ems-cloud/sql/ems_sys.sql

@@ -196,7 +196,7 @@ insert into sys_menu values ('144',  '手动抄表',       '5',    '4',  'meterR
 
 INSERT INTO sys_menu VALUES ('151',  '告警策略',       '6',    '1',  'warn-strategy',       'alarm/index',            '', 1, 0, 'C', '0', '0',    'warn:strategy', 'warnstrategy', 'admin', '2024-08-29 15:40:27', 'admin', '2024-08-29 16:01:10', '告警策略');
 INSERT INTO sys_menu VALUES ('152',  '告警列表',       '6',    '2',  'warn-list',           'alarm/alarm-info/index', '', 1, 0, 'C', '0', '0',    'warn:list', 'warnmsg', 'admin', '2024-08-29 15:40:27', 'admin', '2024-08-29 16:01:36', '告警策略');
-INSERT INTO sys_menu VALUES ('153',  '巡检任务',       '6',    '3',  'oper-task',           'task/index',             '', 1, 0, 'C', '0', '0',    'oper-mgr:task', 'task', 'admin', '2024-08-29 15:40:27', 'admin', '2024-08-29 16:02:38', '巡检任务');
+INSERT INTO sys_menu VALUES ('153',  '巡检计划',       '6',    '3',  'oper-plan',           'task/index',             '', 1, 0, 'C', '0', '0',    'oper-mgr:task', 'task', 'admin', '2024-08-29 15:40:27', 'admin', '2024-08-29 16:02:38', '巡检任务');
 insert into sys_menu values ('154',  '巡检报告',       '6',    '4',  'oper-report',         'task/report/index',      '', 1, 0, 'C', '0', '0',    'oper-mgr:report',        'note',           'admin', sysdate(), '', null, '巡检报告');
 
 insert into sys_menu values ('161',  '区域配置',       '7',    '1',  'areacfg',            'basecfg/area/index',    '', 1, 0, 'C', '0', '0',   'basecfg:area:list',      'cfgwrite',       'admin', sysdate(), '', null, '区域配置');
@@ -825,7 +825,7 @@ INSERT INTO `sys_dict_type` VALUES (104, '计量类型', 'meter_type', '0', 'adm
 INSERT INTO `sys_dict_type` VALUES (105, '设施对象类型', 'obj_type', '0', 'admin', '2024-08-12 14:22:40', 'admin', '2024-08-28 15:33:20', '对象类型 0：园区，1：区块，2：设施，3：设备');
 INSERT INTO `sys_dict_type` VALUES (106, '标签', 'basecfg_lable', '0', 'admin', '2024-08-19 10:44:49', '', NULL, NULL);
 INSERT INTO `sys_dict_type` VALUES (107, '告警规则', 'alarm_thre_type', '0', 'admin', '2024-08-26 10:26:49', '', NULL, '1大于；2小于');
-INSERT INTO `sys_dict_type` VALUES (108, '告警类型', 'alarm_type', '0', 'admin', '2024-08-26 10:28:04', '', NULL, '1：一般告警 2：重要告警 3：紧急告警 4：恢复告警 5：诊断告警 6：其他告警');
+INSERT INTO `sys_dict_type` VALUES (108, '告警类型', 'alarm_type', '0', 'admin', '2024-08-26 10:28:04', '', NULL, '1：一般 2：重要 3：紧急 4：恢复 5：诊断 6：其他');
 INSERT INTO `sys_dict_type` VALUES (109, '告警状态', 'alarm_state', '0', 'admin', '2024-08-26 11:39:44', 'admin', '2024-08-26 11:40:27', '0-新增，1-处置中，2-已处置，3-消散');
 INSERT INTO `sys_dict_type` VALUES (110, '设备台账对象类型', 'device_type', '0', 'admin', '2024-08-27 15:00:16', '', NULL, '设备台账对象类型');
 INSERT INTO `sys_dict_type` VALUES (111, '巡检类型', 'task_type', '0', 'admin', '2024-08-29 14:28:37', '', NULL, '1自动；2手动');
@@ -898,7 +898,7 @@ INSERT INTO `sys_dict_data` VALUES (109, 0, '手动执行', '99', 'exec_mode', N
 INSERT INTO `sys_dict_data` VALUES (111, 0, '不区分', '0', 'meter_type', NULL, 'default', 'N', '0', 'admin', '2024-08-09 10:23:59', '', NULL, '0：不区分 ');
 INSERT INTO `sys_dict_data` VALUES (112, 0, '峰电计量', '1', 'meter_type', NULL, 'default', 'N', '0', 'admin', '2024-08-09 10:24:14', '', NULL, '1：峰电计量  ');
 INSERT INTO `sys_dict_data` VALUES (113, 0, '谷电计量', '2', 'meter_type', NULL, 'default', 'N', '0', 'admin', '2024-08-09 10:24:24', '', NULL, '2：谷电计量');
-INSERT INTO `sys_dict_data` VALUES (114, 0, '区块', '1', 'obj_type', NULL, 'default', 'N', '0', 'admin', '2024-08-12 14:23:19', 'admin', '2024-08-28 15:33:44', '');
+INSERT INTO `sys_dict_data` VALUES (114, 0, '区域', '1', 'obj_type', NULL, 'default', 'N', '0', 'admin', '2024-08-12 14:23:19', 'admin', '2024-08-28 15:33:44', '');
 INSERT INTO `sys_dict_data` VALUES (115, 0, '设施', '2', 'obj_type', NULL, 'default', 'N', '0', 'admin', '2024-08-12 14:23:30', '', NULL, ' 2-设施 ');
 INSERT INTO `sys_dict_data` VALUES (116, 0, '设备', '3', 'obj_type', NULL, 'default', 'N', '0', 'admin', '2024-08-12 14:23:40', 'admin', '2024-08-12 14:23:47', '3-设备');
 INSERT INTO `sys_dict_data` VALUES (117, 1, ' photovoltaic', '100', 'basecfg_lable', NULL, 'default', 'N', '0', 'admin', '2024-08-19 10:50:16', 'admin', '2024-08-19 14:33:00', '光伏');
@@ -906,12 +906,12 @@ INSERT INTO `sys_dict_data` VALUES (118, 2, 'energy', '200', 'basecfg_lable', NU
 INSERT INTO `sys_dict_data` VALUES (119, 3, 'Energy storage', '300', 'basecfg_lable', NULL, 'default', 'N', '0', 'admin', '2024-08-19 10:51:30', '', NULL, '储能');
 INSERT INTO `sys_dict_data` VALUES (120, 0, '大于', '1', 'alarm_thre_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:27:12', '', NULL, NULL);
 INSERT INTO `sys_dict_data` VALUES (121, 0, '小于', '2', 'alarm_thre_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:27:26', '', NULL, NULL);
-INSERT INTO `sys_dict_data` VALUES (122, 0, '一般告警', '1', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:28:19', 'admin', '2024-08-27 14:41:59', '1：一般告警 2：重要告警 3：紧急告警 4：恢复告警 5：诊断告警 6：其他告警');
-INSERT INTO `sys_dict_data` VALUES (123, 0, '重要告警', '2', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:28:27', 'admin', '2024-08-26 10:28:40', '1：一般告警 2：重要告警 3：紧急告警 4：恢复告警 5：诊断告警 6：其他告警');
-INSERT INTO `sys_dict_data` VALUES (124, 0, '紧急告警', '3', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:28:53', '', NULL, '3：紧急告警 4：恢复告警 5：诊断告警 6：其他告警');
-INSERT INTO `sys_dict_data` VALUES (125, 0, '恢复告警', '4', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:29:17', '', NULL, '4：恢复告警 ');
-INSERT INTO `sys_dict_data` VALUES (126, 0, '诊断告警', '5', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:29:30', '', NULL, '5：诊断告警 ');
-INSERT INTO `sys_dict_data` VALUES (127, 0, '其他告警', '6', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:29:38', '', NULL, '6：其他告警');
+INSERT INTO `sys_dict_data` VALUES (122, 0, '一般', '1', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:28:19', 'admin', '2024-08-27 14:41:59', '1：一般告警');
+INSERT INTO `sys_dict_data` VALUES (123, 0, '重要', '2', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:28:27', 'admin', '2024-08-26 10:28:40', '2：重要告警');
+INSERT INTO `sys_dict_data` VALUES (124, 0, '紧急', '3', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:28:53', '', NULL, '3：紧急告警');
+INSERT INTO `sys_dict_data` VALUES (125, 0, '恢复', '4', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:29:17', '', NULL, '4：恢复告警 ');
+INSERT INTO `sys_dict_data` VALUES (126, 0, '诊断', '5', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:29:30', '', NULL, '5：诊断告警 ');
+INSERT INTO `sys_dict_data` VALUES (127, 0, '其他', '6', 'alarm_type', NULL, 'default', 'N', '0', 'admin', '2024-08-26 10:29:38', '', NULL, '6：其他告警');
 INSERT INTO `sys_dict_data` VALUES (128, 0, '新增', '0', 'alarm_state', NULL, 'default', 'N', '0', 'admin', '2024-08-26 11:40:51', '', NULL, '0-新增，');
 INSERT INTO `sys_dict_data` VALUES (129, 0, '处置中', '1', 'alarm_state', NULL, 'default', 'N', '0', 'admin', '2024-08-26 11:41:06', '', NULL, '1-处置中，');
 INSERT INTO `sys_dict_data` VALUES (130, 0, '已处置', '2', 'alarm_state', NULL, 'default', 'N', '0', 'admin', '2024-08-26 11:41:19', '', NULL, '2-已处置，');
@@ -970,6 +970,7 @@ create table sys_logininfor (
   status         char(1)        default '0'               comment '登录状态（0成功 1失败）',
   msg            varchar(255)   default ''                comment '提示消息',
   login_time     datetime                                 comment '访问时间',
+  access_time    datetime                                 comment '访问时间',
   primary key (info_id),
   key idx_sys_logininfor_s  (status),
   key idx_sys_logininfor_lt (login_time)