From eedc56e3465302fa9a83e3891162d7dcc382e4f5 Mon Sep 17 00:00:00 2001 From: lihongbiao <964708803@qq.com> Date: Thu, 17 Jul 2025 17:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/article/domain/CpLabel.java | 3 +- .../controller/EmEmployeesController.java | 31 +++++-- .../modules/system/domain/EmEmployees.java | 3 + .../system/domain/vo/EmEmployeesDetailVo.java | 9 +- .../system/domain/vo/EmEmployeesVo.java | 15 ++-- .../system/service/EmEmployeesService.java | 17 ++-- .../service/impl/EmEmployeesServiceImpl.java | 82 +++++++++++++------ .../system/service/impl/UserServiceImpl.java | 4 + 8 files changed, 112 insertions(+), 52 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpLabel.java b/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpLabel.java index 408fa88..084ee38 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpLabel.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/article/domain/CpLabel.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; import java.time.LocalDateTime; /** @@ -20,7 +21,7 @@ import java.time.LocalDateTime; */ @Data @TableName("cp_label") -public class CpLabel { +public class CpLabel implements Serializable { private static final long serialVersionUID = 1L; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java index bd7d95e..b4ee189 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java @@ -28,6 +28,7 @@ import com.aircraft.modules.security.service.UserDetailsServiceImpl; import com.aircraft.modules.security.service.dto.AuthUserDto; import com.aircraft.modules.security.service.dto.JwtUserDto; import com.aircraft.modules.system.domain.EmEmployees; +import com.aircraft.modules.system.domain.EmScenic; import com.aircraft.modules.system.domain.vo.EmEmployeesDetailVo; import com.aircraft.modules.system.domain.vo.EmEmployeesVo; import com.aircraft.modules.system.service.EmEmployeesService; @@ -74,7 +75,7 @@ public class EmEmployeesController { private final LoginProperties loginProperties; private final PasswordEncoder passwordEncoder; private final UserDetailsServiceImpl userDetailsService; -// private final EmEmployeesService emEmployeesService; + private final EmEmployeesService emEmployeesService; // @ApiOperation("导出数据") // @GetMapping(value = "/download") @@ -100,14 +101,26 @@ public class EmEmployeesController { // return new ResponseEntity<>(HttpStatus.CREATED); // } // -// @PutMapping -// @Log("修改员工管理") -// @ApiOperation("修改员工管理") -// @PreAuthorize("@el.check('emEmployees:edit')") -// public ResponseEntity updateEmEmployees(@Validated @RequestBody EmEmployeesVo resources){ -// emEmployeesService.update(resources); -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } + @PutMapping + @Log("设置个人信息") + @ApiOperation("设置个人信息") + public ResponseEntity updateEmEmployees(@Validated @RequestBody EmEmployeesVo resources){ + emEmployeesService.update(resources); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("查询详细信息") + @ApiOperation(value = "查询详细信息") + @RequestMapping(value = "{id}", method = {RequestMethod.GET}) + @ApiImplicitParam(name = "id", value = "飞行员id", required = true, paramType = "path") + public ResponseEntity one(@PathVariable final Integer id) { + try { + EmEmployeesDetailVo entity = emEmployeesService.findById(id); + return new ResponseEntity<>(entity,HttpStatus.OK); + } catch (Exception e) { + throw new RuntimeException("查询详细信息失败"); + } + } // // @DeleteMapping // @Log("删除员工管理") diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java index 163b1b1..72ecfaa 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/EmEmployees.java @@ -51,6 +51,9 @@ public class EmEmployees extends BaseEntity { @ApiModelProperty(value = "userid") private Long userid; + @ApiModelProperty(value = "入职时间") + private Timestamp hireDate; + public void copy(EmEmployees source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java index dd37c38..7edf6cf 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesDetailVo.java @@ -8,15 +8,14 @@ import lombok.Data; @Data public class EmEmployeesDetailVo extends EmEmployees { - @ApiModelProperty(value = "账号") - private String username; - @ApiModelProperty(value = "区域名称") private String areaName; @ApiModelProperty(value = "景区名称") private String scenicName; - @ApiModelProperty(value = "角色名称") - private String roleName; + @ApiModelProperty(value = "用户性别") + private String gender; + } + diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesVo.java b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesVo.java index 85b19c9..1ff3aca 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesVo.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/domain/vo/EmEmployeesVo.java @@ -11,13 +11,16 @@ import java.util.Set; @Data public class EmEmployeesVo extends EmEmployees { - @ApiModelProperty(value = "用户账号") - private String username; - @ApiModelProperty(value = "登录密码") private String password; - @TableField(exist = false) - @ApiModelProperty(value = "用户角色") - private Set roles; + @ApiModelProperty(value = "性别") + private String gender; + + @ApiModelProperty(value = "区域id") + private Long areaId; + + @ApiModelProperty(value = "景区id") + private Long scenicId; + } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java index 8851598..565bd74 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java @@ -57,11 +57,11 @@ public interface EmEmployeesService extends IService { // */ // void create(EmEmployeesVo resources); // -// /** -// * 编辑 -// * @param resources / -// */ -// void update(EmEmployeesVo resources); + /** + * 编辑 + * @param resources / + */ + void update(EmEmployeesVo resources); // // /** // * 多选删除 @@ -98,4 +98,11 @@ public interface EmEmployeesService extends IService { * @return */ EmEmployees findByUserId(Long id); + + /** + * 查询详细信息 + * @param id + * @return + */ + EmEmployeesDetailVo findById(Integer id); } \ No newline at end of file diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java index ed63a28..5d1287e 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java @@ -16,12 +16,15 @@ package com.aircraft.modules.system.service.impl; import com.aircraft.exception.EntityExistException; +import com.aircraft.modules.security.service.UserCacheManager; import com.aircraft.modules.system.domain.EmEmployees; import com.aircraft.modules.system.domain.vo.EmEmployeesDetailVo; import com.aircraft.modules.system.domain.vo.EmEmployeesVo; import com.aircraft.modules.system.domain.User; import com.aircraft.modules.system.mapper.UserMapper; import com.aircraft.modules.system.mapper.UserRoleMapper; +import com.aircraft.modules.system.service.EmAreaService; +import com.aircraft.modules.system.service.EmScenicService; import com.aircraft.modules.system.service.UserService; import com.aircraft.utils.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -51,6 +54,11 @@ import javax.servlet.http.HttpServletResponse; public class EmEmployeesServiceImpl extends ServiceImpl implements EmEmployeesService { private final EmEmployeesMapper emEmployeesMapper; + private final RedisUtils redisUtils; + private final UserCacheManager userCacheManager; + private final UserMapper userMapper; + private final EmAreaService areaService; + private final EmScenicService scenicService; @Override public PageResult queryAll(EmEmployeesQueryCriteria criteria, Page page){ @@ -83,32 +91,38 @@ public class EmEmployeesServiceImpl extends ServiceImpl implements Us private final OnlineUserService onlineUserService; private final EmAreaService areaService; private final EmScenicService scenicService; + @Lazy + @Autowired private final EmEmployeesService employeesService; @Override