diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudImgFilesFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudImgFilesFacadeImpl.java index 14e91508..738a6e35 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudImgFilesFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudImgFilesFacadeImpl.java @@ -1,15 +1,21 @@ package com.zcloud.basic.info.facade; import com.alibaba.cola.dto.MultiResponse; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.api.ImgFilesServiceI; import com.zcloud.basic.info.command.convertor.ImgFilesCoConvertor; +import com.zcloud.basic.info.domain.utils.Smb; import com.zcloud.basic.info.dto.ImgFilesQryCmd; import com.zcloud.basic.info.dto.clientobject.ImgFilesCO; +import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import com.zcloud.gbscommon.zcloudimgfiles.request.ZcloudImgFilesQryCmd; import com.zcloud.gbscommon.zcloudimgfiles.response.ZcloudImgFilesCO; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.BeanUtils; +import org.springframework.util.ObjectUtils; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.List; @@ -32,4 +38,18 @@ public class ZcloudImgFilesFacadeImpl implements ZcloudImgFilesFacade { List zcloudImgFilesCo = imgFilesCoConvertor.converCOsToDubboCOs(response.getData()); return MultiResponse.of(zcloudImgFilesCo); } + + @Override + public String saveFile(MultipartFile multipartFile, String path) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + String filePath = ssoUser.getTenantId().toString() + "/" + DateUtil.getMonth() + "/" + path; + // 文件上传并获取上传路径 + String resultFilePath = null; + try { + resultFilePath = Smb.saveFile(multipartFile, filePath); + } catch (Exception e) { + throw new RuntimeException(e); + } + return resultFilePath; + } } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java index abd9bbec..f1c05127 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java @@ -89,6 +89,11 @@ public class UserController { public SingleResponse getInfoById(@PathVariable("id") Long id) { return userService.getInfoById(id); } + @ApiOperation("详情") + @GetMapping("/getInfoByUserName/{userName}") + public SingleResponse getInfoByUserName(@PathVariable("userName") String userName) { + return userService.getInfoByUserName(userName); + } @ApiOperation("获取当前登录人信息") @GetMapping("/getInfo") public SingleResponse getInfo() { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 90b7ab97..e2471a77 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -110,6 +110,25 @@ public class UserQueryExe { return SingleResponse.of(userCO); } + /** + * 详情 + * + * @param userName + * @return + */ + public SingleResponse executeGetInfoByUserName(String userName) { + UserDO userDO = userRepository.getInfoByUserName(userName); + UserCO userCO = new UserCO(); + BeanUtils.copyProperties(userDO, userCO); + if(AuthContext.getTenantId()==null){ + UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userDO.getPhone()); + if(userExpandInfoDO!=null){ + userCO.setFlowFlag(userExpandInfoDO.getFlowFlag()); + } + } + + return SingleResponse.of(userCO); + } /** diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index 0a113e2a..4ca99205 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -145,6 +145,10 @@ public class UserServiceImpl implements UserServiceI { public SingleResponse getInfoById(Long id) { return userQueryExe.executeGetInfo(id); } + @Override + public SingleResponse getInfoByUserName(String userName) { + return userQueryExe.executeGetInfoByUserName(userName); + } @Override public Response verifyUser(UserVerifyQryCmd userVerifyQryCmd) { diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index 6c75f88c..c8ba89e0 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -55,6 +55,8 @@ public interface UserServiceI { SingleResponse getInfoById(Long id); + + SingleResponse getInfoByUserName(String userName); Response verifyUser(UserVerifyQryCmd userVerifyQryCmd); SingleResponse getInfoBySession(); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java index 307933db..a7b1ea04 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java @@ -32,6 +32,8 @@ public interface UserMapper extends BaseMapper { UserDO getInfoById(@Param("id") Long id); + UserDO getInfoByUserName(@Param("params") Map params); + List getDepartmentLeaderByDepartmentId(List departmentIds); Integer countUser(@Param("params") Map params); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index e1898701..874879d7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -34,6 +34,8 @@ public interface UserRepository extends BaseRepository { Boolean checkUserDepartment(Long[] ids); UserDO getInfoById(Long id); + + UserDO getInfoByUserName(String userName); Response countUser(Map params); List listByPostId(Long postId); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 6008c84e..412aea99 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -223,6 +223,14 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i return userMapper.getInfoById(id); } + @Override + public UserDO getInfoByUserName(String username) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + Map params = new HashMap<>(); + params.put("username", username); + return userMapper.getInfoByUserName(params); + } + @Override public Response countUser(Map params) { if (!ObjectUtils.isEmpty(params.get("username"))) { diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 93bbb263..118fe3cf 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -297,17 +297,17 @@ u.employment_flag, u.flow_flag, CASE - WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 - AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN - '男' - WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 - AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 0 THEN - '女' + WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 + AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN + '男' + WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 + AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 0 THEN + '女' END AS sex, CASE WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0 THEN - (YEAR(NOW()) - SUBSTRING(FROM_BASE64(u.user_id_card), 7, 4)) ELSE NULL + (YEAR(NOW()) - SUBSTRING(FROM_BASE64(u.user_id_card), 7, 4)) ELSE NULL END AS age, cast(substring(FROM_BASE64(u.user_id_card), 7, 8) AS DATE) AS birthday @@ -319,6 +319,90 @@ u.id = #{id} + +