From 6a6fdb7655f658550efa1d4916d36f216fe34a23 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 四月 2025 09:58:37 +0800
Subject: [PATCH] 1、增加一个MyBatis拦截器,这个拦截器可配置启用,拦截器实现设置虚拟卡占用状态时,统一设置为非占用状态; 2、完善代码。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java
index 6265e27..3219a26 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java
@@ -1,8 +1,5 @@
 package com.dy.common.mybatis;
 
-
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.JSONWriter;
 import com.dy.common.po.BaseEntity;
 import com.dy.common.util.IDLongGenerator;
 import org.apache.ibatis.executor.Executor;
@@ -25,8 +22,9 @@
 
     static int MAPPED_STATEMENT_INDEX = 0;
     static int PARAMETER_INDEX = 1;
-    static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME = "setId";
-    static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME2 = "setUserId";
+    static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETID = "setId";
+    static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETUSERID = "setUserId";
+    static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETROLEID = "setRoleId";
 
     /**
      * 鎷︽埅閫昏緫瀹炵幇
@@ -42,24 +40,35 @@
             if (entity instanceof BaseEntity) {
                 //Class<? extends Object> entityClass = entity.getClass();
                 Class<?> entityClass = entity.getClass();
-                Method setMt = null ;
+                Method setId = null ;
+                Method setUserId = null ;
+                Method setRoleId = null ;
                 try{
+                    /*
                     // 娣诲姞鐢ㄦ埛鏃秛serId涓鸿嚜鍔ㄧ敓鎴愪富閿�俽oleId瀛樺湪鏃舵槸涓虹敤鎴风粦瑙掕壊
                     String jsonString = JSONObject.toJSONString(entity, JSONWriter.Feature.WriteMapNullValue);
                     JSONObject jsonObject = JSONObject.parseObject(jsonString);
                     if(jsonObject.containsKey("userId") && !jsonObject.containsKey("roleId")) {
-                        setMt = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME2, Long.class) ;
+                        setUserId = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETUSERID, Long.class) ;
+                        setRoleId = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETROLEID, Long.class) ;
                     }else {
                         //鏈変竴浜涘疄浣撴病鏈塱d锛屼緥濡備腑闂磋〃
-                        setMt = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME, Long.class) ;
+                        setId = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETID, Long.class) ;
                     }
+                    */
+                    //鏈変竴浜涘疄浣撴病鏈塱d锛屼緥濡備腑闂磋〃
+                    setId = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETID, Long.class) ;
+                    // BaUser瀹炰綋涓槸setUserId, BaUserRole瀹炰綋涓寘鍚玸etUserId,鍜宻etRoleId
+                    setUserId = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETUSERID, Long.class) ;
+                    setRoleId = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_SETROLEID, Long.class) ;
                 }catch (Exception e){
                     //褰揺ntityClass娌℃湁setId鏂规硶鏃讹紝浼氭姏鍑哄紓甯�
                 }
-                if(setMt != null){
-                    setMt.invoke(entity, new IDLongGenerator().generate());
+                if(setUserId != null && setRoleId == null){
+                    setUserId.invoke(entity, new IDLongGenerator().generate());
+                }else if(setId != null){
+                    setId.invoke(entity, new IDLongGenerator().generate());
                 }
-
                 invocation.getArgs()[PARAMETER_INDEX] = entity;
             }
         }

--
Gitblit v1.8.0