From c09ec15d95eda912a38b8f22a71aadd3b7fb52fa Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 15 一月 2024 15:28:47 +0800
Subject: [PATCH] 2024-01-15 朱宝民 优化获取角色列表接口
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrDivide.java | 8
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml | 135 ++++++++-----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWallet.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java | 6
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowmeter.java | 6
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePermissionsMapper.java | 18 +
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java | 11
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java | 35 ++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrMonitoringFlowmeter.java | 8
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java | 11
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntakeController.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java | 6
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java | 8
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java | 32 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRechargeHistory.java | 64 ------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml | 59 +++++
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java | 8
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java | 63 ------
30 files changed, 292 insertions(+), 273 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
index d88cdf1..a0d79c5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRoleMapper.java
@@ -2,12 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoBa.BaRole;
-import com.dy.pipIrrGlobal.voBa.VoRole;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
-import java.util.Map;
/**
* @author ZhuBaoMin
@@ -31,25 +29,32 @@
int updateByPrimaryKey(BaRole record);
/**
+ * 鏌ヨ鏌愪釜鐢ㄦ埛鎵�闅跺睘浜庣殑瑙掕壊
+ * @param userId 鐢ㄦ埛ID
+ * @return List<BaRole>
+ */
+ List<BaRole> selectByUserId(@Param("userId") Long userId) ;
+
+ /**
* 鏍规嵁瑙掕壊鍚嶇О鏌ヨ璁板綍鏁伴噺
* @param roleName
* @return
*/
Integer getRecordCountByName(@Param("roleName") String roleName);
- /**
- * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�
- * @param params
- * @return
- */
- Long getRecordCount(Map<?, ?> params);
-
- /**
- * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍
- * @param params
- * @return
- */
- List<VoRole> getRoles(Map<?, ?> params);
+ ///**
+ // * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�
+ // * @param params
+ // * @return
+ // */
+ //Long getRecordCount(Map<?, ?> params);
+ //
+ ///**
+ // * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍
+ // * @param params
+ // * @return
+ // */
+ //List<VoRole> getRoles(Map<?, ?> params);
/**
* 鏍规嵁roleId閫昏緫鍒犻櫎瑙掕壊瀵硅薄
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePermissionsMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePermissionsMapper.java
index 0e3781b..12e0aab 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePermissionsMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePermissionsMapper.java
@@ -1,7 +1,11 @@
package com.dy.pipIrrGlobal.daoBa;
import com.dy.pipIrrGlobal.pojoBa.BaRolePermissions;
+import com.dy.pipIrrGlobal.voBa.VoRole;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
/**
* @author ZhuBaoMin
@@ -27,4 +31,18 @@
* @return
*/
int delPermissionsByRoleId(@Param("roleId") Long roleId);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�
+ * @param params
+ * @return
+ */
+ Long getRecordCount(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍
+ * @param params
+ * @return
+ */
+ List<VoRole> getRoles(Map<?, ?> params);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
index 373c4e7..8f084d4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRole.java
@@ -29,7 +29,7 @@
@AllArgsConstructor
@Schema(name = "瑙掕壊瀹炰綋")
public class BaRole implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151511001L;
/**
* 涓婚敭
@@ -48,10 +48,10 @@
private String name;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java
index 3bff3ae..03373d5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePermissions.java
@@ -7,11 +7,14 @@
* @Description
*/
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
@@ -60,5 +63,6 @@
*/
@Schema(description = "鏉冮檺鍒楄〃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotBlank(message = "鏉冮檺鍒楄〃涓嶈兘涓虹┖")
- private String permissions;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private JSONArray permissions;
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
index 37884d4..5ccb61e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
@@ -32,7 +32,7 @@
@AllArgsConstructor
@Schema(name = "鎺у埗鍣ㄥ疄浣�")
public class PrController implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517001L;
/**
* 涓婚敭
@@ -77,9 +77,9 @@
private Byte addways;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrDivide.java
index e46bbfc..c88ed99 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrDivide.java
@@ -33,7 +33,7 @@
@AllArgsConstructor
@Schema(name = "鍒嗘按鎴垮疄浣�")
public class PrDivide implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517002L;
/**
* 涓婚敭
*/
@@ -129,10 +129,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜虹紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java
index 1ca4c29..b156927 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowMonitoring.java
@@ -29,7 +29,7 @@
@AllArgsConstructor
@Schema(name = "娴侀噺鐩戞祴绔欏疄浣�")
public class PrFlowMonitoring implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517004L;
/**
* 涓婚敭
@@ -91,10 +91,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜虹紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowmeter.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowmeter.java
index cdb8538..892d5cd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowmeter.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrFlowmeter.java
@@ -28,7 +28,7 @@
@AllArgsConstructor
@Schema(name = "娴侀噺璁″疄浣�")
public class PrFlowmeter implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517003L;
/**
* 涓婚敭
@@ -73,9 +73,9 @@
private Byte addways;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java
index 92a4428..61aad7d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntake.java
@@ -26,7 +26,7 @@
@AllArgsConstructor
@Schema(name = "鍙栨按鍙ｅ疄浣�")
public class PrIntake implements BaseEntity {
- public static final long serialVersionUID = 202312260931001L;
+ public static final long serialVersionUID = 202401151517005L;
/**
* 涓婚敭
*/
@@ -105,10 +105,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜虹紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntakeController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntakeController.java
index 745a435..6cb7b1a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntakeController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntakeController.java
@@ -35,7 +35,7 @@
@AllArgsConstructor
@Schema(name = "鍙栨按鍙ｆ崋缁戝疄浣�")
public class PrIntakeController implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517006L;
/**
* 涓婚敭
@@ -77,10 +77,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrMonitoringFlowmeter.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrMonitoringFlowmeter.java
index 8f1de60..c4f5cac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrMonitoringFlowmeter.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrMonitoringFlowmeter.java
@@ -31,7 +31,7 @@
@AllArgsConstructor
@Schema(name = "鐩戞祴绔欐祦閲忚鍏宠仈瀹炰綋")
public class PrMonitoringFlowmeter implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151517007L;
/**
* 涓婚敭
@@ -73,10 +73,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
index bd8befb..ed80934 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
@@ -32,7 +32,7 @@
@AllArgsConstructor
@Schema(name = "寮�鍗�/琛ュ崱瀹炰綋")
public class SeActiveCard implements BaseEntity {
- public static final long serialVersionUID = 202312071927001L;
+ public static final long serialVersionUID = 202401151518001L;
/**
* 涓婚敭
@@ -107,10 +107,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
index 34aa9d7..73ca6ca 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
@@ -33,7 +33,7 @@
@AllArgsConstructor
@Schema(name = "姘村崱娉ㄩ攢瀹炰綋")
public class SeCancel implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151518002L;
/**
* 涓婚敭
*/
@@ -79,10 +79,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
index e61a205..c99a127 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClient.java
@@ -30,7 +30,7 @@
@AllArgsConstructor
@Schema(name = "鍐滄埛瀹炰綋")
public class SeClient implements BaseEntity {
- public static final long serialVersionUID = 202311141539001L;
+ public static final long serialVersionUID = 202401151518003L;
/**
* 涓婚敭
@@ -161,10 +161,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎿嶄綔浜虹紪鍙蜂笉鑳戒负绌�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鎿嶄綔浜篒D涓嶈兘涓虹┖")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
index 6eaa503..d9600e3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
@@ -34,7 +34,7 @@
@AllArgsConstructor
@Schema(name = "鍐滄埛姘村崱瀹炰綋")
public class SeClientCard implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151518004L;
/**
* 涓婚敭
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java
index 2dd1125..26d0bdd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeLoss.java
@@ -33,7 +33,7 @@
@Schema(name = "鎸傚け瀹炰綋")
public class SeLoss implements BaseEntity {
- public static final long serialVersionUID = 20231191728001L;
+ public static final long serialVersionUID = 202401151518005L;
/**
* 涓婚敭
*/
@@ -79,10 +79,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java
index 5bee2dc..efda2e4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SePaymentMethod.java
@@ -30,7 +30,7 @@
@AllArgsConstructor
@Schema(name = "浠樻鏂瑰紡瀹炰綋")
public class SePaymentMethod implements BaseEntity {
- public static final long serialVersionUID = 20231191728001L;
+ public static final long serialVersionUID = 202401151518006L;
/**
* 涓婚敭
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
index 13551c8..2c88b50 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
@@ -27,7 +27,7 @@
@Schema(name = "姘村崱鍏呭�煎疄浣�")
public class SeRecharge implements BaseEntity {
- public static final long serialVersionUID = 20231191728001L;
+ public static final long serialVersionUID = 202401151519001L;
/**
* 涓婚敭
@@ -107,10 +107,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
index a364faa..92c9f2b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
@@ -33,7 +33,7 @@
@AllArgsConstructor
@Schema(name = "姘村崱鍏呭�煎巻鍙插疄浣�")
public class SeRechargeHistory implements BaseEntity {
- public static final long serialVersionUID = 202312080812001L;
+ public static final long serialVersionUID = 202401151519002L;
/**
* 涓婚敭
@@ -113,10 +113,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java
index 8a82772..ebb1554 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeReversal.java
@@ -33,7 +33,7 @@
@AllArgsConstructor
@Schema(name = "姘村崱鍐叉瀹炰綋")
public class SeReversal implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151519003L;
/**
* 涓婚敭
@@ -80,10 +80,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java
index 0fd30e2..2be74c5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeUnlock.java
@@ -33,7 +33,7 @@
@AllArgsConstructor
@Schema(name = "姘村崱瑙ｉ攣瀹炰綋")
public class SeUnlock implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151519004L;
/**
* 涓婚敭
@@ -73,10 +73,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWallet.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWallet.java
index 1133e8d..14b8dd4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWallet.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWallet.java
@@ -32,7 +32,7 @@
@AllArgsConstructor
@Schema(name = "鐢靛瓙閽卞寘琛ㄥ疄浣�")
public class SeWallet implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151519005L;
/**
* 涓婚敭
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java
index 842defc..239ff8e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRecharge.java
@@ -52,67 +52,4 @@
*/
private String remarks;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getWalletid() {
- return walletid;
- }
-
- public void setWalletid(Long walletid) {
- this.walletid = walletid;
- }
-
- public Long getClientid() {
- return clientid;
- }
-
- public void setClientid(Long clientid) {
- this.clientid = clientid;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Double getAmount() {
- return amount;
- }
-
- public void setAmount(Double amount) {
- this.amount = amount;
- }
-
- public Double getAfterrecharge() {
- return afterrecharge;
- }
-
- public void setAfterrecharge(Double afterrecharge) {
- this.afterrecharge = afterrecharge;
- }
-
- public Date getRechargedt() {
- return rechargedt;
- }
-
- public void setRechargedt(Date rechargedt) {
- this.rechargedt = rechargedt;
- }
-
- public String getRemarks() {
- return remarks;
- }
-
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRechargeHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRechargeHistory.java
index 668c31a..9a14c01 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRechargeHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeWalletRechargeHistory.java
@@ -51,68 +51,4 @@
* 澶囨敞淇℃伅
*/
private String remarks;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getWalletid() {
- return walletid;
- }
-
- public void setWalletid(Long walletid) {
- this.walletid = walletid;
- }
-
- public Long getClientid() {
- return clientid;
- }
-
- public void setClientid(Long clientid) {
- this.clientid = clientid;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Double getAmount() {
- return amount;
- }
-
- public void setAmount(Double amount) {
- this.amount = amount;
- }
-
- public Double getAfterrecharge() {
- return afterrecharge;
- }
-
- public void setAfterrecharge(Double afterrecharge) {
- this.afterrecharge = afterrecharge;
- }
-
- public Date getRechargedt() {
- return rechargedt;
- }
-
- public void setRechargedt(Date rechargedt) {
- this.rechargedt = rechargedt;
- }
-
- public String getRemarks() {
- return remarks;
- }
-
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java
index 966e73e..6b88843 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voBa/VoRole.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voBa;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,17 +21,17 @@
public class VoRole implements BaseEntity {
private static final long serialVersionUID = 1L;
- @Schema(title = "ID")
- private Long id;
-
@Schema(title = "瑙掕壊缂栧彿")
- private Long roleId;
+ private String roleId;
@Schema(title = "瑙掕壊鍚嶇О")
private String roleName;
+ @Schema(title = "鏉冮檺ID")
+ private Long perId;
+
@Schema(title = "鏉冮檺鍒楄〃")
- private String permissions;
+ private JSONArray permissions;
@Schema(title = "鎿嶄綔浜�")
private String operator;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index b1b3f1f..edd8936 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -68,6 +68,7 @@
lazy-load-trigger-methods: "" # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
cache-enabled: true #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
+ type-handlers-package: com.dy.pipIrrGlobal.pojoBa.MySqlJsonHandler
pipIrr:
global:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
index c9c866e..12c8b3a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -1,15 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaRoleMapper">
+<!-- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">-->
+<!-- <!–@mbg.generated–>-->
+<!-- <!–@Table ba_role–>-->
+<!-- <id column="id" jdbcType="BIGINT" property="id" />-->
+<!-- <result column="name" jdbcType="VARCHAR" property="name" />-->
+<!-- <result column="operator" jdbcType="BIGINT" property="operator" />-->
+<!-- <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />-->
+<!-- <result column="deleted" jdbcType="TINYINT" property="deleted" />-->
+<!-- </resultMap>-->
+
<resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
- <!--@mbg.generated-->
- <!--@Table ba_role-->
- <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="operator" jdbcType="BIGINT" property="operator" />
<result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
- <result column="deleted" jdbcType="TINYINT" property="deleted" />
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
+
+ <resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">
+ <result column="id" jdbcType="BIGINT" property="id" />
+ <result column="name" jdbcType="VARCHAR" property="name" />
+ <result column="operator" jdbcType="BIGINT" property="operator" />
+ <result column="operate_dt" jdbcType="TIMESTAMP" property="operateDt" />
+ </resultMap>
+
+<!-- <resultMap id="someResultMap" extends="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRole">-->
+<!-- <collection property="priviList" fetchType="eager" column="{roleId=id}" select="com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper.selectPrivilegeByRoleId" />-->
+<!-- </resultMap>-->
+
+ <sql id="part_Column_List">
+ id, name, operator, operate_dt, deleted
+ </sql>
+
+ <select id="selectByUserId" resultMap="partResultMap">
+ select <include refid="part_Column_List" />
+ from ba_role r
+ inner join ba_user_role ur on r.id = ur.roleId
+ where r.deleted != 1
+ <if test="userId != null">
+ and ur.userId = #{userId,jdbcType=BIGINT}
+ </if>
+ </select>
+
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `name`, `operator`, operate_dt, deleted
@@ -21,6 +55,7 @@
from ba_role
where id = #{id,jdbcType=BIGINT}
</select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from ba_role
@@ -110,57 +145,57 @@
WHERE name = #{roleName}
</select>
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�-->
- <select id="getRecordCount" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
- FROM ba_role role
- LEFT JOIN ba_role_permissions per ON per.roleId = role.id
- <where>
- AND role.deleted = 0
+<!-- <!–鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�–>-->
+<!-- <select id="getRecordCount" resultType="java.lang.Long">-->
+<!-- SELECT-->
+<!-- COUNT(*) AS recordCount-->
+<!-- FROM ba_role role-->
+<!-- LEFT JOIN ba_role_permissions per ON per.roleId = role.id-->
+<!-- <where>-->
+<!-- AND role.deleted = 0-->
- <if test = "roleId != null and roleId > 0">
- AND role.id = ${roleId}
- </if>
+<!-- <if test = "roleId != null and roleId > 0">-->
+<!-- AND role.id = ${roleId}-->
+<!-- </if>-->
- <if test = "roleName != null and roleName !=''">
- AND role.name LIKE CONCAT('%',#{roleName},'%')
- </if>
- </where>
- </select>
+<!-- <if test = "roleName != null and roleName !=''">-->
+<!-- AND role.name LIKE CONCAT('%',#{roleName},'%')-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- </select>-->
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍-->
- <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">
- SELECT
- (@i:=@i+1) AS id,
- t.* FROM
- (
- SELECT
- role.id AS roleId,
- role.name AS roleName,
- per.permissions,
- (SELECT `name` FROM ba_user WHERE id = role.operator) AS operator,
- role.operate_dt AS operateDt
- FROM ba_role role
- LEFT JOIN ba_role_permissions per ON per.roleId = role.id
- <where>
- AND role.deleted = 0
+<!-- <!–鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍–>-->
+<!-- <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">-->
+<!-- SELECT-->
+<!-- (@i:=@i+1) AS id,-->
+<!-- t.* FROM-->
+<!-- (-->
+<!-- SELECT-->
+<!-- role.id AS roleId,-->
+<!-- role.name AS roleName,-->
+<!-- per.permissions,-->
+<!-- (SELECT `name` FROM ba_user WHERE id = role.operator) AS operator,-->
+<!-- role.operate_dt AS operateDt-->
+<!-- FROM ba_role role-->
+<!-- LEFT JOIN ba_role_permissions per ON per.roleId = role.id-->
+<!-- <where>-->
+<!-- AND role.deleted = 0-->
- <if test = "roleId != null and roleId > 0">
- AND role.id = ${roleId}
- </if>
+<!-- <if test = "roleId != null and roleId > 0">-->
+<!-- AND role.id = ${roleId}-->
+<!-- </if>-->
- <if test = "roleName != null and roleName !=''">
- AND role.name LIKE CONCAT('%',#{roleName},'%')
- </if>
- </where>
- ORDER BY role.operate_dt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
- ) t
- , (SELECT @i:=0) AS itable
- </select>
+<!-- <if test = "roleName != null and roleName !=''">-->
+<!-- AND role.name LIKE CONCAT('%',#{roleName},'%')-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- ORDER BY role.operate_dt DESC-->
+<!-- <if test="pageCurr != null and pageSize != null">-->
+<!-- LIMIT ${pageCurr}, ${pageSize}-->
+<!-- </if>-->
+<!-- ) t-->
+<!-- , (SELECT @i:=0) AS itable-->
+<!-- </select>-->
<!--鏍规嵁roleId閫昏緫鍒犻櫎瑙掕壊瀵硅薄-->
<update id="deleteRoleById">
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml
index 9fa4b68..9568ad5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePermissionsMapper.xml
@@ -6,12 +6,14 @@
<!--@Table ba_role_permissions-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="roleId" jdbcType="BIGINT" property="roleid" />
- <result column="permissions" jdbcType="VARCHAR" property="permissions" />
+<!-- <result column="permissions" jdbcType="VARCHAR" property="permissions" />-->
+ <result column="permissions" property="permissions" jdbcType="JAVA_OBJECT" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, roleId, permissions
</sql>
+
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -34,7 +36,7 @@
<!--@mbg.generated-->
insert into ba_role_permissions (id, roleId, permissions
)
- values (#{id,jdbcType=BIGINT}, #{roleid,jdbcType=BIGINT}, #{permissions,jdbcType=VARCHAR}
+ values (#{id,jdbcType=BIGINT}, #{roleid,jdbcType=BIGINT}, #{permissions,jdbcType= JAVA_OBJECT, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}
)
</insert>
@@ -60,7 +62,7 @@
#{roleid,jdbcType=BIGINT},
</if>
<if test="permissions != null">
- #{permissions,jdbcType=VARCHAR},
+ #{permissions,jdbcType=JAVA_OBJECT,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
</if>
</trim>
</insert>
@@ -72,7 +74,7 @@
roleId = #{roleid,jdbcType=BIGINT},
</if>
<if test="permissions != null">
- permissions = #{permissions,jdbcType=VARCHAR},
+ permissions = #{permissions,jdbcType=JAVA_OBJECT,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -81,7 +83,54 @@
<!--@mbg.generated-->
update ba_role_permissions
set roleId = #{roleid,jdbcType=BIGINT},
- permissions = #{permissions,jdbcType=VARCHAR}
+ permissions = #{permissions,jdbcType=JAVA_OBJECT,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍鏁�-->
+ <select id="getRecordCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM ba_role role
+ LEFT JOIN ba_role_permissions per ON per.roleId = role.id
+ <where>
+ AND role.deleted = 0
+
+ <if test = "roleId != null and roleId > 0">
+ AND role.id = ${roleId}
+ </if>
+
+ <if test = "roleName != null and roleName !=''">
+ AND role.name LIKE CONCAT('%',#{roleName},'%')
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇瑙掕壊璁板綍-->
+ <select id="getRoles" resultType="com.dy.pipIrrGlobal.voBa.VoRole">
+ SELECT
+
+ CAST(role.id AS char) AS roleId,
+ role.name AS roleName,
+ per.id AS perId,
+ (SELECT `name` FROM ba_user WHERE id = role.operator) AS operator,
+ role.operate_dt AS operateDt
+ FROM ba_role role
+ LEFT JOIN ba_role_permissions per ON per.roleId = role.id
+ <where>
+ AND role.deleted = 0
+
+ <if test = "roleId != null and roleId > 0">
+ AND role.id = ${roleId}
+ </if>
+
+ <if test = "roleName != null and roleName !=''">
+ AND role.name LIKE CONCAT('%',#{roleName},'%')
+ </if>
+ </where>
+ ORDER BY role.operate_dt DESC
+ <if test="pageCurr != null and pageSize != null">
+ LIMIT ${pageCurr}, ${pageSize}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
index 60cce2a..59f2061 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrBase.role;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.aop.SsoAop;
import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.webUtil.BaseResponse;
@@ -62,12 +63,16 @@
@SsoAop()
public BaseResponse<QueryResultVo<List<VoRole>>> getRoles(QueryVo vo){
try {
+ //BaRolePermissions baRolePermissions = roleSv.getRolePermissionsById(2023122018334500002L);
+ //return BaseResponseUtils.buildSuccess(baRolePermissions);
+
QueryResultVo<List<VoRole>> res = roleSv.getRoles(vo);
if(res.itemTotal != null && res.itemTotal > 0) {
return BaseResponseUtils.buildSuccess(res);
}else {
return BaseResponseUtils.buildFail(SystemResultCode.NO_ROLES.getMessage());
}
+
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -127,7 +132,7 @@
// 娣诲姞鏉冮檺鍒楄〃
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(permissions);
+ baRolePermissions.setPermissions(new JSONArray(permissions));
Integer rc = Optional.ofNullable(roleSv.addPermissions(baRolePermissions)).orElse(0);
if(rc <= 0) {
return BaseResponseUtils.buildFail(SystemResultCode.ADD_ROLE_FAIL.getMessage());
@@ -188,7 +193,7 @@
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(permissions);
+ baRolePermissions.setPermissions(new JSONArray(permissions));
roleSv.addPermissions(baRolePermissions);
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -196,7 +201,7 @@
// 淇敼瑙掕壊鎺堟潈
BaRolePermissions baRolePermissions = new BaRolePermissions();
baRolePermissions.setRoleid(roleId);
- baRolePermissions.setPermissions(permissions);
+ baRolePermissions.setPermissions(new JSONArray(permissions));
roleSv.delPermissionsByRoleId(roleId);
roleSv.addPermissions(baRolePermissions);
return BaseResponseUtils.buildSuccess(true) ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
index be9c7e8..0947d23 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleSv.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrBase.role;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoBa.BaRoleMapper;
import com.dy.pipIrrGlobal.daoBa.BaRolePermissionsMapper;
@@ -11,8 +12,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
/**
* @author ZhuBaoMin
@@ -52,9 +55,10 @@
public QueryResultVo<List<VoRole>> getRoles(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
- Long itemTotal = baRoleMapper.getRecordCount(params);
+ Long itemTotal = baRolePermissionsMapper.getRecordCount(params);
QueryResultVo<List<VoRole>> rsVo = new QueryResultVo<>() ;
+
Integer pageCurr = 0;
Integer pageSize = 10000;
rsVo.pageCurr = 1;
@@ -69,10 +73,34 @@
params.put("pageSize", pageSize);
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = baRoleMapper.getRoles(params);
+ //rsVo.obj = baRoleMapper.getRoles(params);
+
+ /**
+ * 鑾峰彇瑙掕壊鍒楄〃锛屾妸姹楄鑹叉潈闄怚D
+ * 閬嶅巻瑙掕壊鍒楄〃骞跺彇鍑鸿鑹插璞′腑鐨刾erId
+ * 鏍规嵁perId鑾峰彇鏉冮檺瀵硅薄锛屽苟灏嗗璞℃坊鍔犲埌瑙掕壊瀵硅薄涓�
+ */
+ List<VoRole> list_Roles = Optional.ofNullable(baRolePermissionsMapper.getRoles(params)).orElse(new ArrayList<>());
+ if(list_Roles.size() > 0) {
+ for(int i = 0; i < list_Roles.size(); i++) {
+ VoRole voRole = list_Roles.get(i);
+ Long perId = voRole.getPerId();
+ BaRolePermissions baRolePermissions = baRolePermissionsMapper.selectByPrimaryKey(perId);
+ JSONArray array_permission = JSONArray.parseArray("[]");
+ if(baRolePermissions != null) {
+ array_permission = baRolePermissions.getPermissions();
+ }
+ voRole.setPermissions(array_permission);
+ }
+ }
+ rsVo.obj = list_Roles;
return rsVo ;
}
+ public BaRolePermissions getRolePermissionsById(Long id) {
+ return baRolePermissionsMapper.selectByPrimaryKey(id);
+ }
+
/**
* 寰楀埌鎵�鏈夎鑹�
* @return 鎵�鏈夎鑹查泦鍚�
--
Gitblit v1.8.0