1.人员影像上传

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -20,6 +20,8 @@ import com.ydtech.modules.base.model.dto.BaseDto;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
+import com.ydtech.modules.esm.model.vo.EsmUserImageQueryVo;
+import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
@@ -66,6 +68,7 @@ public class SysUserController extends BaseController {
 
     private final SysRoleService sysRoleService;
 
+    private final EsmUserImageService esmUserImageService;
 
     //    @PreAuthorize("hasAuthority('sys:user:delete')")
     @ApiOperation(value = "逻辑删除")
@@ -416,9 +419,11 @@ public class SysUserController extends BaseController {
         SysUserInfo userInfo = sysUserInfoService.getById(userId);
 
         SysUserInfoQuery sysUserVo = new SysUserInfoQuery();
+        List<EsmUserImageQueryVo> esmUserImageQueryVo = esmUserImageService.getEsmUserImageQueryVo(userId);
 
         sysUserVo.setSysUser(sysUser);
         sysUserVo.setSysUserInfo(userInfo);
+        sysUserVo.setEsmUserImageVo(esmUserImageQueryVo);
 
         return HttpResult.ok(sysUserVo);
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -10,11 +10,11 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.*;
+import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
 import com.ydtech.modules.admin.service.*;
-import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmUserImage;
@@ -25,36 +25,40 @@ import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
-import lombok.RequiredArgsConstructor;
+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.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
 @Service
-@RequiredArgsConstructor
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
-        implements SysUserService {
-
-    private final SysMenuService sysMenuService;
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
+    @Autowired
+    private SysMenuService sysMenuService;
 
-    private final SysRoleMenuService sysRoleMenuService;
+    @Autowired
+    private SysRoleMenuService sysRoleMenuService;
 
-    private final SysDeptService sysDeptService;
+    @Autowired
+    private SysDeptService sysDeptService;
 
-    private final SysUserMapper sysUserMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
-    private final SysUserRoleService sysUserRoleService;
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
 
-    private  final EsmUserReferrerService esmUserReferrerService;
+    @Autowired
+    private EsmUserReferrerService esmUserReferrerService;
 
-    private final SysUserInfoService sysUserInfoService;
+    @Autowired
+    private SysUserInfoService sysUserInfoService;
 
-    private final EsmUserImageService esmUserImageService;
+    @Autowired
+    private EsmUserImageService esmUserImageService;
 
     @Override
     public SysUser findByUsername(String username) {
@@ -103,7 +107,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
             List<SysMenu> sysMenuList = sysRoleMenuService.gainMenuIds(sysUser.getId());
 
-            lsPerms = sysMenuList.stream().filter(a -> StringUtils.isNotEmpty(a.getPerms())).map(SysMenu::getPerms).collect(Collectors.toList());
+            lsPerms =
+                    sysMenuList.stream().filter(a -> StringUtils.isNotEmpty(a.getPerms())).map(SysMenu::getPerms).collect(Collectors.toList());
 
         }
 
@@ -162,14 +167,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
     /**
      * 获取用户列表
-     * @param page 分页信息
-     * @param sysUser 查询条件
+     *
+     * @param page            分页信息
+     * @param sysUser         查询条件
      * @param containsSubDept 是否汉堡下级机构
      * @return
      */
     @Override
-    public IPage<SysUser> selectUserPage(Page page, SysUser sysUser,String containsSubDept) {
-        return baseMapper.selectUserPage(page,sysUser,containsSubDept);
+    public IPage<SysUser> selectUserPage(Page page, SysUser sysUser, String containsSubDept) {
+        return baseMapper.selectUserPage(page, sysUser, containsSubDept);
     }
 
     @Override
@@ -449,7 +455,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         //用户详情信息
         SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
         sysUserInfo.setId(userId);
-        if(null == sysUserInfo.getRemark())sysUserInfo.setRemark("");
+        if (null == sysUserInfo.getRemark()) sysUserInfo.setRemark("");
         sysUserInfoService.saveOrUpdate(sysUserInfo);
         return HttpResult.ok("修改成功");
     }

src/main/java/com/ydtech/modules/esm/service/EsmUserImageService.java

@@ -2,6 +2,9 @@ package com.ydtech.modules.esm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.esm.model.EsmUserImage;
+import com.ydtech.modules.esm.model.vo.EsmUserImageQueryVo;
+
+import java.util.List;
 
 /**
 * @author Administrator
@@ -10,4 +13,7 @@ import com.ydtech.modules.esm.model.EsmUserImage;
 */
 public interface EsmUserImageService extends IService<EsmUserImage> {
 
+
+    List<EsmUserImageQueryVo> getEsmUserImageQueryVo(String userId);
+
 }

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserImageServiceImpl.java

@@ -3,9 +3,12 @@ package com.ydtech.modules.esm.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.esm.dao.EsmUserImageMapper;
 import com.ydtech.modules.esm.model.EsmUserImage;
+import com.ydtech.modules.esm.model.vo.EsmUserImageQueryVo;
 import com.ydtech.modules.esm.service.EsmUserImageService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【esm_user_image(人员影像信息)】的数据库操作Service实现
@@ -15,6 +18,11 @@ import org.springframework.stereotype.Service;
 public class EsmUserImageServiceImpl extends ServiceImpl<EsmUserImageMapper, EsmUserImage>
     implements EsmUserImageService {
 
+    @Override
+    public List<EsmUserImageQueryVo> getEsmUserImageQueryVo(String userId) {
+        return baseMapper.selectEsmUserImageQueryVo(userId);
+    }
+
 }
 
 

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -33,8 +33,10 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
 
     @Autowired
     public DataSource dataSource;
+
     @Autowired
     private SysUserService sysUserService;
+
     @Autowired
     private EsmUserReferrerService esmUserReferrerService;