新增查询人员接种信息接口

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java

@@ -33,4 +33,18 @@ public class ApiAdminController {
     public Result<String> getCompleteDeptName(Long gridId) {
         return adminService.getCompleteDeptName(gridId);
     }
+
+    /**
+     * 查询用户疫苗接种信息
+     *
+     * @param userName 人员姓名
+     * @param idCard   身份证号
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Object>
+     * @author work@yujt.net.cn
+     * @date 2021/5/8 15:29
+     */
+    @GetMapping("/vim/query")
+    public Result<Object> getUserVimInfo(String userName, String idCard) {
+        return adminService.getUserVimInfo(userName, idCard);
+    }
 }

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<DeptOption> getAllDeptTree();
 
+    /**
+     * 查询用户疫苗接种信息
+     *
+     * @param userName 人员姓名
+     * @param idCard   身份证号
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Object>
+     * @author work@yujt.net.cn
+     * @date 2021/5/8 15:29
+     */
+    @GetMapping("sys/vaccinationinfo/epdc-app/query")
+    Result<Object> getUserVimInfo(@RequestParam("userName") String userName, @RequestParam("idCard") String idCard);
 }

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<DeptOption> getAllDeptTree() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree");
     }
+
+    @Override
+    public Result<Object> getUserVimInfo(String userName, String idCard) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserVimInfo", userName, idCard);
+    }
 }

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<String> getCompleteDeptName(Long gridId);
+
     /**
-     * @Description   获取用户信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
+     * @Description 获取用户信息
      * @Author songyunpeng
-     * @Date  2021/1/27
+     * @Date 2021/1/27
      * @Param []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
      **/
     Result<EpdcWorkLogUserDetailDTO> getUserInfo();
+
     /**
-     * @Description   获取用户部门权限
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @Description 获取用户部门权限
      * @Author songyunpeng
-     * @Date  2021/1/27
+     * @Date 2021/1/27
      * @Param [userId]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
      **/
     Result<EpdcAppWorkLogUserResult> getUserDeptOptionByUserId();
 
     /**
-     * @Description  获取customId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @Description 获取customId
      * @Author songyunpeng
-     * @Date  2021/1/27
+     * @Date 2021/1/27
      * @Param []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      **/
     Result<String> getCustomId();
+
+    /**
+     * 查询用户疫苗接种信息
+     *
+     * @param userName 人员姓名
+     * @param idCard   身份证号
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Object>
+     * @author work@yujt.net.cn
+     * @date 2021/5/8 15:29
+     */
+    Result<Object> getUserVimInfo(String userName, String idCard);
 }

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<String> getCustomId() {
         return analysisFeignClient.getCustomId();
     }
+
+    @Override
+    public Result<Object> 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);
+    }
 }

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<String> 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<String> 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登录
      *