From 54695bfee9f617a1964e1155c63de3db5140d6c7 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 20 Apr 2023 13:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=81=B5=E5=B1=B1=E7=A4=BE?= =?UTF-8?q?=E4=BC=9A=E7=BB=B4=E7=A8=B3=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/FileUtils.java | 28 ++++ .../EpmetCommonServiceOpenFeignClient.java | 2 +- .../java/com/epmet/utils/ImportTaskUtils.java | 19 +++ .../LingShanSpecialCrowdController.java | 24 +-- .../LingShanSpecialCrowdIsOrNotConverter.java | 34 ---- .../LingShanSpecialCrowdJzhzConverter.java | 146 +++++++++++++----- .../LingShanSpecialCrowdSqjzConverter.java | 125 ++++++++++++--- .../LingShanSpecialCrowdYesOrNoConverter.java | 78 ++++++++++ ...ngShanSpecialCrowdDetailAzbjExcelData.java | 12 +- ...ngShanSpecialCrowdDetailBaseExcelData.java | 1 + ...ngshanSpecialCrowdDetailJdryExcelData.java | 14 +- ...ngshanSpecialCrowdDetailJzhzExcelData.java | 13 +- ...ngshanSpecialCrowdDetailSqjzExcelData.java | 13 +- ...ngshanSpecialCrowdDetailXfryExcelData.java | 9 +- ...ngShanSpecialCrowdExcelImportListener.java | 14 +- ...anSpecialCrowdAzbjExcelImportListener.java | 2 +- ...nSpecialCrowdJieduExcelImportListener.java | 2 +- ...cialCrowdJingZhangExcelImportListener.java | 2 +- ...anSpecialCrowdSqjzExcelImportListener.java | 2 +- ...pecialCrowdXinFangExcelImportListener.java | 2 +- .../impl/LingShanSpecialCrowdServiceImpl.java | 11 +- .../lingshan_special_crowd_azbj_export.xlsx | Bin 9634 -> 9833 bytes .../lingshan_special_crowd_jdry_export.xlsx | Bin 9620 -> 9621 bytes .../lingshan_special_crowd_jzhz_export.xlsx | Bin 10016 -> 10066 bytes .../lingshan_special_crowd_sqjz_export.xlsx | Bin 9933 -> 9920 bytes .../lingshan_special_crowd_xfry_export.xlsx | Bin 9439 -> 9486 bytes .../LingshanSpecialCrowdDetailSqjzDao.xml | 2 +- 27 files changed, 396 insertions(+), 159 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdIsOrNotConverter.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java index 00784bc7db..c606583613 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java @@ -153,4 +153,32 @@ public class FileUtils { return templateFilePathStr; } + /** + * @description: 删除文件 + * @param path: + * @return + * @author: WangXianZhang + * @date: 2023/4/18 9:47 AM + */ + public static void deleteFileIfExists(Path path) { + if (path != null) { + try { + Files.deleteIfExists(path); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + /** + * @description: 删除文件 + * @param path: + * @return + * @author: WangXianZhang + * @date: 2023/4/18 9:47 AM + */ + public static void deleteFileIfExists(String path) { + deleteFileIfExists(Paths.get(path)); + } + } diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java index 43766990ba..14bde6bfe9 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java @@ -22,7 +22,7 @@ import java.util.Map; * @date 2020/6/4 10:28 */ @FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallbackFactory = EpmetCommonServiceOpenFeignClientFallbackFactory.class) - //@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallbackFactory = EpmetCommonServiceOpenFeignClientFallbackFactory.class, url = "http://localhost:8103") + // @FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallbackFactory = EpmetCommonServiceOpenFeignClientFallbackFactory.class, url = "http://localhost:8103") public interface EpmetCommonServiceOpenFeignClient { /** * @param formDTO diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java index a8b08efd29..88193f832c 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/utils/ImportTaskUtils.java @@ -54,4 +54,23 @@ public class ImportTaskUtils implements ResultDataResolver { return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).finishImportTask(form); } + /** + * @description: 结束导入任务 + * @return + * @author: WangXianZhang + * @date: 2023/4/20 9:55 AM + */ + public static Result finishImportTask(String taskId, String processStatus, String resultDescFilePath, String resultDesc, Integer successItemsQty, Integer failItemsQty) { + ImportTaskCommonFormDTO form = new ImportTaskCommonFormDTO(); + form.setTaskId(taskId); + form.setOperatorId(EpmetRequestHolder.getHeader(AppClientConstant.USER_ID)); + form.setProcessStatus(processStatus); + form.setResultDescFilePath(resultDescFilePath); + form.setResultDesc(resultDesc); + form.setSuccessItemsQty(successItemsQty); + form.setFailItemsQty(failItemsQty); + + return SpringContextUtils.getBean(EpmetCommonServiceOpenFeignClient.class).finishImportTask(form); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java index 1d99dbce93..9ee0be759e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java @@ -63,11 +63,9 @@ public class LingShanSpecialCrowdController { try { lingShanSpecialCrowdService.importSpecialCrowd(crowdCategory, fileSavePath.toString(), originalFilename); } catch (Exception e) { + // 3.出错的话，删除文件 + FileUtils.deleteFileIfExists(fileSavePath); throw e; - // ... - } finally { - // 3.删除文件 - deleteSpecialCrowdTempFile(fileSavePath); } return new Result(); @@ -97,21 +95,5 @@ public class LingShanSpecialCrowdController { } } - /** - * @description: 删除特殊人群临时文件 - * @param fileSavePath: - * @return - * @author: WangXianZhang - * @date: 2023/4/18 9:47 AM - */ - public void deleteSpecialCrowdTempFile(Path fileSavePath) { - if (fileSavePath != null) { - try { - Files.deleteIfExists(fileSavePath); - } catch ( - IOException e) { - log.error("【灵山街道】导入社会维稳数据，删除临时文件失败"); - } - } - } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdIsOrNotConverter.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdIsOrNotConverter.java deleted file mode 100644 index e146615243..0000000000 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdIsOrNotConverter.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.epmet.excel.converter; - -import com.alibaba.excel.converters.Converter; -import com.alibaba.excel.converters.ReadConverterContext; -import com.alibaba.excel.enums.CellDataTypeEnum; -import org.apache.commons.lang3.StringUtils; - -/** - * 灵山-是否转换器 - */ -public class LingShanSpecialCrowdIsOrNotConverter implements Converter { - @Override - public CellDataTypeEnum supportExcelTypeKey() { - return CellDataTypeEnum.STRING; - } - - @Override - public Class supportJavaTypeKey() { - return Integer.class; - } - - @Override - public Integer convertToJavaData(ReadConverterContext context) throws Exception { - String content = context.getReadCellData().getStringValue(); - if (StringUtils.isNotBlank(content)) { - if (content.equals("是") || content.equals("有")) { - return 1; - } else if (content.equals("无") || content.equals("否")) { - return 0; - } - } - return Converter.super.convertToJavaData(context); - } -} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdJzhzConverter.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdJzhzConverter.java index fbefaf92fd..3a6282cf2c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdJzhzConverter.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdJzhzConverter.java @@ -2,56 +2,128 @@ package com.epmet.excel.converter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.ReadConverterContext; +import com.alibaba.excel.converters.WriteConverterContext; import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import com.epmet.excel.data.LingshanSpecialCrowdDetailJzhzExcelData; /** * 灵山-诊断类型转换器 */ public class LingShanSpecialCrowdJzhzConverter implements Converter { + @Override public CellDataTypeEnum supportExcelTypeKey() { return CellDataTypeEnum.STRING; } @Override - public Integer convertToJavaData(ReadConverterContext context) throws Exception { - String content = context.getReadCellData().getStringValue(); - if (content instanceof String) { - switch (content) { - // 诊断类型 - case "精神分裂症": - return 1; - case "分裂情感性障碍": - return 2; - case "持久的妄想性障碍（偏执性精神病）": - return 3; - case "双相（情感）障碍": - return 4; - case "癫痫所致精神障碍": - return 5; - case "精神发育迟滞伴发精神障碍": - return 6; - case "重度抑郁发作": - return 7; - case "精神活性物质所致精神障碍": - return 8; - case "其他": - return 9; - // 危险性评估等级 - case "0级": - return 0; - case "1级": - return 1; - case "2级": - return 2; - case "3级": - return 3; - case "4级": - return 4; - case "5级": - return 5; + public Class supportJavaTypeKey() { + return Integer.class; + } + + @Override + public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + String fieldName = contentProperty.getField().getName(); + String value = cellData.getStringValue(); + if (fieldName.equals("currentDiagnosis")) { + return Diagnosis.getByName(value).code; + } else if (fieldName.equals("dangerousClass")) { + return DangerousClass.getByName(value).code; + } + + return Converter.super.convertToJavaData(cellData, contentProperty, globalConfiguration); + } + + @Override + public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + String fieldName = contentProperty.getField().getName(); + if (fieldName.equals("currentDiagnosis")) { + return new WriteCellData<>(Diagnosis.getByCode(value).name); + } else if (fieldName.equals("dangerousClass")) { + return new WriteCellData<>(DangerousClass.getByCode(value).name); + } + + return Converter.super.convertToExcelData(value, contentProperty, globalConfiguration); + } + + + /** + * 诊断 + */ + public enum Diagnosis { + JSFLZ(1, "精神分裂症"), + FLQGXZA(2, "分裂情感性障碍"), + CJDWXXZA(3, "持久的妄想性障碍（偏执性精神病）"), + SXZA(4, "双相（情感）障碍"), + DXSZJSZA(5, "癫痫所致精神障碍"), + JSFYCZBFJSZA(6, "精神发育迟滞伴发精神障碍"), + ZDYYFZ(7, "重度抑郁发作"), + JSHXWZ(8, "精神活性物质所致精神障碍"), + OTHERS(9, "其他"); + + private Integer code; + private String name; + + Diagnosis(Integer code, String name) { + this.code = code; + this.name = name; + } + + static Diagnosis getByCode(Integer code) { + for (Diagnosis d : Diagnosis.values()) { + if (d.code.equals(code)) { + return d; + } + } + return null; + } + + static Diagnosis getByName(String name) { + for (Diagnosis d : Diagnosis.values()) { + if (d.name.equals(name)) { + return d; + } + } + return null; + } + } + + public enum DangerousClass { + ZERO(0, "0级"), + ONE(1, "1级"), + TOW(2, "2级（偏执性精神病）"), + THREE(3, "3级（情感）障碍"), + FOUR(4, "4级"), + FIVE(5, "5级"); + + private Integer code; + private String name; + + DangerousClass(Integer code, String name) { + this.code = code; + this.name = name; + } + + static DangerousClass getByCode(Integer code) { + for (DangerousClass d : DangerousClass.values()) { + if (d.code.equals(code)) { + return d; + } + } + return null; + } + + static DangerousClass getByName(String name) { + for (DangerousClass d : DangerousClass.values()) { + if (d.name.equals(name)) { + return d; + } } + return null; } - return Converter.super.convertToJavaData(context); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdSqjzConverter.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdSqjzConverter.java index 8de25b0e9a..7e352d1b81 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdSqjzConverter.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdSqjzConverter.java @@ -3,6 +3,11 @@ package com.epmet.excel.converter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.ReadConverterContext; import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import org.omg.CORBA.PRIVATE_MEMBER; /** * 灵山-社区矫正转换器 @@ -19,33 +24,103 @@ public class LingShanSpecialCrowdSqjzConverter implements Converter { } @Override - public Integer convertToJavaData(ReadConverterContext context) throws Exception { - Object content = context.getReadCellData().getStringValue(); - if (content instanceof String) { - switch ((String) content) { - // 矫正类型 - case "管制": - return 1; - case "缓刑": - return 2; - case "假释": - return 3; - case "暂予监外执行": - return 4; - case "剥夺政治权利": - return 5; - // 接受方式 - case "自行报到": - return 1; - case "狱所押送": - return 2; - case "当庭交接": - return 3; - case "其他": - return 4; + public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + String fieldName = contentProperty.getField().getName(); + String value = cellData.getStringValue(); + if (fieldName.equals("rectificateType")) { + return RectificateType.getByName(value).code; + } else if (fieldName.equals("receiveWay")) { + return ReceiveWay.getByName(value).code; + } + + return Converter.super.convertToJavaData(cellData, contentProperty, globalConfiguration); + } + + @Override + public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + String fieldName = contentProperty.getField().getName(); + if (fieldName.equals("rectificateType")) { + return new WriteCellData(RectificateType.getByCode(value).name); + } else if (fieldName.equals("receiveWay")) { + return new WriteCellData(ReceiveWay.getByCode(value).name); + } + + return Converter.super.convertToExcelData(value, contentProperty, globalConfiguration); + } + + /** + * 矫正类型 + */ + public enum RectificateType { + GUANZHI(1,"管制"), + HUANXING(2,"缓刑"), + JIASHI(3,"假释"), + ZYJWZX(4,"暂予监外执行"), + BDZZQL(5,"剥夺政治权利"); + + private Integer code; + private String name; + + RectificateType(Integer code, String name) { + this.code = code; + this.name = name; + } + + static RectificateType getByCode(Integer code) { + for (RectificateType d : RectificateType.values()) { + if (d.code.equals(code)) { + return d; + } } + return null; + } + + static RectificateType getByName(String name) { + for (RectificateType d : RectificateType.values()) { + if (d.name.equals(name)) { + return d; + } + } + return null; + } + } + + /** + * 接受方式。1.自行报到，2狱所押送，3当庭交接，4其他 + */ + public enum ReceiveWay { + ZXBD(1,"自行报到"), + YSYS(2,"狱所押送"), + DTJJ(3,"当庭交接"), + OTHERS(4,"其他"); + + private Integer code; + private String name; + + ReceiveWay(Integer code, String name) { + this.code = code; + this.name = name; + } + + static ReceiveWay getByCode(Integer code) { + for (ReceiveWay d : ReceiveWay.values()) { + if (d.code.equals(code)) { + return d; + } + } + return null; + } + + static ReceiveWay getByName(String name) { + for (ReceiveWay d : ReceiveWay.values()) { + if (d.name.equals(name)) { + return d; + } + } + return null; } - return Converter.super.convertToJavaData(context); } + + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java new file mode 100644 index 0000000000..1f9281d224 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/converter/LingShanSpecialCrowdYesOrNoConverter.java @@ -0,0 +1,78 @@ +package com.epmet.excel.converter; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.converters.ReadConverterContext; +import com.alibaba.excel.converters.WriteConverterContext; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.data.WriteCellData; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.List; + +/** + * 灵山-是否转换器 + */ +public class LingShanSpecialCrowdYesOrNoConverter implements Converter { + List group1 = Arrays.asList("localFlag", "multipleFlag", "recidivismFlag", "emplacementFlag", "canceledFlag", + "detachedFlag", "canGoOutFlag", "violenceFlag", "allowanceFlag", "subsistenceFlag"); + + List group2 = Arrays.asList("criminalHistoryFlag", "drugRepetitionFlag", "causeTroubleHistoryFlag"); + + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + @Override + public Class supportJavaTypeKey() { + return Integer.class; + } + + @Override + public Integer convertToJavaData(ReadConverterContext context) throws Exception { + String content = context.getReadCellData().getStringValue(); + if (StringUtils.isNotBlank(content)) { + if (content.equals("是") || content.equals("有")) { + return 1; + } else if (content.equals("无") || content.equals("否")) { + return 0; + } + } + return Converter.super.convertToJavaData(context); + } + + @Override + public WriteCellData convertToExcelData(WriteConverterContext context) throws Exception { + String fieldName = context.getContentProperty().getField().getName(); + Integer value = context.getValue(); + if (group1.contains(fieldName)) { + return convertYesOrNoFlag(value); + } else if (group2.contains(fieldName)) { + return convertHaveOrNotFlag(value); + } + + return Converter.super.convertToExcelData(context); + } + + WriteCellData convertHaveOrNotFlag(Integer value) { + if (value.equals(1)) { + return new WriteCellData("有"); + } else if (value.equals(0)) { + return new WriteCellData("无"); + } else { + return new WriteCellData("未知"); + } + } + + WriteCellData convertYesOrNoFlag(Integer value) { + if (value.equals(1)) { + return new WriteCellData("是"); + } else if (value.equals(0)) { + return new WriteCellData("否"); + } else { + return new WriteCellData("未知"); + } + } +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailAzbjExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailAzbjExcelData.java index 49bacc91d7..64c5b887b3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailAzbjExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailAzbjExcelData.java @@ -1,7 +1,8 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; -import com.epmet.excel.converter.LingShanSpecialCrowdIsOrNotConverter; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -26,30 +27,33 @@ public class LingShanSpecialCrowdDetailAzbjExcelData extends LingShanSpecialCrow */ @ExcelProperty(value = "*释放日期") @NotNull(message = "释放日期不能为空") + @DateTimeFormat("yyyy/MM/dd") private Date releaseDate; /** * 原判刑期（单位：月） */ @ExcelProperty(value = "原判刑期（单位：月）") + @DateTimeFormat("yyyy/MM/dd") private Date originPrisonTerm; /** * 是否累犯。0否，1是 */ - @ExcelProperty(value = "是否累犯", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否累犯", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer recidivismFlag; /** * 是否安置。0否，1是 */ - @ExcelProperty(value = "是否安置", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否安置", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer emplacementFlag; /** * 安置日期 */ @ExcelProperty(value = "安置日期") + @DateTimeFormat("yyyy/MM/dd") private Date emplacementDate; /** @@ -61,7 +65,7 @@ public class LingShanSpecialCrowdDetailAzbjExcelData extends LingShanSpecialCrow /** * 是否注销 */ - @ExcelProperty(value = "是否注销", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否注销", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer canceledFlag; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailBaseExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailBaseExcelData.java index 1d43fb5790..27c97a9d0e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailBaseExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingShanSpecialCrowdDetailBaseExcelData.java @@ -26,5 +26,6 @@ public class LingShanSpecialCrowdDetailBaseExcelData { /** * 错误信息 */ + @ExcelProperty(value = "错误信息") private String errorInfo; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJdryExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJdryExcelData.java index 8ca975af70..76f17cb45f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJdryExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJdryExcelData.java @@ -1,13 +1,10 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import com.epmet.excel.converter.LingShanSpecialCrowdIsOrNotConverter; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import lombok.Data; -import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; @@ -23,14 +20,14 @@ public class LingshanSpecialCrowdDetailJdryExcelData extends LingShanSpecialCrow /** * 有无犯罪史 */ - @ExcelProperty(value = "*有无犯罪史", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "*有无犯罪史", converter = LingShanSpecialCrowdYesOrNoConverter.class) @NotNull(message = "有无犯罪史不能为空") private Integer criminalHistoryFlag; /** * 有无复吸史 */ - @ExcelProperty(value = "*有无复吸史", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "*有无复吸史", converter = LingShanSpecialCrowdYesOrNoConverter.class) @NotNull(message = "有无复吸史不能为空") private Integer drugRepetitionFlag; @@ -38,6 +35,7 @@ public class LingshanSpecialCrowdDetailJdryExcelData extends LingShanSpecialCrow * 初次发现日期 */ @ExcelProperty(value = "初次发现日期") + @DateTimeFormat("yyyy/MM/dd") private Date firstDiscoveryDate; /** @@ -67,7 +65,7 @@ public class LingshanSpecialCrowdDetailJdryExcelData extends LingShanSpecialCrow /** * 是否脱管 */ - @ExcelProperty(value = "是否脱管", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否脱管", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer detachedFlag; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJzhzExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJzhzExcelData.java index 067cd35987..98d5012bb1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJzhzExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailJzhzExcelData.java @@ -1,11 +1,10 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; -import com.epmet.excel.converter.LingShanSpecialCrowdIsOrNotConverter; +import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import com.epmet.excel.converter.LingShanSpecialCrowdJzhzConverter; import lombok.Data; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** @@ -22,7 +21,7 @@ public class LingshanSpecialCrowdDetailJzhzExcelData extends LingShanSpecialCrow /** * 有无肇事肇祸史 */ - @ExcelProperty(value = "*有无肇事肇祸史", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "*有无肇事肇祸史", converter = LingShanSpecialCrowdYesOrNoConverter.class) @NotNull(message = "有无肇事肇祸史不能为空") private Integer causeTroubleHistoryFlag; @@ -48,25 +47,25 @@ public class LingshanSpecialCrowdDetailJzhzExcelData extends LingShanSpecialCrow /** * 是否具备外出能力 */ - @ExcelProperty(value = "是否具备外出能力", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否具备外出能力", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer canGoOutFlag; /** * 是否有暴力倾向 */ - @ExcelProperty(value = "是否有暴力倾向", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否有暴力倾向", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer violenceFlag; /** * 是否落实监管补助 */ - @ExcelProperty(value = "是否落实监管补助", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否落实监管补助", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer allowanceFlag; /** * 是否纳入低保 */ - @ExcelProperty(value = "是否纳入低保", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否纳入低保", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer subsistenceFlag; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailSqjzExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailSqjzExcelData.java index 950ce47381..06966e6de8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailSqjzExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailSqjzExcelData.java @@ -1,14 +1,11 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import com.epmet.excel.converter.LingShanSpecialCrowdIsOrNotConverter; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import com.epmet.excel.converter.LingShanSpecialCrowdSqjzConverter; import lombok.Data; -import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; @@ -33,12 +30,14 @@ public class LingshanSpecialCrowdDetailSqjzExcelData extends LingShanSpecialCrow * 矫正开始日期 */ @ExcelProperty(value = "矫正开始日期") + @DateTimeFormat("yyyy/MM/dd") private Date rectificateStartDate; /** * 矫正结束日期 */ @ExcelProperty(value = "矫正结束日期") + @DateTimeFormat("yyyy/MM/dd") private Date rectificateEndDate; /** @@ -68,7 +67,7 @@ public class LingshanSpecialCrowdDetailSqjzExcelData extends LingShanSpecialCrow /** * 是否脱管 */ - @ExcelProperty(value = "是否脱管", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否脱管", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer detachedFlag; /** @@ -80,7 +79,7 @@ public class LingshanSpecialCrowdDetailSqjzExcelData extends LingShanSpecialCrow /** * 是否注销 */ - @ExcelProperty(value = "是否注销" , converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否注销" , converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer canceledFlag; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailXfryExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailXfryExcelData.java index f7a865a3ba..5ba1ca13bb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailXfryExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/LingshanSpecialCrowdDetailXfryExcelData.java @@ -1,11 +1,8 @@ package com.epmet.excel.data; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableName; -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import com.epmet.excel.converter.LingShanSpecialCrowdIsOrNotConverter; +import com.epmet.excel.converter.LingShanSpecialCrowdYesOrNoConverter; import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; @@ -35,13 +32,13 @@ public class LingshanSpecialCrowdDetailXfryExcelData extends LingShanSpecialCrow /** * 是否多次上访 */ - @ExcelProperty(value = "是否多次上访", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否多次上访", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer multipleFlag; /** * 是否在当地 */ - @ExcelProperty(value = "是否在当地", converter = LingShanSpecialCrowdIsOrNotConverter.class) + @ExcelProperty(value = "是否在当地", converter = LingShanSpecialCrowdYesOrNoConverter.class) private Integer localFlag; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java index 72bea84f54..58c06e92e3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java @@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils; import org.redisson.api.RLock; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -99,6 +100,8 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener correctDatas = new ArrayList<>(); + private AtomicInteger correctDatasQty = new AtomicInteger(); + private List persons = new ArrayList<>(); private List personTypes = new ArrayList<>(); @@ -118,6 +121,7 @@ public abstract class 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 delta 5320 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 diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/lingshan_special_crowd_jdry_export.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/lingshan_special_crowd_jdry_export.xlsx index 2ab27382504a9235ab49e89b7a21e5cfc2f17a6b..b584c9be478a96002dd2bc61f7db6fce50eb9ed9 100644 GIT binary patch delta 5242 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 delta 5233 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 b&JZ>nPtbZ0{v6i-`ITJfki`;*{EPKpKZkbe delta 5572 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 H{$21N3e=R# diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/lingshan_special_crowd_sqjz_export.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/lingshan_special_crowd_sqjz_export.xlsx index 47927aa2a0261e390176a94a7509553df85c7b28..821ac90f7e23f6e03622cefc0a8b3c9af8fad3cb 100644 GIT binary patch delta 5549 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 L9!fF&za#$wttn~% delta 5560 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 If9(MM528nJ#{d8T delta 4986 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 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdDetailSqjzDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdDetailSqjzDao.xml index fd26ee7938..f290ca4daa 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdDetailSqjzDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdDetailSqjzDao.xml @@ -51,7 +51,7 @@ , RECTIFICATE_INFO = values(RECTIFICATE_INFO), DETACHED_FLAG = values(DETACHED_FLAG) , DETACHED_REASON = values(DETACHED_REASON), CANCELED_FLAG = values(CANCELED_FLAG) , CANCELED_REASON = values(CANCELED_REASON) - , UPDATED_BY = values(UPDATED_BY), + , UPDATED_BY = values(UPDATED_BY) , UPDATED_TIME = values(UPDATED_TIME)