问题修改

src/main/java/com/tld/controller/MenuController.java

@@ -5,6 +5,7 @@ import com.tld.service.MenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -44,9 +45,8 @@ public class MenuController {
      * @return 返回结果
      */
     @PostMapping("addMenu")
-    public Map<String, Object> addMenu(@RequestBody Menu menu){
-        System.out.println(menu.getPId());
-        return menuService.addMenu(menu);
+    public Map<String, Object> addMenu(@RequestBody Menu menu, HttpServletRequest request){
+        return menuService.addMenu(menu, request);
     }
 
     /**
@@ -55,8 +55,8 @@ public class MenuController {
      * @return 返回结果
      */
     @PutMapping("updateMenu")
-    public Map<String, Object> updateMenu(@RequestBody Menu menu){
-        return menuService.updateMenu(menu);
+    public Map<String, Object> updateMenu(@RequestBody Menu menu, HttpServletRequest request){
+        return menuService.updateMenu(menu, request);
     }
 
     /**

src/main/java/com/tld/controller/RoleController.java

@@ -4,6 +4,8 @@ import com.tld.model.Role;
 import com.tld.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
@@ -33,8 +35,8 @@ public class RoleController {
      * @return 返回结果
      */
     @PostMapping("addRole")
-    public Map<String, Object> addRole(@RequestBody Role role){
-        return roleService.addRole(role);
+    public Map<String, Object> addRole(@RequestBody Role role, HttpServletRequest request){
+        return roleService.addRole(role, request);
     }
 
     /**
@@ -43,8 +45,8 @@ public class RoleController {
      * @return 返回结果
      */
     @PutMapping("updateRole")
-    public Map<String, Object> updateRole(@RequestBody Role role){
-        return roleService.updateRole(role);
+    public Map<String, Object> updateRole(@RequestBody Role role, HttpServletRequest request){
+        return roleService.updateRole(role, request);
     }
 
     /**

src/main/java/com/tld/controller/StorageLocationController.java

@@ -4,6 +4,8 @@ import com.tld.model.StorageLocation;
 import com.tld.service.StorageLocationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
@@ -42,8 +44,8 @@ public class StorageLocationController {
      * @return 返回结果
      */
     @PostMapping("addStorage")
-    public Map<String, Object> addStorage(@RequestBody StorageLocation storageLocation){
-        return storageLocationService.addStorage(storageLocation);
+    public Map<String, Object> addStorage(@RequestBody StorageLocation storageLocation, HttpServletRequest request){
+        return storageLocationService.addStorage(storageLocation, request);
     }
 
     /**
@@ -62,8 +64,8 @@ public class StorageLocationController {
      * @return 返回结果
      */
     @PutMapping("updateStorage")
-    public Map<String, Object> updateStorage(@RequestBody StorageLocation storageLocation){
-        return storageLocationService.updateStorage(storageLocation);
+    public Map<String, Object> updateStorage(@RequestBody StorageLocation storageLocation, HttpServletRequest request){
+        return storageLocationService.updateStorage(storageLocation, request);
     }
 
     /**

src/main/java/com/tld/controller/UserController.java

@@ -53,8 +53,8 @@ public class UserController {
      * @return 返回结果
      */
     @PostMapping("addUser")
-    public Map<String, Object> addUser(@RequestBody User user){
-        return userService.addUser(user);
+    public Map<String, Object> addUser(@RequestBody User user, HttpServletRequest request){
+        return userService.addUser(user, request);
     }
 
     /**
@@ -73,8 +73,8 @@ public class UserController {
      * @return 返回结果
      */
     @PutMapping("updateUser")
-    public Map<String, Object> updateUser(@RequestBody User user){
-        return userService.updateUser(user);
+    public Map<String, Object> updateUser(@RequestBody User user, HttpServletRequest request){
+        return userService.updateUser(user, request);
     }
 
     /**

src/main/java/com/tld/model/Menu.java

@@ -57,5 +57,13 @@ public class Menu implements Serializable {
      * 图表
      */
     private String img;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
 
 }

src/main/java/com/tld/model/Role.java

@@ -44,6 +44,14 @@ public class Role implements Serializable {
      * pda菜单
      */
     private String menuPda;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
     /**
      * 页数
      */

src/main/java/com/tld/model/StorageLocation.java

@@ -64,6 +64,14 @@ public class StorageLocation implements Serializable {
      * 创建时间
      */
     private String createTime;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
     /**
      * 页数
      */

src/main/java/com/tld/model/User.java

@@ -76,6 +76,14 @@ public class User implements Serializable {
      * 菜单
      */
     private String menu;
+    /**
+     * 修改人
+     */
+    private String modifyUser;
+    /**
+     * 修改时间
+     */
+    private String modifyTime;
     /**
      * 页数
      */

src/main/java/com/tld/service/MenuService.java

@@ -2,14 +2,15 @@ package com.tld.service;
 
 import com.tld.model.Menu;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 public interface MenuService {
     Map<String, Object> getMenu(Menu menu);
 
-    Map<String, Object> addMenu(Menu menu);
+    Map<String, Object> addMenu(Menu menu, HttpServletRequest request);
 
-    Map<String, Object> updateMenu(Menu menu);
+    Map<String, Object> updateMenu(Menu menu, HttpServletRequest request);
 
     Map<String, Object> delMenu(String id);
 

src/main/java/com/tld/service/RoleService.java

@@ -2,15 +2,16 @@ package com.tld.service;
 
 import com.tld.model.Role;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 public interface RoleService {
-    Map<String, Object> addRole(Role role);
+    Map<String, Object> addRole(Role role, HttpServletRequest request);
 
     Map<String, Object> getRole(Role role);
 
-    Map<String, Object> updateRole(Role role);
+    Map<String, Object> updateRole(Role role, HttpServletRequest request);
 
     Map<String, Object> delRole(String id);
 

src/main/java/com/tld/service/StorageLocationService.java

@@ -2,17 +2,18 @@ package com.tld.service;
 
 import com.tld.model.StorageLocation;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 public interface StorageLocationService {
     Map<String, Object> getStorage(StorageLocation storageLocation);
 
-    Map<String, Object> addStorage(StorageLocation storageLocation);
+    Map<String, Object> addStorage(StorageLocation storageLocation, HttpServletRequest request);
 
     Map<String, Object> delStorage(String id);
 
-    Map<String, Object> updateStorage(StorageLocation storageLocation);
+    Map<String, Object> updateStorage(StorageLocation storageLocation, HttpServletRequest request);
 
     void export(StorageLocation storageLocation, HttpServletResponse response);
 

src/main/java/com/tld/service/UserService.java

@@ -11,11 +11,11 @@ public interface UserService {
 
     Map<String, Object> getAllUser(User user);
 
-    Map<String, Object> addUser(User user);
+    Map<String, Object> addUser(User user, HttpServletRequest request);
 
     Map<String, Object> delUser(String id);
 
-    Map<String, Object> updateUser(User user);
+    Map<String, Object> updateUser(User user, HttpServletRequest request);
 
     void userExport(User user, HttpServletResponse response);
 

src/main/java/com/tld/service/impl/MenuServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 @Service
@@ -43,9 +44,10 @@ public class MenuServiceImpl implements MenuService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addMenu(Menu menu) {
+    public Map<String, Object> addMenu(Menu menu, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            menu.setModifyUser(request.getHeader("userId"));
             menuMapper.addMenu(menu);
             map.put("msg", "200");
         }catch (Exception e){
@@ -58,9 +60,10 @@ public class MenuServiceImpl implements MenuService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateMenu(Menu menu) {
+    public Map<String, Object> updateMenu(Menu menu, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            menu.setModifyUser(request.getHeader("userId"));
             menuMapper.updateMenu(menu);
             map.put("msg", "200");
         }catch (Exception e){

src/main/java/com/tld/service/impl/RoleServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -23,11 +24,12 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addRole(Role role) {
+    public Map<String, Object> addRole(Role role, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
             roleMapper.addRole(role);
             role.setRoleCode(codeGenerate(role.getId() + ""));
+            role.setModifyUser(request.getHeader("userId"));
             roleMapper.updateRole(role);
             map.put("msg", "200");
         }catch (Exception e){
@@ -56,9 +58,10 @@ public class RoleServiceImpl implements RoleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateRole(Role role) {
+    public Map<String, Object> updateRole(Role role, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            role.setModifyUser(request.getHeader("userId"));
             roleMapper.updateRole(role);
             map.put("msg", "200");
         }catch (Exception e){

src/main/java/com/tld/service/impl/StorageLocationServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -38,7 +39,7 @@ public class StorageLocationServiceImpl implements StorageLocationService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addStorage(StorageLocation storageLocation) {
+    public Map<String, Object> addStorage(StorageLocation storageLocation, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
             int count = storageLocationMapper.getStorageCount(storageLocation);
@@ -47,6 +48,7 @@ public class StorageLocationServiceImpl implements StorageLocationService {
                 map.put("errMsg", "编号存在！");
                 return map;
             }
+            storageLocation.setModifyUser(request.getHeader("userId"));
             storageLocationMapper.addStorage(storageLocation);
             map.put("msg", "200");
         }catch (Exception e){
@@ -74,9 +76,10 @@ public class StorageLocationServiceImpl implements StorageLocationService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateStorage(StorageLocation storageLocation) {
+    public Map<String, Object> updateStorage(StorageLocation storageLocation, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            storageLocation.setModifyUser(request.getHeader("userId"));
             storageLocationMapper.updateStorage(storageLocation);
             map.put("msg", "200");
         }catch (Exception e){

src/main/java/com/tld/service/impl/UserServiceImpl.java

@@ -93,7 +93,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addUser(User user) {
+    public Map<String, Object> addUser(User user, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
             int count = userMapper.getUserIsNot(user);
@@ -104,6 +104,7 @@ public class UserServiceImpl implements UserService {
             }
             user.setPassword(DesEncry.encrypt(user.getPassword()));
             //新增用户
+            user.setModifyUser(request.getHeader("useId"));//修改人
             userMapper.addUser(user);
             user.setCode(codeGenerate(user.getId() + ""));
             //修改用户编号
@@ -134,7 +135,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> updateUser(User user) {
+    public Map<String, Object> updateUser(User user, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
             int count = userMapper.getUserIsNot(user);
@@ -144,6 +145,7 @@ public class UserServiceImpl implements UserService {
                 return map;
             }
             user.setPassword(DesEncry.encrypt(user.getPassword()));
+            user.setModifyUser(request.getHeader("useId"));
             userMapper.updateUser(user);
             map.put("msg", "200");
         } catch (Exception e){

src/main/resources/mapper/MenuMapper.xml

@@ -22,8 +22,17 @@
     <!-- 查询列表 -->
     <select id="getPage" resultType="com.tld.model.Menu">
         select
-        <include refid="field"/>
-        from tld_menu
+            a.id,
+            a.name,
+            a.url,
+            a.p_id,
+            a.order_by,
+            a.type,
+            a.img,
+            a.modify_time as modifyTime,
+            b.user_name as modifyUser
+        from tld_menu a
+        left join tld_user b on a.modify_user = b.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="pId != null and pId != ''">
                 and p_id = #{pId}
@@ -42,7 +51,7 @@
     </select>
     <!-- 新增菜单 -->
     <insert id="addMenu">
-        insert into tld_menu(name,url,p_id,order_by,type,img) values(#{name},#{url},#{pId},#{orderBy},#{type},#{img})
+        insert into tld_menu(name,url,p_id,order_by,type,img,modify_user,modify_time) values(#{name},#{url},#{pId},#{orderBy},#{type},#{img},#{modifyUser},NOW())
     </insert>
     <!-- 修改菜单 -->
     <update id="updateMenu">
@@ -67,6 +76,7 @@
                 <if test="img != null and img != ''">
                     img = #{img},
                 </if>
+                modify_user = #{modifyUser},modify_time=now(),
             </trim>
         </set>
             where id = #{id}

src/main/resources/mapper/RoleMapper.xml

@@ -11,7 +11,8 @@
         <selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
             select LAST_INSERT_ID()
         </selectKey>
-        insert into tld_role(role_name,create_time,remarks) values(#{roleName},DATE_FORMAT(NOW(), '%Y-%m-%d'),#{remarks})
+        insert into tld_role(role_name,create_time,remarks,modify_user,modify_time)
+        values(#{roleName},NOW(),#{remarks},#{modifyUser},NOW())
     </insert>
     <!-- 修改角色信息 -->
     <update id="updateRole">
@@ -36,6 +37,7 @@
                 <if test="menuPda != null">
                     menu_pda = #{menuPda},
                 </if>
+                modify_user = #{modifyUser},modify_time=now(),
             </trim>
         </set>
             where id = #{id}
@@ -43,8 +45,18 @@
     <!-- 查询角色信息 -->
     <select id="getRole" resultType="com.tld.model.Role">
         select
-        <include refid="roleField"/>
-        from tld_role
+            a.id,
+            a.role_code,
+            a.role_name,
+            a.create_time,
+            a.remarks,
+            a.menu,
+            a.menu_before,
+            a.menu_pda,
+            a.modify_time as modifyTime,
+            b.user_name as modifyUser
+        from tld_role a
+        left join tld_user b on a.modify_user = b.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="roleCode != null and roleCode != ''">
                 and role_code like CONCAT(CONCAT('%', #{roleCode}), '%')

src/main/resources/mapper/StorageLocationMapper.xml

@@ -20,11 +20,13 @@
             a.is_product,
             b.name as materialName,
             c.name as wareHouseName,
-            c.tld_id as tldId
-        from
-        tld_storage_location a
+            c.tld_id as tldId,
+            a.modify_time as modifyTime,
+            f.user_name as modifyUser
+        from tld_storage_location a
         left join tld_material_type b on a.storage_location_type = b.tld_id
         left join tld_warehouse c on a.warehouse_where = c.tld_id
+        left join tld_user f on a.modify_user = f.id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="storageLocationCode != null and storageLocationCode != ''">
                 and a.storage_location_code like CONCAT(CONCAT('%', #{storageLocationCode}), '%')
@@ -49,8 +51,8 @@
     </select>
     <!-- 新增库位信息 -->
     <insert id="addStorage">
-        insert into tld_storage_location(storage_location_code,storage_location_name,warehouse_where,storage_location_type,is_not_disable,storage_location_capacity,create_time,is_product)
-        values(#{storageLocationCode},#{storageLocationName},#{warehouseWhere},#{storageLocationType},#{isNotDisable},#{storageLocationCapacity},DATE_FORMAT(NOW(), '%Y-%m-%d'),#{isProduct})
+        insert into tld_storage_location(storage_location_code,storage_location_name,warehouse_where,storage_location_type,is_not_disable,storage_location_capacity,create_time,is_product,modify_user,modify_time)
+        values(#{storageLocationCode},#{storageLocationName},#{warehouseWhere},#{storageLocationType},#{isNotDisable},#{storageLocationCapacity},DATE_FORMAT(NOW(), '%Y-%m-%d'),#{isProduct},#{modifyUser},NOW())
     </insert>
     <!-- 删除库位信息 -->
     <delete id="delStorage">
@@ -82,6 +84,7 @@
                 <if test="isProduct != null and isProduct != ''">
                     is_product = #{isProduct},
                 </if>
+                modify_user = #{modifyUser},modify_time=now(),
             </trim>
         </set>
             where id = #{id}

src/main/resources/mapper/UserMapper.xml

@@ -39,8 +39,11 @@
             c.name as department,
             b.role_name as role,
             a.role as roleId,
-            a.department as departmentId
+            a.department as departmentId,
+            a.modify_time as modifyTime,
+            f.user_name as modifyUser
         from tld_user a
+        left join tld_user f on a.modify_user = f.id
         left join tld_role b on a.role = b.id
         left join tld_department c on a.department = c.tld_id
         <trim prefix="WHERE" prefixOverrides="and |or">
@@ -61,8 +64,8 @@
         <selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
             select LAST_INSERT_ID()
         </selectKey>
-        insert into tld_user(user_name,password,real_name,email,landline,phone,department,role,create_time)
-        values(#{userName},#{password},#{realName},#{email},#{landline},#{phone},#{department},#{role}, DATE_FORMAT(NOW(), '%Y-%m-%d'))
+        insert into tld_user(user_name,password,real_name,email,landline,phone,department,role,create_time,modify_user,modify_time)
+        values(#{userName},#{password},#{realName},#{email},#{landline},#{phone},#{department},#{role},NOW(),#{modifyUser},now())
     </insert>
     <!-- 修改指定用户信息 -->
     <update id="updateUser">
@@ -96,6 +99,7 @@
                 <if test="role != null and role != ''">
                     role = #{role},
                 </if>
+                modify_user = #{modifyUser},modify_time=now(),
             </trim>
         </set>
             where id = #{id}