From 30bcaac63cafe8ed46a7ab09eac6b90fa7aea1d5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 08 十一月 2023 09:38:36 +0800
Subject: [PATCH] 代码整理，及应用MybatisPlus，使得可不用mapper.xml配置文件进行查询demo实现
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 13
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoMpMapper.java | 9
pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log | 0
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java | 32 +++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mybatis/AutoGenerateIdInterceptor.java | 25 +-
pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java | 33 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-sso/logs/pipIrrSso.log | 148 ++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 9
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java | 35 +++
pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java | 52 +++++
pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java | 182 ++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java | 3
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java | 3
14 files changed, 522 insertions(+), 25 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 1729ef2..e9db338 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
@@ -27,29 +27,24 @@
static int MAPPED_STATEMENT_INDEX = 0;
static int PARAMETER_INDEX = 1;
- static int ROWBOUNDS_INDEX = 2;
- static int RESULT_HANDLER_INDEX = 3;
static String BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME = "setId";
- static String BASE_FIELD_SET_CREATE_TIME_FUNTION_NAME = "setCreateDt";
- static String BASE_FIELD_SET_UPDATE_TIME_FUNTION_NAME = "setUpdateDt";
- static String BASE_FIELD_SET_DELETE_FUNTION_NAME = "setDelete";
- public AutoGenerateIdInterceptor() {
- //System.out.println("auto generate primaryKey mybatis plugin start!!!");
- }
-
- @SuppressWarnings("static-access")
+ /**
+ * 鎷︽埅閫昏緫瀹炵幇
+ * @param invocation 浠ｇ悊
+ * @return Object
+ * @throws Throwable 寮傚父
+ */
public Object intercept(Invocation invocation) throws Throwable {
MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[MAPPED_STATEMENT_INDEX];
SqlCommandType commandType = mappedStatement.getSqlCommandType();
- if (commandType.INSERT.equals(SqlCommandType.INSERT)) {
+ if (commandType.equals(SqlCommandType.INSERT)) {
Object entity = invocation.getArgs()[PARAMETER_INDEX];
if (entity instanceof BaseEntity) {
- Class<? extends Object> entityClass = entity.getClass();
+ //Class<? extends Object> entityClass = entity.getClass();
+ Class<?> entityClass = entity.getClass();
Method setMt = entityClass.getMethod(BASE_FIELD_SET_PRIMARY_KEY_FUNTION_NAME, Long.class) ;
- if(setMt != null){
- setMt.invoke(entity, new IDLongGenerator().generate());
- }
+ setMt.invoke(entity, new IDLongGenerator().generate());
invocation.getArgs()[PARAMETER_INDEX] = entity;
}
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
index a88c072..01aa8cf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
@@ -3,9 +3,10 @@
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
-public interface BaUserMapper extends com.baomidou.mybatisplus.core.mapper.Mapper<BaUser> {
+public interface BaUserMapper extends BaseMapper<BaUser> {
/**
* 鐢ㄦ埛鐧诲綍
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoMpMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoMpMapper.java
new file mode 100644
index 0000000..c55b0da
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoDemo/DemoMpMapper.java
@@ -0,0 +1,9 @@
+package com.dy.pipIrrGlobal.daoDemo;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DemoMpMapper extends BaseMapper<DemoMp> {
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
index 31f071d..d5cbc2f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrGlobal.pojoBa;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
import lombok.*;
@TableName(autoResultMap = true)
@@ -9,7 +10,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class BaRolePrivilege {
+public class BaRolePrivilege implements BaseEntity {
public static final long serialVersionUID = 202311062027001L;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index 407df37..1c5f61c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -17,11 +17,13 @@
* 鍙�傚悎璁剧疆浜員ypeHandler銆乯dbcTyped鐨勬儏鍐点�俛utoResultMap 鑷姩鏄犲皠锛�
* 閫氬父閰嶅悎 @TableField() 涓�璧蜂娇鐢紝纭畾鏄犲皠瑙勮寖鎬с��
* 2023-10-24缁忓疄楠岋細
- * 绠�鍗曠殑@TableField("name")涓嶇敤鍔犱笂锛屽嵆浣垮瓨绫诲睘鎬ф槸椹煎嘲锛屾暟鎹簱瀛楁鏄笅
+ * 绠�鍗曠殑@TableField("name")涓嶇敤鍔犱笂锛屽嵆浣跨被灞炴�у悕鏄┘宄帮紝鏁版嵁搴撳瓧娈垫槸涓�
* 鍒掔嚎鎯呭喌锛屼篃涓嶇敤鍔燖TableField("name")銆�
*/
//2023-10-24涓嬮潰TableName涓嶇敤閰嶇疆琛ㄥ悕绉帮紙value="BaUser"鎴栤�渂a_user鈥濓級
-@TableName(autoResultMap = true)
+//鍙閫氳繃椹煎嘲鍛藉悕娉曞垯绫诲悕涓庤〃鍚嶅搴旇捣鏉ュ氨鍙互浜嗭紝濡傛灉涓嶈兘瀵瑰簲璧锋潵锛岄渶瑕佹寚瀹氳〃鍚嶇О
+//渚嬪@TableName(value="TestUser" autoResultMap = true)
+@TableName(value="ba_user", autoResultMap = true)
@Data
@Builder
@ToString
@@ -31,7 +33,7 @@
public static final long serialVersionUID = 202310100926001L;
- /*
+ /* 濡傛灉涓嶆槑纭� type绫诲瀷锛孧P灏嗚嚜鍔ㄤ负鍏惰祴鍊硷紙闆姳ID锛�
IdType:
AUTO(0), //鑷
NONE(1), //鏈缃富閿�
@@ -61,11 +63,13 @@
/**
* 渚涙按鏈烘瀯鏍囩
*/
+ @TableField(value = "orgTag")
public String orgTag;
/**
* 鏄惁瓒呯骇绠＄悊鍛� 1:鏄�,0:鍚�
*/
+ @TableField(value = "supperAdmin")
public Byte supperAdmin;
/**
@@ -81,6 +85,7 @@
/**
* 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄�
*/
- @TableField(exist=false)
+ @TableField(exist = false)
public List<Integer> privileges;
+ //public transient List<Integer> privileges;//姝ょ鏂瑰紡鍙橀噺涓嶅瓨搴擄紝 涔熶笉鍙備笌搴忓垪鍖栦簡
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
index bcceb8d..4b94f1e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrGlobal.pojoBa;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
import lombok.*;
@TableName(autoResultMap = true)
@@ -9,7 +10,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class BaUserRole {
+public class BaUserRole implements BaseEntity {
public static final long serialVersionUID = 202311061942001L;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java
new file mode 100644
index 0000000..b0818e7
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoMp.java
@@ -0,0 +1,32 @@
+package com.dy.pipIrrGlobal.pojoDemo;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@TableName(value="demo_mp", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class DemoMp implements BaseEntity {
+ public static final long serialVersionUID = 202311071534001L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ public Long id ;
+
+ public String name ;
+
+ public Integer age ;
+
+ public LocalDateTime dt ;
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/logs/pipIrrDemo.log
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java
new file mode 100644
index 0000000..6a0b3e9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/mp/DemoMpSv.java
@@ -0,0 +1,33 @@
+package com.dy.pipIrrDemo.mp;
+
+import com.dy.pipIrrGlobal.daoDemo.DemoMpMapper;
+import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DemoMpSv {
+
+ @Autowired
+ private DemoMpMapper demoMpMapper ;
+
+ public DemoMp selectById(Long id){
+ return this.demoMpMapper.selectById(id);
+ }
+
+
+ public List<DemoMp> selectBatchIds(List<Long> ids){
+ return this.demoMpMapper.selectBatchIds(ids);
+ }
+
+ public int insert(DemoMp po){
+ return this.demoMpMapper.insert(po) ;
+ }
+
+ public int updateById(DemoMp po){
+ return this.demoMpMapper.updateById(po) ;
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java
new file mode 100644
index 0000000..d20db9a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest1.java
@@ -0,0 +1,52 @@
+package com.dy.pipIrrDemo.mp;
+
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.time.LocalDateTime;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class MpTest1 {
+
+ @Autowired
+ private DemoMpSv demoMpSv ;
+
+ @Before
+ public void setup(){
+ DataSourceContext.set("ym");
+ }
+
+ @Test
+ public void insert(){
+ DemoMp po = new DemoMp() ;
+ po.name = "寮犱笁" ;
+ po.age = 20 ;
+ po.dt = LocalDateTime.now() ;
+ int count = this.demoMpSv.insert(po) ;
+ System.out.println("鎻掑叆浜�" + count + "璁板綍");
+ }
+
+ @Test
+ public void updateById(){
+ //鎶婁笂闈㈡彃鍏ョ殑璁板綍杩涜鏇存柊
+ DemoMp po = new DemoMp() ;
+ po.id = 2023110716001900000L ;
+ po.name = "鏉庡洓" ;
+ po.age = 22 ;
+ //po.dt = LocalDateTime.now() ;
+ int count = this.demoMpSv.updateById(po);
+ System.out.println("鏇存柊浜�" + count + "璁板綍");
+ }
+
+ @Test
+ public void selectById(){
+ DemoMp po = this.demoMpSv.selectById(1L) ;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java
new file mode 100644
index 0000000..05a5b86
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/test/java/com/dy/pipIrrDemo/mp/MpTest2.java
@@ -0,0 +1,182 @@
+package com.dy.pipIrrDemo.mp;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.pipIrrGlobal.daoDemo.DemoMpMapper;
+import com.dy.pipIrrGlobal.pojoDemo.DemoMp;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class MpTest2 {
+
+ @Autowired
+ private DemoMpMapper demoMpMapper ;
+
+ @Before
+ public void setup(){
+ DataSourceContext.set("ym");
+ }
+
+ @Test
+ public void selectById(){
+ DemoMp po = this.demoMpMapper.selectById(2023110716001900000L) ;
+ System.out.println(po);
+ }
+ @Test
+ public void selectBatchIds(){
+ List<Long> listIds = Arrays.asList(1L, 2L, 2023110716001900000L) ;
+ List<DemoMp> poList = this.demoMpMapper.selectBatchIds(listIds) ;
+ System.out.println(poList);
+ }
+ @Test
+ public void selectByMap(){
+ Map<String, Object > paramMap = new HashMap<>() ;
+ paramMap.put("name", "鏉庡洓");
+ paramMap.put("age", "22") ;
+ List<DemoMp> poList = this.demoMpMapper.selectByMap(paramMap) ;
+ System.out.println(poList);
+ }
+
+ @Test
+ public void selectByWrapperLt(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.like("name", "鍥�").lt("age", 40) ;
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperBt(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.like("name", "鍥�")
+ .between("age", 20, 40)
+ .isNotNull("dt");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperOr(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.like("name", "鍥�")
+ .or()
+ .between("age", 20, 40)
+ .isNotNull("dt")
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperOr1(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.likeLeft("name", "鍥�")
+ .and(wq->wq.between("age", 20, 40).or().isNotNull("dt"))
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperOr2(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.likeLeft("name", "鍥�")
+ .and(wq->wq.between("age", 20, 40).isNotNull("dt"))
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperOr3(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.likeLeft("name", "鍥�")
+ .or(wq->wq.lt("age", 100).gt("age", 10).isNotNull("dt"))
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperOr4(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.nested(wq->wq.lt("age", 50).or().isNotNull("dt"))
+ .likeLeft("name", "鍥�")
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+
+ @Test
+ public void selectByWrapperAnd(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.likeLeft("name", "鍥�")
+ .and(wq->wq.between("age", 20, 40))
+ .isNotNull("dt")
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+
+ @Test
+ public void selectByWrapperIn(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.in("age", Arrays.asList(38, 45))
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperLimit(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.in("age", Arrays.asList(38, 45)).last("limit 1")
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+ @Test
+ public void selectByWrapperLimitSupper(){
+ QueryWrapper<DemoMp> queryWrapper = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ queryWrapper.select("id", "name").in("age", Arrays.asList(38, 45)).last("limit 1")
+ .orderByAsc("id")
+ .orderByAsc("age");
+ List<DemoMp> poList = this.demoMpMapper.selectList(queryWrapper) ;
+ poList.forEach(System.out::println);
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/logs/pipIrrSso.log b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/logs/pipIrrSso.log
new file mode 100644
index 0000000..2861149
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/logs/pipIrrSso.log
@@ -0,0 +1,148 @@
+2023-11-07 14:37:28,586:ERROR main (com.dy.common.mybatis.PrintExceptionSqlInterceptor.intercept:69) - SQL ErrorException:
+java.lang.reflect.InvocationTargetException: null
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:119) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.apache.ibatis.plugin.Invocation.proceed(Invocation.java:49) ~[mybatis-3.5.13.jar:3.5.13]
+ at com.dy.common.mybatis.PrintExceptionSqlInterceptor.intercept(PrintExceptionSqlInterceptor.java:66) [classes/:?]
+ at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:59) [mybatis-3.5.13.jar:3.5.13]
+ at jdk.proxy2.$Proxy207.query(Unknown Source) [?:?]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:154) [mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:147) [mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:142) [mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectOne(DefaultSqlSession.java:75) [mybatis-3.5.13.jar:3.5.13]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:425) [mybatis-spring-2.1.1.jar:2.1.1]
+ at jdk.proxy2.$Proxy133.selectOne(Unknown Source) [?:?]
+ at org.mybatis.spring.SqlSessionTemplate.selectOne(SqlSessionTemplate.java:160) [mybatis-spring-2.1.1.jar:2.1.1]
+ at com.baomidou.mybatisplus.core.override.MybatisMapperMethod.execute(MybatisMapperMethod.java:89) [mybatis-plus-core-3.5.3.2.jar:3.5.3.2]
+ at com.baomidou.mybatisplus.core.override.MybatisMapperProxy$PlainMethodInvoker.invoke(MybatisMapperProxy.java:148) [mybatis-plus-core-3.5.3.2.jar:3.5.3.2]
+ at com.baomidou.mybatisplus.core.override.MybatisMapperProxy.invoke(MybatisMapperProxy.java:89) [mybatis-plus-core-3.5.3.2.jar:3.5.3.2]
+ at jdk.proxy2.$Proxy135.selectById(Unknown Source) [?:?]
+ at com.dy.sso.MapperTest.selectById(MapperTest.java:21) [test-classes/:?]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) [junit-4.13.2.jar:4.13.2]
+ at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56) [junit-4.13.2.jar:4.13.2]
+ at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.statements.RunBeforeTestExecutionCallbacks.evaluate(RunBeforeTestExecutionCallbacks.java:76) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunAfterTestExecutionCallbacks.evaluate(RunAfterTestExecutionCallbacks.java:84) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunBeforeTestMethodCallbacks.evaluate(RunBeforeTestMethodCallbacks.java:75) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunAfterTestMethodCallbacks.evaluate(RunAfterTestMethodCallbacks.java:86) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.SpringRepeat.evaluate(SpringRepeat.java:84) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:252) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:97) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.statements.RunBeforeTestClassCallbacks.evaluate(RunBeforeTestClassCallbacks.java:61) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunAfterTestClassCallbacks.evaluate(RunAfterTestClassCallbacks.java:70) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner.run(ParentRunner.java:413) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.run(SpringJUnit4ClassRunner.java:191) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runner.JUnitCore.run(JUnitCore.java:137) [junit-4.13.2.jar:4.13.2]
+ at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69) [junit-rt.jar:?]
+ at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33) [junit-rt.jar:?]
+ at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:221) [junit-rt.jar:?]
+ at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54) [junit-rt.jar:?]
+Caused by: org.springframework.jdbc.CannotGetJdbcConnectionException: 鏈緱鍒版暟鎹簮鍚嶇О
+ at com.dy.common.multiDataSource.MultiDataSourceTransaction.getConnection(MultiDataSourceTransaction.java:34) ~[classes/:?]
+ at org.apache.ibatis.executor.BaseExecutor.getConnection(BaseExecutor.java:345) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.SimpleExecutor.prepareStatement(SimpleExecutor.java:89) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.SimpleExecutor.doQuery(SimpleExecutor.java:64) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:333) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:158) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:110) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:90) ~[mybatis-3.5.13.jar:3.5.13]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:61) ~[mybatis-3.5.13.jar:3.5.13]
+ at jdk.proxy2.$Proxy207.query(Unknown Source) ~[?:?]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ ... 48 more
+2023-11-07 14:39:05,179:ERROR main (com.dy.common.mybatis.PrintExceptionSqlInterceptor.intercept:69) - SQL ErrorException:
+java.lang.reflect.InvocationTargetException: null
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:119) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.apache.ibatis.plugin.Invocation.proceed(Invocation.java:49) ~[mybatis-3.5.13.jar:3.5.13]
+ at com.dy.common.mybatis.PrintExceptionSqlInterceptor.intercept(PrintExceptionSqlInterceptor.java:66) [classes/:?]
+ at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:59) [mybatis-3.5.13.jar:3.5.13]
+ at jdk.proxy2.$Proxy207.query(Unknown Source) [?:?]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:154) [mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:147) [mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:142) [mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.session.defaults.DefaultSqlSession.selectOne(DefaultSqlSession.java:75) [mybatis-3.5.13.jar:3.5.13]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:425) [mybatis-spring-2.1.1.jar:2.1.1]
+ at jdk.proxy2.$Proxy133.selectOne(Unknown Source) [?:?]
+ at org.mybatis.spring.SqlSessionTemplate.selectOne(SqlSessionTemplate.java:160) [mybatis-spring-2.1.1.jar:2.1.1]
+ at com.baomidou.mybatisplus.core.override.MybatisMapperMethod.execute(MybatisMapperMethod.java:89) [mybatis-plus-core-3.5.3.2.jar:3.5.3.2]
+ at com.baomidou.mybatisplus.core.override.MybatisMapperProxy$PlainMethodInvoker.invoke(MybatisMapperProxy.java:148) [mybatis-plus-core-3.5.3.2.jar:3.5.3.2]
+ at com.baomidou.mybatisplus.core.override.MybatisMapperProxy.invoke(MybatisMapperProxy.java:89) [mybatis-plus-core-3.5.3.2.jar:3.5.3.2]
+ at jdk.proxy2.$Proxy134.selectById(Unknown Source) [?:?]
+ at com.dy.sso.MapperTest.selectById(MapperTest.java:24) [test-classes/:?]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59) [junit-4.13.2.jar:4.13.2]
+ at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56) [junit-4.13.2.jar:4.13.2]
+ at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.statements.RunBeforeTestExecutionCallbacks.evaluate(RunBeforeTestExecutionCallbacks.java:76) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunAfterTestExecutionCallbacks.evaluate(RunAfterTestExecutionCallbacks.java:84) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunBeforeTestMethodCallbacks.evaluate(RunBeforeTestMethodCallbacks.java:75) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunAfterTestMethodCallbacks.evaluate(RunAfterTestMethodCallbacks.java:86) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.SpringRepeat.evaluate(SpringRepeat.java:84) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:252) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:97) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.statements.RunBeforeTestClassCallbacks.evaluate(RunBeforeTestClassCallbacks.java:61) [spring-test-6.0.11.jar:6.0.11]
+ at org.springframework.test.context.junit4.statements.RunAfterTestClassCallbacks.evaluate(RunAfterTestClassCallbacks.java:70) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306) [junit-4.13.2.jar:4.13.2]
+ at org.junit.runners.ParentRunner.run(ParentRunner.java:413) [junit-4.13.2.jar:4.13.2]
+ at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.run(SpringJUnit4ClassRunner.java:191) [spring-test-6.0.11.jar:6.0.11]
+ at org.junit.runner.JUnitCore.run(JUnitCore.java:137) [junit-4.13.2.jar:4.13.2]
+ at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69) [junit-rt.jar:?]
+ at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33) [junit-rt.jar:?]
+ at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:221) [junit-rt.jar:?]
+ at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54) [junit-rt.jar:?]
+Caused by: java.sql.SQLSyntaxErrorException: Unknown column 'org_tag' in 'field list'
+ at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:121) ~[mysql-connector-j-8.0.33.jar:8.0.33]
+ at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:122) ~[mysql-connector-j-8.0.33.jar:8.0.33]
+ at com.mysql.cj.jdbc.ClientPreparedStatement.executeInternal(ClientPreparedStatement.java:916) ~[mysql-connector-j-8.0.33.jar:8.0.33]
+ at com.mysql.cj.jdbc.ClientPreparedStatement.execute(ClientPreparedStatement.java:354) ~[mysql-connector-j-8.0.33.jar:8.0.33]
+ at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_execute(FilterChainImpl.java:3446) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.filter.FilterAdapter.preparedStatement_execute(FilterAdapter.java:1063) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_execute(FilterChainImpl.java:3444) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.wall.WallFilter.preparedStatement_execute(WallFilter.java:639) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_execute(FilterChainImpl.java:3444) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.filter.FilterEventAdapter.preparedStatement_execute(FilterEventAdapter.java:434) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.filter.FilterChainImpl.preparedStatement_execute(FilterChainImpl.java:3444) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl.execute(PreparedStatementProxyImpl.java:158) ~[druid-1.2.20.jar:?]
+ at com.alibaba.druid.pool.DruidPooledPreparedStatement.execute(DruidPooledPreparedStatement.java:483) ~[druid-1.2.20.jar:?]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.apache.ibatis.logging.jdbc.PreparedStatementLogger.invoke(PreparedStatementLogger.java:58) ~[mybatis-3.5.13.jar:3.5.13]
+ at jdk.proxy3.$Proxy209.execute(Unknown Source) ~[?:?]
+ at org.apache.ibatis.executor.statement.PreparedStatementHandler.query(PreparedStatementHandler.java:65) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.statement.RoutingStatementHandler.query(RoutingStatementHandler.java:80) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.SimpleExecutor.doQuery(SimpleExecutor.java:65) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:333) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:158) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:110) ~[mybatis-3.5.13.jar:3.5.13]
+ at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:90) ~[mybatis-3.5.13.jar:3.5.13]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ at java.lang.reflect.Method.invoke(Method.java:578) ~[?:?]
+ at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:61) ~[mybatis-3.5.13.jar:3.5.13]
+ at jdk.proxy2.$Proxy207.query(Unknown Source) ~[?:?]
+ at jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104) ~[?:?]
+ ... 48 more
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 9d20d68..aead030 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -86,7 +86,7 @@
try {
//Boolean flag = cacheManager.getCacheNames().isEmpty() ;
uuid = UUID.randomUUID().toString();
- userPo = this.sv.login(uuid, vo.phone, vo.password);
+ userPo = this.sv.loginWithMapperXml(uuid, vo.phone, vo.password);
} catch (Exception e) {
log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -131,7 +131,7 @@
try {
//Boolean flag = cacheManager.getCacheNames().isEmpty() ;
uuid = UUID.randomUUID().toString();
- userPo = this.sv.login(uuid, vo.phone, vo.password);
+ userPo = this.sv.loginWithMapperXml(uuid, vo.phone, vo.password);
} catch (Exception e) {
log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -222,6 +222,11 @@
return vo ;
}
+ /////////////////////////////////////////////////////////////////
+ //
+ // 浠ヤ笅绉佹湁鏂规硶
+ //
+ /////////////////////////////////////////////////////////////////
/**
* 鍒ゆ柇鐧诲綍鐢ㄦ埛鏄惁鎷ユ湁鎸囧畾鐨勪竴涓潈闄�
* @param privilege 鎸囧畾鐨勪竴涓潈闄�
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
index 6822356..f6cad3e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
@@ -1,5 +1,6 @@
package com.dy.sso.busi;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
@@ -27,10 +28,17 @@
this.baPrivilegeMapper = baPrivilegeMapper ;
}
+ /**
+ * 闇�瑕丅aUserMapper.xml
+ * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
+ * @param phone 鐢ㄦ埛鎵嬫満鍙�
+ * @param password 鐢ㄦ埛瀵嗙爜
+ * @return 鐧诲綍鎴愬姛鐢ㄦ埛
+ */
//褰撴湭娉ㄨВ@Transactional鏃讹紝浼氳緭鍑烘棩蹇楋細SqlSession [org.apache.ibatis.session.defaults.DefaultSqlSession@46727a0c] was not registered for synchronization because synchronization is not active
@Transactional
@Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
- public BaUser login(String uuid, String phone, String password){
+ public BaUser loginWithMapperXml(String uuid, String phone, String password){
BaUser baUser = this.baUserMapper.login(phone, password) ;
if(baUser != null && baUser.id != null){
baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
@@ -38,6 +46,31 @@
return baUser;
}
+ /**
+ * 涓嶉渶瑕� BaUserMapper.xml
+ * @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
+ * @param phone 鐢ㄦ埛鎵嬫満鍙�
+ * @param password 鐢ㄦ埛瀵嗙爜
+ * @return 鐧诲綍鎴愬姛鐢ㄦ埛
+ */
+ //褰撴湭娉ㄨВ@Transactional鏃讹紝浼氳緭鍑烘棩蹇楋細SqlSession [org.apache.ibatis.session.defaults.DefaultSqlSession@46727a0c] was not registered for synchronization because synchronization is not active
+ @Transactional
+ @Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
+ public BaUser loginWithOutMapperXml(String uuid, String phone, String password){
+ QueryWrapper<BaUser> qw = new QueryWrapper<>();
+ //QueryWrapper<DemoMp> queryWrapper = Wrappers.<DemoMp>query() ;
+ qw.select("id", "name", "phone", "orgTag", "supperAdmin")
+ .eq("disabled", 0)
+ .eq("deleted", 0)
+ .eq("phone", phone)
+ .eq("password", password);
+ BaUser baUser = this.baUserMapper.selectOne(qw) ;
+ if(baUser != null && baUser.id != null){
+ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
+ }
+ return baUser;
+ }
+
@CacheEvict(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
public void logout(String uuid){
}
--
Gitblit v1.8.0