天津院项目 配置管理 系统管理 微信接口 完成

cement-business/pom.xml

@@ -115,7 +115,6 @@
             <version>3.17</version>
         </dependency>
 
-
     </dependencies>
 
     <build>
@@ -128,29 +127,41 @@
                     <includeSystemScope>true</includeSystemScope>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>cer</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>py</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>keystore</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
 
-
-        <!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
-      <!--  <resources>
+        <resources>
             <resource>
-                <directory>src/main/java</directory>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
                 <includes>
-                    <include>**/*.xml</include>
+                    <include>*.xlsx</include>
+                    <include>*</include>
                 </includes>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
+                <directory>src/main/java/cn/wise/sc/cement/business/mapper/xml</directory>
+                <filtering>true</filtering>
                 <includes>
-                    <include>**/*.yml</include>
-                    <include>**/*.xml</include>
+                    <include>*.xml</include>
                 </includes>
-                <filtering>false</filtering>
+                <targetPath>cn/wise/sc/cement/business/mapper</targetPath>
             </resource>
-        </resources>-->
-
-
-
+        </resources>
 
     </build>
 

cement-business/src/main/java/cn/wise/sc/cement/business/controller/ClientController.java

@@ -36,7 +36,7 @@ import java.util.Map;
  * @author ztw
  * @since 2020-08-07
  */
-@Api(tags = "委托单位配置")
+@Api(tags = "配置管理-委托单位配置")
 @RestController
 @RequestMapping("/tcdri/client")
 public class ClientController {
@@ -50,7 +50,7 @@ public class ClientController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "status", value = "状态0:禁用 1:启用", paramType = "query", dataType = "Integer"),
 			@ApiImplicitParam(name = "region", value = "所在地区", paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "principal", value = "负责人名字", paramType = "query", dataType = "String")
