Просмотр исходного кода

1、用户修改生日类型为时间戳

machaoyi 1 год назад
Родитель
Сommit
91136dfedd

+ 18 - 9
.idea/workspace.xml

@@ -4,12 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、登录接口新增验证码、记住我字段">
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/entity/UserInfoPO.java" afterDir="false" />
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、用户登录获取信息接口">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/CaptchaUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/utils/CaptchaUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Application.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Application.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserAddVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserAddVO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/entity/SysUserDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/System/SysUserDetail/entity/SysUserDetail.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -91,11 +91,11 @@
       <recent name="C:\Users\setin\IdeaProjects\GeneralFrame\application\src\main\java\com\ctsi" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.ctsi.Auth.entity" />
       <recent name="com.ctsi.System.SysRole.entity.PO" />
       <recent name="com.ctsi.System.SysUserRole.entity.PO" />
       <recent name="com.ctsi.SysUserRole.entity" />
       <recent name="com.ctsi.SysRole.entity" />
-      <recent name="com.ctsi.SysUserDetail.entity" />
     </key>
   </component>
   <component name="RunManager">
@@ -126,7 +126,7 @@
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
       <workItem from="1704932572547" duration="31458000" />
-      <workItem from="1705278479826" duration="13746000" />
+      <workItem from="1705278479826" duration="17483000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -304,7 +304,15 @@
       <option name="project" value="LOCAL" />
       <updated>1705289308166</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="1、用户登录获取信息接口">
+      <option name="closed" value="true" />
+      <created>1705299632072</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1705299632072</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -344,7 +352,8 @@
     <MESSAGE value="1、获取用户菜单排序" />
     <MESSAGE value="1、用户修改密码" />
     <MESSAGE value="1、登录接口新增验证码、记住我字段" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、登录接口新增验证码、记住我字段" />
+    <MESSAGE value="1、用户登录获取信息接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、用户登录获取信息接口" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 2 - 0
application/src/main/java/com/ctsi/Application.java

@@ -8,9 +8,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication(scanBasePackages = {"com.ctsi.*"})
 @MapperScan("com.ctsi.System.*.mapper")
+@EnableTransactionManagement
 public class Application {
     private static final Logger log = LoggerFactory.getLogger(Application.class);
     private static final String SWAGGER_PAGE = "swagger-ui/index.html";

+ 1 - 1
application/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java

@@ -102,7 +102,7 @@ public class SysUserController{
             sysUserDetail.setId(sysUser.getId());
             sysUserDetailService.insert(sysUserDetail);
             //新增用户角色
-            if (!userAddVO.getRoleId().isEmpty()) {
+            if (userAddVO.getRoleId() != null && !userAddVO.getRoleId().isEmpty()) {
                 SysUserRoleAddVO sysUserRoleAddVO = new SysUserRoleAddVO();
                 sysUserRoleAddVO.setUserId(sysUser.getId());
                 sysUserRoleAddVO.setRoleId(userAddVO.getRoleId());

+ 4 - 1
application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserAddVO.java

@@ -1,5 +1,7 @@
 package com.ctsi.System.SysUser.entity.VO;
 
+import com.ctsi.utils.LongtoStringSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,7 +28,8 @@ public class UserAddVO {
     private String email ;
     /** 出生日期 */
     @ApiModelProperty(value = "出生日期",notes = "")
-    private String birthDate ;
+    @JsonSerialize(using = LongtoStringSerialize.class)
+    private Long birthDate ;
     /** 角色id */
     @ApiModelProperty(value = "角色id",notes = "")
     private List<Long> roleId ;

+ 2 - 1
application/src/main/java/com/ctsi/System/SysUser/entity/VO/UserEditVO.java

@@ -31,7 +31,8 @@ public class UserEditVO {
     private String email ;
     /** 出生日期 */
     @ApiModelProperty(value = "出生日期",notes = "")
-    private String birthDate ;
+    @JsonSerialize(using = LongtoStringSerialize.class)
+    private Long birthDate ;
     /** 角色id */
     @ApiModelProperty(value = "角色id",notes = "")
     private List<Long> roleId ;

+ 4 - 3
application/src/main/java/com/ctsi/System/SysUserDetail/entity/SysUserDetail.java

@@ -36,7 +36,8 @@ public class SysUserDetail implements Serializable,Cloneable{
     private String email ;
     /** 出生日期 */
     @ApiModelProperty(value = "出生日期",notes = "")
-    private String birthDate ;
+    @JsonSerialize(using = LongtoStringSerialize.class)
+    private Long birthDate ;
 
     /** 主键id */
     public Long getId(){
@@ -79,11 +80,11 @@ public class SysUserDetail implements Serializable,Cloneable{
         this.email=email;
     }
     /** 出生日期 */
-    public String getBirthDate(){
+    public Long getBirthDate(){
         return this.birthDate;
     }
     /** 出生日期 */
-    public void setBirthDate(String birthDate){
+    public void setBirthDate(Long birthDate){
         this.birthDate=birthDate;
     }
 }