fix 时间格式

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -78,6 +78,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return new SimpleDateFormat(format).format(date);
     }
 
+    public static final Date dateTimeThrow(final String format, final String ts) throws ParseException {
+        return new SimpleDateFormat(format).parse(ts);
+    }
+
     public static final Date dateTime(final String format, final String ts)
     {
         try

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ActivityAdvertisingServiceImpl.java

@@ -1,12 +1,15 @@
 package com.zhongzheng.modules.base.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.base.bo.ActivityAdvertisingAddBo;
 import com.zhongzheng.modules.base.bo.ActivityAdvertisingEditBo;
 import com.zhongzheng.modules.base.bo.ActivityAdvertisingQueryBo;
 import com.zhongzheng.modules.base.domain.ActivityAdvertising;
+import com.zhongzheng.modules.base.domain.Certificate;
 import com.zhongzheng.modules.base.mapper.ActivityAdvertisingMapper;
 import com.zhongzheng.modules.base.service.IActivityAdvertisingService;
 import com.zhongzheng.modules.base.vo.ActivityAdvertisingVo;
@@ -94,6 +97,9 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
      */
     private void validEntityBeforeSave(ActivityAdvertising entity){
         //TODO 做一些数据校验,如唯一约束
+        if(checkNameUnique(entity)&& Validator.isEmpty(entity.getId())){
+            throw new CustomException("名称重复");
+        }
     }
 
     @Override
@@ -103,4 +109,20 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         }
         return this.removeByIds(ids);
     }
+
+    private boolean checkNameUnique(ActivityAdvertising entity) {
+        ActivityAdvertising info = getOne(new LambdaQueryWrapper<ActivityAdvertising>()
+                .eq(ActivityAdvertising::getAdvName,entity.getAdvName()).ne(ActivityAdvertising::getStatus,-1)
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            if(Validator.isNotEmpty(entity.getId())){
+                if(entity.getId().longValue() != info.getId().longValue()){
+                    return true;
+                }
+            }else{
+                return true;
+            }
+        }
+        return false;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSubscribeService.java

@@ -65,9 +65,9 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 
 	boolean editCertificate(List<UserSubscribeCertificateEditBo> bo);
 
-	Map<String, Object> importData(List<UserSubscribeImport> userSubscribeImportList) throws ParseException;
+	Map<String, Object> importData(List<UserSubscribeImport> userSubscribeImportList);
 
-	Map<String,Object> importTrainData(List<UserSubscribeImport> userSubscribeImportList) throws ParseException;
+	Map<String,Object> importTrainData(List<UserSubscribeImport> userSubscribeImportList);
 
 	Map<String, Object> importUpdateData(List<UserSubscribeImport> userSubscribeImportList);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -508,7 +508,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> importData(List<UserSubscribeImport> userSubscribeImportList) throws ParseException {
+    public Map<String, Object> importData(List<UserSubscribeImport> userSubscribeImportList)  {
         if (CollectionUtils.isEmpty(userSubscribeImportList)) {
             throw new IllegalArgumentException("请勿导入空表格");
         }
@@ -541,6 +541,20 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
+            if (userSubscribeImport.getApplySiteExamTime() != null) {
+                try{
+                    userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
+                }catch (ParseException e){
+                    userSubscribeImport.setCause("日期格式错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+            } else {
+                userSubscribeImport.setCause("考试时间未填");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
             userSubscribeAddBo.setGoodsId(goodsId);
             //查询学员Id
             if (StringUtils.isEmpty(userSubscribeImport.getUserName()) || userSubscribeImport.getIdCard() == null) {
@@ -620,13 +634,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
 
-            if (userSubscribeImport.getApplySiteExamTime() != null) {
-                userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
-            } else {
-                userSubscribeImport.setCause("考试时间未填");
-                userSubscribeImports.add(userSubscribeImport);
-                continue;
-            }
+
 
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())) {
                 String[] split = userSubscribeImport.getApplySiteTime().split("-");
@@ -651,7 +659,15 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
             userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
-            String errorMsg = this.insertByAddBoImport(userSubscribeAddBo);
+            String errorMsg = null;
+            try{
+                 errorMsg = this.insertByAddBoImport(userSubscribeAddBo);
+            }catch (ParseException e){
+                userSubscribeImport.setCause("日期格式错误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
             if(Validator.isNotEmpty(errorMsg)){
                 userSubscribeImport.setCause(errorMsg);
                 userSubscribeImports.add(userSubscribeImport);
@@ -667,7 +683,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     }
 
     @Override
-    public Map<String, Object> importTrainData(List<UserSubscribeImport> userSubscribeImportList) throws ParseException {
+    public Map<String, Object> importTrainData(List<UserSubscribeImport> userSubscribeImportList){
         if (CollectionUtils.isEmpty(userSubscribeImportList)) {
             throw new IllegalArgumentException("请勿导入空表格");
         }
@@ -789,7 +805,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
 
             if (Validator.isNotEmpty(userSubscribeImport.getApplySiteExamTime())) {
-                userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
+                try{
+                    userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
+                }catch (ParseException e){
+                    userSubscribeImport.setCause("日期格式错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+
             } else {
                 userSubscribeImport.setCause("考试时间未填");
                 userSubscribeImports.add(userSubscribeImport);
@@ -847,7 +870,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSubscribeAddBo.setImportNo(importNo);
             userSubscribeAddBo.setCreateTime(DateUtils.getNowTime());
             userSubscribeAddBo.setUpdateTime(DateUtils.getNowTime());
-            String errorMsg = this.insertByAddBoImport(userSubscribeAddBo);
+            String errorMsg = null;
+            try{
+                errorMsg = this.insertByAddBoImport(userSubscribeAddBo);
+            }catch (ParseException e){
+                userSubscribeImport.setCause("日期格式错误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
             if(Validator.isNotEmpty(errorMsg)){
                 userSubscribeImport.setCause(errorMsg);
                 userSubscribeImports.add(userSubscribeImport);