diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java
index cc9a45d4..9e4666c4 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseCollectDeviceInfoController.java
@@ -34,7 +34,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController {
     /**
      * 查询采集设备信息列表
      */
-    @SaCheckPermission("ems:base:baseCollectDeviceInfo:list")
+    @SaCheckPermission("ems:baseCollectDeviceInfo:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo, PageQuery pageQuery) {
  //       PageUtils.startPage(pageQuery);
@@ -54,7 +54,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController {
     /**
      * 导出采集设备信息列表
      */
-    @SaCheckPermission("ems:base:baseCollectDeviceInfo:export")
+    @SaCheckPermission("ems:baseCollectDeviceInfo:export")
     //@Log(title = "采集设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) {
@@ -66,7 +66,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController {
     /**
      * 获取采集设备信息详细信息
      */
-    @SaCheckPermission("ems:base:baseCollectDeviceInfo:query")
+    @SaCheckPermission("ems:baseCollectDeviceInfo:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId) {
         return R.ok(emsBaseCollectDeviceInfoService.selectEmsBaseCollectDeviceInfoByObjId(objId));
@@ -75,7 +75,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController {
     /**
      * 新增采集设备信息
      */
-    @SaCheckPermission("ems:base:baseCollectDeviceInfo:add")
+    @SaCheckPermission("ems:baseCollectDeviceInfo:add")
     //@Log(title = "采集设备信息", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) {
@@ -86,7 +86,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController {
     /**
      * 修改采集设备信息
      */
-    @SaCheckPermission("ems:base:baseCollectDeviceInfo:edit")
+    @SaCheckPermission("ems:baseCollectDeviceInfo:edit")
     //@Log(title = "采集设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseCollectDeviceInfo emsBaseCollectDeviceInfo) {
@@ -97,7 +97,7 @@ public class EmsBaseCollectDeviceInfoController extends BaseController {
     /**
      * 删除采集设备信息
      */
-    @SaCheckPermission("ems:base:baseCollectDeviceInfo:remove")
+    @SaCheckPermission("ems:baseCollectDeviceInfo:remove")
     //@Log(title = "采集设备信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds) {
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java
index bfcb0091..334630e2 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyPriceController.java
@@ -34,7 +34,7 @@ public class EmsBaseEnergyPriceController extends BaseController
     /**
      * 查询能源月份单价列表
      */
-    @SaCheckPermission("ems:base:baseEnergyPrice:list")
+    @SaCheckPermission("ems:baseEnergyPrice:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsBaseEnergyPrice emsBaseEnergyPrice, PageQuery pageQuery)
     {
@@ -45,7 +45,7 @@ public class EmsBaseEnergyPriceController extends BaseController
     /**
      * 导出能源月份单价列表
      */
-    @SaCheckPermission("ems:base:baseEnergyPrice:export")
+    @SaCheckPermission("ems:baseEnergyPrice:export")
     //@Log(title = "能源月份单价", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseEnergyPrice emsBaseEnergyPrice)
@@ -58,7 +58,7 @@ public class EmsBaseEnergyPriceController extends BaseController
     /**
      * 获取能源月份单价详细信息
      */
-    @SaCheckPermission("ems:base:baseEnergyPrice:query")
+    @SaCheckPermission("ems:baseEnergyPrice:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -68,7 +68,7 @@ public class EmsBaseEnergyPriceController extends BaseController
     /**
      * 新增能源月份单价
      */
-    @SaCheckPermission("ems:base:baseEnergyPrice:add")
+    @SaCheckPermission("ems:baseEnergyPrice:add")
     //@Log(title = "能源月份单价", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseEnergyPrice emsBaseEnergyPrice)
@@ -79,7 +79,7 @@ public class EmsBaseEnergyPriceController extends BaseController
     /**
      * 修改能源月份单价
      */
-    @SaCheckPermission("ems:base:baseEnergyPrice:edit")
+    @SaCheckPermission("ems:baseEnergyPrice:edit")
     //@Log(title = "能源月份单价", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseEnergyPrice emsBaseEnergyPrice)
@@ -90,7 +90,7 @@ public class EmsBaseEnergyPriceController extends BaseController
     /**
      * 删除能源月份单价
      */
-    @SaCheckPermission("ems:base:baseEnergyPrice:remove")
+    @SaCheckPermission("ems:baseEnergyPrice:remove")
     //@Log(title = "能源月份单价", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java
index 254cf0ff..3f6cfcf3 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseEnergyTypeController.java
@@ -34,7 +34,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 查询能源类型信息列表
      */
-    @SaCheckPermission("ems:base:baseEnergyType:list")
+    @SaCheckPermission("ems:baseEnergyType:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsBaseEnergyType emsBaseEnergyType, PageQuery pageQuery)
     {
@@ -55,7 +55,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 导出能源类型信息列表
      */
-    @SaCheckPermission("ems:base:baseEnergyType:export")
+    @SaCheckPermission("ems:baseEnergyType:export")
     //@Log(title = "能源类型信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseEnergyType emsBaseEnergyType)
@@ -68,7 +68,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 获取能源类型信息详细信息
      */
-    @SaCheckPermission("ems:base:baseEnergyType:query")
+    @SaCheckPermission("ems:baseEnergyType:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -78,7 +78,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 新增能源类型信息
      */
-    @SaCheckPermission("ems:base:baseEnergyType:add")
+    @SaCheckPermission("ems:baseEnergyType:add")
     //@Log(title = "能源类型信息", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
@@ -89,7 +89,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 修改能源类型信息
      */
-    @SaCheckPermission("ems:base:baseEnergyType:edit")
+    @SaCheckPermission("ems:baseEnergyType:edit")
     //@Log(title = "能源类型信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
@@ -100,7 +100,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 删除能源类型信息
      */
-    @SaCheckPermission("ems:base:baseEnergyType:remove")
+    @SaCheckPermission("ems:baseEnergyType:remove")
     //@Log(title = "能源类型信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java
index d26fc64a..e80f2a25 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorInfoController.java
@@ -35,7 +35,7 @@ public class EmsBaseMonitorInfoController extends BaseController
     /**
      * 查询计量设备信息列表
      */
-    @SaCheckPermission("ems:base:baseMonitorInfo:list")
+    @SaCheckPermission("ems:baseMonitorInfo:list")
     @GetMapping("/list")
     public R list(EmsBaseMonitorInfo emsBaseMonitorInfo, PageQuery pageQuery)
     {
@@ -56,7 +56,7 @@ public class EmsBaseMonitorInfoController extends BaseController
     /**
      * 导出计量设备信息列表
      */
-    @SaCheckPermission("ems:base:baseMonitorInfo:export")
+    @SaCheckPermission("ems:baseMonitorInfo:export")
     // @Log(title = "计量设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseMonitorInfo emsBaseMonitorInfo)
@@ -69,7 +69,7 @@ public class EmsBaseMonitorInfoController extends BaseController
     /**
      * 获取计量设备信息详细信息
      */
-    @SaCheckPermission("ems:base:baseMonitorInfo:query")
+    @SaCheckPermission("ems:baseMonitorInfo:query")
     @GetMapping("/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -79,7 +79,7 @@ public class EmsBaseMonitorInfoController extends BaseController
     /**
      * 新增计量设备信息
      */
-    @SaCheckPermission("ems:base:baseMonitorInfo:add")
+    @SaCheckPermission("ems:baseMonitorInfo:add")
     // @Log(title = "计量设备信息", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseMonitorInfo emsBaseMonitorInfo)
@@ -91,7 +91,7 @@ public class EmsBaseMonitorInfoController extends BaseController
     /**
      * 修改计量设备信息
      */
-    @SaCheckPermission("ems:base:baseMonitorInfo:edit")
+    @SaCheckPermission("ems:baseMonitorInfo:edit")
     // @Log(title = "计量设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseMonitorInfo emsBaseMonitorInfo)
@@ -103,7 +103,7 @@ public class EmsBaseMonitorInfoController extends BaseController
     /**
      * 删除计量设备信息
      */
-    @SaCheckPermission("ems:base:baseMonitorInfo:remove")
+    @SaCheckPermission("ems:baseMonitorInfo:remove")
     // @Log(title = "计量设备信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java
index 6766748e..7d4b1f41 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorThresholdController.java
@@ -34,7 +34,7 @@ public class EmsBaseMonitorThresholdController extends BaseController {
     /**
      * 查询计量设备阈值维护列表
      */
-    @SaCheckPermission("ems:base:baseMonitorThreshold:list")
+    @SaCheckPermission("ems:baseMonitorThreshold:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsBaseMonitorThreshold emsBaseMonitorThreshold, PageQuery pageQuery) {
         TableDataInfo<EmsBaseMonitorThreshold> list = emsBaseMonitorThresholdService.queryPageList( pageQuery ,emsBaseMonitorThreshold);
@@ -44,7 +44,7 @@ public class EmsBaseMonitorThresholdController extends BaseController {
     /**
      * 导出计量设备阈值维护列表
      */
-    @SaCheckPermission("ems:base:baseMonitorThreshold:export")
+    @SaCheckPermission("ems:baseMonitorThreshold:export")
     //@Log(title = "计量设备阈值维护", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseMonitorThreshold emsBaseMonitorThreshold) {
@@ -56,7 +56,7 @@ public class EmsBaseMonitorThresholdController extends BaseController {
     /**
      * 获取计量设备阈值维护详细信息
      */
-    @SaCheckPermission("ems:base:baseMonitorThreshold:query")
+    @SaCheckPermission("ems:baseMonitorThreshold:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId) {
         return R.ok(emsBaseMonitorThresholdService.selectEmsBaseMonitorThresholdByObjId(objId));
@@ -65,7 +65,7 @@ public class EmsBaseMonitorThresholdController extends BaseController {
     /**
      * 新增计量设备阈值维护
      */
-    @SaCheckPermission("ems:base:baseMonitorThreshold:add")
+    @SaCheckPermission("ems:baseMonitorThreshold:add")
     //@Log(title = "计量设备阈值维护", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseMonitorThreshold emsBaseMonitorThreshold) {
@@ -76,7 +76,7 @@ public class EmsBaseMonitorThresholdController extends BaseController {
     /**
      * 修改计量设备阈值维护
      */
-    @SaCheckPermission("ems:base:baseMonitorThreshold:edit")
+    @SaCheckPermission("ems:baseMonitorThreshold:edit")
     //@Log(title = "计量设备阈值维护", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseMonitorThreshold emsBaseMonitorThreshold) {
@@ -87,7 +87,7 @@ public class EmsBaseMonitorThresholdController extends BaseController {
     /**
      * 删除计量设备阈值维护
      */
-    @SaCheckPermission("ems:base:baseMonitorThreshold:remove")
+    @SaCheckPermission("ems:baseMonitorThreshold:remove")
     //@Log(title = "计量设备阈值维护", businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds) {
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java
index 3e23ee34..f4aec53a 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseMonitorWorkUnitController.java
@@ -33,7 +33,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController {
     /**
      * 查询统计计量信息列表
      */
-    @SaCheckPermission("ems:base:baseMonitorWorkUnit:list")
+    @SaCheckPermission("ems:baseMonitorWorkUnit:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit, PageQuery pageQuery) {
         TableDataInfo<EmsBaseMonitorWorkUnit> list = emsBaseMonitorWorkUnitService.queryPageList( pageQuery ,emsBaseMonitorWorkUnit);
@@ -43,7 +43,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController {
     /**
      * 导出统计计量信息列表
      */
-    @SaCheckPermission("ems:base:baseMonitorWorkUnit:export")
+    @SaCheckPermission("ems:baseMonitorWorkUnit:export")
     //@Log(title = "统计计量信息" , businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) {
@@ -55,7 +55,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController {
     /**
      * 获取统计计量信息详细信息
      */
-    @SaCheckPermission("ems:base:baseMonitorWorkUnit:query")
+    @SaCheckPermission("ems:baseMonitorWorkUnit:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId) {
         return R.ok(emsBaseMonitorWorkUnitService.selectEmsBaseMonitorWorkUnitByObjId(objId));
@@ -64,7 +64,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController {
     /**
      * 新增统计计量信息
      */
-    @SaCheckPermission("ems:base:baseMonitorWorkUnit:add")
+    @SaCheckPermission("ems:baseMonitorWorkUnit:add")
     //@Log(title = "统计计量信息" , businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) {
@@ -75,7 +75,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController {
     /**
      * 修改统计计量信息
      */
-    @SaCheckPermission("ems:base:baseMonitorWorkUnit:edit")
+    @SaCheckPermission("ems:baseMonitorWorkUnit:edit")
     //@Log(title = "统计计量信息" , businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseMonitorWorkUnit emsBaseMonitorWorkUnit) {
@@ -86,7 +86,7 @@ public class EmsBaseMonitorWorkUnitController extends BaseController {
     /**
      * 删除统计计量信息
      */
-    @SaCheckPermission("ems:base:baseMonitorWorkUnit:remove")
+    @SaCheckPermission("ems:baseMonitorWorkUnit:remove")
     //@Log(title = "统计计量信息" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds) {
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java
index aed1734a..5dd82548 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseSharePriceController.java
@@ -34,7 +34,7 @@ public class EmsBaseSharePriceController extends BaseController {
     /**
      * 查询分时电价维护列表
      */
-    @SaCheckPermission("ems:base:baseSharePrice:list")
+    @SaCheckPermission("ems:baseSharePrice:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsBaseSharePrice emsBaseSharePrice, PageQuery pageQuery) {
         TableDataInfo<EmsBaseSharePrice> list = emsBaseSharePriceService.queryPageList( pageQuery ,emsBaseSharePrice);
@@ -44,7 +44,7 @@ public class EmsBaseSharePriceController extends BaseController {
     /**
      * 导出分时电价维护列表
      */
-    @SaCheckPermission("ems:base:baseSharePrice:export")
+    @SaCheckPermission("ems:baseSharePrice:export")
     //@Log(title = "分时电价维护", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseSharePrice emsBaseSharePrice) {
@@ -56,7 +56,7 @@ public class EmsBaseSharePriceController extends BaseController {
     /**
      * 获取分时电价维护详细信息
      */
-    @SaCheckPermission("ems:base:baseSharePrice:query")
+    @SaCheckPermission("ems:baseSharePrice:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId) {
         return R.ok(emsBaseSharePriceService.selectEmsBaseSharePriceByObjId(objId));
@@ -65,7 +65,7 @@ public class EmsBaseSharePriceController extends BaseController {
     /**
      * 新增分时电价维护
      */
-    @SaCheckPermission("ems:base:baseSharePrice:add")
+    @SaCheckPermission("ems:baseSharePrice:add")
     //@Log(title = "分时电价维护", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseSharePrice emsBaseSharePrice) {
@@ -76,7 +76,7 @@ public class EmsBaseSharePriceController extends BaseController {
     /**
      * 修改分时电价维护
      */
-    @SaCheckPermission("ems:base:baseSharePrice:edit")
+    @SaCheckPermission("ems:baseSharePrice:edit")
     //@Log(title = "分时电价维护", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseSharePrice emsBaseSharePrice) {
@@ -87,7 +87,7 @@ public class EmsBaseSharePriceController extends BaseController {
     /**
      * 删除分时电价维护
      */
-    @SaCheckPermission("ems:base:baseSharePrice:remove")
+    @SaCheckPermission("ems:baseSharePrice:remove")
     //@Log(title = "分时电价维护", businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds) {
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java
index b0f735ef..4fadb420 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/controller/EmsBaseWorkUnitController.java
@@ -7,7 +7,6 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.ems.base.domain.EmsBaseWorkUnit;
@@ -36,12 +35,12 @@ public class EmsBaseWorkUnitController extends BaseController
     /**
      * 查询统计单元信息列表
      */
-    @SaCheckPermission("ems:base:baseWorkUnit:list")
+    @SaCheckPermission("ems:baseWorkUnit:list")
     @GetMapping("/list")
-    public TableDataInfo list(EmsBaseWorkUnit emsBaseWorkUnit, PageQuery pageQuery)
+    public R list(EmsBaseWorkUnit emsBaseWorkUnit, PageQuery pageQuery)
     {
-        TableDataInfo<EmsBaseWorkUnit> list = emsBaseWorkUnitService.queryPageList( pageQuery ,emsBaseWorkUnit);
-        return list;
+        List<EmsBaseWorkUnit> list = emsBaseWorkUnitService.selectEmsBaseWorkUnitList(emsBaseWorkUnit);
+        return R.ok(list);
     }
 
     /**
@@ -56,7 +55,7 @@ public class EmsBaseWorkUnitController extends BaseController
     /**
      * 导出统计单元信息列表
      */
-    @SaCheckPermission("ems:base:baseWorkUnit:export")
+    @SaCheckPermission("ems:baseWorkUnit:export")
     //@Log(title = "统计单元信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseWorkUnit emsBaseWorkUnit)
@@ -69,7 +68,7 @@ public class EmsBaseWorkUnitController extends BaseController
     /**
      * 获取统计单元信息详细信息
      */
-    @SaCheckPermission("ems:base:baseWorkUnit:query")
+    @SaCheckPermission("ems:baseWorkUnit:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -79,31 +78,31 @@ public class EmsBaseWorkUnitController extends BaseController
     /**
      * 新增统计单元信息
      */
-    @SaCheckPermission("ems:base:baseWorkUnit:add")
+    @SaCheckPermission("ems:baseWorkUnit:add")
     //@Log(title = "统计单元信息", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsBaseWorkUnit emsBaseWorkUnit)
     {
-        emsBaseWorkUnit.setCreateBy(LoginHelper.getUsername());
+        emsBaseWorkUnit.setCreatedBy(LoginHelper.getUsername());
         return toAjax(emsBaseWorkUnitService.insertEmsBaseWorkUnit(emsBaseWorkUnit));
     }
 
     /**
      * 修改统计单元信息
      */
-    @SaCheckPermission("ems:base:baseWorkUnit:edit")
+    @SaCheckPermission("ems:baseWorkUnit:edit")
     //@Log(title = "统计单元信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsBaseWorkUnit emsBaseWorkUnit)
     {
-        emsBaseWorkUnit.setUpdateBy(LoginHelper.getUsername());
+        emsBaseWorkUnit.setUpdatedBy(LoginHelper.getUsername());
         return toAjax(emsBaseWorkUnitService.updateEmsBaseWorkUnit(emsBaseWorkUnit));
     }
 
     /**
      * 删除统计单元信息
      */
-    @SaCheckPermission("ems:base:baseWorkUnit:remove")
+    @SaCheckPermission("ems:baseWorkUnit:remove")
     //@Log(title = "统计单元信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java
index 44b0ec8e..4a4f5a56 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseMonitorWorkUnit.java
@@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -57,6 +55,7 @@ public class EmsBaseMonitorWorkUnit extends EmsBaseEntity {
      * 统计单元名称
      */
     //@ExcelProperty(value = "统计单元名称")
+    @TableField(exist = false)
     private String workUnitName;
 
     /**
@@ -115,134 +114,4 @@ public class EmsBaseMonitorWorkUnit extends EmsBaseEntity {
     //@ExcelProperty(value = "修改时间" ,   format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
-    public String getMonitorName() {
-        return monitorName;
-    }
-
-    public void setMonitorName(String monitorName) {
-        this.monitorName = monitorName;
-    }
-
-    public String getWorkUnitName() {
-        return workUnitName;
-    }
-
-    public void setWorkUnitName(String workUnitName) {
-        this.workUnitName = workUnitName;
-    }
-
-    public void setObjId(Long objId) {
-        this.objId = objId;
-    }
-
-    public Long getObjId() {
-        return objId;
-    }
-
-    public void setMonitorCode(String monitorCode) {
-        this.monitorCode = monitorCode;
-    }
-
-    public String getMonitorCode() {
-        return monitorCode;
-    }
-
-    public void setWorkUnitCode(String workUnitCode) {
-        this.workUnitCode = workUnitCode;
-    }
-
-    public String getWorkUnitCode() {
-        return workUnitCode;
-    }
-
-    public void setMonitorStatus(Long monitorStatus) {
-        this.monitorStatus = monitorStatus;
-    }
-
-    public Long getMonitorStatus() {
-        return monitorStatus;
-    }
-
-    public void setMonitorType(Long monitorType) {
-        this.monitorType = monitorType;
-    }
-
-    public Long getMonitorType() {
-        return monitorType;
-    }
-
-    public void setFormulaMode(Long formulaMode) {
-        this.formulaMode = formulaMode;
-    }
-
-    public Long getFormulaMode() {
-        return formulaMode;
-    }
-
-    public void setProportion(BigDecimal proportion) {
-        this.proportion = proportion;
-    }
-
-    public BigDecimal getProportion() {
-        return proportion;
-    }
-
-    public void setIsFlag(String isFlag) {
-        this.isFlag = isFlag;
-    }
-
-    public String getIsFlag() {
-        return isFlag;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedTime(Date updatedTime) {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime() {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("objId" , getObjId())
-                .append("monitorCode" , getMonitorCode())
-                .append("workUnitCode" , getWorkUnitCode())
-                .append("monitorStatus" , getMonitorStatus())
-                .append("monitorType" , getMonitorType())
-                .append("formulaMode" , getFormulaMode())
-                .append("proportion" , getProportion())
-//                .append("remark" , getRemark())
-                .append("isFlag" , getIsFlag())
-                .append("createdBy" , getCreatedBy())
-                .append("createdTime" , getCreatedTime())
-                .append("updatedBy" , getUpdatedBy())
-                .append("updatedTime" , getUpdatedTime())
-                .toString();
-    }
 }
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java
index 3bb1c0ee..2f75dc28 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/domain/EmsBaseWorkUnit.java
@@ -1,17 +1,16 @@
 package org.dromara.ems.base.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.io.Serial;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 统计单元信息对象 ems_base_work_unit
@@ -21,10 +20,10 @@ import java.util.List;
  */
 
 @Data
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode
 @TableName("ems_base_work_unit")
 @AutoMapper(target = EmsBaseWorkUnit.class)
-public class EmsBaseWorkUnit extends EmsBaseEntity {
+public class EmsBaseWorkUnit  {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -80,182 +79,33 @@ public class EmsBaseWorkUnit extends EmsBaseEntity {
     //@ExcelProperty(value = "更新时间",   format = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    @TableField(exist = false)
     private List<EmsBaseWorkUnit> children = new ArrayList<EmsBaseWorkUnit>();
 
+    @TableField(exist = false)
     private String parentName;
 
     private Long parentId;
 
+    @TableField(exist = false)
     private Integer orderNum;
 
     private String ancestors;
 
-    public List<EmsBaseWorkUnit> getChildren() {
-        return children;
-    }
 
-    public void setChildren(List<EmsBaseWorkUnit> children) {
-        this.children = children;
-    }
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
 
-    public String getParentName() {
-        return parentName;
-    }
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
-    public void setParentName(String parentName) {
-        this.parentName = parentName;
-    }
 
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public Integer getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public String getAncestors() {
-        return ancestors;
-    }
-
-    public void setAncestors(String ancestors) {
-        this.ancestors = ancestors;
-    }
-
-    public void setObjId(Long objId)
-    {
-        this.objId = objId;
-    }
-
-    public Long getObjId()
-    {
-        return objId;
-    }
-    public void setWorkUnitCode(String workUnitCode)
-    {
-        this.workUnitCode = workUnitCode;
-    }
-
-    public String getWorkUnitCode()
-    {
-        return workUnitCode;
-    }
-    public void setWorkUnitName(String workUnitName)
-    {
-        this.workUnitName = workUnitName;
-    }
-
-    public String getWorkUnitName()
-    {
-        return workUnitName;
-    }
-    public void setWorkUnitAddress(String workUnitAddress)
-    {
-        this.workUnitAddress = workUnitAddress;
-    }
-
-    public String getWorkUnitAddress()
-    {
-        return workUnitAddress;
-    }
-    public void setWorkUnitSort(Long workUnitSort)
-    {
-        this.workUnitSort = workUnitSort;
-    }
-
-    public Long getWorkUnitSort()
-    {
-        return workUnitSort;
-    }
-    public void setProductLineCode(String productLineCode)
-    {
-        this.productLineCode = productLineCode;
-    }
-
-    public String getProductLineCode()
-    {
-        return productLineCode;
-    }
-    public void setWorkUnitType(Long workUnitType)
-    {
-        this.workUnitType = workUnitType;
-    }
-
-    public Long getWorkUnitType()
-    {
-        return workUnitType;
-    }
-    public void setIsFlag(String isFlag)
-    {
-        this.isFlag = isFlag;
-    }
-
-    public String getIsFlag()
-    {
-        return isFlag;
-    }
-    public void setCreatedBy(String createdBy)
-    {
-        this.createdBy = createdBy;
-    }
-
-    public String getCreatedBy()
-    {
-        return createdBy;
-    }
-    public void setCreatedTime(Date createdTime)
-    {
-        this.createdTime = createdTime;
-    }
-
-    public Date getCreatedTime()
-    {
-        return createdTime;
-    }
-    public void setUpdatedBy(String updatedBy)
-    {
-        this.updatedBy = updatedBy;
-    }
-
-    public String getUpdatedBy()
-    {
-        return updatedBy;
-    }
-    public void setUpdatedTime(Date updatedTime)
-    {
-        this.updatedTime = updatedTime;
-    }
-
-    public Date getUpdatedTime()
-    {
-        return updatedTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objId", getObjId())
-            .append("workUnitCode", getWorkUnitCode())
-            .append("parentId", getParentId())
-            .append("workUnitName", getWorkUnitName())
-            .append("workUnitAddress", getWorkUnitAddress())
-            .append("ancestors", getAncestors())
-            .append("workUnitSort", getWorkUnitSort())
-            .append("productLineCode", getProductLineCode())
-            .append("workUnitType", getWorkUnitType())
-            .append("isFlag", getIsFlag())
-            .append("createdBy", getCreatedBy())
-            .append("createdTime", getCreatedTime())
-            .append("updatedBy", getUpdatedBy())
-            .append("updatedTime", getUpdatedTime())
-            .toString();
-    }
 }
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java
index 04136735..a135d4ff 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/IEmsBaseWorkUnitService.java
@@ -1,7 +1,5 @@
 package org.dromara.ems.base.service;
 
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.ems.base.domain.EmsBaseWorkUnit;
 import org.dromara.ems.base.domain.TreeSelects;
 
@@ -22,7 +20,7 @@ public interface IEmsBaseWorkUnitService
      * @param pageQuery 分页参数
      * @return 统计单元信息分页列表
      */
-    public TableDataInfo<EmsBaseWorkUnit> queryPageList(PageQuery pageQuery ,EmsBaseWorkUnit bo);
+   // public TableDataInfo<EmsBaseWorkUnit> queryPageList(PageQuery pageQuery ,EmsBaseWorkUnit bo);
 
     /**
      * 查询统计单元信息
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java
index 5db45af4..434d1abc 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseMonitorWorkUnitServiceImpl.java
@@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.ems.base.domain.EmsBaseMonitorInfo;
 import org.dromara.ems.base.domain.EmsBaseMonitorWorkUnit;
+import org.dromara.ems.base.domain.EmsBaseWorkUnit;
 import org.dromara.ems.base.mapper.EmsBaseMonitorWorkUnitMapper;
 import org.dromara.ems.base.service.IEmsBaseMonitorWorkUnitService;
 import org.springframework.stereotype.Service;
@@ -56,7 +57,8 @@ public class EmsBaseMonitorWorkUnitServiceImpl implements IEmsBaseMonitorWorkUni
             .select(EmsBaseMonitorInfo::getMonitorName)
             // 使用计量设备编号查询计量设备名称
             .leftJoin(EmsBaseMonitorInfo.class,EmsBaseMonitorInfo::getMonitorCode, EmsBaseMonitorWorkUnit::getMonitorCode)
-
+            .select(EmsBaseWorkUnit::getWorkUnitName)
+            .leftJoin(EmsBaseWorkUnit.class,EmsBaseWorkUnit::getWorkUnitCode, EmsBaseMonitorWorkUnit::getWorkUnitCode)
 
             .eq(bo.getObjId() != null, EmsBaseMonitorWorkUnit::getObjId, bo.getObjId())
             .eq(StringUtils.isNotBlank(bo.getMonitorCode()), EmsBaseMonitorWorkUnit::getMonitorCode, bo.getMonitorCode())
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java
index abfdab0f..48165342 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/base/service/impl/EmsBaseWorkUnitServiceImpl.java
@@ -40,13 +40,13 @@ public class EmsBaseWorkUnitServiceImpl implements IEmsBaseWorkUnitService
     private final EmsBaseMonitorWorkUnitMapper emsBaseMonitorWorkUnitMapper;
 
 
-    /**
+/*    *//**
      * 分页查询统计单元信息列表
      *
      * @param bo        查询条件
      * @param pageQuery 分页参数
      * @return 统计单元信息分页列表
-     */
+     *//*
     @Override
     public TableDataInfo<EmsBaseWorkUnit> queryPageList(PageQuery pageQuery ,EmsBaseWorkUnit bo) {
         MPJLambdaWrapper<EmsBaseWorkUnit> lqw = buildQueryWrapper(bo);
@@ -74,9 +74,9 @@ public class EmsBaseWorkUnitServiceImpl implements IEmsBaseWorkUnitService
             .eq(bo.getCreatedTime() != null, EmsBaseWorkUnit::getCreatedTime, bo.getCreatedTime())
             .eq(StringUtils.isNotBlank(bo.getUpdatedBy()), EmsBaseWorkUnit::getUpdatedBy, bo.getUpdatedBy())
             .eq(bo.getUpdatedTime() != null, EmsBaseWorkUnit::getUpdatedTime, bo.getUpdatedTime())
-            .orderByDesc(EmsBaseWorkUnit::getCreateTime);
+            .orderByDesc(EmsBaseWorkUnit::getCreatedTime);
         return lqw;
-    }
+    }*/
 
 
     /**
@@ -112,7 +112,7 @@ public class EmsBaseWorkUnitServiceImpl implements IEmsBaseWorkUnitService
     @Override
     public int insertEmsBaseWorkUnit(EmsBaseWorkUnit emsBaseWorkUnit)
     {
-        emsBaseWorkUnit.setCreateTime(DateUtils.getNowDate());
+        emsBaseWorkUnit.setCreatedTime(DateUtils.getNowDate());
         return emsBaseWorkUnitMapper.insertEmsBaseWorkUnit(emsBaseWorkUnit);
     }
 
@@ -125,7 +125,7 @@ public class EmsBaseWorkUnitServiceImpl implements IEmsBaseWorkUnitService
     @Override
     public int updateEmsBaseWorkUnit(EmsBaseWorkUnit emsBaseWorkUnit)
     {
-        emsBaseWorkUnit.setUpdateTime(DateUtils.getNowDate());
+        emsBaseWorkUnit.setUpdatedTime(DateUtils.getNowDate());
         return emsBaseWorkUnitMapper.updateEmsBaseWorkUnit(emsBaseWorkUnit);
     }
 
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java
index 8f1a4bf7..217063df 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmDataController.java
@@ -35,7 +35,7 @@ public class EmsRecordAlarmDataController extends BaseController
     /**
      * 查询报警实时数据列表
      */
-    @SaCheckPermission("ems:record:recordAlarmData:list")
+    @SaCheckPermission("ems:recordAlarmData:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsRecordAlarmData emsRecordAlarmData, PageQuery pageQuery)
     {
@@ -47,7 +47,7 @@ public class EmsRecordAlarmDataController extends BaseController
     /**
      * 导出报警实时数据列表
      */
-    @SaCheckPermission("ems:record:recordAlarmData:export")
+    @SaCheckPermission("ems:recordAlarmData:export")
     //@Log(title = "报警实时数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsRecordAlarmData emsRecordAlarmData)
@@ -60,7 +60,7 @@ public class EmsRecordAlarmDataController extends BaseController
     /**
      * 获取报警实时数据详细信息
      */
-    @SaCheckPermission("ems:record:recordAlarmData:query")
+    @SaCheckPermission("ems:recordAlarmData:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -70,7 +70,7 @@ public class EmsRecordAlarmDataController extends BaseController
     /**
      * 新增报警实时数据
      */
-    @SaCheckPermission("ems:record:recordAlarmData:add")
+    @SaCheckPermission("ems:recordAlarmData:add")
     //@Log(title = "报警实时数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsRecordAlarmData emsRecordAlarmData)
@@ -82,7 +82,7 @@ public class EmsRecordAlarmDataController extends BaseController
     /**
      * 修改报警实时数据
      */
-    @SaCheckPermission("ems:record:recordAlarmData:edit")
+    @SaCheckPermission("ems:recordAlarmData:edit")
     //@Log(title = "报警实时数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsRecordAlarmData emsRecordAlarmData)
@@ -94,7 +94,7 @@ public class EmsRecordAlarmDataController extends BaseController
     /**
      * 删除报警实时数据
      */
-    @SaCheckPermission("ems:record:recordAlarmData:remove")
+    @SaCheckPermission("ems:recordAlarmData:remove")
     //@Log(title = "报警实时数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java
index 1b6934e6..7d9f583d 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordAlarmRuleController.java
@@ -35,7 +35,7 @@ public class EmsRecordAlarmRuleController extends BaseController
     /**
      * 查询异常告警规则列表
      */
-    @SaCheckPermission("ems:record:recordAlarmRule:list")
+    @SaCheckPermission("ems:recordAlarmRule:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsRecordAlarmRule emsRecordAlarmRule, PageQuery pageQuery)
     {
@@ -47,7 +47,7 @@ public class EmsRecordAlarmRuleController extends BaseController
      * 导出异常告警规则列表
      */
 
-    @SaCheckPermission("ems:record:recordAlarmRule:export")
+    @SaCheckPermission("ems:recordAlarmRule:export")
      //@Log(title = "异常告警规则", businessType = BusinessType.EXPORT)
      @PostMapping("/export")
     public void export(HttpServletResponse response, EmsRecordAlarmRule emsRecordAlarmRule)
@@ -60,7 +60,7 @@ public class EmsRecordAlarmRuleController extends BaseController
     /**
      * 获取异常告警规则详细信息
      */
-    @SaCheckPermission("ems:record:recordAlarmRule:query")
+    @SaCheckPermission("ems:recordAlarmRule:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -71,7 +71,7 @@ public class EmsRecordAlarmRuleController extends BaseController
      * 新增异常告警规则
      */
 
-    @SaCheckPermission("ems:record:recordAlarmRule:add")
+    @SaCheckPermission("ems:recordAlarmRule:add")
      //@Log(title = "异常告警规则", businessType = BusinessType.INSERT)
      @PostMapping
     public R add(@RequestBody EmsRecordAlarmRule emsRecordAlarmRule)
@@ -85,7 +85,7 @@ public class EmsRecordAlarmRuleController extends BaseController
      * 修改异常告警规则
      */
 
-    @SaCheckPermission("ems:record:recordAlarmRule:edit")
+    @SaCheckPermission("ems:recordAlarmRule:edit")
      //@Log(title = "异常告警规则", businessType = BusinessType.UPDATE)
      @PutMapping
     public R edit(@RequestBody EmsRecordAlarmRule emsRecordAlarmRule)
@@ -98,7 +98,7 @@ public class EmsRecordAlarmRuleController extends BaseController
      * 删除异常告警规则
      */
 
-    @SaCheckPermission("ems:record:recordAlarmRule:remove")
+    @SaCheckPermission("ems:recordAlarmRule:remove")
      //@Log(title = "异常告警规则", businessType = BusinessType.DELETE)
  	@DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java
index fefc6e94..45590a1d 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordDnbInstantController.java
@@ -32,7 +32,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     /**
      * 查询电实时数据列表
      */
-    @SaCheckPermission("ems:record:recordDnbInstant:list")
+    @SaCheckPermission("ems:recordDnbInstant:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsRecordDnbInstant emsRecordDnbInstant, PageQuery pageQuery) {
         TableDataInfo<EmsRecordDnbInstant> list = emsRecordDnbInstantService.queryPageList(pageQuery,emsRecordDnbInstant);
@@ -53,7 +53,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     /**
      * 导出电实时数据列表
      */
-    @SaCheckPermission("ems:record:recordDnbInstant:export")
+    @SaCheckPermission("ems:recordDnbInstant:export")
     //@Log(title = "电实时数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsRecordDnbInstant emsRecordDnbInstant) {
@@ -65,7 +65,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     /**
      * 获取电实时数据详细信息
      */
-    @SaCheckPermission("ems:record:recordDnbInstant:query")
+    @SaCheckPermission("ems:recordDnbInstant:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId) {
         return R.ok(emsRecordDnbInstantService.selectEmsRecordDnbInstantByObjId(objId));
@@ -74,7 +74,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     /**
      * 新增电实时数据
      */
-    @SaCheckPermission("ems:record:recordDnbInstant:add")
+    @SaCheckPermission("ems:recordDnbInstant:add")
     //@Log(title = "电实时数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) {
@@ -85,7 +85,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     /**
      * 修改电实时数据
      */
-    @SaCheckPermission("ems:record:recordDnbInstant:edit")
+    @SaCheckPermission("ems:recordDnbInstant:edit")
     //@Log(title = "电实时数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsRecordDnbInstant emsRecordDnbInstant) {
@@ -96,7 +96,7 @@ public class EmsRecordDnbInstantController extends BaseController {
     /**
      * 删除电实时数据
      */
-    @SaCheckPermission("ems:record:recordDnbInstant:remove")
+    @SaCheckPermission("ems:recordDnbInstant:remove")
     //@Log(title = "电实时数据", businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds) {
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java
index 22a315f6..89bf68ab 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordSteamInstantController.java
@@ -34,7 +34,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     /**
      * 查询蒸汽历史数据列表
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:list")
+    @SaCheckPermission("ems:recordSteamInstant:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsRecordSteamInstant emsRecordSteamInstant, PageQuery pageQuery) {
  //       PageUtils.startPage(pageQuery);
@@ -46,7 +46,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     /**
      * 导出蒸汽历史数据列表
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:export")
+    @SaCheckPermission("ems:recordSteamInstant:export")
     //@Log(title = "蒸汽历史数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsRecordSteamInstant emsRecordSteamInstant) {
@@ -58,7 +58,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     /**
      * 获取蒸汽历史数据详细信息
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:query")
+    @SaCheckPermission("ems:recordSteamInstant:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId) {
         return R.ok(emsRecordSteamInstantService.selectEmsRecordSteamInstantByObjId(objId));
@@ -67,7 +67,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     /**
      * 新增蒸汽历史数据
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:add")
+    @SaCheckPermission("ems:recordSteamInstant:add")
     //@Log(title = "蒸汽历史数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
@@ -78,7 +78,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     /**
      * 修改蒸汽历史数据
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:edit")
+    @SaCheckPermission("ems:recordSteamInstant:edit")
     //@Log(title = "蒸汽历史数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
@@ -89,7 +89,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     /**
      * 删除蒸汽历史数据
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:remove")
+    @SaCheckPermission("ems:recordSteamInstant:remove")
     //@Log(title = "蒸汽历史数据", businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds) {
@@ -101,7 +101,7 @@ public class EmsRecordSteamInstantController extends BaseController {
      * @param emsRecordSteamInstant
      * @return
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:list")
+    @SaCheckPermission("ems:recordSteamInstant:list")
     @GetMapping("/steamInstantList")
     public R steamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) {
         List<EmsRecordSteamInstant> list = emsRecordSteamInstantService
@@ -114,7 +114,7 @@ public class EmsRecordSteamInstantController extends BaseController {
      * @param emsRecordSteamInstant
      * @return
      */
-    @SaCheckPermission("ems:record:recordSteamInstant:list")
+    @SaCheckPermission("ems:recordSteamInstant:list")
     @GetMapping("/latestSteamInstantList")
     public R latestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) {
         List<EmsRecordSteamInstant> list = emsRecordSteamInstantService
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java
index 74579bd6..31b6c4d7 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsRecordWaterInstantController.java
@@ -34,7 +34,7 @@ public class EmsRecordWaterInstantController extends BaseController
     /**
      * 查询水实时数据列表
      */
-    @SaCheckPermission("ems:record:recordWaterInstant:list")
+    @SaCheckPermission("ems:recordWaterInstant:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsRecordWaterInstant emsRecordWaterInstant, PageQuery pageQuery)
     {
@@ -46,7 +46,7 @@ public class EmsRecordWaterInstantController extends BaseController
     /**
      * 导出水实时数据列表
      */
-    @SaCheckPermission("ems:record:recordWaterInstant:export")
+    @SaCheckPermission("ems:recordWaterInstant:export")
     //@Log(title = "水实时数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsRecordWaterInstant emsRecordWaterInstant)
@@ -59,7 +59,7 @@ public class EmsRecordWaterInstantController extends BaseController
     /**
      * 获取水实时数据详细信息
      */
-    @SaCheckPermission("ems:record:recordWaterInstant:query")
+    @SaCheckPermission("ems:recordWaterInstant:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -69,7 +69,7 @@ public class EmsRecordWaterInstantController extends BaseController
     /**
      * 新增水实时数据
      */
-    @SaCheckPermission("ems:record:recordWaterInstant:add")
+    @SaCheckPermission("ems:recordWaterInstant:add")
     //@Log(title = "水实时数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant)
@@ -81,7 +81,7 @@ public class EmsRecordWaterInstantController extends BaseController
     /**
      * 修改水实时数据
      */
-    @SaCheckPermission("ems:record:recordWaterInstant:edit")
+    @SaCheckPermission("ems:recordWaterInstant:edit")
     //@Log(title = "水实时数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsRecordWaterInstant emsRecordWaterInstant)
@@ -93,7 +93,7 @@ public class EmsRecordWaterInstantController extends BaseController
     /**
      * 删除水实时数据
      */
-    @SaCheckPermission("ems:record:recordWaterInstant:remove")
+    @SaCheckPermission("ems:recordWaterInstant:remove")
     //@Log(title = "水实时数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
diff --git a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java
index 96cb5636..3230905e 100644
--- a/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java
+++ b/ruoyi-modules/hwmom-ems/src/main/java/org/dromara/ems/record/controller/EmsVibrationInstantController.java
@@ -34,7 +34,7 @@ public class EmsVibrationInstantController extends BaseController
     /**
      * 查询震动实时数据列表
      */
-    @SaCheckPermission("ems:record:recordVibrationInstant:list")
+    @SaCheckPermission("ems:recordVibrationInstant:list")
     @GetMapping("/list")
     public TableDataInfo list(EmsVibrationInstant emsVibrationInstant, PageQuery pageQuery)
     {
@@ -46,7 +46,7 @@ public class EmsVibrationInstantController extends BaseController
     /**
      * 导出震动实时数据列表
      */
-    @SaCheckPermission("ems:record:recordVibrationInstant:export")
+    @SaCheckPermission("ems:recordVibrationInstant:export")
     //@Log(title = "震动实时数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsVibrationInstant emsVibrationInstant)
@@ -59,7 +59,7 @@ public class EmsVibrationInstantController extends BaseController
     /**
      * 获取震动实时数据详细信息
      */
-    @SaCheckPermission("ems:record:recordVibrationInstant:query")
+    @SaCheckPermission("ems:recordVibrationInstant:query")
     @GetMapping(value = "/{objId}")
     public R getInfo(@PathVariable("objId") Long objId)
     {
@@ -69,7 +69,7 @@ public class EmsVibrationInstantController extends BaseController
     /**
      * 新增震动实时数据
      */
-    @SaCheckPermission("ems:record:recordVibrationInstant:add")
+    @SaCheckPermission("ems:recordVibrationInstant:add")
     //@Log(title = "震动实时数据", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody EmsVibrationInstant emsVibrationInstant)
@@ -81,7 +81,7 @@ public class EmsVibrationInstantController extends BaseController
     /**
      * 修改震动实时数据
      */
-    @SaCheckPermission("ems:record:recordVibrationInstant:edit")
+    @SaCheckPermission("ems:recordVibrationInstant:edit")
     //@Log(title = "震动实时数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public R edit(@RequestBody EmsVibrationInstant emsVibrationInstant)
@@ -93,7 +93,7 @@ public class EmsVibrationInstantController extends BaseController
     /**
      * 删除震动实时数据
      */
-    @SaCheckPermission("ems:record:recordVibrationInstant:remove")
+    @SaCheckPermission("ems:recordVibrationInstant:remove")
     //@Log(title = "震动实时数据", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{objIds}")
     public R remove(@PathVariable Long[] objIds)
@@ -106,7 +106,7 @@ public class EmsVibrationInstantController extends BaseController
      * @param emsVibrationInstant
      * @return
      */
-    @SaCheckPermission("ems:record:recordVibrationInstant:list")
+    @SaCheckPermission("ems:recordVibrationInstant:list")
     @GetMapping("/vibrationInstantList")
     public R vibrationInstantList(EmsVibrationInstant emsVibrationInstant) {
         List<EmsVibrationInstant> list = emsVibrationInstantService