From 79a2ac5489fbc0b8d43e3eb73f56dbf3ba0d8557 Mon Sep 17 00:00:00 2001 From: yujt Date: Sat, 8 May 2021 19:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=8E=A5=E7=A7=8D=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAdminController.java | 14 ++++++++ .../esua/epdc/feign/AdminFeignClient.java | 11 ++++++ .../fallback/AdminFeignClientFallback.java | 5 +++ .../elink/esua/epdc/service/AdminService.java | 31 +++++++++++----- .../epdc/service/impl/AdminServiceImpl.java | 12 +++++++ .../epdc/service/impl/AppUserServiceImpl.java | 35 ++----------------- 6 files changed, 66 insertions(+), 42 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index 8f18153..da93f18 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -33,4 +33,18 @@ public class ApiAdminController { public Result getCompleteDeptName(Long gridId) { return adminService.getCompleteDeptName(gridId); } + + /** + * 查询用户疫苗接种信息 + * + * @param userName 人员姓名 + * @param idCard 身份证号 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2021/5/8 15:29 + */ + @GetMapping("/vim/query") + public Result getUserVimInfo(String userName, String idCard) { + return adminService.getUserVimInfo(userName, idCard); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index d4e475c..f560107 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -146,4 +146,15 @@ public interface AdminFeignClient { @GetMapping("sys/dept/party/getDeptTree") Result getAllDeptTree(); + /** + * 查询用户疫苗接种信息 + * + * @param userName 人员姓名 + * @param idCard 身份证号 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2021/5/8 15:29 + */ + @GetMapping("sys/vaccinationinfo/epdc-app/query") + Result getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 42f07b8..43fe324 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -77,4 +77,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result getAllDeptTree() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree"); } + + @Override + public Result getUserVimInfo(String userName, String idCard) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java index 7675901..395459c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -23,29 +23,42 @@ public interface AdminService { * @date 2019/9/11 09:46 */ Result getCompleteDeptName(Long gridId); + /** - * @Description 获取用户信息 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 获取用户信息 * @Author songyunpeng - * @Date 2021/1/27 + * @Date 2021/1/27 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result getUserInfo(); + /** - * @Description 获取用户部门权限 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 获取用户部门权限 * @Author songyunpeng - * @Date 2021/1/27 + * @Date 2021/1/27 * @Param [userId] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result getUserDeptOptionByUserId(); /** - * @Description 获取customId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 获取customId * @Author songyunpeng - * @Date 2021/1/27 + * @Date 2021/1/27 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result getCustomId(); + + /** + * 查询用户疫苗接种信息 + * + * @param userName 人员姓名 + * @param idCard 身份证号 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2021/5/8 15:29 + */ + Result getUserVimInfo(String userName, String idCard); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index 4668114..a5df275 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptOption; @@ -107,4 +108,15 @@ public class AdminServiceImpl implements AdminService { public Result getCustomId() { return analysisFeignClient.getCustomId(); } + + @Override + public Result getUserVimInfo(String userName, String idCard) { + if (StringUtils.isBlank(userName) || StringUtils.isBlank(idCard)) { + return new Result().error("请补充查询条件"); + } + userName = ModuleUtils.replaceIllegalCharacter(userName); + idCard = ModuleUtils.replaceIllegalCharacter(idCard); + + return adminFeignClient.getUserVimInfo(userName, idCard); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 78e0a31..6c9396b 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -176,7 +176,7 @@ public class AppUserServiceImpl implements AppUserService { } //3、上传到服务器 UploadToOssDTO dto = new UploadToOssDTO(); - dto.setFileByte(this.fileToByteArray(wxaCodeUnlimit)); + dto.setFileByte(FileUtils.fileToByteArray(wxaCodeUnlimit)); dto.setFileName(wxaCodeUnlimit.getName()); Result ossResult = ossFeignClient.uploadFile(dto); if (null == ossResult || !ossResult.success() || null == ossResult.getData()) { @@ -208,7 +208,7 @@ public class AppUserServiceImpl implements AppUserService { } UploadToOssDTO dto = new UploadToOssDTO(); - dto.setFileByte(this.fileToByteArray(wxaCodeUnlimit)); + dto.setFileByte(FileUtils.fileToByteArray(wxaCodeUnlimit)); dto.setFileName(wxaCodeUnlimit.getName()); Result ossResult = ossFeignClient.uploadFile(dto); @@ -218,37 +218,6 @@ public class AppUserServiceImpl implements AppUserService { return ossResult; } - /** - * File文件转为byte[] - * - * @param file - * @return byte[] - * @author work@yujt.net.cn - * @date 2019/9/19 15:56 - */ - private byte[] fileToByteArray(File file) { - try { - //获取输入流 - FileInputStream fis = new FileInputStream(file); - //新的 byte 数组输出流，缓冲区容量1024byte - ByteArrayOutputStream bos = new ByteArrayOutputStream(1024); - //缓存 - byte[] b = new byte[1024]; - int n; - while ((n = fis.read(b)) != NumConstant.ONE_NEG) { - bos.write(b, NumConstant.ZERO, n); - } - fis.close(); - //改变为byte[] - byte[] data = bos.toByteArray(); - bos.close(); - return data; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - /** * 根据openId登录 *