From 142dc283a1ce95a97f0b35596fe25a0d7d488783 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 20 Oct 2022 14:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LogOperationController.java    |  6 ++++++
 .../java/com/epmet/dao/LogOperationDao.java   |  3 +++
 .../epmet/service/LogOperationService.java    |  3 +++
 .../service/impl/LogOperationServiceImpl.java | 19 +++++++++++++++++++
 .../V0.0.25__alter_log_operation2.sql         |  3 +++
 .../main/resources/mapper/LogOperationDao.xml |  6 ++++++
 6 files changed, 40 insertions(+)
 create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.25__alter_log_operation2.sql

diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java
index 2da04fe5d6..52d96b8697 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/LogOperationController.java
@@ -62,4 +62,10 @@ public class LogOperationController {
                 formDTO.getPageSize(),
                 formDTO.getCategory()));
     }
+
+    @PostMapping("complementLogOperation")
+    public Result complementLogOperation(){
+        logOperationService.complementLogOperation();
+        return new Result();
+    }
 }
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java
index 59650e60ae..9b68f81ed7 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java
@@ -40,4 +40,7 @@ public interface LogOperationDao extends BaseDao<LogOperationEntity> {
                                          @Param("operatorName")String operatorName,
                                          @Param("operatorMobile")String operatorMobile,
                                          @Param("category")String category);
+
+    List<String> getStaffId();
+
 }
\ No newline at end of file
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java
index ad7bc8acb6..a60ba94ff7 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java
@@ -42,4 +42,7 @@ public interface LogOperationService {
                                          String operatorName,
                                          String operatorMobile,
                                          Integer pageNo, Integer pageSize,String category);
+
+    void complementLogOperation();
+
 }
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
index f9837728e7..189f83cf7e 100644
--- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.feign.ResultDataResolver;
@@ -201,4 +202,22 @@ public class LogOperationServiceImpl implements LogOperationService, ResultDataR
         PageInfo<LogOperationResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
+
+    /**
+     * Desc: 补全 log_operation 表的 org_id 和 org_id_path
+     * @param
+     * @author zxc
+     * @date 2022/10/20 13:50
+     */
+    @Override
+    public void complementLogOperation() {
+        Integer no = NumConstant.ONE;
+        Integer size;
+        do {
+            PageInfo<String> pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> logOperationDao.getStaffId());
+            size = pageInfo.getList().size();
+
+            no++;
+        }while (size == NumConstant.ONE_HUNDRED);
+    }
 }
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.25__alter_log_operation2.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.25__alter_log_operation2.sql
new file mode 100644
index 0000000000..aa1c5f98a3
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.25__alter_log_operation2.sql
@@ -0,0 +1,3 @@
+
+alter table log_operation add COLUMN ORG_ID VARCHAR(32) comment '组织ID' AFTER ID;
+alter table log_operation add COLUMN ORG_ID_PATH VARCHAR(255) comment '组织ID全路径，包括组织ID' AFTER ORG_ID;
\ No newline at end of file
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml
index b65219788c..2a962daf18 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml
@@ -60,4 +60,10 @@
         </if>
         ORDER BY lo.OPERATING_TIME DESC
     </select>
+    <select id="getStaffId" resultType="java.lang.String">
+        SELECT
+            OPERATOR_ID
+        FROM log_operation
+        GROUP BY OPERATOR_ID
+    </select>
 </mapper>
\ No newline at end of file