From c8b01767292b3acaae1cc93618265f8d0e0dbf71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 16:09:24 +0800
Subject: [PATCH] 开发8-26加班人员管理对接权限结束

---
 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java              |    2 
 /dev/null                                                                                     |    5 --
 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java           |    8 +++
 user-server/src/main/resources/mapper/RoleManangeMapper.xml                                   |    6 ++
 user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java          |    2 +
 standard-server/src/main/resources/mapper/ProductMapper.xml                                   |    2 
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java        |   23 +++++------
 user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java             |    2 +
 user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java           |   12 ++++++
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java |    7 +++
 10 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 398bc0d..94b96e4 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -37,8 +37,8 @@
         from lims_laboratory.product
         where state = 1
           and specifications_id = #{specificationsId}
-        ORDER BY product.`create_time` DESC
           and version = #{version}
+        ORDER BY product.`create_time` DESC
     </select>
 
     <select id="deleteList">
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
deleted file mode 100644
index c5ad7c2..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-import com.yuanchu.limslaboratory.service.RoleService;
-import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Api(tags = "鐢ㄦ埛妯″潡")
-@RestController
-@RequestMapping("/role")
-public class RoleController {
-
-    @Autowired
-    private RoleService roleService;
-
-    @ApiOperation("鏂板鐢ㄦ埛-->鑾峰彇鐢ㄦ埛鏉冮檺鍒楄〃")
-    @GetMapping("/list")
-    public Result<?> getUserRoleList(){
-        List<Map<String,Object>> data = roleService.getUserRoleList();
-        return Result.success(data);
-    }
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index a01ef4c..7e21786 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.limslaboratory.clients.UserLoginUtils;
 import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.RoleManagerService;
 import com.yuanchu.limslaboratory.service.UserService;
 import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
 import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -24,6 +25,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -42,6 +44,9 @@
 
     @Autowired
     private UserService userService;
+
+    @Autowired
+    private RoleManagerService roleManagerService;
 
     @ApiOperation("鐢ㄦ埛鐧诲綍")
     @ApiImplicitParams(value = {
@@ -75,6 +80,13 @@
         }
     }
 
+    @ApiOperation("鏂板鐢ㄦ埛鑾峰彇瑙掕壊鏉冮檺淇℃伅")
+    @GetMapping("/list")
+    public Result<?> getUserListRole(){
+        List<Map<String,Object>> data = roleManagerService.getUserListRole();
+        return Result.success(data);
+    }
+
     @ApiOperation("鐧诲綍-->鑾峰彇鐢ㄦ埛淇℃伅")
     @GetMapping("/info")
     public Result<?> getUserInfo(@RequestHeader("X-Token") String token){
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java
index f0c2e12..d0232db 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java
@@ -33,4 +33,6 @@
     int deleteRoleMenuByRoleId(Long id);
 
     RoleAndMenuDto selectAllRoleAndMenuByRoleId(Long roleId);
+
+    List<Map<String, Object>> getUserListRole();
 }
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java
deleted file mode 100644
index 764ad21..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.limslaboratory.mapper;
-
-import com.yuanchu.limslaboratory.pojo.Role;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-public interface RoleMapper extends BaseMapper<Role> {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
deleted file mode 100644
index 1a24ca9..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="Role瀵硅薄", description="")
-public class Role implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "瑙掕壊id")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "瑙掕壊鍚�")
-    private String name;
-
-    @ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺")
-    private Integer power;
-
-    @TableLogic(value = "1", delval = "0")
-    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
-    private Integer state;
-
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
-    private Date createTime;
-
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
-    private Date updateTime;
-
-    @Version
-    @ApiModelProperty(value = "涔愯閿�")
-    private Integer version;
-
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
index eef9229..fed072b 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
@@ -18,7 +18,7 @@
     private String account;
 
     @ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺", example = "1", required = true)
-    private Integer roleId;
+    private Long roleId;
 
     @ApiModelProperty(value = "骞撮緞", example = "23")
     private Integer age;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
index dd75f80..8bafbd6 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
@@ -20,7 +20,10 @@
     private String account;
 
     @ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺", example = "1", required = true)
-    private Long role_id;
+    private Long roleId;
+
+    @ApiModelProperty(value = "鍏宠仈 浼佷笟id")
+    private Integer enterpriseId;
 
     @ApiModelProperty(value = "骞撮緞", example = "23")
     private Integer age;
