From cb43358e3c6fa27486b74b800576117bb913b161 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 12 Dec 2024 14:43:38 +0800
Subject: [PATCH] 666

---
 .../contoller/GridTableUserController.java    | 14 +++++++++++
 .../modules/grid/dao/GridTableUserDao.java    |  2 ++
 .../grid/service/GridTableUserService.java    |  2 ++
 .../impl/GridTableUserServiceImpl.java        | 25 ++++++++++++++++++-
 .../mapper/grid/GridTableUserDao.xml          |  7 ++++++
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/grid/contoller/GridTableUserController.java b/src/main/java/com/xujie/sys/modules/grid/contoller/GridTableUserController.java
index 0d508080..3298d91d 100644
--- a/src/main/java/com/xujie/sys/modules/grid/contoller/GridTableUserController.java
+++ b/src/main/java/com/xujie/sys/modules/grid/contoller/GridTableUserController.java
@@ -74,6 +74,20 @@ public class GridTableUserController {
         gridTableUserService.updateTableUser(gridTableUserList);
         return R.ok("修改用户配置成功");
     }
+    /**
+     * @Description 改变列宽
+     * @Title updateColumnSize
+      * @param gridTableUserList
+     * @author rq
+     * @date 2024/12/12 14:11
+     * @return R
+     * @throw
+     */
+    @PostMapping("updateColumnSize")
+    public R updateColumnSize(@RequestBody GridTableUser data){
+        gridTableUserService.updateColumnSize(data);
+        return R.ok("修改用户配置成功");
+    }
 
     /**
      * @return
diff --git a/src/main/java/com/xujie/sys/modules/grid/dao/GridTableUserDao.java b/src/main/java/com/xujie/sys/modules/grid/dao/GridTableUserDao.java
index 0d9ccd68..be43bc81 100644
--- a/src/main/java/com/xujie/sys/modules/grid/dao/GridTableUserDao.java
+++ b/src/main/java/com/xujie/sys/modules/grid/dao/GridTableUserDao.java
@@ -13,4 +13,6 @@ import java.util.List;
 public interface GridTableUserDao extends BaseMapper<GridTableUser> {
 
     List<GridTableUser> getTableUserListLanguage(GridTableUserQuery gridTableUserQuery);
+
+    List<GridTableUser> getTableUserListLanguageDefault(GridTableUserQuery gridTableUserQuery);
 }
\ No newline at end of file
diff --git a/src/main/java/com/xujie/sys/modules/grid/service/GridTableUserService.java b/src/main/java/com/xujie/sys/modules/grid/service/GridTableUserService.java
index ccb9b9a9..cbc2c721 100644
--- a/src/main/java/com/xujie/sys/modules/grid/service/GridTableUserService.java
+++ b/src/main/java/com/xujie/sys/modules/grid/service/GridTableUserService.java
@@ -33,6 +33,8 @@ public interface GridTableUserService {
      * @return R
      **/
     void updateTableUser(List<GridTableUser> gridTableUserList);
+
+    void updateColumnSize( GridTableUser data);
     /*
      * @Author li_she
      * @Description 多语言配置 用户动态table
diff --git a/src/main/java/com/xujie/sys/modules/grid/service/impl/GridTableUserServiceImpl.java b/src/main/java/com/xujie/sys/modules/grid/service/impl/GridTableUserServiceImpl.java
index 5690137a..235c2efa 100644
--- a/src/main/java/com/xujie/sys/modules/grid/service/impl/GridTableUserServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/grid/service/impl/GridTableUserServiceImpl.java
@@ -8,6 +8,7 @@ import com.xujie.sys.modules.grid.query.GridTableUserQuery;
 import com.xujie.sys.modules.grid.service.GridTableUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -65,12 +66,34 @@ public class GridTableUserServiceImpl extends ServiceImpl<GridTableUserDao, Grid
                     .update(gridTableUser);
         }
     }
+    @Override
+    public void updateColumnSize( GridTableUser gridTableUser){
+        lambdaUpdate().eq(gridTableUser.getUserId()!=null,GridTableUser::getUserId, gridTableUser.getUserId())
+                .eq(gridTableUser.getFunctionId()!=null,GridTableUser::getFunctionId,gridTableUser.getFunctionId())
+                .eq(gridTableUser.getTableId()!=null,GridTableUser::getTableId,gridTableUser.getTableId())
+                .eq(gridTableUser.getColumnProp()!=null,GridTableUser::getColumnProp,gridTableUser.getColumnProp())
+                .update(gridTableUser);
+    }
 
     @Override
+    @Transactional
     public List<GridTableUser> getTableUserListLanguage(GridTableUserQuery gridTableUserQuery) {
-        return gridTableUserDao.getTableUserListLanguage(gridTableUserQuery);
+        List<GridTableUser> result= gridTableUserDao.getTableUserListLanguage(gridTableUserQuery);
+        if(result.size()==0){
+            result=gridTableUserDao.getTableUserListLanguageDefault(gridTableUserQuery);
+            if(result.size()>0){
+                saveGridTableUserList(result);
+            }
+        }
+        return result;
     }
 
+    // @Override
+    // public List<GridTableUser> getTableUserListLanguage(GridTableUserQuery gridTableUserQuery) {
+    //     return gridTableUserDao.getTableUserListLanguage(gridTableUserQuery);
+    // }
+
+
     @Override
     public void removerDefault(GridTableUserQuery gridTableUser) {
         lambdaUpdate().eq(GridTableUser::getFunctionId,gridTableUser.getFunctionId()).remove();
diff --git a/src/main/resources/mapper/grid/GridTableUserDao.xml b/src/main/resources/mapper/grid/GridTableUserDao.xml
index 66ddefdb..834a02f6 100644
--- a/src/main/resources/mapper/grid/GridTableUserDao.xml
+++ b/src/main/resources/mapper/grid/GridTableUserDao.xml
@@ -61,4 +61,11 @@
 
     </select>
 
+    <select id="getTableUserListLanguageDefault" resultType="com.xujie.sys.modules.grid.entity.GridTableUser">
+     SELECT #{userId} as user_id ,
+     table_id,table_name,column_prop,column_label,column_hidden,column_image,column_sortable,column_width,format,function_id,
+sort_lv,status,fixed,serial_number,column_type,align,header_align from
+        grid_table_default
+        where function_id=#{functionId} and table_id=#{tableId}
+    </select>
 </mapper>
\ No newline at end of file