基本模板2

logs/2022-04-21/litigationcase_info_20220421_0.log

@@ -0,0 +1,12 @@
+18:46:50.799 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Starting LitigationCaseApplication on ShengQianLei with PID 2912 (D:\IdeaProject\LitigationCase\target\classes started by skylar in D:\IdeaProject\LitigationCase)
+18:46:50.801 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - The following profiles are active: dev
+18:46:51.819 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 9095 (http)
+18:46:51.831 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-9095"]
+18:46:51.839 eductrain [main ] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+18:46:51.839 eductrain [main ] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.21]
+18:46:52.014 eductrain [main ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+18:46:52.014 eductrain [main ] INFO  o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1180 ms
+18:46:52.690 eductrain [main ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+18:46:52.850 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-9095"]
+18:46:52.870 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 9095 (http) with context path ''
+18:46:52.872 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Started LitigationCaseApplication in 2.6 seconds (JVM running for 3.279)

logs/2022-04-22/litigationcase_error_20220422_0.log

@@ -0,0 +1,18 @@
+15:53:54.049 eductrain [http-nio-9095-exec-10 ] ERROR c.a.l.service.impl.UserServiceIml - 
+### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Unknown column 'txt_hold1' in 'field list'
+### The error may exist in com/abcsz/litigationcase/dao/mapper/UserMapper.java (best guess)
+### The error may involve defaultParameterMap
+### The error occurred while setting parameters
+### SQL: SELECT  user_id,user_account,user_password,user_name,user_identity,user_tel,user_email,is_abc,law_firm_id,module_configure,permit_configure,user_descripe,create_time,update_time,txt_hold1,txt_hold2,del_flag  FROM tb_user     WHERE (user_identity = ? AND del_flag = ?)
+### Cause: java.sql.SQLSyntaxErrorException: Unknown column 'txt_hold1' in 'field list'
+; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Unknown column 'txt_hold1' in 'field list'****[Ljava.lang.StackTraceElement;@468ef2d9
+15:53:54.050 eductrain [http-nio-9095-exec-10 ] ERROR c.a.l.service.impl.UserServiceIml - X001****系统异常
+15:55:41.415 eductrain [http-nio-9095-exec-1 ] ERROR c.a.l.service.impl.UserServiceIml - 
+### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Unknown column 'txt_hold1' in 'field list'
+### The error may exist in com/abcsz/litigationcase/dao/mapper/UserMapper.java (best guess)
+### The error may involve defaultParameterMap
+### The error occurred while setting parameters
+### SQL: SELECT  user_id,user_account,user_password,user_name,user_identity,user_tel,user_email,is_abc,law_firm_id,module_configure,permit_configure,user_descripe,create_time,update_time,txt_hold1,txt_hold2,del_flag  FROM tb_user     WHERE (user_identity = ? AND del_flag = ?)
+### Cause: java.sql.SQLSyntaxErrorException: Unknown column 'txt_hold1' in 'field list'
+; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Unknown column 'txt_hold1' in 'field list'****[Ljava.lang.StackTraceElement;@6371b0a5
+16:01:02.528 eductrain [http-nio-9095-exec-1 ] ERROR c.a.l.service.impl.UserServiceIml - X001****系统异常

logs/2022-04-22/litigationcase_info_20220422_0.log

@@ -0,0 +1,94 @@
+15:43:17.596 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Starting LitigationCaseApplication on ShengQianLei with PID 15048 (D:\IdeaProject\LitigationCase\target\classes started by skylar in D:\IdeaProject\LitigationCase)
+15:43:17.598 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - The following profiles are active: dev
+15:43:18.590 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 9095 (http)
+15:43:18.606 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-9095"]
+15:43:18.614 eductrain [main ] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+15:43:18.614 eductrain [main ] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.21]
+15:43:18.795 eductrain [main ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+15:43:18.795 eductrain [main ] INFO  o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1166 ms
+15:43:19.536 eductrain [main ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+15:43:19.709 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-9095"]
+15:43:19.729 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 9095 (http) with context path ''
+15:43:19.732 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Started LitigationCaseApplication in 2.577 seconds (JVM running for 3.565)
+15:43:46.848 eductrain [http-nio-9095-exec-1 ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+15:43:46.848 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+15:43:46.857 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 8 ms
+15:53:53.863 eductrain [http-nio-9095-exec-10 ] INFO  c.a.l.service.impl.UserServiceIml - 用户信息新增....
+15:53:53.944 eductrain [http-nio-9095-exec-10 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+15:53:53.968 eductrain [http-nio-9095-exec-10 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+15:54:42.283 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Starting LitigationCaseApplication on ShengQianLei with PID 9736 (D:\IdeaProject\LitigationCase\target\classes started by skylar in D:\IdeaProject\LitigationCase)
+15:54:42.287 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - The following profiles are active: dev
+15:54:57.197 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Starting LitigationCaseApplication on ShengQianLei with PID 9744 (D:\IdeaProject\LitigationCase\target\classes started by skylar in D:\IdeaProject\LitigationCase)
+15:54:57.200 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - The following profiles are active: dev
+15:54:58.508 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 9095 (http)
+15:54:58.524 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-9095"]
+15:54:58.532 eductrain [main ] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+15:54:58.532 eductrain [main ] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.21]
+15:54:58.716 eductrain [main ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+15:54:58.716 eductrain [main ] INFO  o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1435 ms
+15:54:59.757 eductrain [main ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+15:54:59.945 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-9095"]
+15:54:59.970 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 9095 (http) with context path ''
+15:54:59.973 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Started LitigationCaseApplication in 3.479 seconds (JVM running for 4.396)
+15:55:10.702 eductrain [http-nio-9095-exec-1 ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+15:55:10.702 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+15:55:10.708 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 6 ms
+15:55:10.858 eductrain [http-nio-9095-exec-1 ] INFO  c.a.l.service.impl.UserServiceIml - 用户信息新增....
+15:55:21.988 eductrain [http-nio-9095-exec-1 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+15:55:22.182 eductrain [http-nio-9095-exec-1 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+16:01:02.585 eductrain [Thread-3 ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+16:01:02.586 eductrain [Thread-3 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+16:01:02.599 eductrain [Thread-3 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+16:02:28.486 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Starting LitigationCaseApplication on ShengQianLei with PID 11680 (D:\IdeaProject\LitigationCase\target\classes started by skylar in D:\IdeaProject\LitigationCase)
+16:02:28.488 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - The following profiles are active: dev
+16:02:29.797 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 9095 (http)
+16:02:29.810 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-9095"]
+16:02:29.819 eductrain [main ] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+16:02:29.819 eductrain [main ] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.21]
+16:02:30.010 eductrain [main ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+16:02:30.010 eductrain [main ] INFO  o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1473 ms
+16:02:30.815 eductrain [main ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+16:02:31.012 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-9095"]
+16:02:31.038 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 9095 (http) with context path ''
+16:02:31.042 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Started LitigationCaseApplication in 3.242 seconds (JVM running for 4.394)
+16:02:38.782 eductrain [http-nio-9095-exec-1 ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+16:02:38.782 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+16:02:38.788 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 6 ms
+16:02:38.937 eductrain [http-nio-9095-exec-1 ] INFO  c.a.l.service.impl.UserServiceIml - 用户信息新增....
+16:02:43.709 eductrain [http-nio-9095-exec-1 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+16:02:43.894 eductrain [http-nio-9095-exec-1 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+16:03:55.249 eductrain [http-nio-9095-exec-1 ] INFO  c.a.l.service.impl.UserServiceIml - 0000****交易成功
+16:04:08.009 eductrain [Thread-3 ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+16:04:08.011 eductrain [Thread-3 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+16:04:08.030 eductrain [Thread-3 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.
+16:04:11.168 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Starting LitigationCaseApplication on ShengQianLei with PID 15192 (D:\IdeaProject\LitigationCase\target\classes started by skylar in D:\IdeaProject\LitigationCase)
+16:04:11.170 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - The following profiles are active: dev
+16:04:12.198 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 9095 (http)
+16:04:12.211 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-9095"]
+16:04:12.219 eductrain [main ] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+16:04:12.219 eductrain [main ] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.21]
+16:04:12.386 eductrain [main ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+16:04:12.386 eductrain [main ] INFO  o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1178 ms
+16:04:13.104 eductrain [main ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+16:05:37.728 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Starting LitigationCaseApplication on ShengQianLei with PID 13624 (D:\IdeaProject\LitigationCase\target\classes started by skylar in D:\IdeaProject\LitigationCase)
+16:05:37.730 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - The following profiles are active: dev
+16:05:38.894 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 9095 (http)
+16:05:38.908 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-9095"]
+16:05:38.916 eductrain [main ] INFO  o.a.catalina.core.StandardService - Starting service [Tomcat]
+16:05:38.916 eductrain [main ] INFO  o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.21]
+16:05:39.081 eductrain [main ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext
+16:05:39.081 eductrain [main ] INFO  o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1256 ms
+16:05:39.860 eductrain [main ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'applicationTaskExecutor'
+16:05:40.045 eductrain [main ] INFO  o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-9095"]
+16:05:40.070 eductrain [main ] INFO  o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 9095 (http) with context path ''
+16:05:40.073 eductrain [main ] INFO  c.a.l.LitigationCaseApplication - Started LitigationCaseApplication in 2.901 seconds (JVM running for 3.872)
+16:05:49.396 eductrain [http-nio-9095-exec-1 ] INFO  o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+16:05:49.396 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Initializing Servlet 'dispatcherServlet'
+16:05:49.403 eductrain [http-nio-9095-exec-1 ] INFO  o.s.web.servlet.DispatcherServlet - Completed initialization in 7 ms
+16:05:49.574 eductrain [http-nio-9095-exec-1 ] INFO  c.a.l.service.impl.UserServiceIml - 用户信息新增....
+16:05:53.971 eductrain [http-nio-9095-exec-1 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Starting...
+16:05:54.179 eductrain [http-nio-9095-exec-1 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Start completed.
+16:06:58.246 eductrain [http-nio-9095-exec-1 ] INFO  c.a.l.service.impl.UserServiceIml - Y001****该用户已存在，请勿重复新增
+16:06:58.286 eductrain [Thread-3 ] INFO  o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'applicationTaskExecutor'
+16:06:58.290 eductrain [Thread-3 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown initiated...
+16:06:58.299 eductrain [Thread-3 ] INFO  com.zaxxer.hikari.HikariDataSource - HikariPool-1 - Shutdown completed.

pom.xml

@@ -92,8 +92,14 @@
 			<version>1.2.75</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-launcher</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 
-	</dependencies>
+    </dependencies>
 
 	<build>
 		<plugins>

src/main/java/com/abcsz/litigationcase/LitigationCaseApplication.java

@@ -9,7 +9,6 @@ public class LitigationCaseApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(LitigationCaseApplication.class, args);
-		CodeGenerator.codeGenerator();
 	}
 
 }

src/main/java/com/abcsz/litigationcase/controller/UserController.java

@@ -1,6 +1,16 @@
 package com.abcsz.litigationcase.controller;
 
 
+import com.abcsz.litigationcase.domain.ro.UserQueryRo;
+import com.abcsz.litigationcase.domain.ro.UserRo;
+import com.abcsz.litigationcase.domain.vo.PublicVo;
+import com.abcsz.litigationcase.domain.vo.UseQueryVo;
+import com.abcsz.litigationcase.service.UserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -17,5 +27,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/userEntity")
 public class UserController {
 
+    @Autowired
+    private UserService userService;
+
+    @ApiOperation("用户信息新增")
+    @PostMapping("/query")
+    public UseQueryVo query(@RequestBody @Validated UserQueryRo ro) throws Exception {
+
+        UseQueryVo vo = userService.userQuery(ro);
+        return vo;
+    }
+
+    @ApiOperation("用户信息新增")
+    @PostMapping("/insert")
+    public PublicVo insert(@RequestBody @Validated UserRo ro) throws Exception {
+
+        PublicVo vo = userService.userInsert(ro);
+        return vo;
+    }
+
+
+    @ApiOperation("用户信息修改")
+    @PostMapping("/modify")
+    public PublicVo modify(@RequestBody @Validated UserRo ro) throws Exception {
+
+        PublicVo vo = userService.userModify(ro);
+        return vo;
+    }
 }
 

src/main/java/com/abcsz/litigationcase/dao/entity/UserEntity.java

@@ -1,5 +1,6 @@
 package com.abcsz.litigationcase.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 
@@ -8,6 +9,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,13 +17,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 用户的模块权限表
  * </p>
  *
  * @author shengqianlei
- * @since 2022-04-21
+ * @since 2022-04-22
  */
 @Data
 @TableName("tb_user")
@@ -43,6 +47,9 @@ public class UserEntity implements Serializable {
     @ApiModelProperty(value = "用户姓名")
     private String userName;
 
+    @ApiModelProperty(value = "用户证件号码")
+    private String userIdentity;
+
     @ApiModelProperty(value = "用户手机号")
     private String userTel;
 
@@ -52,6 +59,9 @@ public class UserEntity implements Serializable {
     @ApiModelProperty(value = "是否行内 0-行内 1-行外")
     private Integer isAbc;
 
+    @ApiModelProperty(value = "银行信息 行内必输")
+    private Integer bankId;
+
     @ApiModelProperty(value = "事务所id 行外必输")
     private String lawFirmId;
 
@@ -65,13 +75,15 @@ public class UserEntity implements Serializable {
     private String userDescripe;
 
     @ApiModelProperty(value = "创建日期")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "更新日期")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
+    @TableField(value = "txt_hold_1")
     private String txtHold1;
 
+    @TableField(value = "txt_hold_2")
     private String txtHold2;
 
     @ApiModelProperty(value = "是否失效 0-正常 9-失效")

src/main/java/com/abcsz/litigationcase/dao/mapper/UserMapper.java

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author shengqianlei
  * @since 2022-04-21
  */
+
 @Mapper
 public interface UserMapper extends BaseMapper<UserEntity> {
 

src/main/java/com/abcsz/litigationcase/domain/ro/UserQueryRo.java

@@ -0,0 +1,14 @@
+package com.abcsz.litigationcase.domain.ro;
+
+
+import lombok.Data;
+
+@Data
+public class UserQueryRo {
+
+    private String userIdentity;
+
+    private Integer bankId;
+
+    private String lawFirmId;
+}

src/main/java/com/abcsz/litigationcase/domain/ro/UserRo.java

@@ -0,0 +1,58 @@
+package com.abcsz.litigationcase.domain.ro;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class UserRo {
+    @ApiModelProperty(value = "用户账号")
+    @NotNull(message = "用户账号不能为空")
+    private String userAccount;
+
+    @ApiModelProperty(value = "用户密码")
+    @NotNull(message = "密码不能为空")
+    private String userPassword;
+
+    @ApiModelProperty(value = "用户姓名")
+    @NotNull(message = "用户姓名不能为空")
+    private String userName;
+
+    @ApiModelProperty(value = "用户证件号码")
+    @NotNull(message = "用户证件号码不能为空")
+    private String userIdentity;
+
+    @ApiModelProperty(value = "用户手机号")
+    private String userTel;
+
+    @ApiModelProperty(value = "用户邮箱")
+    private String userEmail;
+
+    @ApiModelProperty(value = "是否行内 0-行内 1-行外")
+    @NotNull(message = "是否行内人员")
+    private Integer isAbc;
+
+    @ApiModelProperty(value = "银行信息 行内必输")
+    private Integer bankId;
+
+    @ApiModelProperty(value = "事务所id行外必输")
+    private String lawFirmId;
+
+    @ApiModelProperty(value = "模块配置")
+    private String moduleConfigure;
+
+    @ApiModelProperty(value = "权限配置")
+    private String permitConfigure;
+
+    @ApiModelProperty(value = "用户描述")
+    private String userDescripe;
+
+    private String txtHold1;
+
+    private String txtHold2;
+
+    @ApiModelProperty(value = "是否失效 0-正常 9-失效")
+    private Integer delFlag;
+
+}

src/main/java/com/abcsz/litigationcase/domain/vo/PublicVo.java

@@ -0,0 +1,17 @@
+package com.abcsz.litigationcase.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "返回基本类")
+public class PublicVo {
+
+    @ApiModelProperty(value = "返回码")
+    private String retCode;
+
+
+    @ApiModelProperty(value = "返回信息")
+    private String retMsg;
+}

src/main/java/com/abcsz/litigationcase/domain/vo/UseQueryVo.java

@@ -0,0 +1,11 @@
+package com.abcsz.litigationcase.domain.vo;
+
+import com.abcsz.litigationcase.dao.entity.UserEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UseQueryVo  extends PublicVo{
+    private List<UserEntity> data;
+}

src/main/java/com/abcsz/litigationcase/service/UserService.java

@@ -1,8 +1,14 @@
 package com.abcsz.litigationcase.service;
 
 import com.abcsz.litigationcase.dao.entity.UserEntity;
+import com.abcsz.litigationcase.domain.ro.UserQueryRo;
+import com.abcsz.litigationcase.domain.ro.UserRo;
+import com.abcsz.litigationcase.domain.vo.PublicVo;
+import com.abcsz.litigationcase.domain.vo.UseQueryVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户的模块权限表 服务类
@@ -13,4 +19,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface UserService extends IService<UserEntity> {
 
+    UseQueryVo userQuery(UserQueryRo ro);
+
+    PublicVo userInsert(UserRo ro);
+
+    PublicVo userModify(UserRo ro);
 }

src/main/java/com/abcsz/litigationcase/service/impl/UserServiceIml.java

@@ -2,10 +2,19 @@ package com.abcsz.litigationcase.service.impl;
 
 import com.abcsz.litigationcase.dao.entity.UserEntity;
 import com.abcsz.litigationcase.dao.mapper.UserMapper;
+import com.abcsz.litigationcase.domain.ro.UserQueryRo;
+import com.abcsz.litigationcase.domain.ro.UserRo;
+import com.abcsz.litigationcase.domain.vo.PublicVo;
+import com.abcsz.litigationcase.domain.vo.UseQueryVo;
 import com.abcsz.litigationcase.service.UserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * <p>
  * 用户的模块权限表 服务实现类
@@ -14,7 +23,160 @@ import org.springframework.stereotype.Service;
  * @author shengqianlei
  * @since 2022-04-21
  */
+@Slf4j
 @Service
 public class UserServiceIml extends ServiceImpl<UserMapper, UserEntity> implements UserService {
 
+    @Autowired
+    private  UserMapper userMapper;
+
+
+    @Override
+    public UseQueryVo userQuery(UserQueryRo ro) {
+        return null;
+    }
+
+    @Override
+    public PublicVo userInsert(UserRo ro) {
+        log.info("用户信息新增....");
+        PublicVo publicVo = new PublicVo();
+
+        try
+        {
+            /* 查询该用户是否已经存在 */
+            QueryWrapper<UserEntity> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("user_identity",ro.getUserIdentity());
+            queryWrapper1.eq("del_flag", 0);
+            UserEntity userEntity = userMapper.selectOne(queryWrapper1);
+            if(userEntity !=null){
+                publicVo.setRetCode("Y001");
+                publicVo.setRetMsg("该用户已存在，请勿重复新增");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+            if(ro.getIsAbc()==0 && ro.getBankId() == null){
+                publicVo.setRetCode("Y002");
+                publicVo.setRetMsg("行内人员请输入所属银行信息");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+            if(ro.getIsAbc()==1 && ro.getLawFirmId() ==null){
+                publicVo.setRetCode("Y003");
+                publicVo.setRetMsg("行外人员请输入所属事务所信息");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+            UserEntity userEntity1 = new UserEntity();
+            userEntity1.setUserAccount(ro.getUserAccount());
+            userEntity1.setUserPassword(ro.getUserPassword());
+            userEntity1.setUserName(ro.getUserName());
+            userEntity1.setUserIdentity(ro.getUserIdentity());
+            userEntity1.setUserTel(ro.getUserTel());
+            userEntity1.setUserEmail(ro.getUserEmail());
+            userEntity1.setIsAbc(ro.getIsAbc());
+            userEntity1.setLawFirmId(ro.getLawFirmId());
+            userEntity1.setModuleConfigure(ro.getModuleConfigure());
+            userEntity1.setPermitConfigure(ro.getPermitConfigure());
+            userEntity1.setUserDescripe(ro.getUserDescripe());
+            userEntity1.setCreateTime(new Date());
+            userEntity1.setUpdateTime(new Date());
+            userEntity1.setTxtHold1(ro.getTxtHold1());
+            userEntity1.setTxtHold2(ro.getTxtHold2());
+            userEntity1.setDelFlag(ro.getDelFlag());
+            int count1 = userMapper.insert(userEntity1);
+            if(count1 != 1){
+                publicVo.setRetCode("S001");
+                publicVo.setRetMsg("用户新增失败，请重新添加");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+        } catch (Exception e) {
+            log.error(e.getMessage() + "****" +e.getStackTrace());
+            publicVo.setRetCode("X001");
+            publicVo.setRetMsg("系统异常");
+            log.error(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+            return publicVo;
+        }
+        publicVo.setRetCode("0000");
+        publicVo.setRetMsg("交易成功");
+        log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+        return publicVo;
+    }
+
+    @Override
+    public PublicVo userModify(UserRo ro) {
+        log.info("用户信息修改(包括删除)...");
+        PublicVo publicVo = new PublicVo();
+
+        try {
+            /* 查询该用户是否存在 */
+            QueryWrapper<UserEntity> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("user_identity", ro.getUserIdentity());
+            queryWrapper1.eq("del_flag", 0);
+            UserEntity userEntity1 = userMapper.selectOne(queryWrapper1);
+            if (userEntity1 == null) {
+                publicVo.setRetCode("Y001");
+                publicVo.setRetMsg("该用户不存在，请先新增");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+            if(ro.getIsAbc()==0 && ro.getBankId() == null){
+                publicVo.setRetCode("Y002");
+                publicVo.setRetMsg("行内人员请输入所属银行信息");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+            if(ro.getIsAbc()==1 && ro.getLawFirmId() ==null){
+                publicVo.setRetCode("Y003");
+                publicVo.setRetMsg("行外人员请输入所属事务所信息");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+            UserEntity userEntity2 = new UserEntity();
+            userEntity2.setUserAccount(ro.getUserAccount());
+            userEntity2.setUserPassword(ro.getUserPassword());
+            userEntity2.setUserName(ro.getUserName());
+            userEntity2.setUserIdentity(ro.getUserIdentity());
+            userEntity2.setUserTel(ro.getUserTel());
+            userEntity2.setUserEmail(ro.getUserEmail());
+            userEntity2.setIsAbc(ro.getIsAbc());
+            userEntity2.setLawFirmId(ro.getLawFirmId());
+            userEntity2.setModuleConfigure(ro.getModuleConfigure());
+            userEntity2.setPermitConfigure(ro.getPermitConfigure());
+            userEntity2.setUserDescripe(ro.getUserDescripe());
+            userEntity2.setUpdateTime(new Date());
+            userEntity2.setTxtHold1(ro.getTxtHold1());
+            userEntity2.setTxtHold2(ro.getTxtHold2());
+            userEntity2.setDelFlag(ro.getDelFlag());
+            QueryWrapper<UserEntity> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("user_identity", ro.getUserIdentity());
+            queryWrapper2.eq("del_flag", 0);
+            int count1 = userMapper.update(userEntity2,queryWrapper2);
+            if(count1 != 1){
+                publicVo.setRetCode("S001");
+                publicVo.setRetMsg("用户更新失败，请重新更新");
+                log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+                return publicVo;
+            }
+
+        }
+        catch (Exception e){
+            log.error(e.getMessage() + "****" +e.getStackTrace());
+            publicVo.setRetCode("X001");
+            publicVo.setRetMsg("系统异常");
+            log.error(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+            return publicVo;
+        }
+
+        publicVo.setRetCode("0000");
+        publicVo.setRetMsg("交易成功");
+        log.info(publicVo.getRetCode() + "****" + publicVo.getRetMsg());
+        return publicVo;
+    }
 }

src/main/java/com/abcsz/litigationcase/utils/CodeGenerator.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author shengqianlei
@@ -26,7 +27,7 @@ public class CodeGenerator {
         //是否打开文件夹
         globalConfig.setOpen(false);
         //是否覆盖
-        globalConfig.setFileOverride(true);
+        globalConfig.setFileOverride(false);
         globalConfig.setSwagger2(true);
         globalConfig.setIdType(IdType.ASSIGN_UUID);
         globalConfig.setAuthor("shengqianlei");
@@ -66,7 +67,7 @@ public class CodeGenerator {
         /* 4 策略配置 */
         StrategyConfig strategyConfig = new StrategyConfig();
         // 映射的表名
-        strategyConfig.setInclude("tb_data_dictionary");
+        strategyConfig.setInclude("tb_user");
         // 去除表tb_前缀
         strategyConfig.setTablePrefix("tb_");
         strategyConfig.setNaming(NamingStrategy.underline_to_camel);

src/main/resources/logback-spring.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <contextName>eductrain</contextName>
+    <property name="maxFileSize" value="20MB" />
+    <property name="maxHistory" value="10" />
+    <property name="totalSizeCap" value="2GB" />
+    <property name="logHome" value="./logs"/>
+    <property name="serverName" value="litigationcase" />
+
+    <!--输出到控制台-->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %contextName [%thread %X{requestId}] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--输出到文件-->
+    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${logHome}/%d{yyyy-MM-dd}/${serverName}_info_%d{yyyyMMdd}_%i.log</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+            <maxFileSize>${maxFileSize}</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %contextName [%thread %X{requestId}] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到文件-->
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${logHome}/%d{yyyy-MM-dd}/${serverName}_error_%d{yyyyMMdd}_%i.log</fileNamePattern>
+            <maxHistory>${maxHistory}</maxHistory>
+            <totalSizeCap>${totalSizeCap}</totalSizeCap>
+            <maxFileSize>${maxFileSize}</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %contextName [%thread %X{requestId}] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <logger name="org.springframework" level="INFO"/>
+    <logger name="com.dooffe" level="DEBUG"/>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="ERROR" />
+        <appender-ref ref="INFO"/>
+    </root>
+
+</configuration>

src/test/java/com/abcsz/litigationcase/CodeGenerator.java

@@ -0,0 +1,96 @@
+package com.abcsz.litigationcase;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+import com.baomidou.mybatisplus.generator.config.PackageConfig;
+import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.config.TemplateConfig;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import org.junit.Test;
+
+/**
+ * @author shengqianlei
+ * @Description mybatis-plus代码自动生成器
+ */
+
+public class CodeGenerator {
+    @Test
+    public  void codeGenerator(){
+        /* 代码生成器 */
+        AutoGenerator autoGenerator = new AutoGenerator();
+
+        /* 1 全局配置 */
+        GlobalConfig globalConfig = new GlobalConfig();
+        //项目路径
+        String projectPath = System.getProperty("user.dir");
+        //文件生成地址
+        globalConfig.setOutputDir(projectPath+"/src/main/java");
+        //是否打开文件夹
+        globalConfig.setOpen(false);
+        //是否覆盖
+        globalConfig.setFileOverride(false);
+        globalConfig.setSwagger2(true);
+        globalConfig.setIdType(IdType.ASSIGN_UUID);
+        globalConfig.setAuthor("shengqianlei");
+        globalConfig.setEntityName("%sEntity");
+        globalConfig.setMapperName("%sMapper");
+        globalConfig.setXmlName("%sMapper");
+        globalConfig.setServiceName("%sService");
+        globalConfig.setServiceImplName("%sServiceIml");
+        globalConfig.setControllerName("%sController");
+
+        autoGenerator.setGlobalConfig(globalConfig);
+
+        /* 2 数据源配置 */
+        DataSourceConfig dataSourceConfig = new DataSourceConfig();
+        dataSourceConfig.setDbType(DbType.MYSQL);
+        dataSourceConfig.setUrl("jdbc:mysql://10.39.129.22:3306/litigationcasedb?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
+        dataSourceConfig.setDriverName("com.mysql.cj.jdbc.Driver");
+        dataSourceConfig.setUsername("root");
+        dataSourceConfig.setPassword("Abcsz@95599");
+        autoGenerator.setDataSource(dataSourceConfig);
+
+        /* 3 包配置 */
+        PackageConfig packageConfig = new PackageConfig();
+        // 父包名
+        packageConfig.setParent("com.abcsz.litigationcase");
+        // 模块名
+        packageConfig.setModuleName(null);
+        packageConfig.setEntity("dao.entity");
+        packageConfig.setMapper("dao.mapper");
+        packageConfig.setXml("dao.mapper.xml");
+        packageConfig.setService("service");
+        packageConfig.setServiceImpl("service.impl");
+        packageConfig.setController("controller");
+
+        autoGenerator.setPackageInfo(packageConfig);
+
+        /* 4 策略配置 */
+        StrategyConfig strategyConfig = new StrategyConfig();
+        // 映射的表名
+        strategyConfig.setInclude("tb_user");
+        // 去除表tb_前缀
+        strategyConfig.setTablePrefix("tb_");
+        strategyConfig.setNaming(NamingStrategy.underline_to_camel);
+        strategyConfig.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategyConfig.setEntityLombokModel(true);
+        strategyConfig.setRestControllerStyle(true);
+        strategyConfig.setEntitySerialVersionUID(true);
+
+        autoGenerator.setStrategy(strategyConfig);
+
+        /* 5 模板配置 */
+        TemplateConfig templateConfig = new TemplateConfig();
+        // 不生成mapper的xml文件
+        templateConfig.setXml(null);
+        autoGenerator.setTemplate(templateConfig);
+//        autoGenerator.setTemplateEngine(new FreemarkerTemplateEngine());
+
+        autoGenerator.execute();
+
+
+    }
+}

src/test/java/com/abcsz/litigationcase/LitigationCaseApplicationTests.java

@@ -0,0 +1,13 @@
+package com.abcsz.litigationcase;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class LitigationCaseApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}