diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 6b6d376c..ffcc1694 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -1,5 +1,6 @@ package com.zdxt.code.controller; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -165,4 +166,32 @@ public class EnforcementRegistrationController extends BaseController EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); return ZDResponse.success("查询成功",enforcementRegistration); } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @GetMapping("/queryFiles/{key}") + @ResponseBody + public ZDResponse queryFiles(@PathVariable String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", enforcementRegistrationService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @PostMapping("/queryFilesPost") + @ResponseBody + public ZDResponse queryFilesPost(String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", enforcementRegistrationService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index d611de7a..e8268e88 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -2,6 +2,8 @@ package com.zdxt.code.service; import com.zdxt.code.domain.EnforceRegCount; import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.common.zdxtFile.AttFileRespDTO; + import java.util.List; import java.util.Map; @@ -66,4 +68,11 @@ public interface IEnforcementRegistrationService */ public List queryEarlyWarning(String searchValue); + /** + * 查询附件 + * @param key + * @return + */ + AttFileRespDTO queryFiles(String key); + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index 2f7e2d61..0354151c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -3,9 +3,11 @@ package com.zdxt.code.service.impl; import java.util.*; import java.util.stream.Collectors; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.dto.ZdxtFileBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.code.domain.EnforceRegCount; @@ -15,6 +17,8 @@ import com.zdxt.code.service.ILawEnforcementWarningListService; import com.zdxt.code.service.IRuleItemListService; import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; +import com.zdxt.common.zdxtFile.AttFileRespDTO; +import com.zdxt.common.zdxtFile.FilePreviewUtilBean; import com.zdxt.common.zdxtFile.ZdxtFileCommon; import org.dmg.pmml.association.Item; import org.springframework.beans.factory.annotation.Autowired; @@ -210,4 +214,21 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat return results; } + + @Override + public AttFileRespDTO queryFiles(String key) { + ZdxtFileBean zdxtFileBeanCondition = new ZdxtFileBean(); + zdxtFileBeanCondition.setBusinessId(key); + List fileBeanList = zdxtFileCommonApi.selectZdxtFileList(zdxtFileBeanCondition); + + ArrayList fileList = new ArrayList<>(); + for (ZdxtFileBean fileBean : fileBeanList) { + ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon(); + BeanUtil.copyProperties(fileBean, zdxtFileCommon); + fileList.add(zdxtFileCommon); + } + + FilePreviewUtilBean filePreviewUtilBean = new FilePreviewUtilBean(); + return filePreviewUtilBean.attachementToAttFileRespDTO(fileList); + } }