@@ -31,6 +34,9 @@
     @ApiModelProperty(value = "閭", example = "12345678@qq.com")
     private String email;
 
+    @ApiModelProperty(value = "缁勭粐鏋舵瀯Id", example = "2")
+    private Integer organizationId;
+
     @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0", example = "0")
     private Integer jobState;
 
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java
index c051e02..9367e29 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java
@@ -26,4 +26,6 @@
     boolean updateRoleMenu(UpdateRoleMenuDto dto);
 
     RoleAndMenuDto getRoleAndMenuByRole(Long roleId);
+
+    List<Map<String, Object>> getUserListRole();
 }
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
deleted file mode 100644
index 75c12b5..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-import com.yuanchu.limslaboratory.pojo.Role;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-public interface RoleService extends IService<Role> {
-
-    List<Map<String,Object>> getUserRoleList();
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
index 735ee30..2a4313b 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@
 import com.yuanchu.limslaboratory.pojo.dto.UpdateRoleMenuDto;
 import com.yuanchu.limslaboratory.service.RoleManagerService;
 import com.yuanchu.limslaboratory.utils.JsonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -136,6 +138,11 @@
         return roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);
     }
 
+    @Override
+    public List<Map<String, Object>> getUserListRole() {
+        return roleManageMapper.getUserListRole();
+    }
+
 
     private List<Menu> getEnumChildren(Menu root, List<Menu> all) {
         return all.stream()
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
deleted file mode 100644
index 2d91447..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yuanchu.limslaboratory.pojo.Role;
-import com.yuanchu.limslaboratory.mapper.RoleMapper;
-import com.yuanchu.limslaboratory.service.RoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
-
-    @Resource
-    private RoleMapper roleMapper;
-
-    @Override
-    public List<Map<String, Object>> getUserRoleList() {
-        LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(Role::getId, Role::getName);
-        return roleMapper.selectMaps(wrapper);
-    }
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 72e2822..a95c292 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -126,23 +126,20 @@
 
     @Override
     public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
-        User user = new User()
-                .setName(updatePersonnelVo.getName())
-                .setAccount(updatePersonnelVo.getAccount())
-                .setAge(String.valueOf(updatePersonnelVo.getAge()))
-                .setPhone(updatePersonnelVo.getPhone())
-                .setEmail(updatePersonnelVo.getEmail())
-                .setRoleId(updatePersonnelVo.getRole_id())
-                .setPassword(updatePersonnelVo.getPassword())
-                .setJobState(updatePersonnelVo.getJobState());
-        LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(User::getId, updatePersonnelVo.getId());
-        return userMapper.update(user, updateWrapper);
+        try {
+            MyUtil.PrintLog(updatePersonnelVo.toString());
+            User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(updatePersonnelVo), User.class);
+
+            LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(User::getId, updatePersonnelVo.getId());
+            return userMapper.update(unmarshal, updateWrapper);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override
     public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
-        MyUtil.PrintLog(name + status + "=============");
         return userMapper.getNewPersonnelPage(name, page, status);
     }
 
diff --git a/user-server/src/main/resources/mapper/RoleManangeMapper.xml b/user-server/src/main/resources/mapper/RoleManangeMapper.xml
index f2d1cc1..1944922 100644
--- a/user-server/src/main/resources/mapper/RoleManangeMapper.xml
+++ b/user-server/src/main/resources/mapper/RoleManangeMapper.xml
@@ -91,6 +91,10 @@
         and r.id=#{roleId}
     </select>
 
+    <select id="getUserListRole" resultType="map">
+        SELECT CONCAT(r.`id`, '') id, r.`name`
+        FROM role r
+    </select>
     <resultMap id="roleAndMenuById" type="com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto">
         <result property="roleName" column="roleName"/>
         <result property="createTime" column="createTime"/>
@@ -124,4 +128,4 @@
             <result property="parentId" column="parentId"/>
         </collection>
     </resultMap>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/user-server/src/main/resources/mapper/RoleMapper.xml b/user-server/src/main/resources/mapper/RoleMapper.xml
deleted file mode 100644
index ea9cf2d..0000000
--- a/user-server/src/main/resources/mapper/RoleMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.limslaboratory.mapper.RoleMapper">
-
-</mapper>

--
Gitblit v1.9.3