From 34fa44018c791a131d932e8511bfaebd7b9fee3c Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 30 Jul 2024 12:07:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=8E=A7=E5=88=B6=E7=94=A8=E6=88=B7=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1209375258017792]后端-全局控制用户默认首页 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1209375258017792
---
 src/main/java/neatlogic/framework/dao/mapper/UserMapper.java | 2 ++
 src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java
index da180c2fd..6b56da416 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java
+++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.java
@@ -268,4 +268,6 @@ public interface UserMapper {
     void updateUserTokenByUuid(@Param("token") String token, @Param("uuid") String uuid);
 
     void deleteUserDataByUserUuid(String userUuid);
+
+    void deleteUserDataByUserUuidAndType(@Param("userUuid") String userUuid, @Param("type") String type);
 }
diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
index ff4d9e504..962882d32 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
@@ -1670,6 +1670,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         DELETE  FROM `user_data` WHERE `user_uuid` = #{value}
     </delete>
 
+    <delete id="deleteUserDataByUserUuidAndType">
+        DELETE  FROM `user_data` WHERE `user_uuid` = #{userUuid} and `type` = #{type}
+    </delete>
+
     <update id="updateUserTokenByUuid">
         update `user`
         set `token` = #{token}
-- 
Gitee


From abd3a20481b2a559cf4b7c653361a25f0ac449d1 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 30 Jul 2024 15:14:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=8E=A7=E5=88=B6=E7=94=A8=E6=88=B7=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1209375258017792]后端-全局控制用户默认首页 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1209375258017792
---
 .../framework/dao/mapper/UserMapper.xml       |  6 ++--
 .../neatlogic/framework/dto/UserDataVo.java   | 35 +++++++++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
index 962882d32..1f67f762b 100644
--- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
+++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml
@@ -807,7 +807,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
     <select id="getUserDataByUserUuidAndType" parameterType="java.lang.String"
             resultType="neatlogic.framework.dto.UserDataVo" useCache="false">
         SELECT `user_uuid` as userUuid,
-               `data`      as data,
+               `data`      as dataStr,
                `type`      as type
         FROM `user_data`
         where `user_uuid` = #{userUuid}
@@ -1381,7 +1381,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
 
     <insert id="insertUserData" parameterType="neatlogic.framework.dto.UserDataVo">
         INSERT INTO `user_data` (`user_uuid`, `data`, `type`)
-        VALUES (#{userUuid}, #{data}, #{type})
+        VALUES (#{userUuid}, #{dataStr}, #{type})
     </insert>
 
     <!--<insert id="insertUserAgent" parameterType="neatlogic.framework.dto.UserAgentVo">
@@ -1550,7 +1550,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
 
     <update id="updateUserData" parameterType="neatlogic.framework.dto.UserDataVo">
         UPDATE `user_data`
-        SET `data` = #{data}
+        SET `data` = #{dataStr}
         WHERE `user_uuid` = #{userUuid}
           and `type` = #{type}
     </update>
diff --git a/src/main/java/neatlogic/framework/dto/UserDataVo.java b/src/main/java/neatlogic/framework/dto/UserDataVo.java
index 7260c4fb4..529e3bdad 100644
--- a/src/main/java/neatlogic/framework/dto/UserDataVo.java
+++ b/src/main/java/neatlogic/framework/dto/UserDataVo.java
@@ -1,25 +1,26 @@
 package neatlogic.framework.dto;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.restful.annotation.EntityField;
 
 public class UserDataVo implements Cloneable{
-	@EntityField(name = "用户uuid",
-			type = ApiParamType.STRING)
+	@EntityField(name = "common.useruuid", type = ApiParamType.STRING)
 	private String userUuid;
-	@EntityField(name = "数据",
-			type = ApiParamType.STRING)
-	private String data;
-	@EntityField(name = "功能类型",
-			type = ApiParamType.STRING)
+	@EntityField(name = "common.data", type = ApiParamType.JSONOBJECT)
+	private JSONObject data;
+	@EntityField(name = "common.type", type = ApiParamType.STRING)
 	private String type;
 
+	@JSONField(serialize = false)
+	private String dataStr;
 
 	public UserDataVo() {
 
 	}
 
-	public UserDataVo(String userUuid, String data, String type) {
+	public UserDataVo(String userUuid, JSONObject data, String type) {
 		this.userUuid = userUuid;
 		this.data = data;
 		this.type = type;
@@ -29,7 +30,10 @@ public class UserDataVo implements Cloneable{
 		return userUuid;
 	}
 
-	public String getData() {
+	public JSONObject getData() {
+		if (data == null && dataStr != null) {
+			data = JSONObject.parseObject(dataStr);
+		}
 		return data;
 	}
 
@@ -41,7 +45,7 @@ public class UserDataVo implements Cloneable{
 		this.userUuid = userUuid;
 	}
 
-	public void setData(String data) {
+	public void setData(JSONObject data) {
 		this.data = data;
 	}
 
@@ -49,6 +53,17 @@ public class UserDataVo implements Cloneable{
 		this.type = type;
 	}
 
+	public String getDataStr() {
+		if (dataStr == null && data != null) {
+			dataStr = data.toJSONString();
+		}
+		return dataStr;
+	}
+
+	public void setDataStr(String dataStr) {
+		this.dataStr = dataStr;
+	}
+
 	public Object clone() throws CloneNotSupportedException{
 	    return super.clone();
 	}
-- 
Gitee