代码同步

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java

@@ -410,27 +410,22 @@ public class EquipmentCategoryController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/exportImageZip")
 	@ApiOperation(httpMethod = "GET", value = "设备监管码、电梯码批量导出压缩包", notes = "设备监管码、电梯码批量导出压缩包")
-	public void exportImageZip(HttpServletResponse response, EquipExportDto dto, @RequestParam("type") String type, @RequestParam("pageNum") Long pageNum, @RequestParam("size") Long size) throws IOException {
+	public void exportImageZip(HttpServletResponse response, @RequestParam Map<String, Object> map) throws IOException {
+		String type = String.valueOf(map.get("type"));
 		ImageSizeEnums imageSizeEnums = ImageSizeEnums.getEnumByCode(type);
 		//创建list 存放图片
 		List<File> fileList = new ArrayList<>();
-		if (!ObjectUtils.isEmpty(dto.getUSE_PLACE())) {
-			String address = dto.getUSE_PLACE().substring(1, dto.getUSE_PLACE().length() - 1);
-			address = address.replace(", ", "/");
-			dto.setUSE_PLACE(address);
-		}
-		List<EquipExportVo> equipExportData = equipmentCategoryServiceImpl.exportImageZip(dto, pageNum, size);
-		List<EquipExportVo> unique = equipExportData.stream().filter(item -> !ObjectUtils.isEmpty(item.getSupervisoryCode())).collect(
-				Collectors.collectingAndThen(
-						Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(EquipExportVo::getSupervisoryCode))), ArrayList::new)
-		);
-		if (ImageSizeEnums.DT.getCode().equals(type)){
-			unique = unique.stream().filter(item -> !ObjectUtils.isEmpty(item.getCode96333())).collect(
-					Collectors.collectingAndThen(
-							Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(EquipExportVo::getCode96333))), ArrayList::new)
-			);
+		JSONObject jsonObject = new JSONObject(map);
+		Page<JSONObject> pageList = equipmentCategoryServiceImpl.queryByKeys(jsonObject);
+		List<JSONObject> equipExportData;
+		if (map.containsKey("ids") && !ObjectUtils.isEmpty(map.get("ids"))) {
+			List<String> strings = Arrays.asList(String.valueOf(map.get("ids")).split(","));
+			equipExportData = pageList.getRecords().stream().filter(item -> strings.contains(String.valueOf(item.get("SEQUENCE_NBR")))).collect(Collectors.toList());
+		} else {
+			equipExportData = pageList.getRecords();
 		}
-		if (ObjectUtils.isEmpty(unique)){
+
+		if (ObjectUtils.isEmpty(equipExportData)) {
 			File zipFile = File.createTempFile("设备码信息", ".zip");
 			File nullFile = File.createTempFile("当前导出数据为空+", ".txt");
 			fileList.add(nullFile);
@@ -439,18 +434,22 @@ public class EquipmentCategoryController extends BaseController {
 			ImageUtils.downloadResourceZip("设备码信息.zip", zipFile.getAbsolutePath(), response);
 			zipFile.delete();
 		}
-		for (EquipExportVo equipExportDatum : unique) {
-			InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/" + imageSizeEnums.getBgPath());
-			if (ImageSizeEnums.DT.getCode().equals(type) && !ObjectUtils.isEmpty(equipExportDatum.getCode96333()) && !ObjectUtils.isEmpty(equipExportDatum.getSupervisoryCode())) {
-				File QrCodeFile = File.createTempFile(equipExportDatum.getCode96333() + "+", ".png");
-				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.getSupervisoryCode(), "", equipExportDatum.getCode96333(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+		if (ImageSizeEnums.DT.getCode().equals(type)) {
+			for (JSONObject equipExportDatum : equipExportData.stream().filter(item -> !ObjectUtils.isEmpty(item.get("CODE96333"))).collect(Collectors.toList())) {
+				InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/" + imageSizeEnums.getBgPath());
+				File QrCodeFile = File.createTempFile(equipExportDatum.get("CODE96333") + "+", ".png");
+				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.get("SUPERVISORY_CODE"), "", String.valueOf(equipExportDatum.get("CODE96333")), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
 				fileList.add(new File(QrCodeFile.getAbsolutePath()));
-			} else if (!ObjectUtils.isEmpty(equipExportDatum.getSupervisoryCode())) {
-				File QrCodeFile = File.createTempFile(equipExportDatum.getSupervisoryCode() + "+", ".png");
-				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.getSupervisoryCode(), "", equipExportDatum.getSupervisoryCode(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+				bgImgFile.close();
+			}
+		} else {
+			for (JSONObject equipExportDatum : equipExportData.stream().filter(item -> !ObjectUtils.isEmpty(item.get("SUPERVISORY_CODE"))).collect(Collectors.toList())) {
+				InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/" + imageSizeEnums.getBgPath());
+				File QrCodeFile = File.createTempFile(equipExportDatum.get("SUPERVISORY_CODE") + "+", ".png");
+				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.get("SUPERVISORY_CODE"), "", String.valueOf(equipExportDatum.get("SUPERVISORY_CODE")), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
 				fileList.add(new File(QrCodeFile.getAbsolutePath()));
+				bgImgFile.close();
 			}
-			bgImgFile.close();
 		}
 		File zipFile = File.createTempFile("设备码信息", ".zip");
 		// 调用压缩方法
@@ -461,4 +460,5 @@ public class EquipmentCategoryController extends BaseController {
 	}
 
 
+
 }