From 2dcc0e6e55812c3b8578c2bdb590f8e96dca27d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E5=87=AF?= <371894675@qq.com>
Date: Tue, 26 Dec 2023 19:38:58 +0800
Subject: [PATCH] modify

---
 .gitignore                                                | 3 ++-
 .../java/com/dragon/system/common/domain/SysDept.java     | 2 ++
 .../java/com/dragon/system/common/domain/SysUser.java     | 2 ++
 .../com/dragon/system/common/domain/model/LoginUser.java  | 1 +
 .../system/server/controller/SysConfigController.java     | 2 ++
 .../server/service/impl/SysConfigPlusServiceImpl.java     | 6 ++++++
 .../server/service/impl/SysDeptPlusServiceImpl.java       | 1 +
 .../src/main/resources/mapper/system/SysConfigMapper.xml  | 8 ++++++++
 8 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 09bdfea..af088b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ target/
 .settings
 .springBeans
 
+/.idea
 ### IntelliJ IDEA ###
 .idea
 *.iws
@@ -43,4 +44,4 @@ nbdist/
 
 !*/build/*.java
 !*/build/*.html
-!*/build/*.xml
\ No newline at end of file
+!*/build/*.xml
diff --git a/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysDept.java b/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysDept.java
index e17aa82..52dc2b9 100644
--- a/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysDept.java
+++ b/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysDept.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dragon.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -81,6 +82,7 @@ public class SysDept extends BaseEntity {
      * 父部门名称
      */
     @TableField(exist = false)
+
     private String parentName;
 
     /**
diff --git a/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysUser.java b/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysUser.java
index f30a6e3..aa58ce6 100644
--- a/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysUser.java
+++ b/dragon-system-common/src/main/java/com/dragon/system/common/domain/SysUser.java
@@ -127,6 +127,8 @@ public class SysUser extends BaseEntity {
      */
     private Long roleId;
 
+
+
     public SysUser() {
 
     }
diff --git a/dragon-system-common/src/main/java/com/dragon/system/common/domain/model/LoginUser.java b/dragon-system-common/src/main/java/com/dragon/system/common/domain/model/LoginUser.java
index 9eb95d9..3624325 100644
--- a/dragon-system-common/src/main/java/com/dragon/system/common/domain/model/LoginUser.java
+++ b/dragon-system-common/src/main/java/com/dragon/system/common/domain/model/LoginUser.java
@@ -53,6 +53,7 @@ public class LoginUser implements Serializable {
      */
     private Set<String> roles;
 
+    private  String name;
     /**
      * 用户信息
      */
diff --git a/dragon-system-server/src/main/java/com/dragon/system/server/controller/SysConfigController.java b/dragon-system-server/src/main/java/com/dragon/system/server/controller/SysConfigController.java
index 97bd408..c17818e 100644
--- a/dragon-system-server/src/main/java/com/dragon/system/server/controller/SysConfigController.java
+++ b/dragon-system-server/src/main/java/com/dragon/system/server/controller/SysConfigController.java
@@ -13,6 +13,7 @@ import com.dragon.system.common.domain.SysConfig;
 import com.dragon.system.server.service.ISysConfigService;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +37,7 @@ public class SysConfigController extends BaseController {
     @RequiresPermissions("system:config:list")
     @GetMapping("/list")
     public Result<TableDataInfo<SysConfig>> list(SysConfig config) {
+
         startPage();
         List<SysConfig> list = configService.selectConfigList(config);
         return getDataTable(list);
diff --git a/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysConfigPlusServiceImpl.java b/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysConfigPlusServiceImpl.java
index 33d9e32..4d4657d 100644
--- a/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysConfigPlusServiceImpl.java
+++ b/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysConfigPlusServiceImpl.java
@@ -59,9 +59,15 @@ public class SysConfigPlusServiceImpl extends ServiceImpl<SysConfigPlusMapper, S
         } if (Objects.nonNull(endTime) && endTime instanceof Date endDate){
             sysConfigLambdaQueryWrapper.lt(SysConfig::getCreateTime,endDate);
         }
+
         return this.list(sysConfigLambdaQueryWrapper);
     }
 
+    public static void main(String[] args) {
+        int i = Runtime.getRuntime().availableProcessors() * 2 + 1;
+        System.out.println(i);
+    }
+
     /**
      * 根据参数键名查询参数值
      */
diff --git a/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysDeptPlusServiceImpl.java b/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysDeptPlusServiceImpl.java
index 721765d..dced85b 100644
--- a/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysDeptPlusServiceImpl.java
+++ b/dragon-system-server/src/main/java/com/dragon/system/server/service/impl/SysDeptPlusServiceImpl.java
@@ -34,6 +34,7 @@ public class SysDeptPlusServiceImpl extends ServiceImpl<SysDeptPlusMapper, SysDe
      */
     @Override
     public List<SysDept> querList(SysDept dept) {
+
         LambdaQueryWrapper<SysDept> sysDeptLambdaQueryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotEmpty(dept.getDeptName())){
             sysDeptLambdaQueryWrapper.like(SysDept::getDeptName,dept.getDeptName());
diff --git a/dragon-system-server/src/main/resources/mapper/system/SysConfigMapper.xml b/dragon-system-server/src/main/resources/mapper/system/SysConfigMapper.xml
index 8bcbb4e..c8c4e25 100644
--- a/dragon-system-server/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/dragon-system-server/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -16,6 +16,14 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <insert id="hhh" useGeneratedKeys="true" keyProperty="id">
+        insert into tb_user
+        (name,age)
+        values
+        <foreach collection="list" item="aa" index="index" separator="," open="(" close=")">
+            #{aa.name},#{aa.age}
+        </foreach>
+    </insert>
     <sql id="selectConfigVo">
         select config_id,
                config_name,