From b8ca3e1e01f3b302abcb656db732065f3f2ee119 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jul 2020 15:15:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E5=B1=85=E6=B0=91=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=B3=B0-2020-07-30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/service/impl/UserServiceImpl.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 7ba654ecd..95572042d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1558,11 +1558,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public PageData<UserDTO> authenticatedpage(Map<String, Object> params) {
-        String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
-        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
-            List<UserDTO> userDtoList = Lists.newArrayList();
-            return new PageData<>(userDtoList, NumConstant.ZERO);
-        }
+//        String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
+//        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+//            List<UserDTO> userDtoList = Lists.newArrayList();
+//            return new PageData<>(userDtoList, NumConstant.ZERO);
+//        }
         this.verifyParams(params);
         // 查询当前用户所具有的的数据权限
         params.put("deptIdList",SecurityUser.getUser().getDeptIdList());

From 7d69beedee410dfb8e7d5705af5daa5ab6adcd31 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 30 Jul 2020 17:02:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-=E5=AE=9A=E6=97=B6bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=E8=A1=A8?=
 =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E6=A0=A1=E9=AA=8C=E4=BD=8D=E7=BD=AE=E3=80=91?=
 =?UTF-8?q?=E9=AD=8F=E5=87=AF=202020-07-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ScheduleJobServiceImpl.java   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
index fa8b480ec..1536044f0 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.entity.ScheduleJobEntity;
+import com.elink.esua.epdc.exception.ModuleErrorCode;
 import com.elink.esua.epdc.utils.ScheduleUtils;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
@@ -23,15 +24,14 @@ import com.elink.esua.epdc.dto.ScheduleJobDTO;
 import com.elink.esua.epdc.enums.ScheduleStatusEnum;
 import com.elink.esua.epdc.service.ScheduleJobService;
 import org.apache.commons.lang3.StringUtils;
+import org.quartz.CronExpression;
+import org.quartz.CronScheduleBuilder;
 import org.quartz.Scheduler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class ScheduleJobServiceImpl extends BaseServiceImpl<ScheduleJobDao, ScheduleJobEntity> implements ScheduleJobService {
@@ -69,10 +69,16 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl<ScheduleJobDao, Sche
         ScheduleJobEntity entity = ConvertUtils.sourceToTarget(dto, ScheduleJobEntity.class);
         entity.setStatus(ScheduleStatusEnum.NORMAL.value());
         try{
-            ScheduleUtils.createScheduleJob(scheduler, entity);
+            Date date;
+            CronExpression exp = new CronExpression(dto.getCronExpression());
+            date = exp.getNextValidTimeAfter(new Date());
+            if (date == null) {
+                throw new RenException("请输入正确的表达式");
+            }
             this.insert(entity);
+            ScheduleUtils.createScheduleJob(scheduler, entity);ScheduleUtils.createScheduleJob(scheduler, entity);
         }catch (Exception e){
-            throw new RenException("请输入正确的表达式");
+            throw new RenException(ModuleErrorCode.JOB_ERROR, e);
         }