From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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 960f6d0..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{
- // 鍒ゆ柇涓婚敭鏄痠d杩樻槸userId
+ /*
+ // 娣诲姞鐢ㄦ埛鏃秛serId涓鸿嚜鍔ㄧ敓鎴愪富閿�俽oleId瀛樺湪鏃舵槸涓虹敤鎴风粦瑙掕壊
String jsonString = JSONObject.toJSONString(entity, JSONWriter.Feature.WriteMapNullValue);
JSONObject jsonObject = JSONObject.parseObject(jsonString);
- if(jsonObject.containsKey("userId")) {
- setMt = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME2, Long.class) ;
+ if(jsonObject.containsKey("userId") && !jsonObject.containsKey("roleId")) {
+ 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