From 0a1af1f220a6b47db08bc6d2e2b9660d08fe59ed Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:47 +0800
Subject: [PATCH] leftjoin

---
 ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java |   14 +++++++-------
 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml                       |    2 +-
 ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java    |    4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index a2ddb0d..2dc0b40 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -35,7 +35,7 @@
      */
     @GetMapping("/assetManagement")
     @ApiOperation(value = "璧勪骇绠＄悊", notes = "璧勪骇绠＄悊")
-    @PreAuthorize("hasAuthority('assetManagement:page')")
+    @PreAuthorize("@ss.hasPermi('assetManagement:page')")
     public Result assetManagement(DataCenterQuery query) {
         return monitorService.assetManagement(query);
     }
@@ -48,7 +48,7 @@
      */
     @GetMapping("/platformOnlineRate")
     @ApiOperation(value = "骞冲彴鍦ㄧ嚎鐜�", notes = "骞冲彴鍦ㄧ嚎鐜�")
-    @PreAuthorize("hasAuthority('platformOnline:page')")
+    @PreAuthorize("@ss.hasPermi('platformOnline:page')")
     public Result platformOnlineRate(DataCenterQuery query) {
         return platformOnlineService.page(query);
     }
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
index f96abd4..f3dc788 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
@@ -32,48 +32,48 @@
 
     @PostMapping
     @ApiOperation(value = "娣诲姞", notes = "娣诲姞")
-    @PreAuthorize("hasAuthority('dynamicColumn:add')")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:add')")
     public Result add(@RequestBody @Validated(Add.class) DynamicColumnForm form) {
         return dynamicColumnService.add(form);
     }
 
     @PutMapping
     @ApiOperation(value = "淇敼", notes = "淇敼")
-    @PreAuthorize("hasAuthority('dynamicColumn:edit')")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:edit')")
     public Result update(@RequestBody @Validated(Update.class) DynamicColumnForm form) {
         return dynamicColumnService.update(form);
     }
 
     @DeleteMapping("/{id}")
     @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
-    @PreAuthorize("hasAuthority('dynamicColumn:del')")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:del')")
     public Result removeById(@PathVariable("id") String id) {
         return dynamicColumnService.removeById(id);
     }
 
     @DeleteMapping("/batch")
     @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
-    @PreAuthorize("hasAuthority('dynamicColumn:del:batch')")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:del:batch')")
     public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
         return dynamicColumnService.remove(ids);
     }
 
     @GetMapping("/page")
     @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
-    @PreAuthorize("hasAuthority('dynamicColumn:page')")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:page')")
     public Result page(DynamicColumnQuery query) {
         return dynamicColumnService.page(query);
     }
 
     @GetMapping("/{id}")
     @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
-    @PreAuthorize("hasAuthority('dynamicColumn:detail')")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:detail')")
     public Result detail(@PathVariable("id") Integer id) {
         return dynamicColumnService.detail(id);
     }
 
     @GetMapping("/list")
-    @PreAuthorize("hasAuthority('dynamicColumn:list')")
+    @PreAuthorize("@ss.hasPermi('dynamicColumn:list')")
     @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
     public Result list() {
         return dynamicColumnService.all();
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index ed1861a..850ac2e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -95,7 +95,7 @@
         FROM
         t_yw_point yp
         INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
-        INNER JOIN t_yw_unit yu ON yu.id = yp.unit_id
+        LEFT JOIN t_yw_unit yu ON yu.id = yp.unit_id
         <where>
             <if test="query.pointName != null and query.pointName != ''">
                 AND m.name like concat('%', #{query.pointName} ,'%')

--
Gitblit v1.8.0