+			@ApiImplicitParam(name = "principal", value = "姓名", paramType = "query", dataType = "String")
 	})
 	@GetMapping("/getPage")
 	public BaseResponse getPage(PageQuery pageQuery, Integer status, String region, String principal) {
@@ -74,7 +74,7 @@ public class ClientController {
 	}
 
 	@ApiOperation(value = "委托单位详情")
-	@GetMapping("{id}")
+	@GetMapping("/{id}")
 	public BaseResponse getById(@PathVariable Integer id){
 		try {
 			Client e = clientService.getById(id);

cement-business/src/main/java/cn/wise/sc/cement/business/controller/MethodController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -28,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author ztw
  * @since 2020-08-18
  */
-@Api(tags = "检测方法配置")
+@Api(tags = "配置管理-检测方法配置")
 @RestController
 @RequestMapping("/business/method")
 public class MethodController {
@@ -64,7 +65,7 @@ public class MethodController {
 
 
 	@ApiOperation(value = "检测方法详情")
-	@GetMapping("{id}")
+	@GetMapping("/{id}")
 	public BaseResponse getById(@PathVariable Integer id){
 		try {
 			Method e = methodService.getById(id);
@@ -91,6 +92,7 @@ public class MethodController {
 
 	@ApiOperation(value = "新增检测方法")
 	@PostMapping("/create")
+	@Transactional
 	public BaseResponse create(@RequestBody MethodQuery query){
 		try {
 			return methodService.create(query);
@@ -102,6 +104,7 @@ public class MethodController {
 
 	@ApiOperation(value = "更新检测方法")
 	@PostMapping("/update")
+	@Transactional
 	public BaseResponse update(@RequestBody MethodQuery query){
 		try {
 			return methodService.update(query);

cement-business/src/main/java/cn/wise/sc/cement/business/controller/ProjectController.java

@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author ztw
  * @since 2020-08-07
  */
-@Api(tags = "项目配置")
+@Api(tags = "配置管理-项目配置")
 @RestController
 @RequestMapping("/tcdri/project")
 public class ProjectController {
@@ -41,13 +41,15 @@ public class ProjectController {
 
 	@ApiOperation(value = "项目分页列表")
 	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "status", value = "状态0:禁用 1:启用", paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "clientId", value = "客户id", paramType = "query", dataType = "Integer")
+			@ApiImplicitParam(name = "code", value = "项目编号", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "clientId", value = "客户id", paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "name", value = "项目名称", paramType = "query", dataType = "String"),
+
 	})
 	@GetMapping("/getPage")
-	public BaseResponse getPage(PageQuery pageQuery, Integer status, Integer clientId) {
+	public BaseResponse getPage(PageQuery pageQuery, String code, Integer clientId, String name) {
 		try {
-			return projectService.getPage(pageQuery, status, clientId);
+			return projectService.getPage(pageQuery, code, clientId, name);
 		} catch (Exception e) {
 			log.debug("项目分页列表{}", e);
 		}
@@ -65,7 +67,7 @@ public class ProjectController {
 	}
 
 	@ApiOperation(value = "项目详情")
-	@GetMapping("{id}")
+	@GetMapping("/{id}")
 	public BaseResponse getById(@PathVariable Integer id){
 		try {
 			Project e = projectService.getById(id);

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysApprovalController.java

+package cn.wise.sc.cement.business.controller;
+
+
+import cn.wise.sc.cement.business.entity.SysApproval;
+import cn.wise.sc.cement.business.entity.SysGroup;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.service.ISysApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-21
+ */
+@Api(tags="系统管理-审批管理")
+@RestController
+@RequestMapping("/business/sys-approval")
+public class SysApprovalController {
+
+	private static final Logger log = LoggerFactory.getLogger("SysApprovalController");
+
+	@Autowired
+	private ISysApprovalService approvalService;
+
+
+	@ApiOperation(value = "审批分页列表")
+	@GetMapping("/getPage")
+	public BaseResponse getPage(PageQuery pageQuery) {
+		try {
+			return approvalService.getPage(pageQuery);
+		} catch (Exception e) {
+			log.debug("审批分页列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "新增审批")
+	@PostMapping("/create")
+	public BaseResponse create(@RequestBody SysApproval query) {
+		try {
+			return approvalService.create(query);
+		}catch (Exception e) {
+			log.debug("新增审批{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "修改审批")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody SysApproval query) {
+		try {
+			return approvalService.update(query);
+		}catch (Exception e) {
+			log.debug("修改审批{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "审批详情")
+	@GetMapping("/{id}")
+	public BaseResponse getById(@PathVariable Integer id){
+		try {
+			SysApproval approval = approvalService.getById(id);
+			if(approval == null){
+				return BaseResponse.errorMsg("信息错误!");
+			}
+			return BaseResponse.okData(approval);
+		}catch (Exception e){
+			log.debug("审批详情{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+
+
+}
+

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysGroupController.java

 package cn.wise.sc.cement.business.controller;
 
 
-import cn.hutool.core.util.StrUtil;
-import cn.wise.sc.cement.business.entity.Method;
 import cn.wise.sc.cement.business.entity.SysGroup;
-import cn.wise.sc.cement.business.entity.Team;
+import cn.wise.sc.cement.business.entity.SysRole;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
-import cn.wise.sc.cement.business.model.query.TeamQuery;
+import cn.wise.sc.cement.business.model.query.RoleQuery;
 import cn.wise.sc.cement.business.service.ISysGroupService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -27,12 +22,13 @@ import org.springframework.web.bind.annotation.*;
  * </p>
  *
  * @author ztw
- * @since 2020-08-18
+ * @since 2020-08-21
  */
-@Api(tags = "组别管理")
+@Api(tags="系统管理-组别管理")
 @RestController
 @RequestMapping("/business/sys-group")
 public class SysGroupController {
+
 	private static final Logger log = LoggerFactory.getLogger("SysGroupController");
 
 	@Autowired
@@ -49,51 +45,39 @@ public class SysGroupController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
-
-	@ApiOperation(value = "组别详情")
-	@GetMapping("{id}")
-	public BaseResponse getById(@PathVariable Integer id){
-		try {
-			SysGroup e = groupService.getById(id);
-			if(e == null){
-				return BaseResponse.errorMsg("信息错误!");
-			}
-			return BaseResponse.okData(e);
-		}catch (Exception e){
-			log.debug("组别详情{}",e);
-		}
-		return BaseResponse.errorMsg("失败!");
-	}
-
-	@ApiOperation(value = "获取组别信息")
-	@GetMapping("/getList")
-	public BaseResponse getList() {
+	@ApiOperation(value = "新增组别")
+	@PostMapping("/create")
+	public BaseResponse create(@RequestBody SysGroup query) {
 		try {
-			return groupService.getList();
-		} catch (Exception e) {
-			log.debug("获取组别信息{}", e);
+			return groupService.create(query);
+		}catch (Exception e) {
+			log.debug("新增组别{}",e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "新增")
-	@PostMapping("/create")
-	public BaseResponse create(@RequestBody SysGroup query){
+	@ApiOperation(value = "修改组别")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody SysGroup query) {
 		try {
-			return groupService.create(query);
-		}catch (Exception e){
-			log.debug("新增{}",e);
+			return groupService.update(query);
+		}catch (Exception e) {
+			log.debug("修改组别{}",e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
 
-	@ApiOperation(value = "更新")
-	@PostMapping("/update")
-	public BaseResponse update(@RequestBody SysGroup query){
+	@ApiOperation(value = "组别详情")
+	@GetMapping("/{id}")
+	public BaseResponse getById(@PathVariable Integer id){
 		try {
-			return groupService.update(query);
+			SysGroup group = groupService.getById(id);
+			if(group == null){
+				return BaseResponse.errorMsg("信息错误!");
+			}
+			return BaseResponse.okData(group);
 		}catch (Exception e){
-			log.debug("更新{}",e);
+			log.debug("角色详情{}",e);
 		}
 		return BaseResponse.errorMsg("失败!");
 	}
@@ -102,21 +86,6 @@ public class SysGroupController {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysPermissionController.java

+package cn.wise.sc.cement.business.controller;
+
+
+import cn.wise.sc.cement.business.entity.SysPermission;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.service.ISysPermissionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+@Api(tags="系统管理-权限管理")
+@RestController
+@RequestMapping("/business/sys-permission")
+public class SysPermissionController {
+
+	private static final Logger log = LoggerFactory.getLogger("SysPermissionController");
+
+	@Autowired
+	private ISysPermissionService permissionService;
+
+	@ApiOperation(value = "当前登录用户拥有的权限")
+	@GetMapping("/current")
+	public BaseResponse permissionsCurrent() {
+		try {
+			return permissionService.current();
+		}catch (Exception e) {
+			log.debug("当前登录用户拥有的权限{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+
+	}
+
+	@ApiOperation(value = "菜单列表")
+	@GetMapping("/permissionsList")
+	public BaseResponse permissionsList() {
+		try {
+			return permissionService.permissionsList();
+		}catch (Exception e) {
+			log.debug("菜单列表{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "一级菜单")
+	@GetMapping("/parents")
+	public BaseResponse parentMenu() {
+		try {
+			return permissionService.parents();
+		}catch (Exception e) {
+			log.debug("一级菜单{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "菜单树")
+	@GetMapping("/tree")
+	public BaseResponse tree() {
+		try {
+			return permissionService.tree();
+		}catch (Exception e) {
+			log.debug("菜单树{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "根据角色id获取权限")
+	@GetMapping("/listByRoleId")
+	public BaseResponse listByRoleId(Integer roleId) {
+		try {
+			return permissionService.listByRoleId(roleId);
+		}catch (Exception e) {
+			log.debug("根据角色id获取权限{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@ApiOperation(value = "保存菜单")
+	@PostMapping("/create")
+	public BaseResponse create(@RequestBody SysPermission permission) {
+		try {
+
+			return permissionService.create(permission);
+		}catch (Exception e) {
+			log.debug("保存菜单{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "修改菜单")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody SysPermission permission) {
+		try {
+			return permissionService.update(permission);
+		}catch (Exception e) {
+			log.debug("修改菜单{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@GetMapping("/{id}")
+	@ApiOperation(value = "菜单详情")
+	public BaseResponse get(@PathVariable Integer id) {
+		try {
+			SysPermission permission = permissionService.getById(id);
+			return BaseResponse.okData(permission);
+		}catch (Exception e) {
+			log.debug("根据菜单id获取菜单{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@PostMapping("/delete/{id}")
+	@ApiOperation(value = "删除菜单")
+	@Transactional
+	public BaseResponse delete(@PathVariable Integer id) {
+		try {
+			permissionService.removeById(id);
+			return BaseResponse.okMsg("成功");
+		}catch (Exception e) {
+			log.debug("删除菜单{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+}
+

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysRoleController.java

+package cn.wise.sc.cement.business.controller;
+
+
+import cn.wise.sc.cement.business.entity.Project;
+import cn.wise.sc.cement.business.entity.SysPermission;
+import cn.wise.sc.cement.business.entity.SysRole;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.query.RoleQuery;
+import cn.wise.sc.cement.business.model.query.UserQuery;
+import cn.wise.sc.cement.business.service.ISysRoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+@Api(tags = "系统管理-角色管理")
+@RestController
+@RequestMapping("/business/sys-role")
+public class SysRoleController {
+
+	private static final Logger log = LoggerFactory.getLogger("SysRoleController");
+
+	@Autowired
+	private ISysRoleService roleService;
+
+	@ApiOperation(value = "角色分页列表")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "name", value = "角色名称", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getPage")
+	public BaseResponse getPage(PageQuery pageQuery, String name) {
+		try {
+			return roleService.getPage(pageQuery, name);
+		} catch (Exception e) {
+			log.debug("角色分页列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "新增角色")
+	@PostMapping("/create")
+	public BaseResponse create(@RequestBody RoleQuery query) {
+		try {
+			return roleService.create(query);
+		}catch (Exception e) {
+			log.debug("新增角色{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "修改角色")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody RoleQuery query) {
+		try {
+			return roleService.update(query);
+		}catch (Exception e) {
+			log.debug("修改角色{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "角色详情")
+	@GetMapping("/{id}")
+	public BaseResponse getById(@PathVariable Integer id){
+		try {
+			SysRole role = roleService.getById(id);
+			if(role == null){
+				return BaseResponse.errorMsg("信息错误!");
+			}
+			return BaseResponse.okData(role);
+		}catch (Exception e){
+			log.debug("角色详情{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "所有角色")
+	@GetMapping("/getAll")
+	public BaseResponse getAll(){
+		try {
+			List<SysRole> list = roleService.list();
+			return BaseResponse.okData(list);
+		}catch (Exception e){
+			log.debug("所有角色{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "根据用户id获取拥有的角色")
+	@GetMapping("/byUserId")
+	public BaseResponse byUserId(Integer userId){
+		try {
+			return roleService.byUserId(userId);
+		}catch (Exception e){
+			log.debug("根据用户id获取拥有的角色{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@ApiOperation(value = "删除角色")
+	@PostMapping("/delete/{id}")
+	public BaseResponse delete(@PathVariable Integer id){
+		try {
+			return roleService.delete(id);
+		}catch (Exception e){
+			log.debug("删除角色{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysUserController.java

 package cn.wise.sc.cement.business.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.wise.sc.cement.business.entity.Client;
+import cn.wise.sc.cement.business.entity.SysUser;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.query.UserQuery;
+import cn.wise.sc.cement.business.model.vo.ProjectVo;
+import cn.wise.sc.cement.business.service.ISysUserService;
+import cn.wise.sc.cement.business.wrapper.WrapMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -11,9 +32,93 @@ import org.springframework.web.bind.annotation.RestController;
  * @author ztw
  * @since 2020-08-14
  */
+@Api(tags = "系统管理-人员管理")
 @RestController
 @RequestMapping("/tcdri/sys-user")
 public class SysUserController {
 
+	private static final Logger log = LoggerFactory.getLogger("SysUserController");
+
+	@Autowired
+	private ISysUserService userService;
+
+	@ApiOperation(value = "人员分页列表")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "status", value = "状态0:禁用 1:启用", paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "groupId", value = "组别id", paramType = "query", dataType = "Integer"),
+			@ApiImplicitParam(name = "name", value = "姓名", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getPage")
+	public BaseResponse getPage(PageQuery pageQuery, Integer status, Integer groupId, String name) {
+		try {
+			return userService.getPage(pageQuery, status, groupId, name);
+		} catch (Exception e) {
+			log.debug("人员分页列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "新增人员")
+	@PostMapping("/create")
+	public BaseResponse create(@RequestBody UserQuery query) {
+		try {
+			return userService.create(query);
+		}catch (Exception e) {
+			log.debug("新增人员{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "更新人员")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody UserQuery query) {
+		try {
+			return userService.update(query);
+		}catch (Exception e) {
+			log.debug("更新人员{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+	@ApiOperation(value = "启用禁用")
+	@PostMapping("/status")
+	public BaseResponse status(Integer status, Integer id) {
+		try {
+			return userService.status(status, id);
+		}catch (Exception e) {
+			log.debug("启用禁用{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "人员详情")
+	@GetMapping("/{id}")
+	public BaseResponse getById(@PathVariable Integer id){
+		try {
+			return userService.findById(id);
+		}catch (Exception e){
+			log.debug("人员详情{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
+
+	//待完成接口：  导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamController.java

@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author ztw
  * @since 2020-08-18
  */
-@Api(tags = "检测项配置")
+@Api(tags = "配置管理-检测项配置")
 @RestController
 @RequestMapping("/business/team")
 public class TeamController {
@@ -68,7 +68,7 @@ public class TeamController {
 
 
 	@ApiOperation(value = "检测项详情")
-	@GetMapping("{id}")
+	@GetMapping("/{id}")
 	public BaseResponse getById(@PathVariable Integer id){
 		try {
 			Team e = teamService.getById(id);

cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java

 package cn.wise.sc.cement.business.controller;
 
+import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.service.impl.WeiXinService;
 import cn.wise.sc.cement.business.wrapper.WrapMapper;
 import cn.wise.sc.cement.business.wrapper.Wrapper;
@@ -26,26 +27,24 @@ public class WeiXinController {
 
 	@ApiOperation(value = "获取登录token")
 	@GetMapping("/getToken")
-	public Wrapper getToken(String code){
+	public BaseResponse getToken(String code){
 		try {
-			Wrapper wrapper = weiXinService.getToken(code);
-			return wrapper;
+			return weiXinService.getToken(code);
 		}catch (Exception e){
 			log.debug("获取登录token{}",e);
 		}
-		return WrapMapper.error("失败");
+		return BaseResponse.errorMsg("失败!");
 	}
 
 	@ApiOperation(value = "当前登录用户")
 	@GetMapping("/getLoginUser")
-	public Wrapper getLoginUser(HttpServletRequest request){
+	public BaseResponse getLoginUser(){
 		try {
-			Wrapper wrapper = weiXinService.getLoginUser(request);
-			return wrapper;
+			return weiXinService.getLoginUser();
 		}catch (Exception e){
-			log.debug("获取登录token{}",e);
+			log.debug("当前登录用户{}",e);
 		}
-		return WrapMapper.error("失败");
+		return BaseResponse.errorMsg("失败!");
 	}
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Client.java

@@ -27,23 +27,6 @@ public class Client extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public static Client crate(final ClientQuery clientQuery) {
-        Client newClient = new Client();
-        BeanUtils.copyProperties(clientQuery, newClient);
-        newClient.setStatus(true);
-        return newClient;
-    }
-
-
-    @Override
-    public ClientVo toVo() {
-        ClientVo clientVo = new ClientVo();
-        BeanUtils.copyProperties(this, clientVo, "status");
-        clientVo.setStatus(this.getStatus() ? "启用" : "禁用");
-        return clientVo;
-    }
-
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -72,4 +55,9 @@ public class Client extends BaseEntity implements Serializable {
      */
     private Boolean status;
 
+
+
+
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Project.java

@@ -11,6 +11,7 @@ import lombok.experimental.Accessors;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -27,23 +28,6 @@ public class Project extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public static Project crate(ProjectQuery query) {
-        Project newObj = new Project();
-        BeanUtils.copyProperties(query, newObj);
-        newObj.setStatus(true);
-        return newObj;
-    }
-
-
-    @Override
-    public ProjectVo toVo() {
-        ProjectVo projectVo = new ProjectVo();
-        BeanUtils.copyProperties(this, projectVo, "status", "client_id");
-        projectVo.setStatus(this.getStatus() ? "启用" : "禁用");
-        return projectVo;
-    }
-
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -67,4 +51,13 @@ public class Project extends BaseEntity implements Serializable {
      */
     private Boolean status;
 
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysApproval.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysApproval implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 审批流程
+     */
+    private String name;
+
+    /**
+     * 审批人id
+     */
+    private Integer userId;
+
+    /**
+     * 状态 0:禁用 1:激活
+     */
+    private Boolean status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysGroup.java

@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +14,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author ztw
- * @since 2020-08-18
+ * @since 2020-08-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,5 +36,15 @@ public class SysGroup implements Serializable {
      */
     private Boolean status;
 
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysPermission.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysPermission implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 上级ID(如果是一级为0)
+     */
+    private Integer parentId;
+
+    /**
+     * 名字
+     */
+    private String name;
+
+    /**
+     * 菜单图标
+     */
+    private String css;
+
+    /**
+     * 链接
+     */
+    private String href;
+
+    /**
+     * 1菜单权限,2按钮权限
+     */
+    private Integer type;
+
+    /**
+     * 接口权限
+     */
+    private String permission;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+	/**
+	 * 子元素
+	 */
+	@TableField(exist = false)
+	private List<SysPermission> child;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysRole.java

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysRole implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 角色名称
+     */
+    private String name;
+
+    /**
+     * （0禁用，1启用）
+     */
+    private Boolean status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysUser.java

@@ -41,17 +41,17 @@ public class SysUser implements Serializable {
     /**
      * 性别0女1男
      */
-    private Boolean sex;
+    private Integer sex;
 
     /**
      * 部门id
      */
-    private Integer departmentId;
+    private Integer groupId;
 
     /**
      * 职务id
      */
-    private Integer positionId;
+    private Integer postId;
 
     /**
      * 微信号
@@ -106,7 +106,7 @@ public class SysUser implements Serializable {
     /**
      * （0删除，1正常）
      */
-    private Integer isDelete;
+    private Boolean isDelete;
 
     /**
      * 创建时间
@@ -123,5 +123,8 @@ public class SysUser implements Serializable {
      */
     private String remark;
 
-
+	public interface Status {
+		Boolean VALID = true;
+		Boolean LOCKED = false;
+	}
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/ClientMapper.java

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.Client;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.ClientVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +21,10 @@ import java.util.Map;
  */
 public interface ClientMapper extends BaseMapper<Client> {
 
+
+	IPage<ClientVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
+
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/ProjectMapper.java

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.Project;
+import cn.wise.sc.cement.business.model.vo.ProjectVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +20,8 @@ import java.util.Map;
  */
 public interface ProjectMapper extends BaseMapper<Project> {
 
+	IPage<ProjectVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysApprovalMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SysApproval;
+import cn.wise.sc.cement.business.model.vo.ApprovalVo;
+import cn.wise.sc.cement.business.model.vo.GroupVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-21
+ */
+public interface SysApprovalMapper extends BaseMapper<SysApproval> {
+
+	IPage<ApprovalVo> getPage(@Param("page") Page page);
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysGroupMapper.java

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.SysGroup;
+import cn.wise.sc.cement.business.model.vo.GroupVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -9,8 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author ztw
- * @since 2020-08-18
+ * @since 2020-08-21
  */
 public interface SysGroupMapper extends BaseMapper<SysGroup> {
 
+	IPage<GroupVo> getPage(@Param("page") Page page);
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysPermissionMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SysPermission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+public interface SysPermissionMapper extends BaseMapper<SysPermission> {
+
+	@Select("select distinct sp.* from sys_permission sp " +
+			"inner join sys_role_permission rp on sp.id = rp.permission_id " +
+			"inner join sys_role_user ru on ru.role_id = rp.role_id " +
+			"where ru.user_id = #{userId} order by sp.parent_id,sp.sort")
+	List<SysPermission> listByUserId(Integer userId);
+
+	@Select("select p.* from sys_permission p inner join sys_role_permission rp on p.id = rp.permission_id where rp.role_id = #{roleId} order by p.parent_id, p.sort")
+	List<SysPermission> listByRoleId(Integer roleId);
+
+	@Select("select * from sys_permission t where t.id = #{id}")
+	SysPermission getById(Integer id);
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysRoleMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.SysRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+
+	int saveRolePermission(@Param("roleId") Integer roleId, @Param("permissionIds") List<Integer> permissionIds);
+
+	@Delete("delete from sys_role_permission where role_id = #{roleId}")
+	int deleteRolePermission(Integer roleId);
+
+	@Select("select * from sys_role r inner join sys_role_user ru on r.id = ru.role_id where ru.user_id = #{userId}")
+	SysRole byUserId(Integer userId);
+
+	@Select("select count(*) from sys_role_user t where t.role_id = #{id}")
+	Integer getUserByRoleId(@Param("id") Integer id);
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SysUserMapper.java

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.SysUser;
+import cn.wise.sc.cement.business.model.vo.UserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +19,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+
+	IPage<UserVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
+	UserVo getById(Integer id);
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/TeamMapper.java

 package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.Team;
+import cn.wise.sc.cement.business.model.vo.TeamVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +20,8 @@ import java.util.Map;
  */
 public interface TeamMapper extends BaseMapper<Team> {
 
+	IPage<TeamVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
 	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ClientMapper.xml

@@ -16,6 +16,15 @@
         </where>
     </sql>
 
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.ClientVo">
+        select t.*,
+                (select count(*) from project p where p.client_id = t.id) projectNums
+        from client t
+        <include refid="where" />
+        order by t.id desc
+    </select>
+
+
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
@@ -23,7 +32,7 @@
         t.principal as 联系人,
         t.principal_phone as 联系电话,
         t.region as 所在地区,
-        0 as 项目数,
+        (select count(*) from project p where p.client_id = t.id) as 项目数,
         (
         CASE t.status
         WHEN 0 THEN '已禁用'

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ProjectMapper.xml

@@ -15,12 +15,20 @@
         </where>
     </sql>
 
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.ProjectVo">
+        select t.*,cl.name clientName
+        FROM project t
+        left join client cl on cl.id = t.client_id
+        <include refid="where" />
+        order by t.id desc
+    </select>
+
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
         t.name as 项目名称,
         t.code as 项目编号,
-        cl.name as 所属单位,
+        cl.name as 所属单位
         FROM project t
         left join client cl on cl.id = t.client_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysApprovalMapper.xml

+<?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="cn.wise.sc.cement.business.mapper.SysApprovalMapper">
+
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.ApprovalVo">
+        select sa.*, su.name as userName
+        from sys_approval sa
+        left join sys_user su on su.id = sa.user_id
+    </select>
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysGroupMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.cement.business.mapper.SysGroupMapper">
 
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.GroupVo">
+        select sg.*,
+        (select count(*) from sys_user su
+        where su.group_id = sg.id and su.is_delete=1
+        and su.status = 1
+        ) as members
+        from sys_group sg
+    </select>
+
+
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysPermissionMapper.xml

+<?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="cn.wise.sc.cement.business.mapper.SysPermissionMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysRoleMapper.xml

+<?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="cn.wise.sc.cement.business.mapper.SysRoleMapper">
+
+    <insert id="saveRolePermission">
+        insert into sys_role_permission(role_id, permission_id) values
+        <foreach collection="permissionIds" item="permissionId"
+                 separator=",">
+            (#{roleId}, #{permissionId})
+        </foreach>
+    </insert>
+
+
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SysUserMapper.xml

@@ -2,4 +2,49 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.cement.business.mapper.SysUserMapper">
 
+
+    <sql id="where">
+        <where>
+            <if test="params.status != null and params.status != ''">
+                and su.status = #{params.status}
+            </if>
+            <if test="params.gourpId != null and params.gourpId != ''">
+                and su.group_id = #{params.gourpId}
+            </if>
+            <if test="params.name != null and params.name != ''">
+                and su.name like concat('%', #{params.name}, '%')
+            </if>
+        </where>
+    </sql>
+
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.UserVo">
+        SELECT su.*, sg.name as groupName, sp.name as postName
+        FROM sys_user su
+        left join  sys_group sg on  sg.id = su.group_id
+        left join  sys_post sp on  sp.id = su.post_id
+        <include refid="where" />
+        ORDER BY su.create_time DESC
+    </select>
+
+
+    <select id="getById" resultType="cn.wise.sc.cement.business.model.vo.UserVo">
+        SELECT su.*, sg.name as groupName, sp.name as postName,
+        sr.id as roleId, sr.name as roleName
+        FROM sys_user su
+        left join  sys_group sg on  sg.id = su.group_id
+        left join  sys_post sp on  sp.id = su.post_id
+        left join  sys_role_user sru on  sru.user_id = su.id
+        left join  sys_role sr on  sr.id = sru.role_id
+        where su.id = #{id}
+    </select>
+
+
+
+
+
+
+
+
+
+
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml

@@ -15,6 +15,15 @@
         </where>
     </sql>
 
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.TeamVo">
+        SELECT t.*,
+         sg.name as groupName
+        FROM team t
+        left join  sys_group sg on  sg.id = t.group_id
+        <include refid="where" />
+        ORDER BY t.id DESC
+    </select>
+
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
@@ -25,10 +34,18 @@
         t.pro_charge as 建议产值,
         t.qualifications as 资质范围
         FROM team t
-        left join  sys_group sg on  cl.id = t.client_id
+        left join  sys_group sg on  sg.id = t.group_id
         ,(select @i:=0)t
         <include refid="where" />
         ORDER BY t.id DESC
     </select>
 
+
+
+
+
+
+
+
+
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/model/LoginUser.java

+package cn.wise.sc.cement.business.model;
+
+import java.util.List;
+
+import cn.wise.sc.cement.business.entity.SysPermission;
+import cn.wise.sc.cement.business.entity.SysRole;
+import cn.wise.sc.cement.business.entity.SysUser;
+import lombok.Data;
+
+@Data
+public class LoginUser extends SysUser {
+
+	private List<SysPermission> permissions;
+	private String token;
+	/** 登陆时间戳（毫秒） */
+	private Long loginTime;
+	/** 过期时间戳 */
+	private Long expireTime;
+
+	private String postName;
+
+	SysRole roleList;
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/PageQuery.java

@@ -4,6 +4,7 @@ package cn.wise.sc.cement.business.model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 import java.io.Serializable;
 
@@ -19,7 +20,10 @@ public class PageQuery implements Serializable {
 
     private static final long serialVersionUID = 3979320797076183357L;
     @ApiModelProperty(value = "当前所在页码")
+    @NonNull
     private Integer pageNo = 0;
+
     @ApiModelProperty(value = "每页显示数量")
+    @NonNull
     private Integer pageSize = 10;
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/RoleQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: qh
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("角色请求")
+public class RoleQuery {
+
+	private Integer id;
+
+	/**
+	 * 角色名称
+	 */
+	private String name;
+
+	/**
+	 * （0禁用，1启用）
+	 */
+	private Boolean status;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 权限id数组
+	 */
+	private List<Integer> permissionIds;
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/UserQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @description: 用户请求
+ * @author: qh
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("用户请求")
+public class UserQuery {
+
+	private Integer id;
+
+	/**
+	 * 用户账号
+	 */
+	private String username;
+
+	/**
+	 * 真实姓名
+	 */
+	private String name;
+
+	/**
+	 * 性别0女1男
+	 */
+	private Integer sex;
+
+	/**
+	 * 部门id
+	 */
+	private Integer groupId;
+
+	/**
+	 * 职务id
+	 */
+	private Integer postId;
+
+	/**
+	 * 微信号
+	 */
+	private String wxId;
+
+	/**
+	 * 职称
+	 */
+	private String qualifications;
+
+	/**
+	 * 状态（0禁用，1启用）
+	 */
+	private Boolean status;
+
+	/**
+	 * 工作年限
+	 */
+	private Double workYear;
+
+	/**
+	 * 手机号
+	 */
+	private String phone;
+
+	/**
+	 * 专业
+	 */
+	private String major;
+
+	/**
+	 * 邮箱
+	 */
+	private String email;
+
+	/**
+	 * 从事本技术领域日期
+	 */
+	private LocalDate technologyDate;
+
+	/**
+	 * 从事本技术领域年限
+	 */
+	private Double technologyYear;
+
+	/**
+	 * 文化程度
+	 */
+	private String education;
+
+	/**
+	 * （0删除，1正常）
+	 */
+	private Boolean isDelete;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 修改时间
+	 */
+	private LocalDateTime updateTime;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ApprovalVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("审批Vo")
+public class ApprovalVo {
+
+	private Integer id;
+
+	/**
+	 * 审批流程
+	 */
+	private String name;
+
+	/**
+	 * 审批人id
+	 */
+	private Integer userId;
+
+	/**
+	 * 状态 0:禁用 1:激活
+	 */
+	private Boolean status;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 审批人姓名
+	 */
+	private String userName;
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ClientVo.java

 package cn.wise.sc.cement.business.model.vo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
 /**
- * @description: 委托单位Vo
+ * @description:
  * @author: qh
  * @create: 2020-08-07 15:09
  **/
 @Data
-public class ClientVo extends BaseVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+@ApiModel("委托单位Vo")
+public class ClientVo  {
 
     private Integer id;
 
@@ -45,5 +45,5 @@ public class ClientVo extends BaseVo implements Serializable {
     /**
      * 项目名字
      */
-    private List<String> projects;
+    private Integer projectNums;
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/GroupVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("组别Vo")
+public class GroupVo {
+
+	private Integer id;
+
+	/**
+	 * 组别名称
+	 */
+	private String name;
+
+	/**
+	 * 状态 0:禁用 1:激活
+	 */
+	private Boolean status;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 组内人数
+	 */
+	private Integer members;
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ProjectVo.java

 package cn.wise.sc.cement.business.model.vo;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.io.Serializable;
 
 /**
- * @description: 项目vo
+ * @description:
  * @author: qh
  * @create: 2020-08-07 15:41
  **/
 @Data
-public class ProjectVo extends BaseVo implements Serializable {
-    private static final long serialVersionUID = 1L;
+@ApiModel("项目Vo")
+public class ProjectVo  {
 
     private Integer id;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/TeamVo.java

 package cn.wise.sc.cement.business.model.vo;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,11 +8,13 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
- * @description: 检测项Vo
- * @author: qh
+ * @description:
+ * @author: ztw
  * @create: 2020-08-07 15:09
  **/
+
 @Data
+@ApiModel("检测项Vo")
 public class TeamVo extends BaseVo implements Serializable {
 
     private static final long serialVersionUID = 1L;

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/UserVo.java

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("用户Vo")
+public class UserVo {
+
+	private Integer id;
+
+	/**
+	 * 用户账号
+	 */
+	private String username;
+
+	/**
+	 * 真实姓名
+	 */
+	private String name;
+
+	/**
+	 * 性别0女1男
+	 */
+	private Integer sex;
+
+	/**
+	 * 部门id
+	 */
+	private Integer groupId;
+
+	/**
+	 * 职务id
+	 */
+	private Integer postId;
+
+	/**
+	 * 微信号
+	 */
+	private String wxId;
+
+	/**
+	 * 职称
+	 */
+	private String qualifications;
+
+	/**
+	 * 状态（0禁用，1启用）
+	 */
+	private Boolean status;
+
+	/**
+	 * 工作年限
+	 */
+	private Double workYear;
+
+	/**
+	 * 手机号
+	 */
+	private String phone;
+
+	/**
+	 * 专业
+	 */
+	private String major;
+
+	/**
+	 * 邮箱
+	 */
+	private String email;
+
+	/**
+	 * 从事本技术领域日期
+	 */
+	private LocalDate technologyDate;
+
+	/**
+	 * 从事本技术领域年限
+	 */
+	private Double technologyYear;
+
+	/**
+	 * 文化程度
+	 */
+	private String education;
+
+	/**
+	 * （0删除，1正常）
+	 */
+	private Boolean isDelete;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 修改时间
+	 */
+	private LocalDateTime updateTime;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 组名称
+	 */
+	private String groupName;
+
+	/**
+	 * 职务名称
+	 */
+	private String postName;
+
+	/**
+	 * 角色id
+	 */
+	private Integer roleId;
+
+	/**
+	 * 角色名称
+	 */
+	private String roleName;
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/IClientService.java

@@ -36,23 +36,23 @@ public interface IClientService extends IService<Client> {
      *
      * @return List
      */
-    BaseResponse<List<ClientVo>> getList();
+    BaseResponse<List<Client>> getList();
 
     /**
      * 新增委托单位
      *
-     * @param clientQuery query
+     * @param  query
      * @return ClientVo
      */
-    BaseResponse<ClientVo> create(final ClientQuery clientQuery);
+    BaseResponse<Client> create(ClientQuery query);
 
     /**
      * 更新委托单位
      *
-     * @param clientQuery query
+     * @param  query
      * @return ClientVo
      */
-    BaseResponse<ClientVo> update(final ClientQuery clientQuery);
+    BaseResponse<Client> update(ClientQuery query);
 
     /**
      * 启用禁用

cement-business/src/main/java/cn/wise/sc/cement/business/service/IProjectService.java

@@ -27,18 +27,17 @@ public interface IProjectService extends IService<Project> {
      * 获取分页
      *
      * @param pageQuery 分页
-     * @param status    状态
      * @param clientId  委托方单位id
      * @return IPage<ProjectVo>
      */
-    BaseResponse<IPage<ProjectVo>> getPage(PageQuery pageQuery, Integer status, Integer clientId);
+    BaseResponse<IPage<ProjectVo>> getPage(PageQuery pageQuery, String code, Integer clientId, String name);
 
     /**
      * 获取所有启动的项目信息
      *
      * @return List
      */
-    BaseResponse<List<ProjectVo>> getList();
+    BaseResponse<List<Project>> getList();
 
     /**
      * 新增项目
@@ -46,7 +45,7 @@ public interface IProjectService extends IService<Project> {
      * @param query query
      * @return ProjectVo
      */
-    BaseResponse<ProjectVo> create(ProjectQuery query);
+    BaseResponse<Project> create(ProjectQuery query);
 
     /**
      * 编辑
@@ -54,7 +53,7 @@ public interface IProjectService extends IService<Project> {
      * @param query query
      * @return ProjectVo
      */
-    BaseResponse<ProjectVo> update(ProjectQuery query);
+    BaseResponse<Project> update(ProjectQuery query);
 
     /**
      * 启用禁用

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysApprovalService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SysApproval;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.ApprovalVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-21
+ */
+public interface ISysApprovalService extends IService<SysApproval> {
+
+	BaseResponse<IPage<ApprovalVo>> getPage(PageQuery pageQuery);
+
+	BaseResponse<SysApproval> create(SysApproval query);
+
+	BaseResponse<SysApproval> update(SysApproval query);
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysGroupService.java

 package cn.wise.sc.cement.business.service;
 
 import cn.wise.sc.cement.business.entity.SysGroup;
+import cn.wise.sc.cement.business.entity.SysRole;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.GroupVo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -14,13 +17,11 @@ import java.util.List;
  * </p>
  *
  * @author ztw
- * @since 2020-08-18
+ * @since 2020-08-21
  */
 public interface ISysGroupService extends IService<SysGroup> {
 
-	BaseResponse<IPage<SysGroup>> getPage(PageQuery pageQuery);
-
-	BaseResponse<List<SysGroup>> getList();
+	BaseResponse<IPage<GroupVo>> getPage(PageQuery pageQuery);
 
 	BaseResponse<SysGroup> create(SysGroup query);
 
@@ -28,5 +29,4 @@ public interface ISysGroupService extends IService<SysGroup> {
 
 
 
-
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysPermissionService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SysPermission;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+public interface ISysPermissionService extends IService<SysPermission> {
+
+	BaseResponse<List<SysPermission>> current();
+
+	BaseResponse<List<SysPermission>> permissionsList();
+
+	BaseResponse<List<SysPermission>> parents();
+
+	BaseResponse<JSONArray> tree();
+
+	BaseResponse<List<SysPermission>> listByRoleId(Integer roleId);
+
+	BaseResponse<SysPermission> create(SysPermission permission);
+
+	BaseResponse<SysPermission> update(SysPermission permission);
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysRoleService.java

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SysRole;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.query.RoleQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+	BaseResponse<IPage<SysRole>> getPage(PageQuery pageQuery, String name);
+
+	BaseResponse<SysRole> create(RoleQuery query);
+
+	BaseResponse<SysRole> update(RoleQuery query);
+
+	BaseResponse<SysRole> byUserId(Integer userId);
+
+	BaseResponse delete(Integer id);
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/ISysUserService.java

 package cn.wise.sc.cement.business.service;
 
 import cn.wise.sc.cement.business.entity.SysUser;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.query.UserQuery;
+import cn.wise.sc.cement.business.model.vo.UserVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +19,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISysUserService extends IService<SysUser> {
 
+	LoginUser getLoginUser();
+
+	BaseResponse<IPage<UserVo>> getPage(PageQuery pageQuery, Integer status, Integer groupId, String name);
+
+	BaseResponse<SysUser> create(UserQuery query);
+
+	BaseResponse<SysUser> update(UserQuery query);
+
+	BaseResponse<Boolean> status(Integer status, Integer id);
+
+	BaseResponse<UserVo> findById(Integer id);
+
+
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ClientServiceImpl.java

@@ -17,10 +17,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -41,131 +44,74 @@ import java.util.stream.Collectors;
 @Service
 public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> implements IClientService {
 
-	private static final Logger log = LoggerFactory.getLogger("ClientServiceImpl");
-
-    final
-    ProjectMapper projectMapper;
 	@Resource
 	private ClientMapper clientMapper;
 
-
-
-	public ClientServiceImpl(ProjectMapper projectMapper) {
-        this.projectMapper = projectMapper;
-    }
-
-
     @Override
     public BaseResponse<IPage<ClientVo>> getPage(PageQuery pageQuery, Integer status, String region, String principal) {
-
-        QueryWrapper<Client> qw = new QueryWrapper<>();
-        qw.orderByDesc("id");
-        if (status != null) {
-            qw.eq("status", status);
-        }
-        if (StrUtil.isNotBlank(region)) {
-            qw.like("region", region);
-        }
-        if (StrUtil.isNotBlank(principal)) {
-            qw.like("principal", principal);
-        }
-        IPage<Client> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-        this.page(page);
-        IPage<ClientVo> rts = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-        //关联项目名
-        List<Client> records = page.getRecords();
-        if (records == null) {
-            return BaseResponse.okData(rts);
-        }
-        List<Integer> clientIds = records.stream().map(Client::getId).collect(Collectors.toList());
-        BusinessExceptionEnum.COLLECTION_NOT_ILLEGAL.assertCollectionNotILLEGAL(clientIds);
-        QueryWrapper<Project> qwProject = new QueryWrapper<>();
-        qwProject.in("client_id",clientIds);
-        List<Project> projects = projectMapper.selectList(qwProject);
-
-        List<ClientVo> rtsRe = new ArrayList<>(page.getRecords().size());
-        for (Client client : page.getRecords()) {
-            ClientVo clientVo = client.toVo();
-            List<String> projectNames = new ArrayList<>();
-            projects.forEach(arg->{
-                if (arg.getClientId().intValue() == client.getId()){
-                    projectNames.add(arg.getName());
-                }
-            });
-            clientVo.setProjects(projectNames);
-            rtsRe.add(clientVo);
-        }
-        rts.setRecords(rtsRe);
-        return BaseResponse.okData(rts);
+	    Map<String, Object> params = new HashMap<>();
+	    params.put("status", status);
+	    params.put("region", region);
+	    params.put("principal", principal);
+	    Page<ClientVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+	    IPage<ClientVo> pages = clientMapper.getPage(page,params);
+        return BaseResponse.okData(pages);
     }
 
     @Override
-    public BaseResponse<List<ClientVo>> getList() {
+    public BaseResponse<List<Client>> getList() {
         QueryWrapper<Client> qw = new QueryWrapper<>();
         qw.eq("status", 1);
         List<Client> list = this.list(qw);
-        List<ClientVo> rts = new ArrayList<>(list.size());
-        list.forEach(arg -> {
-            ClientVo clientVo = new ClientVo();
-            clientVo.setId(arg.getId());
-            clientVo.setName(arg.getName());
-            rts.add(clientVo);
-        });
-        return BaseResponse.okData(rts);
+        return BaseResponse.okData(list);
     }
 
     @Override
-    public BaseResponse<ClientVo> create(final ClientQuery clientQuery) {
-        //判断名字是否重复
-        if (clientIsExisting(clientQuery.getName())) {
-            return BaseResponse.errorMsg("当前单位名已存在!");
-        }
-        Client crate = Client.crate(clientQuery);
-        this.save(crate);
-        return BaseResponse.okData(crate.toVo());
+    @Transactional
+    public BaseResponse<Client> create(ClientQuery query) {
+        //判断单位名称是否重复
+	    QueryWrapper<Client> qw = new QueryWrapper<>();
+	    qw.eq("name", query.getName());
+	    int count = clientMapper.selectCount(qw);
+	    if(count>0){
+		    return BaseResponse.errorMsg("单位名称已存在!");
+	    }
+	    Client create = new Client();
+	    BeanUtils.copyProperties(query, create);
+	    create.setStatus(true);
+	    clientMapper.insert(create);
+        return BaseResponse.okData(create);
     }
 
     @Override
-    public BaseResponse<ClientVo> update(final ClientQuery clientQuery) {
+    @Transactional
+    public BaseResponse<Client> update(ClientQuery query) {
         //判断名字是否重复
-        if (clientIsExisting(clientQuery.getName())) {
-            return BaseResponse.errorMsg("当前单位名已存在!");
-        }
-        Client update = Client.crate(clientQuery);
-        update.setId(clientQuery.getId());
-        this.updateById(update);
-        return BaseResponse.okData(update.toVo());
+	    QueryWrapper<Client> qw = new QueryWrapper<>();
+	    qw.eq("name", query.getName());
+	    qw.ne("id", query.getId());
+	    int count = clientMapper.selectCount(qw);
+	    if(count>0){
+		    return BaseResponse.errorMsg("单位名称已存在!");
+	    }
+	    Client update = new Client();
+	    BeanUtils.copyProperties(query, update);
+	    update.setId(query.getId());
+	    clientMapper.updateById(update);
+        return BaseResponse.okData(update);
     }
 
     @Override
+    @Transactional
     public BaseResponse<Boolean> status(Integer status, Integer id) {
         BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(status);
         BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(id);
-
         Client update = new Client();
         update.setId(id);
         update.setStatus(status == 1);
-
         return BaseResponse.okData(this.updateById(update));
     }
 
-
-    /**
-     * 判断单位是否重复
-     *
-     * @param name 单位名
-     * @return bool
-     */
-    private boolean clientIsExisting(String name) {
-        BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(name);
-        //判断名字是否重复
-        QueryWrapper<Client> qw = new QueryWrapper<>();
-        qw.eq("name", name);
-        qw.eq("status", 1);
-        int count = this.count(qw);
-        return count > 0;
-    }
-
 	@Override
     public void export(Integer status, String region, String principal, String fileName, HttpServletResponse response){
 	    Map<String, Object> params = new HashMap<>();

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/MethodServiceImpl.java

@@ -2,14 +2,10 @@ package cn.wise.sc.cement.business.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.Method;
-import cn.wise.sc.cement.business.entity.SysGroup;
-import cn.wise.sc.cement.business.entity.Team;
 import cn.wise.sc.cement.business.mapper.MethodMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.MethodQuery;
-import cn.wise.sc.cement.business.model.query.TeamQuery;
-import cn.wise.sc.cement.business.model.vo.TeamVo;
 import cn.wise.sc.cement.business.service.IMethodService;
 import cn.wise.sc.cement.business.util.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,7 +34,7 @@ import java.util.Map;
 @Service
 public class MethodServiceImpl extends ServiceImpl<MethodMapper, Method> implements IMethodService {
 
-	@Autowired
+	@Resource
 	private MethodMapper methodMapper;
 
 
@@ -53,7 +50,7 @@ public class MethodServiceImpl extends ServiceImpl<MethodMapper, Method> impleme
 			qw.like("standard", standard);
 		}
 		IPage<Method> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-		this.page(page);
+		page = methodMapper.selectPage(page,qw);
 		return BaseResponse.okData(page);
 	}
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ProjectServiceImpl.java

@@ -4,10 +4,12 @@ package cn.wise.sc.cement.business.service.impl;
 import cn.wise.sc.cement.business.entity.Client;
 import cn.wise.sc.cement.business.entity.Project;
 import cn.wise.sc.cement.business.exception.BusinessExceptionEnum;
+import cn.wise.sc.cement.business.mapper.ClientMapper;
 import cn.wise.sc.cement.business.mapper.ProjectMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.ProjectQuery;
+import cn.wise.sc.cement.business.model.vo.ClientVo;
 import cn.wise.sc.cement.business.model.vo.ProjectVo;
 import cn.wise.sc.cement.business.service.IClientService;
 import cn.wise.sc.cement.business.service.IProjectService;
@@ -19,8 +21,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -41,123 +45,76 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements IProjectService {
 
-	private static final Logger log = LoggerFactory.getLogger("ProjectServiceImpl");
-
-	final
-	IClientService iClientService;
 
 	@Resource
 	private ProjectMapper projectMapper;
-
-    public ProjectServiceImpl(IClientService iClientService) {
-        this.iClientService = iClientService;
-    }
+	@Resource
+	private ClientMapper clientMapper;
 
     @Override
-    public BaseResponse<IPage<ProjectVo>> getPage(final PageQuery pageQuery,
-                                                  final Integer status,
-                                                  final Integer clientId) {
-
-        QueryWrapper<Project> qw = new QueryWrapper<>();
-        qw.orderByDesc("id");
-        if (status != null) {
-            qw.eq("status", status);
-        }
-        if (clientId != null && clientId > 0) {
-            qw.like("client_id", clientId);
-        }
-        IPage<Project> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-        this.page(page);
-        //Client_id的委托单位列表
-        List<Project> records = page.getRecords();
-        List<Integer> clientIds = records.stream().map(Project::getClientId).collect(Collectors.toList());
-        QueryWrapper<Client> qwClient = new QueryWrapper<>();
-        qwClient.in("client_id", clientIds);
-        List<Client> clients = iClientService.list(qwClient);
-        BusinessExceptionEnum.COLLECTION_NOT_ILLEGAL.assertCollectionNotILLEGAL(clients);
-
-        IPage<ProjectVo> rts = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-        List<ProjectVo> rtsRe = new ArrayList<>(page.getRecords().size());
-        for (Project project : page.getRecords()) {
-            ProjectVo projectVo = project.toVo();
-            //Client_id转ClientName
-            clients.forEach(arg -> {
-                if (arg.getId().intValue() == project.getClientId()) {
-                    projectVo.setClientName(arg.getName());
-                }
-            });
-            rtsRe.add(projectVo);
-        }
-        rts.setRecords(rtsRe);
-        return BaseResponse.okData(rts);
+    public BaseResponse<IPage<ProjectVo>> getPage(PageQuery pageQuery, String code, Integer clientId, String name) {
+	    Map<String, Object> params = new HashMap<>();
+	    params.put("code", code);
+	    params.put("clientId", clientId);
+	    params.put("name", name);
+	    Page<ProjectVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+        IPage<ProjectVo> pages = projectMapper.getPage(page, params);
+        return BaseResponse.okData(pages);
     }
 
     @Override
-    public BaseResponse<List<ProjectVo>> getList() {
+    public BaseResponse<List<Project>> getList() {
         QueryWrapper<Project> qw = new QueryWrapper<>();
         qw.eq("status", 1);
         List<Project> list = this.list(qw);
-        List<ProjectVo> rts = new ArrayList<>(list.size());
-        list.forEach(arg -> {
-            ProjectVo modelVo = new ProjectVo();
-            modelVo.setId(arg.getId());
-            modelVo.setName(arg.getName());
-            rts.add(modelVo);
-        });
-        return BaseResponse.okData(rts);
+        return BaseResponse.okData(list);
     }
 
     @Override
-    public BaseResponse<ProjectVo> create(ProjectQuery query) {
-        if (projectIsExisting(query.getCode(), query.getClientId())) {
-            return BaseResponse.errorMsg("项目编号已存在!");
-        }
-        Project crate = Project.crate(query);
-        this.save(crate);
-        return BaseResponse.okData(crate.toVo());
+    @Transactional
+    public BaseResponse<Project> create(ProjectQuery query) {
+	    QueryWrapper<Project> qw = new QueryWrapper<>();
+	    qw.eq("name", query.getName());
+	    int count = projectMapper.selectCount(qw);
+	    if(count>0){
+		    return BaseResponse.errorMsg("项目名称已存在!");
+	    }
+	    Project create = new Project();
+	    BeanUtils.copyProperties(query, create);
+	    create.setStatus(true);
+	    projectMapper.insert(create);
+        return BaseResponse.okData(create);
     }
 
     @Override
-    public BaseResponse<ProjectVo> update(ProjectQuery query) {
-        //判断名字是否重复
-        if (projectIsExisting(query.getName(), query.getClientId())) {
-            return BaseResponse.errorMsg("项目编号已存在!");
-        }
-        Project update = Project.crate(query);
-        update.setId(query.getId());
-        this.updateById(update);
-        return BaseResponse.okData(update.toVo());
+    @Transactional
+    public BaseResponse<Project> update(ProjectQuery query) {
+	    //判断名字是否重复
+	    QueryWrapper<Project> qw = new QueryWrapper<>();
+	    qw.eq("name", query.getName());
+	    qw.ne("id", query.getId());
+	    int count = projectMapper.selectCount(qw);
+	    if(count>0){
+		    return BaseResponse.errorMsg("项目名称已存在!");
+	    }
+	    Project update = new Project();
+	    BeanUtils.copyProperties(query, update);
+	    update.setId(query.getId());
+	    projectMapper.updateById(update);
+        return BaseResponse.okData(update);
     }
 
     @Override
+    @Transactional
     public BaseResponse<Boolean> status(Integer status, Integer id) {
         BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(status);
         BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(id);
-
         Project update = new Project();
         update.setId(id);
         update.setStatus(status == 1);
-
         return BaseResponse.okData(this.updateById(update));
     }
 
-    private boolean projectIsExisting(String code, Integer clientId) {
-        BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(code);
-        //判断名字是否重复
-        QueryWrapper<Project> qw = new QueryWrapper<>();
-        qw.eq("code", code);
-        qw.eq("status", 1);
-        int count = this.count(qw);
-        //判断单位是否存在可用
-        if (clientId != null) {
-            QueryWrapper<Client> isExistingClient = new QueryWrapper<>();
-            isExistingClient.eq("status", 1);
-            isExistingClient.eq("id", clientId);
-            count += iClientService.count(isExistingClient);
-        }
-        return count > 0;
-    }
-
 	@Override
 	public void export(String code, Integer clientId, String name, String fileName, HttpServletResponse response){
 		Map<String, Object> params = new HashMap<>();

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysApprovalServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SysApproval;
+import cn.wise.sc.cement.business.entity.SysGroup;
+import cn.wise.sc.cement.business.mapper.SysApprovalMapper;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.ApprovalVo;
+import cn.wise.sc.cement.business.model.vo.GroupVo;
+import cn.wise.sc.cement.business.service.ISysApprovalService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-21
+ */
+@Service
+public class SysApprovalServiceImpl extends ServiceImpl<SysApprovalMapper, SysApproval> implements ISysApprovalService {
+
+	@Resource
+	private SysApprovalMapper approvalMapper;
+
+
+	/**
+	 * 获取分页
+	 * @param pageQuery
+	 * @return
+	 */
+	@Override
+	public BaseResponse<IPage<ApprovalVo>> getPage(PageQuery pageQuery) {
+		Page<ApprovalVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<ApprovalVo> pages = approvalMapper.getPage(page);
+		return BaseResponse.okData(pages);
+	}
+
+	/**
+	 * 新增
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public BaseResponse<SysApproval> create(SysApproval query) {
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("组别名称不能为空!");
+		}
+		QueryWrapper<SysApproval> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		int count = approvalMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		query.setStatus(true);
+		approvalMapper.insert(query);
+		return BaseResponse.okData(query);
+	}
+
+	/**
+	 * 修改
+	 * @param query
+	 * @return
+	 */
+	@Override
+	public BaseResponse<SysApproval> update(SysApproval query) {
+
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("组别名称不能为空!");
+		}
+		QueryWrapper<SysApproval> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		qw.ne("id", query.getId());
+		int count = approvalMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		approvalMapper.updateById(query);
+		return BaseResponse.okData(query);
+	}
+
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysGroupServiceImpl.java

 package cn.wise.sc.cement.business.service.impl;
 
-import cn.hutool.core.util.StrUtil;
-import cn.wise.sc.cement.business.entity.Method;
 import cn.wise.sc.cement.business.entity.SysGroup;
+import cn.wise.sc.cement.business.entity.SysRole;
 import cn.wise.sc.cement.business.mapper.SysGroupMapper;
+import cn.wise.sc.cement.business.mapper.SysRoleMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
-import cn.wise.sc.cement.business.model.query.MethodQuery;
+import cn.wise.sc.cement.business.model.vo.GroupVo;
 import cn.wise.sc.cement.business.service.ISysGroupService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -22,44 +23,84 @@ import java.util.List;
  * </p>
  *
  * @author ztw
- * @since 2020-08-18
+ * @since 2020-08-21
  */
 @Service
 public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> implements ISysGroupService {
 
-	@Override
-	public BaseResponse<IPage<SysGroup>> getPage(PageQuery pageQuery) {
-		QueryWrapper<SysGroup> qw = new QueryWrapper<>();
-		qw.orderByDesc("id");
-		IPage<SysGroup> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-		this.page(page);
-		return BaseResponse.okData(page);
-	}
-
-
+	@Resource
+	private SysGroupMapper groupMapper;
 
+	/**
+	 * 获取分页
+	 * @param pageQuery
+	 * @return
+	 */
 	@Override
-	public BaseResponse<List<SysGroup>> getList() {
-		QueryWrapper<SysGroup> qw = new QueryWrapper<>();
-		List<SysGroup> list = this.list(qw);
-		return BaseResponse.okData(list);
+	public BaseResponse<IPage<GroupVo>> getPage(PageQuery pageQuery) {
+		Page<GroupVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<GroupVo> pages = groupMapper.getPage(page);
+		return BaseResponse.okData(pages);
 	}
 
-
+	/**
+	 * 新增组别
+	 * @param query
+	 * @return
+	 */
 	@Override
 	public BaseResponse<SysGroup> create(SysGroup query) {
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("组别名称不能为空!");
+		}
+		QueryWrapper<SysGroup> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		int count = groupMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
 		query.setStatus(true);
-		this.save(query);
+		groupMapper.insert(query);
 		return BaseResponse.okData(query);
 	}
 
-
+	/**
+	 * 修改组别
+	 * @param query
+	 * @return
+	 */
 	@Override
 	public BaseResponse<SysGroup> update(SysGroup query) {
-		this.updateById(query);
+
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("组别名称不能为空!");
+		}
+		QueryWrapper<SysGroup> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		qw.ne("id", query.getId());
+		int count = groupMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		groupMapper.updateById(query);
 		return BaseResponse.okData(query);
 	}
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysPermissionServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SysPermission;
+import cn.wise.sc.cement.business.mapper.SysPermissionMapper;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
+import cn.wise.sc.cement.business.service.ISysPermissionService;
+import cn.wise.sc.cement.business.service.ISysUserService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+@Service
+public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, SysPermission> implements ISysPermissionService {
+
+	@Resource
+	private SysPermissionMapper permissionMapper;
+	@Autowired
+	private ISysUserService userService;
+
+
+	/**
+	 *当前登录用户拥有的权限
+	 * @return
+	 */
+	@Override
+	public BaseResponse<List<SysPermission>> current(){
+		LoginUser loginUser = userService.getLoginUser();
+
+		List<SysPermission> list = loginUser.getPermissions();
+		final List<SysPermission> permissions = list.stream().filter(l -> l.getType().equals(1))
+				.collect(Collectors.toList());
+		//		setChild(permissions);
+		//
+		//		return permissions.stream().filter(p -> p.getParentId().equals(0L)).collect(Collectors.toList());
+		// 2018.06.09 支持多级菜单
+		List<SysPermission> firstLevel = permissions.stream().filter(p -> p.getParentId().equals(0)).collect(Collectors.toList());
+		firstLevel.parallelStream().forEach(p -> {
+			setChild(p, permissions);
+		});
+
+		return BaseResponse.okData(firstLevel);
+	}
+	private void setChild(SysPermission p, List<SysPermission> permissions) {
+		List<SysPermission> child = permissions.parallelStream().filter(a -> a.getParentId().equals(p.getId())).collect(Collectors.toList());
+		p.setChild(child);
+		if (!CollectionUtils.isEmpty(child)) {
+			child.parallelStream().forEach(c -> {
+				//递归设置子元素，多级菜单支持
+				setChild(c, permissions);
+			});
+		}
+	}
+
+	/**
+	 * 菜单列表
+	 */
+	@Override
+	public BaseResponse<List<SysPermission>> permissionsList(){
+		List<SysPermission> permissionsAll = this.list();
+		List<SysPermission> list = Lists.newArrayList();
+		setPermissionsList(0, permissionsAll, list);
+		return BaseResponse.okData(list);
+	}
+	private void setPermissionsList(Integer pId, List<SysPermission> permissionsAll, List<SysPermission> list) {
+		for (SysPermission per : permissionsAll) {
+			if (per.getParentId().equals(pId)) {
+				list.add(per);
+				if (permissionsAll.stream().filter(p -> p.getParentId().equals(per.getId())).findAny() != null) {
+					setPermissionsList(per.getId(), permissionsAll, list);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 一级菜单
+	 * @return
+	 */
+	@Override
+	public BaseResponse<List<SysPermission>> parents(){
+		QueryWrapper<SysPermission> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type",1);
+		queryWrapper.eq("parent_id", 0);
+		queryWrapper.orderByAsc("parent_id","sort");
+		List<SysPermission> list = this.list(queryWrapper);
+		return BaseResponse.okData(list);
+	}
+
+	/**
+	 * 菜单树
+	 * @return
+	 */
+	@Override
+	public BaseResponse<JSONArray> tree(){
+		List<SysPermission> permissionsAll = this.list();
+		JSONArray array = new JSONArray();
+		setPermissionsTree(0, permissionsAll, array);
+		return BaseResponse.okData(array);
+	}
+	private void setPermissionsTree(Integer pId, List<SysPermission> permissionsAll, JSONArray array) {
+		for (SysPermission per : permissionsAll) {
+			if (per.getParentId().equals(pId)) {
+				String string = JSONObject.toJSONString(per);
+				JSONObject parent = (JSONObject) JSONObject.parse(string);
+				array.add(parent);
+
+				if (permissionsAll.stream().filter(p -> p.getParentId().equals(per.getId())).findAny() != null) {
+					JSONArray child = new JSONArray();
+					parent.put("child", child);
+					setPermissionsTree(per.getId(), permissionsAll, child);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 根据角色id获取权限
+	 * @param roleId
+	 * @return
+	 */
+	@Override
+	public BaseResponse<List<SysPermission>> listByRoleId(Integer roleId){
+		List<SysPermission> list =  permissionMapper.listByRoleId(roleId);
+		return BaseResponse.okData(list);
+	}
+
+	/**
+	 * 新增
+	 * @param permission
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<SysPermission> create(SysPermission permission){
+		if(StringUtils.isEmpty(permission.getName())){
+			return BaseResponse.errorMsg("权限名称不可为空");
+		}
+		this.save(permission);
+		return BaseResponse.okData(permission);
+	}
+
+	/**
+	 * 修改
+	 * @param permission
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<SysPermission> update(SysPermission permission){
+		if(StringUtils.isEmpty(permission.getName())){
+			return BaseResponse.errorMsg("权限名称不可为空");
+		}
+		this.updateById(permission);
+		return BaseResponse.okData(permission);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysRoleServiceImpl.java

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SysRole;
+import cn.wise.sc.cement.business.entity.SysUser;
+import cn.wise.sc.cement.business.mapper.SysRoleMapper;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.query.RoleQuery;
+import cn.wise.sc.cement.business.model.query.UserQuery;
+import cn.wise.sc.cement.business.model.vo.ClientVo;
+import cn.wise.sc.cement.business.service.ISysRoleService;
+import cn.wise.sc.cement.business.wrapper.WrapMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-08-20
+ */
+@Service
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+
+	@Resource
+	private SysRoleMapper roleMapper;
+
+	/**
+	 * 获取分页
+	 * @param pageQuery
+	 * @param name
+	 * @return
+	 */
+	@Override
+	public BaseResponse<IPage<SysRole>> getPage(PageQuery pageQuery, String name) {
+		QueryWrapper<SysRole> qw = new QueryWrapper<>();
+		if(StringUtils.isNotEmpty(name)){
+			qw.like("name", name);
+		}
+		qw.orderByDesc("create_time");
+		IPage<SysRole> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		page = roleMapper.selectPage(page, qw);
+		return BaseResponse.okData(page);
+	}
+
+	/**
+	 * 新增角色
+	 * @param query
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<SysRole> create(RoleQuery query) {
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("角色名称不能为空!");
+		}
+		QueryWrapper<SysRole> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		int count = roleMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		SysRole role = new SysRole();
+		BeanUtils.copyProperties(query,role);
+		List<Integer> permissionIds = query.getPermissionIds();
+		role.setStatus(true);
+		role.setCreateTime(LocalDateTime.now());
+		roleMapper.insert(role);
+		if (!CollectionUtils.isEmpty(permissionIds)) {
+			roleMapper.saveRolePermission(role.getId(), permissionIds);
+		}
+		return BaseResponse.okData(role);
+	}
+
+	@Override
+	@Transactional
+	public BaseResponse<SysRole> update(RoleQuery query) {
+		if (StringUtils.isEmpty(query.getName())) {
+			return BaseResponse.errorMsg("角色名称不能为空!");
+		}
+		QueryWrapper<SysRole> qw = new QueryWrapper<>();
+		qw.eq("name", query.getName());
+		qw.ne("id", query.getId());
+		int count = roleMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg(query.getName() + "已存在");
+		}
+		SysRole role = new SysRole();
+		BeanUtils.copyProperties(query,role);
+		List<Integer> permissionIds = query.getPermissionIds();
+		roleMapper.updateById(role);
+		roleMapper.deleteRolePermission(role.getId());
+		if (!CollectionUtils.isEmpty(permissionIds)) {
+			roleMapper.saveRolePermission(role.getId(), permissionIds);
+		}
+		return BaseResponse.okData(role);
+	}
+
+	/**
+	 * 根据用户id获取拥有的角色
+	 * @param userId
+	 * @return
+	 */
+	@Override
+	public BaseResponse<SysRole> byUserId(Integer userId) {
+		if (userId == null) {
+			return BaseResponse.errorMsg("用户id不能为空!");
+		}
+		SysRole role= roleMapper.byUserId(userId);
+		return BaseResponse.okData(role);
+	}
+
+	/**
+	 * 删除角色
+	 * @param id
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse delete(Integer id) {
+		SysRole role = roleMapper.selectById(id);
+		if(role == null){
+			return BaseResponse.errorMsg("角色不存在!");
+		}
+		Integer conunts = roleMapper.getUserByRoleId(id);
+		if(conunts!=0 && conunts>0){
+			return BaseResponse.errorMsg(conunts+"个用户正在使用!");
+		}
+		roleMapper.deleteById(id);
+		return BaseResponse.okData("删除成功");
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java

 package cn.wise.sc.cement.business.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import cn.wise.sc.cement.business.entity.Client;
-import cn.wise.sc.cement.business.entity.Project;
-import cn.wise.sc.cement.business.entity.SysGroup;
 import cn.wise.sc.cement.business.entity.Team;
 import cn.wise.sc.cement.business.exception.BusinessExceptionEnum;
-import cn.wise.sc.cement.business.mapper.ProjectMapper;
-import cn.wise.sc.cement.business.mapper.SysGroupMapper;
 import cn.wise.sc.cement.business.mapper.TeamMapper;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
-import cn.wise.sc.cement.business.model.query.ProjectQuery;
 import cn.wise.sc.cement.business.model.query.TeamQuery;
 import cn.wise.sc.cement.business.model.vo.ClientVo;
-import cn.wise.sc.cement.business.model.vo.ProjectVo;
 import cn.wise.sc.cement.business.model.vo.TeamVo;
 import cn.wise.sc.cement.business.service.ITeamService;
 import cn.wise.sc.cement.business.util.ExcelUtil;
@@ -23,18 +16,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -47,49 +40,18 @@ import java.util.stream.Collectors;
 @Service
 public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements ITeamService {
 
-	private static final Logger log = LoggerFactory.getLogger("TeamServiceImpl");
-
-	final
-	TeamMapper teamMapper;
-	@Autowired
-	private SysGroupMapper groupMapper;
-
-	public TeamServiceImpl(TeamMapper teamMapper) {
-		this.teamMapper = teamMapper;
-	}
-
+	@Resource
+	private TeamMapper teamMapper;
 
 	@Override
 	public BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, Integer gourpId, String name) {
-		QueryWrapper<Team> qw = new QueryWrapper<>();
-		qw.orderByDesc("id");
-		if (status != null) {
-			qw.eq("status", status);
-		}
-		if (gourpId != null) {
-			qw.eq("group_id", gourpId);
-		}
-		if (StrUtil.isNotBlank(name)) {
-			qw.like("name", name);
-		}
-		IPage<Team> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-		this.page(page);
-
-		IPage<TeamVo> rts = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-		//关联组名名
-		List<Team> records = page.getRecords();
-		if (records == null) {
-			return BaseResponse.okData(rts);
-		}
-		List<TeamVo> rtsRe = new ArrayList<>(page.getRecords().size());
-		for (Team team : page.getRecords()) {
-			SysGroup group = groupMapper.selectById(team.getGroupId());
-			TeamVo teamVo = team.toVo();
-			teamVo.setGroupName(group.getName());
-			rtsRe.add(teamVo);
-		}
-		rts.setRecords(rtsRe);
-		return BaseResponse.okData(rts);
+		Map<String, Object> params = new HashMap<>();
+		params.put("status", status);
+		params.put("gourpId", gourpId);
+		params.put("name", name);
+		Page<TeamVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<TeamVo> pages = teamMapper.getPage(page,params);
+		return BaseResponse.okData(pages);
 	}
 
 
@@ -109,6 +71,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 	}
 
 	@Override
+	@Transactional
 	public BaseResponse<TeamVo> create(TeamQuery query) {
 		Team crate = Team.crate(query);
 		this.save(crate);
@@ -116,6 +79,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 	}
 
 	@Override
+	@Transactional
 	public BaseResponse<TeamVo> update(TeamQuery query) {
 		Team update = Team.crate(query);
 		update.setId(query.getId());
@@ -124,6 +88,7 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
 	}
 
 	@Override
+	@Transactional
 	public BaseResponse<Boolean> status(Integer status, Integer id) {
 		BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(status);
 		BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(id);

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/UserServiceImpl.java

 package cn.wise.sc.cement.business.service.impl;
 
+import cn.wise.sc.cement.business.entity.Project;
+import cn.wise.sc.cement.business.entity.SysPermission;
 import cn.wise.sc.cement.business.entity.SysUser;
+import cn.wise.sc.cement.business.exception.BusinessExceptionEnum;
+import cn.wise.sc.cement.business.mapper.SysPermissionMapper;
 import cn.wise.sc.cement.business.mapper.SysUserMapper;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.query.UserQuery;
+import cn.wise.sc.cement.business.model.vo.ClientVo;
+import cn.wise.sc.cement.business.model.vo.UserVo;
 import cn.wise.sc.cement.business.service.ISysUserService;
+import cn.wise.sc.cement.business.util.JwtUtil;
+import cn.wise.sc.cement.business.util.RedisUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.BaseNumberUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -18,6 +44,144 @@ import org.springframework.stereotype.Service;
 public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 
 
+	@Resource
+	private SysUserMapper userMapper;
+	@Resource
+	private HttpServletRequest request;
+	@Autowired
+	RedisUtil redisUtil;
+	@Resource
+	private SysPermissionMapper permissionMapper;
+
+	/**
+	 * 当前登录用户
+	 * @return
+	 */
+	@Override
+	public LoginUser getLoginUser() {
+		try {
+			String token = request.getHeader("Authorization");
+			System.out.println("==================Authorization===================");
+			System.out.println(token);
+			Map map = JwtUtil.parserToken(token);
+			Object obj = redisUtil.getString(map.get("id").toString());
+			BusinessExceptionEnum.CACHE_NOT_FOUND.assertNotNull(obj);
+			SysUser sysUser = userMapper.selectById(Integer.valueOf(map.get("id").toString()));
+			LoginUser loginUser = new LoginUser();
+			BeanUtils.copyProperties(sysUser, loginUser);
+			List<SysPermission> permissionList =  permissionMapper.listByUserId(loginUser.getId());
+			loginUser.setPermissions(permissionList);
+			return loginUser;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	/**
+	 * 人员分页列表
+	 * @param pageQuery
+	 * @param status
+	 * @param groupId
+	 * @param name
+	 * @return
+	 */
+	@Override
+	public BaseResponse<IPage<UserVo>> getPage(PageQuery pageQuery, Integer status, Integer groupId, String name) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("status", status);
+		params.put("groupId", groupId);
+		params.put("name", name);
+		Page<UserVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<UserVo> pages = userMapper.getPage(page,params);
+		return BaseResponse.okData(pages);
+	}
+
+	/**
+	 * 新增人员
+	 * @param query
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<SysUser> create(UserQuery query) {
+		if (StringUtils.isEmpty(query.getPhone())) {
+			return BaseResponse.errorMsg("手机号码不可为空!");
+		}
+		QueryWrapper<SysUser> qw = new QueryWrapper<>();
+		qw.eq("phone", query.getPhone());
+		int count = userMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg("手机号已存在!");
+		}
+
+		SysUser user = new SysUser();
+		BeanUtils.copyProperties(query,user);
+		userMapper.insert(user);
+		return BaseResponse.okData(user);
+	}
+
+	/**
+	 * 修改人员
+	 * @param query
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<SysUser> update(UserQuery query) {
+		if (StringUtils.isEmpty(query.getPhone())) {
+			return BaseResponse.errorMsg("手机号码不可为空!");
+		}
+		QueryWrapper<SysUser> qw = new QueryWrapper<>();
+		qw.eq("phone", query.getPhone());
+		qw.ne("id", query.getId());
+		int count = userMapper.selectCount(qw);
+		if (count > 0) {
+			return BaseResponse.errorMsg("手机号已存在!");
+		}
+		SysUser user = new SysUser();
+		BeanUtils.copyProperties(query,user);
+		user.setId(query.getId());
+		userMapper.updateById(user);
+		return BaseResponse.okData(user);
+	}
+
+	/**
+	 * 禁用启用
+	 * @param status
+	 * @param id
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<Boolean> status(Integer status, Integer id) {
+		BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(status);
+		BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(id);
+		SysUser update = new SysUser();
+		update.setId(id);
+		update.setStatus(status == 1);
+		return BaseResponse.okData(this.updateById(update));
+	}
+
+	/**
+	 * 人员详情
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public BaseResponse<UserVo> findById(Integer id){
+		BusinessExceptionEnum.BAD_LICENCE_TYPE.assertNotNull(id);
+		UserVo userVo = userMapper.getById(id);
+		return BaseResponse.okData(userVo);
+	}
+
+
+
+
+
+
+
+
+
 
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/WeiXinService.java

@@ -2,6 +2,8 @@ package cn.wise.sc.cement.business.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.SysUser;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.service.ISysUserService;
 import cn.wise.sc.cement.business.util.JwtUtil;
 import cn.wise.sc.cement.business.util.RedisUtil;
@@ -23,8 +25,6 @@ import java.util.Map;
 @Service
 public class WeiXinService {
 
-	private static final Logger log = LoggerFactory.getLogger("WeiXinService");
-
 	@Value("${weixin.corpid}")
 	private String corpid;
 	@Value("${weixin.corpsecret}")
@@ -39,9 +39,9 @@ public class WeiXinService {
 	 * @param code
 	 * @return
 	 */
-	public Wrapper getToken(String code) {
+	public BaseResponse<String> getToken(String code) {
 		if (StrUtil.isEmpty(code)) {
-			return WrapMapper.error("code为必填项!");
+			return BaseResponse.errorMsg("code为必填项!");
 		}
 		System.out.println("==================code===================");
 		System.out.println(code);
@@ -51,7 +51,7 @@ public class WeiXinService {
 			param = String.format(param, accessToken, code);
 			JSONObject jsonObject = WeixinInterfaceUtil.doGet(Global.USERINFOURL, param);
 			if(jsonObject.get("errcode").toString().equals("40029")){
-				return WrapMapper.error("code失效!");
+				return BaseResponse.errorMsg("code失效!");
 			}
 			String UserId = jsonObject.getString("UserId");
 			System.out.println("==================UserId===================");
@@ -61,23 +61,22 @@ public class WeiXinService {
 			wrapper.eq("phone", userJson.get("mobile"));
 			SysUser sysUser = userService.getOne(wrapper);
 			if(sysUser == null){
-				return WrapMapper.error("非系统用户不允许登录!");
+				return BaseResponse.errorMsg("非系统用户不允许登录!");
 			}
 			if(sysUser.getStatus()==false){
-				return WrapMapper.error("用户被禁用!");
+				return BaseResponse.errorMsg("用户被禁用!");
 			}
-			if(sysUser.getIsDelete() ==0){
-				return WrapMapper.error("用户被删除!");
+			if(sysUser.getIsDelete()==false){
+				return BaseResponse.errorMsg("用户被删除!");
 			}
 			//生成token,存入redis
 			String token = JwtUtil.createToken(sysUser.getId(), sysUser.getUsername(),
 					sysUser.getName(), sysUser.getPhone());
 			System.out.println(token);
 			redisUtil.setString(sysUser.getId().toString(),token,3600);
-			return WrapMapper.wrap(200,"成功",token);
+			return BaseResponse.okData(token);
 		} catch (Exception e) {
-			log.error("异常! 参数:{}", code);
-			return WrapMapper.error(e.getMessage());
+			return BaseResponse.errorMsg(e.getMessage());
 		}
 	}
 
@@ -92,7 +91,6 @@ public class WeiXinService {
 			System.out.println(accessToken);
 			return accessToken;
 		} catch (Exception e) {
-			log.error("异常! 参数:{}", corpid);
 			return null;
 		}
 	}
@@ -107,28 +105,17 @@ public class WeiXinService {
 			System.out.println(jsonObject);
 			return jsonObject;
 		} catch (Exception e) {
-			log.error("异常! 参数:{}", accessToken+accessToken);
 			return null;
 		}
 	}
 
-
-	public Wrapper getLoginUser(HttpServletRequest request) {
-		try {
-			String token = request.getHeader("Authorization");
-			System.out.println("==================Authorization===================");
-			System.out.println(token);
-			Map map = JwtUtil.parserToken(token);
-			Object obj = redisUtil.getString(map.get("id").toString());
-			if(obj == null){
-				return WrapMapper.error("token过期或失效!");
-			}
-			return WrapMapper.wrap(200,"成功",map);
-
-		} catch (Exception e) {
-			log.error("异常");
-			return WrapMapper.error(e.getMessage());
-		}
+	/**
+	 * 当前登录用户
+	 * @return
+	 */
+	public BaseResponse<LoginUser> getLoginUser() {
+		LoginUser loginUser = userService.getLoginUser();
+		return BaseResponse.okData(loginUser);
 	}