diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java index 7abec7d07..d6caa9b0f 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java @@ -8,6 +8,8 @@ import org.apache.commons.codec.CharEncoding; import org.springframework.util.Base64Utils; import java.io.UnsupportedEncodingException; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.UUID; /** @@ -79,4 +81,26 @@ public class ModuleUtils { throw new RenException("字符串编码方法异常"); } } + + /** + * 验证字符串是否是日期格式 + * + * @param str 被验证的字符串 + * @param dateFormat 指定日期格式 + * @return boolean + * @author work@yujt.net.cn + * @date 2020/2/7 10:53 + */ + public static boolean isValidDate(String str, String dateFormat) { + boolean convertSuccess = true; + // 指定日期格式 + SimpleDateFormat format = new SimpleDateFormat(dateFormat); + try { + format.setLenient(false); + format.parse(str); + } catch (ParseException e) { + convertSuccess = false; + } + return convertSuccess; + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java index e3ef61c7d..229442daf 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.utils.DateUtils; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -33,32 +34,20 @@ public class ScheduleJobParamDTO { public ScheduleJobParamDTO getByJobParams(String params) { - ScheduleJobParamDTO scheduleJobParam = null; + ScheduleJobParamDTO scheduleJobParam; try { scheduleJobParam = JSONObject.parseObject(params, ScheduleJobParamDTO.class); String dateStr = scheduleJobParam.getDateStr(); if (StringUtils.isBlank(dateStr)) { scheduleJobParam.setDateStr(null); - } else if (!isValidDate(dateStr)) { + } else if (!ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) { scheduleJobParam.setDateStr(null); } } catch (Exception e) { - log.error("定时任务参数格式错误,报错参数:{}", params); + log.error("定时任务参数格式错误,错误参数:{}", params); throw new RenException("定时任务参数格式错误"); } return scheduleJobParam; } - private static boolean isValidDate(String str) { - boolean convertSuccess = true; - // 指定日期格式 - SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN); - try { - format.setLenient(false); - format.parse(str); - } catch (ParseException e) { - convertSuccess = false; - } - return convertSuccess; - } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java index 9ef5ef28c..e47ab88d9 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java @@ -737,10 +737,10 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl getUniqueWrapper(KpiManualScoreEntity entity) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(entity.getRuleId()), "RULE_ID", entity.getRuleId()) - .eq(null != entity.getDeptId(), "DEPT_ID", entity.getDeptId()) - .eq("score_end_date", entity.getScoreEndDate()) - .eq("score_start_date", entity.getScoreStartDate()); + wrapper.eq(StringUtils.isNotBlank(entity.getRuleId()), KpiFieldConstant.RULE_ID, entity.getRuleId()) + .eq(null != entity.getDeptId(), KpiFieldConstant.DEPT_ID, entity.getDeptId()) + .eq(KpiFieldConstant.SCORE_END_DATE, entity.getScoreEndDate()) + .eq(KpiFieldConstant.SCORE_START_DATE, entity.getScoreStartDate()); return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java index aac232fa4..32444f7e3 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java @@ -30,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.KpiFieldConstant; import com.elink.esua.epdc.constant.KpiScheduleCodeConstant; @@ -315,7 +316,12 @@ public class KpiRuleServiceImpl extends BaseServiceImpl