From ab522c45f635052de66e37c5cd980c5665330fe1 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 23 Apr 2025 15:56:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(os-admin,=20os-ems):=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20Redis=20=E4=B8=BB=E6=9C=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=92=8Csql=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 Redis 主机配置从 175.27.215.92 修改为 127.0.0.1
- 修正权限控制相关的表达式，将 'ems.base' 修改为 'ems/base'
- 在 EmsVibrationInstantMapper.xml 中修改查询结果的排序方式，从 collectTime 改为 objId
---
 os-admin/src/main/resources/application.yml          |  2 +-
 .../base/controller/EmsBaseEnergyTypeController.java | 12 ++++++------
 .../mapper/ems/record/EmsVibrationInstantMapper.xml  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/os-admin/src/main/resources/application.yml b/os-admin/src/main/resources/application.yml
index f9dca8d..343e7e9 100644
--- a/os-admin/src/main/resources/application.yml
+++ b/os-admin/src/main/resources/application.yml
@@ -80,7 +80,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 175.27.215.92
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseEnergyTypeController.java b/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseEnergyTypeController.java
index 91cdf37..f2f08ff 100644
--- a/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseEnergyTypeController.java
+++ b/os-ems/src/main/java/com/os/ems/base/controller/EmsBaseEnergyTypeController.java
@@ -37,7 +37,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 查询能源类型信息列表
      */
-    @PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:list')")
+    @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmsBaseEnergyType emsBaseEnergyType)
     {
@@ -70,7 +70,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 导出能源类型信息列表
      */
-    @PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:export')")
+    @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:export')")
     @Log(title = "能源类型信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsBaseEnergyType emsBaseEnergyType)
@@ -83,7 +83,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 获取能源类型信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:query')")
+    @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:query')")
     @GetMapping(value = "/{objId}")
     public AjaxResult getInfo(@PathVariable("objId") Long objId)
     {
@@ -93,7 +93,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 新增能源类型信息
      */
-    @PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:add')")
+    @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:add')")
     @Log(title = "能源类型信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
@@ -104,7 +104,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 修改能源类型信息
      */
-    @PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:edit')")
+    @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:edit')")
     @Log(title = "能源类型信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EmsBaseEnergyType emsBaseEnergyType)
@@ -115,7 +115,7 @@ public class EmsBaseEnergyTypeController extends BaseController
     /**
      * 删除能源类型信息
      */
-    @PreAuthorize("@ss.hasPermi('ems.base:baseEnergyType:remove')")
+    @PreAuthorize("@ss.hasPermi('ems/base:baseEnergyType:remove')")
     @Log(title = "能源类型信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{objIds}")
     public AjaxResult remove(@PathVariable Long[] objIds)
diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
index 87ca5e9..ba14c93 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
                 and rdi.collectTime between #{params.beginRecordTime} and #{params.endRecordTime}</if>
         </where>
-        order by rdi.collectTime
+        order by rdi.objId
     </select>