菜单功能完善

src/main/java/com/caimei365/manager/entity/SysMenu.java

@@ -1,5 +1,6 @@
 package com.caimei365.manager.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -40,6 +41,7 @@ public class SysMenu {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date createTime;
     /**
      * 隐藏状态：0显示，1隐藏

src/main/java/com/caimei365/manager/entity/SysRole.java

@@ -1,5 +1,6 @@
 package com.caimei365.manager.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -27,10 +28,12 @@ public class SysRole {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date createTime;
     /**
      * 更新时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date updateTime;
     /**
      * 删除标记：0未删，其他删除

src/main/java/com/caimei365/manager/entity/SysUser.java

@@ -1,5 +1,6 @@
 package com.caimei365.manager.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -40,10 +41,12 @@ public class SysUser {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date createTime;
     /**
      * 更新时间
      */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date updateTime;
     /**
      * 删除标记：0未删，其他删除

src/main/java/com/caimei365/manager/service/impl/SysUserServiceImpl.java

@@ -150,6 +150,9 @@ public class SysUserServiceImpl implements SysUserService {
      */
     @Override
     public ResponseJson<Void> deleteUser(Integer id) {
+        // 删除用户角色关联
+        sysUserDao.deleteUserRoleRelation(id);
+        // 删除用户
         sysUserDao.deleteSysUser(id);
         return ResponseJson.success();
     }
@@ -240,6 +243,9 @@ public class SysUserServiceImpl implements SysUserService {
      */
     @Override
     public ResponseJson<Void> deleteRole(Integer id) {
+        // 删除角色菜单关联
+        sysUserDao.deleteRoleMenuRelation(id);
+        // 删除角色
         sysUserDao.deleteRole(id);
         return ResponseJson.success();
     }

src/main/resources/mapper/SysUserDao.xml

@@ -79,7 +79,7 @@
         DELETE FROM sys_role_menu WHERE role_id = #{roleId}
     </delete>
     <update id="updateRole">
-        UPDATE sys_role SET role_name=#{roleName}, role_desc=#{roleDesc}, update_time=NOW()
+        UPDATE sys_role SET role_name=#{roleName}, role_desc=#{roleDesc}, del_flag=#{delFlag}, update_time=NOW()
         WHERE id = #{id}
     </update>
     <update id="deleteRole">
@@ -119,7 +119,7 @@
         WHERE m.name = #{name}
     </select>
     <update id="updateMenu">
-        UPDATE sys_menu SET title=#{title}, name=#{name}, icon=#{icon}, parent_id=#{parentId}, hidden=#{hidden}, status=#{status}, sort=#{sort}, update_time=NOW()
+        UPDATE sys_menu SET title=#{title}, name=#{name}, icon=#{icon}, parent_id=#{parentId}, hidden=#{hidden}, status=#{status}, sort=#{sort}, del_flag=#{delFlag}, update_time=NOW()
         WHERE id = #{id}
     </update>
     <insert id="insertMenu" keyProperty="id" keyColumn="id" useGeneratedKeys="true">