Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow into master

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -38,7 +38,7 @@ public interface SysUserFeignService {
 	public List<String> queryRoleCodeListByUserId(@RequestParam("userId") Long userId);
 
 	@PostMapping(value = "user/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)
-	public Boolean updateSysUser(SysUser user);
+	public HttpResponseResult<Boolean> updateSysUser(SysUser user);
 
 	@PostMapping(value = "exit/{clientId}/{phone}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
 	public HttpResponseResult<String> exitByPhone(@PathVariable("clientId") String clientId, @PathVariable("phone") String phone);

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -43,8 +43,8 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 	}
 
 	@Override
-	public Boolean updateSysUser(SysUser user) {
-		return false;
+	public HttpResponseResult<Boolean> updateSysUser(SysUser user) {
+		return null;
 	}
 
 	@Override

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -6,11 +6,9 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dto.EmployeeDto;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.EmployeeVo;
-import com.yonge.cooleshow.biz.dal.vo.StudentVo;
-import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
@@ -20,7 +18,7 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
 
-import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -48,7 +46,7 @@ public class EmployeeController extends BaseController {
             @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
     @PreAuthorize("@pcs.hasPermissions('employee/detail')")
-    public HttpResponseResult<EmployeeVo> detail(@PathVariable("id") Long id){
+    public HttpResponseResult<EmployeeVo> detail(@PathVariable("id") Long id) {
         EmployeeVo detail = employeeService.detail(id);
         return succeed(detail);
     }
@@ -77,7 +75,7 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "修改员工")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('employee/update')")
-    public HttpResponseResult<EmployeeDto> update(@Valid @RequestBody EmployeeDto employee) throws Exception{
+    public HttpResponseResult<EmployeeDto> update(@Valid @RequestBody EmployeeDto employee) throws Exception {
         employee.setUpdateTime(new Date());
         return employeeService.updateEmployee(employee);
     }
@@ -86,10 +84,13 @@ public class EmployeeController extends BaseController {
     @GetMapping("/queryUserInfo")
     public HttpResponseResult<EmployeeVo> apiQueryUserInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if(sysUser != null && sysUser.getId() != null){
+        if (sysUser != null && sysUser.getId() != null) {
             Employee employee = employeeService.get(sysUser.getId());
             EmployeeVo employeeVo = new EmployeeVo().buildVo(employee);
             employeeVo.setRoleIds(employeeDao.queryUserRole(sysUser.getId()));
+
+            BeanUtils.copyProperties(sysUser, employeeVo, "gender");
+            employeeVo.setGender(GenderEnum.valueOf(sysUser.getGender()));
             return succeed(employeeVo);
         }
         return failed("获取用户信息失败");

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/HomeController.java

@@ -23,7 +23,7 @@ public class HomeController extends BaseController {
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "查询用户待办事项数")
-    @GetMapping("/getUserToDoNum ")
+    @GetMapping("/getUserToDoNum")
     @PreAuthorize("@pcs.hasPermissions('home/getUserToDoNum')")
     public HttpResponseResult<HomeTotalVo> getUserToDoNum() {
         SysUser user = sysUserFeignService.queryUserInfo();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/EmployeeSearch.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * @Author: liweifan
  * @Data: 2022/3/21 15:26
  */
-@ApiModel(value = "StudentSearch", description = "学院管理查询")
+@ApiModel(value = "EmployeeSearch", description = "学院管理查询")
 public class EmployeeSearch extends QueryInfo{
     @ApiModelProperty(value = "学院编号/昵称/电话")
     private String search;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GenderEnum.java

@@ -3,14 +3,18 @@ package com.yonge.cooleshow.biz.dal.enums;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /***
  * 性别
  * @author liweifan
  * @updateTime 2022/4/2 14:53
  */
 public enum GenderEnum implements BaseEnum<Integer, GenderEnum> {
-    GIRL(0,"女"),
-    BOY(1,"男");
+    GIRL(0, "女"),
+    BOY(1, "男");
     @EnumValue
     private Integer code;
     private String msg;
@@ -36,4 +40,14 @@ public enum GenderEnum implements BaseEnum<Integer, GenderEnum> {
     public Integer getCode() {
         return this.code;
     }
+
+    public static GenderEnum valueOf(Integer code) {
+        GenderEnum[] values = GenderEnum.values();
+        for (GenderEnum value : values) {
+            if(value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
+    }
 }