From 38a33fdca0d4e4010a7ab67eaca46901f8d5a8b9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 10 May 2022 16:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=90=8D=E4=BA=86=E5=91=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/IcResiUserConstant.java | 9 +++++++++ .../com/epmet/constant/IcResiUserConstant.java | 14 -------------- .../controller/IcTripReportRecordController.java | 1 - .../handler/IcTripReportExcelImportListener.java | 1 - .../service/impl/IcResiUserExportServiceImpl.java | 1 - .../impl/IcTripReportRecordServiceImpl.java | 1 - 6 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/IcResiUserConstant.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java index 84a00be746..e5817de8cf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java @@ -15,4 +15,13 @@ public interface IcResiUserConstant { String USER_TYPE_IC_RESI="icresi"; String USER_TYPE_INPUT="input"; String USER_TYPE_IMPORT="import"; + + + // origin:变动：change; 迁出：out; 死亡：died; 出生birth; 迁入：in + String CHANGE = "change"; + String OUT = "out"; + String DIED = "died"; + String BIRTH = "birth"; + String IN = "in"; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/IcResiUserConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/IcResiUserConstant.java deleted file mode 100644 index d59ec493d4..0000000000 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/IcResiUserConstant.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.epmet.constant; - -public interface IcResiUserConstant { - // origin:变动：change; 迁出：out; 死亡：died; 出生birth; 迁入：in - String CHANGE = "change"; - String OUT = "out"; - String DIED = "died"; - String BIRTH = "birth"; - String IN = "in"; - - - - -} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 6e1aff48ff..72d0f8283c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -19,7 +19,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.constant.IcResiUserConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcTripReportRecordDTO; import com.epmet.dto.form.IcTripReportFormDTO; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java index 20e9ed3dc5..3a521ab157 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java @@ -7,7 +7,6 @@ import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.constant.IcResiUserConstant; import com.epmet.entity.IcTripReportRecordEntity; import com.epmet.excel.data.IcTripReportExcelData; import com.epmet.service.impl.IcTripReportRecordServiceImpl; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 0edf48b55f..c6ebaed2fc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -27,7 +27,6 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.constant.IcResiUserConstant; import com.epmet.dto.form.ExportResiUserFormDTO; import com.epmet.dto.form.IcExportTemplateQueryFormDTO; import com.epmet.dto.form.IcResiUserPageFormDTO; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 97f5ed43e0..df68662c19 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -21,7 +21,6 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.IcResiUserConstant; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcTripReportRecordDao; import com.epmet.dao.UserBaseInfoDao;