Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

定时任务 全部完成

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -53,4 +56,12 @@ public interface ITaskTimeService {
      * @return
      */
     TaskTime getTaskTimeById(String id);
+
+    /**
+     * 定时任务复制查询，分页，排序
+     * @param taskTime
+     * @param pager
+     * @return
+     */
+    ListPager queryTaskTimeByPager(TaskTime taskTime, Pager pager);
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService;
 import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -181,4 +183,19 @@ public class TaskTimeController {
             return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
         }
     }
+
+    @GetMapping("/query")
+    @ApiOperation(value = "定时任务复杂查询，分页，排序",notes = "定时任务复杂查询，分页，排序")
+    public ResultBean queryTaskTimeByPager(TaskTime taskTime, Pager pager){
+        try {
+            ListPager taskTimeListPager = taskTimeService.queryTaskTimeByPager(taskTime,pager);
+            return  ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -125,7 +127,7 @@ public class TaskTimeExpressionController {
 
     @GetMapping(value = "/get/{id}")
     @ApiOperation(value = "查询系统时间表达式", notes = "查询根据ID查询系统时间表达式")
-    public ResultBean getByTaskTimeExpressionId(@PathVariable("id") String id) {
+    public ResultBean getTaskTimeExpressionById(@PathVariable("id") String id) {
         try {
             // 数据校验
             ValidatorBean.checkNotNull(id, "定时任务id 不能为空");
@@ -143,4 +145,19 @@ public class TaskTimeExpressionController {
             return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
+
+    @GetMapping("query")
+    @ApiOperation(value = "时间表达式查询，分页，排序",notes = "时间表达式查询，分页，排序")
+    public ResultBean queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager){
+        try {
+            ListPager taskTimeExpressionListPager = taskTimeExpressionService.queryTaskTimeExpressionByPager(taskTimeExpression,pager);
+            return  ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java

@@ -111,7 +111,7 @@ public class SysMessageService implements ISysMessageService {
     @Override
     public void deleteSysMessageByIds(String[] ids) {
         LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString());
-        long[] array = new long[ids.length];
+        Long[] array = new Long[ids.length];
         for (int i = 0; i < ids.length; i++) {
             array[i] = Long.parseLong(ids[i]);
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java

@@ -66,7 +66,7 @@ public class TaskTimeExpressionServiceImpl implements ITaskTimeExpressionService
             pager = PagerHelper.getPager(pager, taskTimeRecordingRDao.listCount());
             return new ListPager(taskTimeRecordingRDao.listPager(pager),pager);
         }else {
-            String hqlPack = CoreHqlPack.packHqlSysFile(taskTimeExpression);
+            String hqlPack = CoreHqlPack.packHqlTaskTimeExpression(taskTimeExpression);
             pager = PagerHelper.getPager(pager, taskTimeRecordingRDao.findByHqlWhereCount(hqlPack));
             return new ListPager(taskTimeRecordingRDao.findByHqlWherePage(hqlPack + taskTimeExpression.orderBy(),pager),pager);
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java

@@ -1,11 +1,15 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
 import cn.estsh.i3plus.pojo.platform.repository.TaskTimeRepository;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import org.slf4j.Logger;
@@ -32,7 +36,7 @@ public class TaskTimeServiceImpl implements ITaskTimeService {
 
     @Override
     public void updateTaskTime(TaskTime taskTime) {
-        LOGGER.info("定时任务 TASK_TIMED :{}", taskTime);
+        LOGGER.info("定时任务 TASK_TIME :{}", taskTime);
         taskTimeRDao.update(taskTime);
     }
 
@@ -47,25 +51,38 @@ public class TaskTimeServiceImpl implements ITaskTimeService {
 
     @Override
     public void deleteTaskTimeById(String id) {
-        LOGGER.info("定时任务 TASK_TIMED Key:{}", id);
+        LOGGER.info("定时任务 TASK_TIME Key:{}", id);
         taskTimeRDao.deleteById(Long.parseLong(id));
     }
 
     @Override
     public TaskTime insertTaskTime(TaskTime taskTime) {
-        LOGGER.info("定时任务 TASK_TIMED :{}", taskTime);
+        LOGGER.info("定时任务 TASK_TIME :{}", taskTime);
         return taskTimeRDao.insert(taskTime);
     }
 
     @Override
     public List<TaskTime> listTaskTime() {
-        LOGGER.info("定时任务 TASK_TIMED find All");
+        LOGGER.info("定时任务 TASK_TIME find All");
         return taskTimeRDao.findAll();
     }
 
     @Override
     public TaskTime getTaskTimeById(String id) {
-        LOGGER.info("定时任务 TASK_TIMED find id:{}", id);
+        LOGGER.info("定时任务 TASK_TIME find id:{}", id);
         return taskTimeRDao.getOne(Long.parseLong(id));
     }
+
+    @Override
+    public ListPager queryTaskTimeByPager(TaskTime taskTime, Pager pager) {
+        LOGGER.info("定时任务 TASK_TIME TaskTime:{}，Pager:{}",taskTime,pager);
+        if(taskTime == null) {
+            pager = PagerHelper.getPager(pager, taskTimeRDao.listCount());
+            return new ListPager(taskTimeRDao.listPager(pager),pager);
+        }else {
+            String hqlPack = CoreHqlPack.packHqlTaskTime(taskTime);
+            pager = PagerHelper.getPager(pager, taskTimeRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(taskTimeRDao.findByHqlWherePage(hqlPack + taskTime.orderBy(),pager),pager);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeService.java

@@ -0,0 +1,109 @@
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
+import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
+import com.alibaba.fastjson.JSON;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Rollback;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @Date : 2018-11-03 00:09
+ * @Modify :
+ **/
+public class TestTaskTimeService extends TestBase {
+
+    @Autowired
+    ITaskTimeService taskTimeService;
+
+    /**
+     * 测试 查询所有硬件
+     */
+    @Test
+    @Transactional
+    public void testListTaskTime() {
+        List list = taskTimeService.listTaskTime();
+        System.out.println(JSON.toJSONString(list));
+    }
+
+    /**
+     * 测试 根据id查询硬件
+     */
+    @Test
+    @Transactional
+    public void testGetTaskTimeById() {
+        TaskTime taskTime = taskTimeService.getTaskTimeById("1057110061127700480");
+        System.out.println(JSON.toJSONString(taskTime));
+    }
+
+    /**
+     * 测试 添加硬件
+     */
+    @Test
+    @Transactional
+    @Rollback(false)
+    public void testInsertTaskTime() {
+        TaskTime taskTime = new TaskTime();
+        taskTime.setName("时间表达式");
+        taskTime.setTaskStartDateTime("2018-01-01 00:00:00");
+        taskTime.setTaskEndDateTime("2018-12-31 00:00:00");
+        taskTime.setLastRunDateTime("2018-11-03 00:00:00");
+        taskTime.setTaskTypeId(ImppEnumUtil.TASK_METHOD_TYPE.TYPE_GROUP.getValue());
+        taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
+
+        for (int i = 0; i < 50; i++) {
+            taskTime.setId(null);
+            taskTime.setName("时间表达式"+i);
+            taskTimeService.insertTaskTime(taskTime);
+        }
+        System.out.println(JSON.toJSONString(taskTime));
+    }
+
+    /**
+     * 测试 修改硬件
+     */
+    @Test
+    @Transactional
+    public void testUpdateTaskTime(){
+        TaskTime taskTime = taskTimeService.getTaskTimeById("1057110613261684736");
+        taskTime.setName("测试修改");
+
+        taskTimeService.updateTaskTime(taskTime);
+    }
+
+    /**
+     * 测试 根据id删除硬件
+     */
+    @Test
+    @Transactional
+    public void testDeleteTaskTimeById(){
+        taskTimeService.deleteTaskTimeById("1057111616417566720");
+    }
+
+    /**
+     * 测试 复杂查询
+     */
+    @Test
+    @Transactional
+    public void testQueryTaskTimeByPager(){
+        TaskTime taskTime = new TaskTime();
+
+        Pager pager = new Pager();
+        pager.setPageSize(10);
+        pager.setCurrentPage(5);
+
+        ListPager list = taskTimeService.queryTaskTimeByPager(taskTime,pager);
+        System.out.println(list);
+    }
+}