子系统管理，标签管理

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

@@ -12,7 +12,6 @@ import com.ruoyi.ems.domain.AreaBuildingZoning;
 import com.ruoyi.ems.domain.EmsDevice;
 import com.ruoyi.ems.domain.common.AreaTier;
 import com.ruoyi.ems.domain.vo.QueryDevice;
-import com.ruoyi.ems.domain.vo.TreeEntity;
 import com.ruoyi.ems.service.IAreaBuildingService;
 import com.ruoyi.ems.service.IAreaBuildingZoningService;
 import com.ruoyi.ems.service.IEmsDeviceService;
@@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 

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

@@ -0,0 +1,115 @@
+package com.ruoyi.ems.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.EmsSubsystem;
+import com.ruoyi.ems.service.IEmsSubsystemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 能源子系统Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-16
+ */
+@RestController
+@RequestMapping("/subsystem")
+public class EmsSubsystemController extends BaseController
+{
+    @Autowired
+    private IEmsSubsystemService emsSubsystemService;
+
+    /**
+     * 查询能源子系统列表
+     */
+    @RequiresPermissions("adapter:subsystem:list")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsSubsystem emsSubsystem)
+    {
+        startPage();
+        List<EmsSubsystem> list = emsSubsystemService.selectEmsSubsystemList(emsSubsystem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询能源子系统列表
+     */
+    @GetMapping("/listAll")
+    public AjaxResult listAll(EmsSubsystem emsSubsystem)
+    {
+        return success( emsSubsystemService.selectEmsSubsystemList(emsSubsystem));
+    }
+
+
+    /**
+     * 导出能源子系统列表
+     */
+    @RequiresPermissions("adapter:subsystem:export")
+    @Log(title = "能源子系统", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsSubsystem emsSubsystem)
+    {
+        List<EmsSubsystem> list = emsSubsystemService.selectEmsSubsystemList(emsSubsystem);
+        ExcelUtil<EmsSubsystem> util = new ExcelUtil<EmsSubsystem>(EmsSubsystem.class);
+        util.exportExcel(response, list, "能源子系统数据");
+    }
+
+    /**
+     * 获取能源子系统详细信息
+     */
+    @RequiresPermissions("adapter:subsystem:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(emsSubsystemService.selectEmsSubsystemById(id));
+    }
+
+    /**
+     * 新增能源子系统
+     */
+    @RequiresPermissions("adapter:subsystem:add")
+    @Log(title = "能源子系统", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsSubsystem emsSubsystem)
+    {
+        return toAjax(emsSubsystemService.insertEmsSubsystem(emsSubsystem));
+    }
+
+    /**
+     * 修改能源子系统
+     */
+    @RequiresPermissions("adapter:subsystem:edit")
+    @Log(title = "能源子系统", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsSubsystem emsSubsystem)
+    {
+        return toAjax(emsSubsystemService.updateEmsSubsystem(emsSubsystem));
+    }
+
+    /**
+     * 删除能源子系统
+     */
+    @RequiresPermissions("adapter:subsystem:remove")
+    @Log(title = "能源子系统", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emsSubsystemService.deleteEmsSubsystemByIds(ids));
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.ruoyi.ems.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.ems.domain.EmsTag;
+import com.ruoyi.ems.service.IEmsTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 标签分类Controller
+ * 
+ * @author ruoyi
+ * @date 2024-08-16
+ */
+@RestController
+@RequestMapping("/tag")
+public class EmsTagController extends BaseController
+{
+    @Autowired
+    private IEmsTagService emsTagService;
+
+    /**
+     * 查询标签分类列表
+     */
+    @RequiresPermissions("ems:tag:list")
+    @GetMapping("/list")
+    public TableDataInfo list(EmsTag emsTag)
+    {
+        startPage();
+        List<EmsTag> list = emsTagService.selectEmsTagList(emsTag);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出标签分类列表
+     */
+    @RequiresPermissions("ems:tag:export")
+    @Log(title = "标签分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmsTag dimEmsTag)
+    {
+        List<EmsTag> list = emsTagService.selectEmsTagList(dimEmsTag);
+        ExcelUtil<EmsTag> util = new ExcelUtil<EmsTag>(EmsTag.class);
+        util.exportExcel(response, list, "标签分类数据");
+    }
+
+    /**
+     * 获取标签分类详细信息
+     */
+    @RequiresPermissions("ems:tag:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(emsTagService.selectEmsTagById(id));
+    }
+
+    /**
+     * 新增标签分类
+     */
+    @RequiresPermissions("ems:tag:add")
+    @Log(title = "标签分类", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmsTag dimEmsTag)
+    {
+        return toAjax(emsTagService.insertEmsTag(dimEmsTag));
+    }
+
+    /**
+     * 修改标签分类
+     */
+    @RequiresPermissions("ems:tag:edit")
+    @Log(title = "标签分类", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmsTag dimEmsTag)
+    {
+        return toAjax(emsTagService.updateEmsTag(dimEmsTag));
+    }
+
+    /**
+     * 删除标签分类
+     */
+    @RequiresPermissions("ems:tag:remove")
+    @Log(title = "标签分类", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emsTagService.deleteEmsTagByIds(ids));
+    }
+}

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

@@ -50,6 +50,13 @@ public class EmsDevice extends BaseEntity
     /** 归属设施代码 */
     private String refFacs;
 
+    /** 归属子系统代码 */
+    private String subsystemCode;
+
+    /** 归属子系统名称 */
+    @Excel(name = "子系统")
+    private String subsystemName;
+
     /** 归属设施名称 */
     @Excel(name = "归属设施")
     private String refFacsName;
@@ -57,43 +64,38 @@ public class EmsDevice extends BaseEntity
     /** 归属区域路径 */
     private String areaPath;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setDeviceCode(String deviceCode) 
-    {
-        this.deviceCode = deviceCode;
+
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getDeviceCode() 
-    {
+    public String getDeviceCode() {
         return deviceCode;
     }
-    public void setDeviceName(String deviceName) 
-    {
-        this.deviceName = deviceName;
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
     }
 
-    public String getDeviceName() 
-    {
+    public String getDeviceName() {
         return deviceName;
     }
-    public void setDeviceType(Long deviceType) 
-    {
-        this.deviceType = deviceType;
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
     }
 
-    public Long getDeviceType() 
-    {
+    public Long getDeviceType() {
         return deviceType;
     }
 
+    public void setDeviceType(Long deviceType) {
+        this.deviceType = deviceType;
+    }
+
     public String getDeviceTypeName() {
         return deviceTypeName;
     }
@@ -102,14 +104,12 @@ public class EmsDevice extends BaseEntity
         this.deviceTypeName = deviceTypeName;
     }
 
-    public void setDeviceStatus(Long deviceStatus)
-    {
-        this.deviceStatus = deviceStatus;
+    public Long getDeviceStatus() {
+        return deviceStatus;
     }
 
-    public Long getDeviceStatus() 
-    {
-        return deviceStatus;
+    public void setDeviceStatus(Long deviceStatus) {
+        this.deviceStatus = deviceStatus;
     }
 
     public String getAreaType() {
@@ -120,23 +120,12 @@ public class EmsDevice extends BaseEntity
         this.areaType = areaType;
     }
 
-    public void setRefArea(String refArea)
-    {
-        this.refArea = refArea;
-    }
-
-    public String getRefArea() 
-    {
+    public String getRefArea() {
         return refArea;
     }
-    public void setRefFacs(String refFacs) 
-    {
-        this.refFacs = refFacs;
-    }
 
-    public String getRefFacs() 
-    {
-        return refFacs;
+    public void setRefArea(String refArea) {
+        this.refArea = refArea;
     }
 
     public String getRefAreaName() {
@@ -147,6 +136,30 @@ public class EmsDevice extends BaseEntity
         this.refAreaName = refAreaName;
     }
 
+    public String getRefFacs() {
+        return refFacs;
+    }
+
+    public void setRefFacs(String refFacs) {
+        this.refFacs = refFacs;
+    }
+
+    public String getSubsystemCode() {
+        return subsystemCode;
+    }
+
+    public void setSubsystemCode(String subsystemCode) {
+        this.subsystemCode = subsystemCode;
+    }
+
+    public String getSubsystemName() {
+        return subsystemName;
+    }
+
+    public void setSubsystemName(String subsystemName) {
+        this.subsystemName = subsystemName;
+    }
+
     public String getRefFacsName() {
         return refFacsName;
     }
@@ -174,7 +187,11 @@ public class EmsDevice extends BaseEntity
             .append("deviceStatus", getDeviceStatus())
             .append("areaType", getAreaType())
             .append("refArea", getRefArea())
+            .append("refAreaName", getRefAreaName())
             .append("refFacs", getRefFacs())
+            .append("refFacsName", getRefFacsName())
+            .append("subsystemCode", getSubsystemCode())
+            .append("subsystemName", getSubsystemName())
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())
             .toString();

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

@@ -0,0 +1,163 @@
+package com.ruoyi.ems.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 能源子系统对象 adm_ems_subsystem
+ * 
+ * @author ruoyi
+ * @date 2024-08-16
+ */
+public class EmsSubsystem extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 系统代码 */
+    @Excel(name = "系统代码")
+    private String systemCode;
+
+    /** 系统名称 */
+    @Excel(name = "系统名称")
+    private String systemName;
+
+    /** 系统简称 */
+    @Excel(name = "系统简称")
+    private String shortName;
+
+    /** 厂商 */
+    @Excel(name = "厂商")
+    private String manFacturer;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contactPerson;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String contactNumber;
+
+    /** 维护人 */
+    @Excel(name = "维护人")
+    private String maintainerPerson;
+
+    /** 维护电话 */
+    @Excel(name = "维护电话")
+    private String maintainerNumber;
+
+    /** 备注说明 */
+    @Excel(name = "备注说明")
+    private String descr;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSystemCode(String systemCode) 
+    {
+        this.systemCode = systemCode;
+    }
+
+    public String getSystemCode() 
+    {
+        return systemCode;
+    }
+    public void setSystemName(String systemName) 
+    {
+        this.systemName = systemName;
+    }
+
+    public String getSystemName() 
+    {
+        return systemName;
+    }
+    public void setShortName(String shortName) 
+    {
+        this.shortName = shortName;
+    }
+
+    public String getShortName() 
+    {
+        return shortName;
+    }
+    public void setManFacturer(String manFacturer) 
+    {
+        this.manFacturer = manFacturer;
+    }
+
+    public String getManFacturer() 
+    {
+        return manFacturer;
+    }
+    public void setContactPerson(String contactPerson) 
+    {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getContactPerson() 
+    {
+        return contactPerson;
+    }
+    public void setContactNumber(String contactNumber) 
+    {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getContactNumber() 
+    {
+        return contactNumber;
+    }
+    public void setMaintainerPerson(String maintainerPerson) 
+    {
+        this.maintainerPerson = maintainerPerson;
+    }
+
+    public String getMaintainerPerson() 
+    {
+        return maintainerPerson;
+    }
+    public void setMaintainerNumber(String maintainerNumber) 
+    {
+        this.maintainerNumber = maintainerNumber;
+    }
+
+    public String getMaintainerNumber() 
+    {
+        return maintainerNumber;
+    }
+    public void setDescr(String descr) 
+    {
+        this.descr = descr;
+    }
+
+    public String getDescr() 
+    {
+        return descr;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("systemCode", getSystemCode())
+            .append("systemName", getSystemName())
+            .append("shortName", getShortName())
+            .append("manFacturer", getManFacturer())
+            .append("contactPerson", getContactPerson())
+            .append("contactNumber", getContactNumber())
+            .append("maintainerPerson", getMaintainerPerson())
+            .append("maintainerNumber", getMaintainerNumber())
+            .append("descr", getDescr())
+            .toString();
+    }
+}

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

@@ -39,6 +39,9 @@ public class QueryDevice {
     /** 区域代码 */
     private String refArea;
 
+    /** 所属子系统 */
+    private String subsystemCode;
+
     private List<String> buildingCodes;
 
     private List<String> zoningCodes;
@@ -91,6 +94,14 @@ public class QueryDevice {
         this.refArea = refArea;
     }
 
+    public String getSubsystemCode() {
+        return subsystemCode;
+    }
+
+    public void setSubsystemCode(String subsystemCode) {
+        this.subsystemCode = subsystemCode;
+    }
+
     public List<String> getBuildingCodes() {
         return buildingCodes;
     }

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

@@ -0,0 +1,62 @@
+package com.ruoyi.ems.mapper;
+
+import com.ruoyi.ems.domain.EmsSubsystem;
+
+import java.util.List;
+
+/**
+ * 能源子系统Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-16
+ */
+public interface EmsSubsystemMapper
+{
+    /**
+     * 查询能源子系统
+     * 
+     * @param id 能源子系统主键
+     * @return 能源子系统
+     */
+     EmsSubsystem selectEmsSubsystemById(Long id);
+
+    /**
+     * 查询能源子系统列表
+     * 
+     * @param emsSubsystem 能源子系统
+     * @return 能源子系统集合
+     */
+     List<EmsSubsystem> selectEmsSubsystemList(EmsSubsystem emsSubsystem);
+
+    /**
+     * 新增能源子系统
+     * 
+     * @param emsSubsystem 能源子系统
+     * @return 结果
+     */
+     int insertEmsSubsystem(EmsSubsystem emsSubsystem);
+
+    /**
+     * 修改能源子系统
+     * 
+     * @param emsSubsystem 能源子系统
+     * @return 结果
+     */
+     int updateEmsSubsystem(EmsSubsystem emsSubsystem);
+
+    /**
+     * 删除能源子系统
+     * 
+     * @param id 能源子系统主键
+     * @return 结果
+     */
+     int deleteEmsSubsystemById(Long id);
+
+    /**
+     * 批量删除能源子系统
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteEmsSubsystemByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.ems.service;
+
+import com.ruoyi.ems.domain.EmsSubsystem;
+
+import java.util.List;
+
+/**
+ * 能源子系统Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-08-16
+ */
+public interface IEmsSubsystemService
+{
+    /**
+     * 查询能源子系统
+     * 
+     * @param id 能源子系统主键
+     * @return 能源子系统
+     */
+     EmsSubsystem selectEmsSubsystemById(Long id);
+
+    /**
+     * 查询能源子系统列表
+     * 
+     * @param admEmsSubsystem 能源子系统
+     * @return 能源子系统集合
+     */
+     List<EmsSubsystem> selectEmsSubsystemList(EmsSubsystem admEmsSubsystem);
+
+    /**
+     * 新增能源子系统
+     * 
+     * @param admEmsSubsystem 能源子系统
+     * @return 结果
+     */
+     int insertEmsSubsystem(EmsSubsystem admEmsSubsystem);
+
+    /**
+     * 修改能源子系统
+     * 
+     * @param admEmsSubsystem 能源子系统
+     * @return 结果
+     */
+     int updateEmsSubsystem(EmsSubsystem admEmsSubsystem);
+
+    /**
+     * 批量删除能源子系统
+     * 
+     * @param ids 需要删除的能源子系统主键集合
+     * @return 结果
+     */
+     int deleteEmsSubsystemByIds(Long[] ids);
+
+    /**
+     * 删除能源子系统信息
+     * 
+     * @param id 能源子系统主键
+     * @return 结果
+     */
+     int deleteEmsSubsystemById(Long id);
+}

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

@@ -0,0 +1,94 @@
+package com.ruoyi.ems.service.impl;
+
+import com.ruoyi.ems.domain.EmsSubsystem;
+import com.ruoyi.ems.mapper.EmsSubsystemMapper;
+import com.ruoyi.ems.service.IEmsSubsystemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 能源子系统Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-08-16
+ */
+@Service
+public class EmsSubsystemServiceImpl implements IEmsSubsystemService
+{
+    @Autowired
+    private EmsSubsystemMapper emsSubsystemMapper;
+
+    /**
+     * 查询能源子系统
+     * 
+     * @param id 能源子系统主键
+     * @return 能源子系统
+     */
+    @Override
+    public EmsSubsystem selectEmsSubsystemById(Long id)
+    {
+        return emsSubsystemMapper.selectEmsSubsystemById(id);
+    }
+
+    /**
+     * 查询能源子系统列表
+     * 
+     * @param emsSubsystem 能源子系统
+     * @return 能源子系统
+     */
+    @Override
+    public List<EmsSubsystem> selectEmsSubsystemList(EmsSubsystem emsSubsystem)
+    {
+        return emsSubsystemMapper.selectEmsSubsystemList(emsSubsystem);
+    }
+
+    /**
+     * 新增能源子系统
+     * 
+     * @param emsSubsystem 能源子系统
+     * @return 结果
+     */
+    @Override
+    public int insertEmsSubsystem(EmsSubsystem emsSubsystem)
+    {
+        return emsSubsystemMapper.insertEmsSubsystem(emsSubsystem);
+    }
+
+    /**
+     * 修改能源子系统
+     * 
+     * @param emsSubsystem 能源子系统
+     * @return 结果
+     */
+    @Override
+    public int updateEmsSubsystem(EmsSubsystem emsSubsystem)
+    {
+        return emsSubsystemMapper.updateEmsSubsystem(emsSubsystem);
+    }
+
+    /**
+     * 批量删除能源子系统
+     * 
+     * @param ids 需要删除的能源子系统主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsSubsystemByIds(Long[] ids)
+    {
+        return emsSubsystemMapper.deleteEmsSubsystemByIds(ids);
+    }
+
+    /**
+     * 删除能源子系统信息
+     * 
+     * @param id 能源子系统主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsSubsystemById(Long id)
+    {
+        return emsSubsystemMapper.deleteEmsSubsystemById(id);
+    }
+}

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

@@ -15,16 +15,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="refArea"           column="ref_area"    />
         <result property="refFacs"           column="ref_facs"    />
         <result property="refFacsName"       column="ref_facs_name"    />
+        <result property="subsystemCode"     column="subsystem_code"    />
+        <result property="subsystemName"     column="subsystem_name"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectEmsDeviceVo">
         select
-            d.`id`, d.`device_code`, d.`device_name`, d.`device_type`, dt.`type_name` as device_type_name, d.`device_status`, d.`area_type`, d.`ref_area`, d.`ref_facs`, f.`facs_name` as ref_facs_name, d.`create_time`, d.`update_time`
+            d.`id`, d.`device_code`, d.`device_name`, d.`device_type`, dt.`type_name` as device_type_name, d.`device_status`, d.`area_type`, d.`ref_area`, d.`ref_facs`, f.`facs_name` as ref_facs_name, d.`create_time`, d.`update_time`, d.`subsystem_code`, s.`system_name` as subsystem_name
         from adm_ems_device d
             LEFT JOIN dim_devc_type dt ON d.`device_type` = dt.`type_code`
             LEFT JOIN adm_ems_facs f ON d.`ref_facs` = f.`facs_code`
+            LEFT JOIN adm_ems_subsystem s ON d.`subsystem_code` = s.`system_code`
     </sql>
 
     <select id="selectEmsDeviceList" parameterType="com.ruoyi.ems.domain.EmsDevice" resultMap="EmsDeviceResult">
@@ -37,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaType != null and areaType != ''"> and d.`area_type` = #{areaType}</if>
             <if test="refArea != null  and refArea != ''"> and d.`ref_area` = #{refArea}</if>
             <if test="refFacs != null  and refFacs != ''"> and d.`ref_facs` = #{refFacs}</if>
+            <if test="subsystemCode != null  and subsystemCode != ''"> and d.`subsystem_code` = #{subsystemCode}</if>
         </where>
     </select>
 
@@ -48,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null  and deviceName != ''"> and d.`device_name` like concat('%', #{deviceName}, '%')</if>
             <if test="deviceType != null "> and d.`device_type` = #{deviceType}</if>
             <if test="refFacs != null  and refFacs != ''"> and d.`ref_facs` = #{refFacs}</if>
+            <if test="subsystemCode != null  and subsystemCode != ''"> and d.`subsystem_code` = #{subsystemCode}</if>
             <if test="areaType == 'Area' and refArea != null and refArea != ''">
                 and ((d.`area_type` = 'Area' and d.`ref_area` = #{refArea})
                 <if test="buildingCodes != null">
@@ -99,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaType != null">area_type,</if>
             <if test="refArea != null">ref_area,</if>
             <if test="refFacs != null">ref_facs,</if>
+            <if test="subsystemCode != null">subsystem_code,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
@@ -110,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaType != null">#{areaType},</if>
             <if test="refArea != null">#{refArea},</if>
             <if test="refFacs != null">#{refFacs},</if>
+            <if test="subsystemCode != null">#{subsystemCode},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
          </trim>
@@ -125,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaType != null">area_type = #{areaType},</if>
             <if test="refArea != null">ref_area = #{refArea},</if>
             <if test="refFacs != null">ref_facs = #{refFacs},</if>
+            <if test="subsystemCode != null">subsystem_code = #{subsystemCode},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>

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

@@ -0,0 +1,96 @@
+<?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.EmsSubsystemMapper">
+    
+    <resultMap type="com.ruoyi.ems.domain.EmsSubsystem" id="AdmEmsSubsystemResult">
+        <result property="id"    column="id"    />
+        <result property="systemCode"    column="system_code"    />
+        <result property="systemName"    column="system_name"    />
+        <result property="shortName"    column="short_name"    />
+        <result property="manFacturer"    column="man_facturer"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="contactNumber"    column="contact_number"    />
+        <result property="maintainerPerson"    column="maintainer_person"    />
+        <result property="maintainerNumber"    column="maintainer_number"    />
+        <result property="descr"    column="descr"    />
+    </resultMap>
+
+    <sql id="selectEmsSubsystemVo">
+        select id, system_code, system_name, short_name, man_facturer, contact_person, contact_number, maintainer_person, maintainer_number, descr from adm_ems_subsystem
+    </sql>
+
+    <select id="selectEmsSubsystemList" parameterType="com.ruoyi.ems.domain.EmsSubsystem" resultMap="AdmEmsSubsystemResult">
+        <include refid="selectEmsSubsystemVo"/>
+        <where>  
+            <if test="systemCode != null  and systemCode != ''"> and system_code = #{systemCode}</if>
+            <if test="systemName != null  and systemName != ''"> and system_name like concat('%', #{systemName}, '%')</if>
+            <if test="shortName != null  and shortName != ''"> and short_name like concat('%', #{shortName}, '%')</if>
+            <if test="manFacturer != null  and manFacturer != ''"> and man_facturer = #{manFacturer}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
+            <if test="contactNumber != null  and contactNumber != ''"> and contact_number = #{contactNumber}</if>
+            <if test="maintainerPerson != null  and maintainerPerson != ''"> and maintainer_person = #{maintainerPerson}</if>
+            <if test="maintainerNumber != null  and maintainerNumber != ''"> and maintainer_number = #{maintainerNumber}</if>
+            <if test="descr != null  and descr != ''"> and descr = #{descr}</if>
+        </where>
+    </select>
+    
+    <select id="selectEmsSubsystemById" parameterType="Long" resultMap="AdmEmsSubsystemResult">
+        <include refid="selectEmsSubsystemVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertEmsSubsystem" parameterType="com.ruoyi.ems.domain.EmsSubsystem" useGeneratedKeys="true" keyProperty="id">
+        insert into adm_ems_subsystem
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="systemCode != null and systemCode != ''">system_code,</if>
+            <if test="systemName != null and systemName != ''">system_name,</if>
+            <if test="shortName != null">short_name,</if>
+            <if test="manFacturer != null">man_facturer,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="contactNumber != null">contact_number,</if>
+            <if test="maintainerPerson != null">maintainer_person,</if>
+            <if test="maintainerNumber != null">maintainer_number,</if>
+            <if test="descr != null">descr,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="systemCode != null and systemCode != ''">#{systemCode},</if>
+            <if test="systemName != null and systemName != ''">#{systemName},</if>
+            <if test="shortName != null">#{shortName},</if>
+            <if test="manFacturer != null">#{manFacturer},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="contactNumber != null">#{contactNumber},</if>
+            <if test="maintainerPerson != null">#{maintainerPerson},</if>
+            <if test="maintainerNumber != null">#{maintainerNumber},</if>
+            <if test="descr != null">#{descr},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEmsSubsystem" parameterType="com.ruoyi.ems.domain.EmsSubsystem">
+        update adm_ems_subsystem
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="systemCode != null and systemCode != ''">system_code = #{systemCode},</if>
+            <if test="systemName != null and systemName != ''">system_name = #{systemName},</if>
+            <if test="shortName != null">short_name = #{shortName},</if>
+            <if test="manFacturer != null">man_facturer = #{manFacturer},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
+            <if test="maintainerPerson != null">maintainer_person = #{maintainerPerson},</if>
+            <if test="maintainerNumber != null">maintainer_number = #{maintainerNumber},</if>
+            <if test="descr != null">descr = #{descr},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmsSubsystemById" parameterType="Long">
+        delete from adm_ems_subsystem where id = #{id}
+    </delete>
+
+    <delete id="deleteEmsSubsystemByIds" parameterType="String">
+        delete from adm_ems_subsystem where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ems-cloud/ruoyi-gateway/src/main/resources/application-local.yml

@@ -29,23 +29,11 @@ spring:
             - StripPrefix=1
         # 能源管理
         - id: ems-server
-          uri: lb://ems-server
+          uri: http://172.192.13.78:9202
           predicates:
             - Path=/ems/**
           filters:
             - StripPrefix=0
-        - id: ems-server-74
-          uri: http://172.192.13.74:9202
-          predicates:
-            - Path=/74/ems/**
-          filters:
-            - StripPrefix=1
-        - id: ems-server-78
-          uri: http://172.192.13.78:9202
-          predicates:
-            - Path=/78/ems/**
-          filters:
-            - StripPrefix=1
         # 定时任务
         - id: ruoyi-job
           uri: lb://ruoyi-job

ems-cloud/sql/ems_server.sql

@@ -484,13 +484,13 @@ create table adm_ems_facs  (
   `facs_type`       varchar(32)     not null                     comment '设施分类',
   `facs_subtype`    varchar(32)     not null                     comment '设施子类',
   `enable`          int             default '0'                  comment '启用状态0-停用，1-启用',
-  `ref_area`        varchar(32)     not null                    comment '归属区域代码',
+  `ref_area`        varchar(32)     not null                     comment '归属区域代码',
   `manufacturer`    varchar(64)     default null                 comment '厂商',
   `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
   unique key ux_ems_facs_code(`facs_code`)
-) engine=innodb auto_increment=1 comment = '能源设施/系统表';
+) engine=innodb auto_increment=1 comment = '能源设施表';
 
 -- 能源设施/系统DEMO数据
 INSERT INTO `adm_ems_facs` (`facs_code`, `facs_name`, `facs_type`, `facs_subtype`, `enable`, `ref_area`, `manufacturer`) VALUES ('W201', '北区-供电网', 'W', 'W2', 1, '321283124S3001', '华设');
@@ -522,7 +522,7 @@ create table adm_ems_facs_attr  (
   `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
    primary key (`id`),
    unique key ux_ems_facs_code(`facs_code`)
-) engine=innodb auto_increment=1 comment = '能源设施/系统属性表';
+) engine=innodb auto_increment=1 comment = '能源设施属性表';
 
 -- 设施属性DEMO数据
 INSERT INTO `adm_ems_facs_attr` (`facs_code`, `attr_name`, `attr_desc`, `attr_value`, `attr_unit`) VALUES ('W201', 'input_load', '进线负荷', '293.55', 'kw/h');
@@ -530,6 +530,26 @@ INSERT INTO `adm_ems_facs_attr` (`facs_code`, `attr_name`, `attr_desc`, `attr_va
 
 
 -- ----------------------------
+-- 能源子系统表
+-- ----------------------------
+drop table if exists adm_ems_subsystem;
+create table adm_ems_subsystem  (
+  `id`                 bigint(20)      not null auto_increment      comment '序号',
+  `system_code`        varchar(16)     not null                     comment '系统代码',
+  `system_name`        varchar(32)     not null                     comment '系统名称',
+  `short_name`         varchar(16)     default null                 comment '系统简称',
+  `man_facturer`       varchar(64)     default null                 comment '厂商',
+  `contact_person`     varchar(32)     default null                 comment '联系人',
+  `contact_number`     varchar(128)    default null                 comment '联系电话',
+  `maintainer_person`  varchar(32)     default null                 comment '维护人',
+  `maintainer_number`  varchar(128)    default null                 comment '维护电话',
+  `descr`              varchar(1024)   default null                 comment '备注说明',
+  primary key (`id`),
+  unique key ux_ems_facs_code(`system_code`)
+) engine=innodb auto_increment=1 comment = '能源子系统表';
+
+
+-- ----------------------------
 -- 能源设施能流关系表
 -- ----------------------------
 drop table if exists adm_ems_facs_flow_rel;
@@ -555,7 +575,7 @@ INSERT INTO `adm_ems_facs_flow_rel` (`code`, `export_facs_code`, `input_facs_cod
 
 
 -- ----------------------------
--- 能源设备表
+-- 用能设备表
 -- ----------------------------
 drop table if exists adm_ems_device;
 create table adm_ems_device  (
@@ -567,11 +587,12 @@ create table adm_ems_device  (
   `area_type`       varchar(32)     default null                 comment '设备类型',
   `ref_area`        varchar(64)     default null                 comment '归属区域代码',
   `ref_facs`        varchar(64)     default null                 comment '归属设施代码',
+  `subsystem_code`  varchar(16)     default null                 comment '子系统名称',
   `create_time`     datetime        default CURRENT_TIMESTAMP    comment '创建时间',
   `update_time`     datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
   unique key ux_device_code(`device_code`)
-) engine=innodb auto_increment=1 comment = '能源设备表';
+) engine=innodb auto_increment=1 comment = '用能设备表';
 
 
 -- ----------------------------

ems-cloud/sql/ems_sys.sql

@@ -196,9 +196,10 @@ insert into sys_menu values ('118',  '告警列表',       '6',    '2',  'warn-l
 insert into sys_menu values ('119',  '巡检任务',       '6',    '3',  'oper-task',          'oper-mgr/task',          '', 1, 0, 'C', '0', '0',   'oper-mgr:task',          'task',           'admin', sysdate(), '', null, '巡检任务');
 insert into sys_menu values ('120',  '巡检报告',       '6',    '4',  'oper-report',        'oper-mgr/report',        '', 1, 0, 'C', '0', '0',   'oper-mgr:report',        'note',           'admin', sysdate(), '', null, '巡检报告');
 
-insert into sys_menu values ('121',  '建筑区块',       '7',    '1',  'buildingcfg',        '',                       '', 1, 0, 'M', '0', '0',   'basecfg:building',       'building',       'admin', sysdate(), '', null, '用户管理菜单');
-insert into sys_menu values ('122',  '设备设施',       '7',    '2',  'devicecfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:device',         'devicemgr',      'admin', sysdate(), '', null, '用户管理菜单');
-insert into sys_menu values ('123',  '能源计量',       '7',    '3',  'energycfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:energy',         'energy',         'admin', sysdate(), '', null, '用户管理菜单');
+insert into sys_menu values ('121',  '建筑区块',       '7',    '1',  'buildingcfg',        '',                       '', 1, 0, 'M', '0', '0',   'basecfg:building',       'building',       'admin', sysdate(), '', null, '建筑区块菜单');
+insert into sys_menu values ('122',  '设备设施',       '7',    '2',  'devicecfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:device',         'devicemgr',      'admin', sysdate(), '', null, '设备设施菜单');
+insert into sys_menu values ('123',  '能源计量',       '7',    '3',  'energycfg',          '',                       '', 1, 0, 'M', '0', '0',   'basecfg:energy',         'energy',         'admin', sysdate(), '', null, '能源计量菜单');
+insert into sys_menu values ('124',  '标签管理',       '7',    '4',  'emstag',             'basecfg/tag',            '', 1, 0, 'C', '0', '0',   'basecfg:tag:list',            'tree',           'admin', sysdate(), '', null, '标签菜单');
 
 insert into sys_menu values ('170',  '用户管理',       '8',   '1',  'user',               'system/user/index',      '', 1, 0, 'C', '0', '0',   'system:user:list',       'user',           'admin', sysdate(), '', null, '用户管理菜单');
 insert into sys_menu values ('171',  '角色管理',       '8',   '2',  'role',               'system/role/index',      '', 1, 0, 'C', '0', '0',   'system:role:list',       'peoples',        'admin', sysdate(), '', null, '角色管理菜单');
@@ -211,15 +212,16 @@ insert into sys_menu values ('177',  '通知公告',       '8',   '8',  'notice'
 insert into sys_menu values ('178',  '日志管理',       '8',   '9',  'log',                '',                       '', 1, 0, 'M', '0', '0',   '',                       'log',            'admin', sysdate(), '', null, '日志管理菜单');
 insert into sys_menu values ('179',  '在线用户',       '8',   '10', 'online',             'monitor/online/index',   '', 1, 0, 'C', '0', '0',   'monitor:online:list',    'online',         'admin', sysdate(), '', null, '在线用户菜单');
 
-insert into sys_menu values ('180',  '光伏',          '9',   '1',  'adapter-pv',         'adapter/pv/index',      '', 1, 0, 'C', '0', '0',   'adapter:user:list',       'photovoltaic',        'admin', sysdate(), '', null, '光伏');
-insert into sys_menu values ('181',  '光储直柔',       '9',   '2',  'adapter-gczr',       'adapter/gczr/index',    '', 1, 0, 'C', '0', '0',   'adapter:role:list',       'deviceaccess',      'admin', sysdate(), '', null, '光储直柔');
-insert into sys_menu values ('182',  '光储充',         '9',   '3',  'adapter-gcc',        'adapter/gcc/index',     '', 1, 0, 'C', '0', '0',   'adapter:menu:list',       'energyconsume',       'admin', sysdate(), '', null, '光储充');
-insert into sys_menu values ('183',  '充电桩',         '9',   '4',  'adapter-cdz',        'adapter/cdz/index',     '', 1, 0, 'C', '0', '0',   'adapter:dept:list',       'powerstore',       'admin', sysdate(), '', null, '充电桩');
-insert into sys_menu values ('184',  '智慧照明',       '9',   '5',  'adapter-zm',         'adapter/zm/index',      '', 1, 0, 'C', '0', '0',   'adapter:post:list',       'system',        'admin', sysdate(), '', null, '智慧照明');
-insert into sys_menu values ('185',  '智慧海绵',       '9',   '6',  'adapter-hm',         'adapter/hm/index',      '', 1, 0, 'C', '0', '0',   'adapter:dict:list',       'system',        'admin', sysdate(), '', null, '智慧海绵');
-insert into sys_menu values ('186',  '垃圾厨余',       '9',   '7',  'adapter-ljcy',       'adapter/ljcy/index',    '', 1, 0, 'C', '0', '0',   'adapter:config:list',     'system',      'admin', sysdate(), '', null, '垃圾厨余');
-insert into sys_menu values ('187',  '能耗监测',       '9',   '8',  'adapter-nhjc',       'adapter/nhjc/index',    '', 1, 0, 'C', '0', '0',   'adapter:notice:list',     'system',      'admin', sysdate(), '', null, '能耗监测');
-insert into sys_menu values ('188',  '设备管理',       '9',   '9',  'adapter-devc',       'adapter/devc/index',    '', 1, 0, 'M', '0', '0',   'adapter:devc:list',       'system',      'admin', sysdate(), '', null, '设备管理');
+insert into sys_menu values ('180',  '系统信息',       '9',   '1',  'adapter-subsystem',  'adapter/subsystem/index',  '', 1, 0, 'C', '0', '0',   'adapter:subsystem:list',  'note',           'admin', sysdate(), '', null, '光伏');
+insert into sys_menu values ('181',  '光伏',          '9',   '2',  'adapter-pv',         'adapter/pv/index',         '', 1, 0, 'C', '0', '0',   'adapter:pv:list',         'photovoltaic',   'admin', sysdate(), '', null, '光伏');
+insert into sys_menu values ('182',  '光储直柔',       '9',   '3',  'adapter-gczr',       'adapter/gczr/index',       '', 1, 0, 'C', '0', '0',   'adapter:gczr:list',       'deviceaccess',   'admin', sysdate(), '', null, '光储直柔');
+insert into sys_menu values ('183',  '光储充',         '9',   '4',  'adapter-gcc',        'adapter/gcc/index',        '', 1, 0, 'C', '0', '0',   'adapter:gcc:list',       'energyconsume',  'admin', sysdate(), '', null, '光储充');
+insert into sys_menu values ('184',  '充电桩',         '9',   '5',  'adapter-cdz',        'adapter/cdz/index',        '', 1, 0, 'C', '0', '0',   'adapter:cdz:list',       'powerstore',     'admin', sysdate(), '', null, '充电桩');
+insert into sys_menu values ('185',  '智慧照明',       '9',   '6',  'adapter-zm',         'adapter/zm/index',         '', 1, 0, 'C', '0', '0',   'adapter:zm:list',       'system',         'admin', sysdate(), '', null, '智慧照明');
+insert into sys_menu values ('186',  '智慧海绵',       '9',   '7',  'adapter-hm',         'adapter/hm/index',         '', 1, 0, 'C', '0', '0',   'adapter:hm:list',       'system',         'admin', sysdate(), '', null, '智慧海绵');
+insert into sys_menu values ('187',  '垃圾厨余',       '9',   '8',  'adapter-ljcy',       'adapter/ljcy/index',       '', 1, 0, 'C', '0', '0',   'adapter:ljcy:list',     'system',         'admin', sysdate(), '', null, '垃圾厨余');
+insert into sys_menu values ('188',  '能耗监测',       '9',   '9',  'adapter-nhjc',       'adapter/nhjc/index',       '', 1, 0, 'C', '0', '0',   'adapter:nhjc:list',     'system',         'admin', sysdate(), '', null, '能耗监测');
+insert into sys_menu values ('189',  '设备管理',       '9',   '10',  'adapter-devc',      'adapter/devc/index',       '', 1, 0, 'M', '0', '0',   'adapter:devc:list',       'system',         'admin', sysdate(), '', null, '设备管理');
 
 insert into sys_menu values ('998',  '表单构建',       '99',   '1',  'build',              'tool/build/index',       '', 1, 0, 'C', '0', '0',   'tool:build:list',        'build',          'admin', sysdate(), '', null, '表单构建菜单');
 insert into sys_menu values ('999',  '代码生成',       '99',   '2',  'gen',                'tool/gen/index',         '', 1, 0, 'C', '0', '0',   'tool:gen:list',          'code',           'admin', sysdate(), '', null, '代码生成菜单');
@@ -235,9 +237,9 @@ insert into sys_menu values ('1111',  '用能报表',   '111', '2',  'statement-
 insert into sys_menu values ('1112',  '告警报表',   '111', '3',  'statement-warn',    'analysis/statement/warn',     '', 1, 0, 'C', '0', '0',    'analysis:statement:warn',      'warn',     'admin', sysdate(), '', null, '告警报表');
 insert into sys_menu values ('1113',  '自定义',     '111', '4',  'statement-warn',    'analysis/statement/custom',   '', 1, 0, 'C', '0', '0',   'analysis:statement:custom',    'statement-zdy',   'admin', sysdate(), '', null, '自定义报表');
 -- 业务配置菜单
-insert into sys_menu values ('1210',  '服务区',     '121', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
-insert into sys_menu values ('1211',  '地块配置',   '121', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
-insert into sys_menu values ('1212',  '区域配置',   '121', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
+insert into sys_menu values ('1210',  '地块划分',   '121', '1',  'basecfg-servicearea',    'basecfg/area/index',         '', 1, 0, 'C', '0', '0',   'basecfg:area:list',           'cfgwrite',   'admin', sysdate(), '', null, '服务区配置');
+insert into sys_menu values ('1211',  '建筑配置',   '121', '2',  'basecfg-building',       'basecfg/building/index',     '', 1, 0, 'C', '0', '0',   'basecfg:building:list',        'cfgwrite',   'admin', sysdate(), '', null, '楼宇建筑配置');
+insert into sys_menu values ('1212',  '功能分区',   '121', '3',  'basecfg-zoning',         'basecfg/zoning/index',       '', 1, 0, 'C', '0', '0',   'basecfg:zoning:list',          'cfgwrite',   'admin', sysdate(), '', null, '区块配置');
 insert into sys_menu values ('1220',  '设施分类',   '122', '1',  'basecfg-facstype',       'basecfg/facstype/index',     '', 1, 0, 'C', '0', '0',   'basecfg:facstype:list',        'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
 insert into sys_menu values ('1221',  '能源设施',   '122', '2',  'basecfg-facscfg',        'basecfg/emsfacs/index',      '', 1, 0, 'C', '0', '0',   'basecfg:emsfacs:list',         'cfgwrite',   'admin', sysdate(), '', null, '设施配置');
 insert into sys_menu values ('1222',  '能流关系',   '122', '3',  'basecfg-flowrel',        'basecfg/flowrel/index',      '', 1, 0, 'C', '0', '0',   'basecfg:flowrel:list',         'cfgwrite',   'admin', sysdate(), '', null, '设备配置');
@@ -293,8 +295,8 @@ insert into sys_menu values ('1770', '公告查询', '177', '1', '#', '', '', 1,
 insert into sys_menu values ('1771', '公告新增', '177', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values ('1772', '公告修改', '177', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values ('1773', '公告删除', '177', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values ('1780',  '操作日志', '178', '1',  'operlog',           'system/operlog/index',       '', 1, 0, 'C', '0', '0',    'system:operlog:list',          'form',          'admin', sysdate(), '', null, '操作日志菜单');
-insert into sys_menu values ('1781',  '登录日志', '178', '2',  'logininfor',        'system/logininfor/index',    '', 1, 0, 'C', '0', '0',    'system:logininfor:list',       'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
+insert into sys_menu values ('1780', '操作日志', '178', '1',  'operlog',           'system/operlog/index',       '', 1, 0, 'C', '0', '0',    'system:operlog:list',          'form',          'admin', sysdate(), '', null, '操作日志菜单');
+insert into sys_menu values ('1781', '登录日志', '178', '2',  'logininfor',        'system/logininfor/index',    '', 1, 0, 'C', '0', '0',    'system:logininfor:list',       'logininfor',    'admin', sysdate(), '', null, '登录日志菜单');
 
 -- 操作日志按钮
 insert into sys_menu values ('17800', '操作查询', '1780', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query',       '#', 'admin', sysdate(), '', null, '');
@@ -366,45 +368,45 @@ INSERT INTO `sys_menu` VALUES (2015,'add',105, 1, '', NULL, NULL, 1, 0, 'F', '0'
 INSERT INTO `sys_menu` VALUES (2016,'edit',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:edit', '#', 'admin', sysdate(), '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2017,'remove',105, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'power-mgr:gs:remove', '#', 'admin', sysdate(), '', NULL, '');
 -- 产能预测
-INSERT INTO `sys_menu` VALUES (null,'list',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'export',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'query',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'add',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'edit',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'remove',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2018,'list',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2019,'export',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2020,'query',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2021,'add',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2022,'edit',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2023,'remove',1100, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:prod:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- 用能预测
-INSERT INTO `sys_menu` VALUES (null,'list',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'export',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'query',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'add',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'edit',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'remove',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2024,'list',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2025,'export',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2026,'query',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2027,'add',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2028,'edit',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2029,'remove',1101, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:consume:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- 碳排预测
-INSERT INTO `sys_menu` VALUES (null,'list',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'export',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'query',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'add',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'edit',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'remove',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2030,'list',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2031,'export',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2032,'query',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2033,'add',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2034,'edit',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2035,'remove',1102, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'prediction:ca:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- 碳排计量
-INSERT INTO `sys_menu` VALUES (null,'list',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'export',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'query',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'add',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'edit',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'remove',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2036,'list',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2037,'export',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2038,'query',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2039,'add',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2040,'edit',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2041,'remove',112, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:emission:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 
 -- 碳排计量
-INSERT INTO `sys_menu` VALUES (null,'list',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:list', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'export',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:export', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'query',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:query', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'add',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:add', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'edit',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:edit', '#', 'admin', sysdate(), '', NULL, '');
-INSERT INTO `sys_menu` VALUES (null,'remove',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:remove', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2042,'list',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:list', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2043,'export',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:export', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2044,'query',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:query', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2045,'add',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:add', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2046,'edit',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:edit', '#', 'admin', sysdate(), '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2047,'remove',113, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'ca-analysis:sink:remove', '#', 'admin', sysdate(), '', NULL, '');
 
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
@@ -436,155 +438,205 @@ create table sys_role_menu (
 -- ----------------------------
 -- 初始化-角色和菜单关联表数据
 -- ----------------------------
-insert into sys_role_menu values ('2', '1');
-insert into sys_role_menu values ('2', '2');
-insert into sys_role_menu values ('2', '3');
-insert into sys_role_menu values ('2', '4');
-insert into sys_role_menu values ('2', '5');
-insert into sys_role_menu values ('2', '6');
-insert into sys_role_menu values ('2', '7');
-insert into sys_role_menu values ('2', '8');
-insert into sys_role_menu values ('2', '9');
-insert into sys_role_menu values ('2', '10');
-insert into sys_role_menu values ('2', '99');
-insert into sys_role_menu values ('2', '100');
-insert into sys_role_menu values ('2', '101');
-insert into sys_role_menu values ('2', '102');
-insert into sys_role_menu values ('2', '103');
-insert into sys_role_menu values ('2', '104');
-insert into sys_role_menu values ('2', '105');
-insert into sys_role_menu values ('2', '106');
-insert into sys_role_menu values ('2', '107');
-insert into sys_role_menu values ('2', '108');
-insert into sys_role_menu values ('2', '109');
-insert into sys_role_menu values ('2', '110');
-insert into sys_role_menu values ('2', '111');
-insert into sys_role_menu values ('2', '112');
-insert into sys_role_menu values ('2', '113');
-insert into sys_role_menu values ('2', '114');
-insert into sys_role_menu values ('2', '115');
-insert into sys_role_menu values ('2', '116');
-insert into sys_role_menu values ('2', '117');
-insert into sys_role_menu values ('2', '118');
-insert into sys_role_menu values ('2', '119');
-insert into sys_role_menu values ('2', '120');
-insert into sys_role_menu values ('2', '121');
-insert into sys_role_menu values ('2', '122');
-insert into sys_role_menu values ('2', '123');
-insert into sys_role_menu values ('2', '124');
-insert into sys_role_menu values ('2', '125');
-insert into sys_role_menu values ('2', '190');
-insert into sys_role_menu values ('2', '191');
-insert into sys_role_menu values ('2', '192');
-insert into sys_role_menu values ('2', '193');
-insert into sys_role_menu values ('2', '194');
-insert into sys_role_menu values ('2', '195');
-insert into sys_role_menu values ('2', '196');
-insert into sys_role_menu values ('2', '197');
-insert into sys_role_menu values ('2', '198');
-insert into sys_role_menu values ('2', '199');
-insert into sys_role_menu values ('2', '188');
-insert into sys_role_menu values ('2', '189');
-insert into sys_role_menu values ('2', '500');
-insert into sys_role_menu values ('2', '501');
-insert into sys_role_menu values ('2', '510');
-insert into sys_role_menu values ('2', '511');
-insert into sys_role_menu values ('2', '520');
-insert into sys_role_menu values ('2', '521');
-insert into sys_role_menu values ('2', '522');
-insert into sys_role_menu values ('2', '523');
-insert into sys_role_menu values ('2', '530');
-insert into sys_role_menu values ('2', '531');
-insert into sys_role_menu values ('2', '532');
-insert into sys_role_menu values ('2', '533');
-insert into sys_role_menu values ('2', '534');
-insert into sys_role_menu values ('2', '535');
-insert into sys_role_menu values ('2', '536');
-insert into sys_role_menu values ('2', '537');
-insert into sys_role_menu values ('2', '538');
-insert into sys_role_menu values ('2', '539');
-insert into sys_role_menu values ('2', '540');
-insert into sys_role_menu values ('2', '541');
-insert into sys_role_menu values ('2', '542');
-insert into sys_role_menu values ('2', '543');
-insert into sys_role_menu values ('2', '1000');
-insert into sys_role_menu values ('2', '1001');
-insert into sys_role_menu values ('2', '1002');
-insert into sys_role_menu values ('2', '1003');
-insert into sys_role_menu values ('2', '1004');
-insert into sys_role_menu values ('2', '1005');
-insert into sys_role_menu values ('2', '1006');
-insert into sys_role_menu values ('2', '1007');
-insert into sys_role_menu values ('2', '1008');
-insert into sys_role_menu values ('2', '1009');
-insert into sys_role_menu values ('2', '1010');
-insert into sys_role_menu values ('2', '1011');
-insert into sys_role_menu values ('2', '1012');
-insert into sys_role_menu values ('2', '1013');
-insert into sys_role_menu values ('2', '1014');
-insert into sys_role_menu values ('2', '1015');
-insert into sys_role_menu values ('2', '1016');
-insert into sys_role_menu values ('2', '1017');
-insert into sys_role_menu values ('2', '1018');
-insert into sys_role_menu values ('2', '1019');
-insert into sys_role_menu values ('2', '1020');
-insert into sys_role_menu values ('2', '1021');
-insert into sys_role_menu values ('2', '1022');
-insert into sys_role_menu values ('2', '1023');
-insert into sys_role_menu values ('2', '1024');
-insert into sys_role_menu values ('2', '1025');
-insert into sys_role_menu values ('2', '1026');
-insert into sys_role_menu values ('2', '1027');
-insert into sys_role_menu values ('2', '1028');
-insert into sys_role_menu values ('2', '1029');
-insert into sys_role_menu values ('2', '1030');
-insert into sys_role_menu values ('2', '1031');
-insert into sys_role_menu values ('2', '1032');
-insert into sys_role_menu values ('2', '1033');
-insert into sys_role_menu values ('2', '1034');
-insert into sys_role_menu values ('2', '1035');
-insert into sys_role_menu values ('2', '1036');
-insert into sys_role_menu values ('2', '1037');
-insert into sys_role_menu values ('2', '1038');
-insert into sys_role_menu values ('2', '1039');
-insert into sys_role_menu values ('2', '1040');
-insert into sys_role_menu values ('2', '1041');
-insert into sys_role_menu values ('2', '1042');
-insert into sys_role_menu values ('2', '1043');
-insert into sys_role_menu values ('2', '1044');
-insert into sys_role_menu values ('2', '1045');
-insert into sys_role_menu values ('2', '1046');
-insert into sys_role_menu values ('2', '1047');
-insert into sys_role_menu values ('2', '1048');
-insert into sys_role_menu values ('2', '1049');
-insert into sys_role_menu values ('2', '1050');
-insert into sys_role_menu values ('2', '1051');
-insert into sys_role_menu values ('2', '1052');
-insert into sys_role_menu values ('2', '1053');
-insert into sys_role_menu values ('2', '1054');
-insert into sys_role_menu values ('2', '1055');
-insert into sys_role_menu values ('2', '1056');
-insert into sys_role_menu values ('2', '1057');
-insert into sys_role_menu values ('2', '1058');
-insert into sys_role_menu values ('2', '1059');
-insert into sys_role_menu values ('2', '1060');
-insert into sys_role_menu values ('2', '1061');
-insert into sys_role_menu values ('2', '1062');
-insert into sys_role_menu values ('2', '1063');
-insert into sys_role_menu values ('2', '1064');
-insert into sys_role_menu values ('2', '1065');
-insert into sys_role_menu values ('2', '1066');
-insert into sys_role_menu values ('2', '1067');
-insert into sys_role_menu values ('2', '1068');
-insert into sys_role_menu values ('2', '1069');
-insert into sys_role_menu values ('2', '1071');
-insert into sys_role_menu values ('2', '1072');
-insert into sys_role_menu values ('2', '1073');
-insert into sys_role_menu values ('2', '1074');
-insert into sys_role_menu values ('2', '1075');
-insert into sys_role_menu values ('2', '1076');
-insert into sys_role_menu values ('2', '1077');
-insert into sys_role_menu values ('2', '1078');
+insert into sys_role_menu values ('2', 1);
+insert into sys_role_menu values ('2', 2);
+insert into sys_role_menu values ('2', 3);
+insert into sys_role_menu values ('2', 4);
+insert into sys_role_menu values ('2', 5);
+insert into sys_role_menu values ('2', 6);
+insert into sys_role_menu values ('2', 7);
+insert into sys_role_menu values ('2', 8);
+insert into sys_role_menu values ('2', 9);
+insert into sys_role_menu values ('2', 99);
+insert into sys_role_menu values ('2', 100);
+insert into sys_role_menu values ('2', 101);
+insert into sys_role_menu values ('2', 102);
+insert into sys_role_menu values ('2', 103);
+insert into sys_role_menu values ('2', 104);
+insert into sys_role_menu values ('2', 105);
+insert into sys_role_menu values ('2', 106);
+insert into sys_role_menu values ('2', 107);
+insert into sys_role_menu values ('2', 108);
+insert into sys_role_menu values ('2', 109);
+insert into sys_role_menu values ('2', 110);
+insert into sys_role_menu values ('2', 111);
+insert into sys_role_menu values ('2', 112);
+insert into sys_role_menu values ('2', 113);
+insert into sys_role_menu values ('2', 114);
+insert into sys_role_menu values ('2', 115);
+insert into sys_role_menu values ('2', 116);
+insert into sys_role_menu values ('2', 117);
+insert into sys_role_menu values ('2', 118);
+insert into sys_role_menu values ('2', 119);
+insert into sys_role_menu values ('2', 120);
+insert into sys_role_menu values ('2', 121);
+insert into sys_role_menu values ('2', 122);
+insert into sys_role_menu values ('2', 123);
+insert into sys_role_menu values ('2', 124);
+insert into sys_role_menu values ('2', 170);
+insert into sys_role_menu values ('2', 171);
+insert into sys_role_menu values ('2', 172);
+insert into sys_role_menu values ('2', 173);
+insert into sys_role_menu values ('2', 174);
+insert into sys_role_menu values ('2', 175);
+insert into sys_role_menu values ('2', 176);
+insert into sys_role_menu values ('2', 177);
+insert into sys_role_menu values ('2', 178);
+insert into sys_role_menu values ('2', 179);
+insert into sys_role_menu values ('2', 180);
+insert into sys_role_menu values ('2', 181);
+insert into sys_role_menu values ('2', 182);
+insert into sys_role_menu values ('2', 183);
+insert into sys_role_menu values ('2', 184);
+insert into sys_role_menu values ('2', 185);
+insert into sys_role_menu values ('2', 186);
+insert into sys_role_menu values ('2', 187);
+insert into sys_role_menu values ('2', 188);
+insert into sys_role_menu values ('2', 189);
+insert into sys_role_menu values ('2', 998);
+insert into sys_role_menu values ('2', 999);
+insert into sys_role_menu values ('2', 1100);
+insert into sys_role_menu values ('2', 1101);
+insert into sys_role_menu values ('2', 1102);
+insert into sys_role_menu values ('2', 1110);
+insert into sys_role_menu values ('2', 1111);
+insert into sys_role_menu values ('2', 1112);
+insert into sys_role_menu values ('2', 1113);
+insert into sys_role_menu values ('2', 1210);
+insert into sys_role_menu values ('2', 1211);
+insert into sys_role_menu values ('2', 1212);
+insert into sys_role_menu values ('2', 1220);
+insert into sys_role_menu values ('2', 1221);
+insert into sys_role_menu values ('2', 1222);
+insert into sys_role_menu values ('2', 1223);
+insert into sys_role_menu values ('2', 1230);
+insert into sys_role_menu values ('2', 1231);
+insert into sys_role_menu values ('2', 1232);
+insert into sys_role_menu values ('2', 1700);
+insert into sys_role_menu values ('2', 1701);
+insert into sys_role_menu values ('2', 1702);
+insert into sys_role_menu values ('2', 1703);
+insert into sys_role_menu values ('2', 1704);
+insert into sys_role_menu values ('2', 1705);
+insert into sys_role_menu values ('2', 1706);
+insert into sys_role_menu values ('2', 1710);
+insert into sys_role_menu values ('2', 1711);
+insert into sys_role_menu values ('2', 1712);
+insert into sys_role_menu values ('2', 1713);
+insert into sys_role_menu values ('2', 1714);
+insert into sys_role_menu values ('2', 1720);
+insert into sys_role_menu values ('2', 1721);
+insert into sys_role_menu values ('2', 1722);
+insert into sys_role_menu values ('2', 1723);
+insert into sys_role_menu values ('2', 1730);
+insert into sys_role_menu values ('2', 1731);
+insert into sys_role_menu values ('2', 1732);
+insert into sys_role_menu values ('2', 1733);
+insert into sys_role_menu values ('2', 1740);
+insert into sys_role_menu values ('2', 1741);
+insert into sys_role_menu values ('2', 1742);
+insert into sys_role_menu values ('2', 1743);
+insert into sys_role_menu values ('2', 1744);
+insert into sys_role_menu values ('2', 1750);
+insert into sys_role_menu values ('2', 1751);
+insert into sys_role_menu values ('2', 1752);
+insert into sys_role_menu values ('2', 1753);
+insert into sys_role_menu values ('2', 1754);
+insert into sys_role_menu values ('2', 1760);
+insert into sys_role_menu values ('2', 1761);
+insert into sys_role_menu values ('2', 1762);
+insert into sys_role_menu values ('2', 1763);
+insert into sys_role_menu values ('2', 1764);
+insert into sys_role_menu values ('2', 1770);
+insert into sys_role_menu values ('2', 1771);
+insert into sys_role_menu values ('2', 1772);
+insert into sys_role_menu values ('2', 1773);
+insert into sys_role_menu values ('2', 1780);
+insert into sys_role_menu values ('2', 1781);
+insert into sys_role_menu values ('2', 1790);
+insert into sys_role_menu values ('2', 1791);
+insert into sys_role_menu values ('2', 1792);
+insert into sys_role_menu values ('2', 2000);
+insert into sys_role_menu values ('2', 2001);
+insert into sys_role_menu values ('2', 2002);
+insert into sys_role_menu values ('2', 2003);
+insert into sys_role_menu values ('2', 2004);
+insert into sys_role_menu values ('2', 2005);
+insert into sys_role_menu values ('2', 2006);
+insert into sys_role_menu values ('2', 2007);
+insert into sys_role_menu values ('2', 2008);
+insert into sys_role_menu values ('2', 2009);
+insert into sys_role_menu values ('2', 2010);
+insert into sys_role_menu values ('2', 2011);
+insert into sys_role_menu values ('2', 2012);
+insert into sys_role_menu values ('2', 2013);
+insert into sys_role_menu values ('2', 2014);
+insert into sys_role_menu values ('2', 2015);
+insert into sys_role_menu values ('2', 2016);
+insert into sys_role_menu values ('2', 2017);
+insert into sys_role_menu values ('2', 2018);
+insert into sys_role_menu values ('2', 2019);
+insert into sys_role_menu values ('2', 2020);
+insert into sys_role_menu values ('2', 2021);
+insert into sys_role_menu values ('2', 2022);
+insert into sys_role_menu values ('2', 2023);
+insert into sys_role_menu values ('2', 2024);
+insert into sys_role_menu values ('2', 2025);
+insert into sys_role_menu values ('2', 2026);
+insert into sys_role_menu values ('2', 2027);
+insert into sys_role_menu values ('2', 2028);
+insert into sys_role_menu values ('2', 2029);
+insert into sys_role_menu values ('2', 2030);
+insert into sys_role_menu values ('2', 2031);
+insert into sys_role_menu values ('2', 2032);
+insert into sys_role_menu values ('2', 2033);
+insert into sys_role_menu values ('2', 2034);
+insert into sys_role_menu values ('2', 2035);
+insert into sys_role_menu values ('2', 2036);
+insert into sys_role_menu values ('2', 2037);
+insert into sys_role_menu values ('2', 2038);
+insert into sys_role_menu values ('2', 2039);
+insert into sys_role_menu values ('2', 2040);
+insert into sys_role_menu values ('2', 2041);
+insert into sys_role_menu values ('2', 2042);
+insert into sys_role_menu values ('2', 2043);
+insert into sys_role_menu values ('2', 2044);
+insert into sys_role_menu values ('2', 2045);
+insert into sys_role_menu values ('2', 2046);
+insert into sys_role_menu values ('2', 2047);
+insert into sys_role_menu values ('2', 12100);
+insert into sys_role_menu values ('2', 12101);
+insert into sys_role_menu values ('2', 12102);
+insert into sys_role_menu values ('2', 12103);
+insert into sys_role_menu values ('2', 12110);
+insert into sys_role_menu values ('2', 12111);
+insert into sys_role_menu values ('2', 12112);
+insert into sys_role_menu values ('2', 12113);
+insert into sys_role_menu values ('2', 12120);
+insert into sys_role_menu values ('2', 12121);
+insert into sys_role_menu values ('2', 12122);
+insert into sys_role_menu values ('2', 12123);
+insert into sys_role_menu values ('2', 12200);
+insert into sys_role_menu values ('2', 12201);
+insert into sys_role_menu values ('2', 12202);
+insert into sys_role_menu values ('2', 12210);
+insert into sys_role_menu values ('2', 12211);
+insert into sys_role_menu values ('2', 12212);
+insert into sys_role_menu values ('2', 12213);
+insert into sys_role_menu values ('2', 12220);
+insert into sys_role_menu values ('2', 12221);
+insert into sys_role_menu values ('2', 12222);
+insert into sys_role_menu values ('2', 12230);
+insert into sys_role_menu values ('2', 12231);
+insert into sys_role_menu values ('2', 12232);
+insert into sys_role_menu values ('2', 12233);
+insert into sys_role_menu values ('2', 17800);
+insert into sys_role_menu values ('2', 17801);
+insert into sys_role_menu values ('2', 17802);
+insert into sys_role_menu values ('2', 17810);
+insert into sys_role_menu values ('2', 17811);
+insert into sys_role_menu values ('2', 17812);
+insert into sys_role_menu values ('2', 17813);
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门