From b2fa12af199acd5ca4e23a2c3b87ee3e016fe1a0 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Sun, 28 Apr 2024 19:25:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=BC=94=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/inspect/hzinfo-inspect.iml | 339 +-------------------- .../mapper/EventRecordTemplateMapper.java | 15 + .../showTempalte/mapper/EventTemplateMapper.java | 8 + .../showTempalte/mapper/PlanTemplateMapper.java | 15 + .../TaskObjectProjectContentTemplateMapper.java | 10 + .../mapper/TaskObjectProjectTemplateMapper.java | 9 + .../mapper/TaskObjectTemplateMapper.java | 8 + .../showTempalte/mapper/TaskTemplateMapper.java | 8 + .../service/IEventRecordTemplateService.java | 8 + .../service/IEventTemplateService.java | 8 + .../showTempalte/service/IPlanTemplateService.java | 15 + .../ITaskObjectProjectContentTemplateService.java | 15 + .../service/ITaskObjectProjectTemplateService.java | 8 + .../service/ITaskObjectTemplateService.java | 7 + .../showTempalte/service/ITaskTemplateService.java | 7 + .../impl/EventRecordTemplateServiceImpl.java | 19 ++ .../service/impl/EventTemplateServiceImpl.java | 19 ++ .../service/impl/PlanTemplateServiceImpl.java | 20 ++ ...askObjectProjectContentTemplateServiceImpl.java | 19 ++ .../impl/TaskObjectProjectTemplateServiceImpl.java | 16 + .../impl/TaskObjectTemplateServiceImpl.java | 19 ++ .../service/impl/TaskTemplateServiceImpl.java | 17 ++ .../task/controller/CreateTaskController.java | 39 +++ .../task/entity/EventRecordTemplateEntity.java | 20 ++ .../inspect/task/entity/EventTemplateEntity.java | 27 ++ .../inspect/task/service/ICreateTaskService.java | 9 + .../task/service/impl/CreateTaskServiceImpl.java | 269 ++++++++++++++++ 27 files changed, 636 insertions(+), 337 deletions(-) create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventRecordTemplateMapper.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventTemplateMapper.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/PlanTemplateMapper.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectContentTemplateMapper.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectTemplateMapper.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectTemplateMapper.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskTemplateMapper.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/CreateTaskController.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventRecordTemplateEntity.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventTemplateEntity.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ICreateTaskService.java create mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/CreateTaskServiceImpl.java diff --git a/hzims-service/inspect/hzinfo-inspect.iml b/hzims-service/inspect/hzinfo-inspect.iml index 6e5d7b6..40defed 100644 --- a/hzims-service/inspect/hzinfo-inspect.iml +++ b/hzims-service/inspect/hzinfo-inspect.iml @@ -1,5 +1,5 @@ - + @@ -7,6 +7,7 @@ + @@ -14,340 +15,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventRecordTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventRecordTemplateMapper.java new file mode 100644 index 0000000..3a340a9 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventRecordTemplateMapper.java @@ -0,0 +1,15 @@ +package com.hnac.hzinfo.inspect.showTempalte.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzinfo.inspect.task.entity.EventRecordTemplateEntity; + +/** + * @ClassName EventRecordTemplateMapper + * @description: + * @author: hx + * @create: 2023-10-12 15:08 + * @Version 4.0 + **/ +public interface EventRecordTemplateMapper extends BaseMapper { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventTemplateMapper.java new file mode 100644 index 0000000..0a47db1 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/EventTemplateMapper.java @@ -0,0 +1,8 @@ +package com.hnac.hzinfo.inspect.showTempalte.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzinfo.inspect.task.entity.EventTemplateEntity; + +public interface EventTemplateMapper extends BaseMapper { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/PlanTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/PlanTemplateMapper.java new file mode 100644 index 0000000..45152aa --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/PlanTemplateMapper.java @@ -0,0 +1,15 @@ +package com.hnac.hzinfo.inspect.showTempalte.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzinfo.inspect.showTemplate.entity.PlanTemplateEntity; + +/** + * @ClassName PlanTemplateMapper + * @description: + * @author: hx + * @create: 2023-10-12 10:16 + * @Version 4.0 + **/ +public interface PlanTemplateMapper extends BaseMapper { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectContentTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectContentTemplateMapper.java new file mode 100644 index 0000000..ad206ac --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectContentTemplateMapper.java @@ -0,0 +1,10 @@ +package com.hnac.hzinfo.inspect.showTempalte.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectContentTemplateEntity; + +public interface TaskObjectProjectContentTemplateMapper extends BaseMapper { + + + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectTemplateMapper.java new file mode 100644 index 0000000..cb50214 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectProjectTemplateMapper.java @@ -0,0 +1,9 @@ +package com.hnac.hzinfo.inspect.showTempalte.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectTemplateEntity; + +public interface TaskObjectProjectTemplateMapper extends BaseMapper { + + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectTemplateMapper.java new file mode 100644 index 0000000..2b31837 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskObjectTemplateMapper.java @@ -0,0 +1,8 @@ +package com.hnac.hzinfo.inspect.showTempalte.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectTemplateEntity; + +public interface TaskObjectTemplateMapper extends BaseMapper { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskTemplateMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskTemplateMapper.java new file mode 100644 index 0000000..e464a3d --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/mapper/TaskTemplateMapper.java @@ -0,0 +1,8 @@ +package com.hnac.hzinfo.inspect.showTempalte.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskTemplateEntity; + +public interface TaskTemplateMapper extends BaseMapper { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java new file mode 100644 index 0000000..d987eba --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventRecordTemplateService.java @@ -0,0 +1,8 @@ +package com.hnac.hzinfo.inspect.showTempalte.service; + +import com.hnac.hzinfo.inspect.task.entity.EventRecordTemplateEntity; +import org.springblade.core.mp.base.BaseService; + +public interface IEventRecordTemplateService extends BaseService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java new file mode 100644 index 0000000..3e4a685 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IEventTemplateService.java @@ -0,0 +1,8 @@ +package com.hnac.hzinfo.inspect.showTempalte.service; + +import com.hnac.hzinfo.inspect.task.entity.EventTemplateEntity; +import org.springblade.core.mp.base.BaseService; + +public interface IEventTemplateService extends BaseService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java new file mode 100644 index 0000000..2e94bdb --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/IPlanTemplateService.java @@ -0,0 +1,15 @@ +package com.hnac.hzinfo.inspect.showTempalte.service; + +import com.hnac.hzinfo.inspect.showTemplate.entity.PlanTemplateEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @ClassName IPlanTemplateService + * @description: + * @author: hx + * @create: 2023-10-12 10:18 + * @Version 4.0 + **/ +public interface IPlanTemplateService extends BaseService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java new file mode 100644 index 0000000..75453fc --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectContentTemplateService.java @@ -0,0 +1,15 @@ +package com.hnac.hzinfo.inspect.showTempalte.service; + +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectContentTemplateEntity; +import org.springblade.core.mp.base.BaseService; + +/** + * @ClassName ITaskObjectProjectContentTemplateService + * @description: + * @author: hx + * @create: 2023-10-12 14:53 + * @Version 4.0 + **/ +public interface ITaskObjectProjectContentTemplateService extends BaseService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java new file mode 100644 index 0000000..b24b006 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectProjectTemplateService.java @@ -0,0 +1,8 @@ +package com.hnac.hzinfo.inspect.showTempalte.service; + +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectTemplateEntity; +import org.springblade.core.mp.base.BaseService; + +public interface ITaskObjectProjectTemplateService extends BaseService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java new file mode 100644 index 0000000..d291692 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskObjectTemplateService.java @@ -0,0 +1,7 @@ +package com.hnac.hzinfo.inspect.showTempalte.service; + +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectTemplateEntity; +import org.springblade.core.mp.base.BaseService; + +public interface ITaskObjectTemplateService extends BaseService { +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java new file mode 100644 index 0000000..aa073ec --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/ITaskTemplateService.java @@ -0,0 +1,7 @@ +package com.hnac.hzinfo.inspect.showTempalte.service; + +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskTemplateEntity; +import org.springblade.core.mp.base.BaseService; + +public interface ITaskTemplateService extends BaseService { +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java new file mode 100644 index 0000000..f56f3b0 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventRecordTemplateServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzinfo.inspect.showTempalte.service.impl; + +import com.hnac.hzinfo.inspect.showTempalte.mapper.EventRecordTemplateMapper; +import com.hnac.hzinfo.inspect.showTempalte.service.IEventRecordTemplateService; +import com.hnac.hzinfo.inspect.task.entity.EventRecordTemplateEntity; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @ClassName EventRecordTemplateServiceImpl + * @description: + * @author: hx + * @create: 2023-10-12 15:16 + * @Version 4.0 + **/ +@Service +public class EventRecordTemplateServiceImpl extends BaseServiceImpl implements IEventRecordTemplateService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java new file mode 100644 index 0000000..83636fc --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/EventTemplateServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzinfo.inspect.showTempalte.service.impl; + +import com.hnac.hzinfo.inspect.showTempalte.mapper.EventTemplateMapper; +import com.hnac.hzinfo.inspect.showTempalte.service.IEventTemplateService; +import com.hnac.hzinfo.inspect.task.entity.EventTemplateEntity; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @ClassName EventTemplateServiceImpl + * @description: + * @author: hx + * @create: 2023-10-12 15:11 + * @Version 4.0 + **/ +@Service +public class EventTemplateServiceImpl extends BaseServiceImpl implements IEventTemplateService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java new file mode 100644 index 0000000..01675f6 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/PlanTemplateServiceImpl.java @@ -0,0 +1,20 @@ +package com.hnac.hzinfo.inspect.showTempalte.service.impl; + +import com.hnac.hzinfo.inspect.showTempalte.mapper.PlanTemplateMapper; +import com.hnac.hzinfo.inspect.showTempalte.service.IPlanTemplateService; +import com.hnac.hzinfo.inspect.showTemplate.entity.PlanTemplateEntity; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @ClassName PlanTemplateServiceImpl + * @description: + * @author: hx + * @create: 2023-10-12 10:18 + * @Version 4.0 + **/ +@Service +public class PlanTemplateServiceImpl extends BaseServiceImpl implements IPlanTemplateService { + + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java new file mode 100644 index 0000000..5a8aef2 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectContentTemplateServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzinfo.inspect.showTempalte.service.impl; + +import com.hnac.hzinfo.inspect.showTempalte.mapper.TaskObjectProjectContentTemplateMapper; +import com.hnac.hzinfo.inspect.showTempalte.service.ITaskObjectProjectContentTemplateService; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectContentTemplateEntity; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @ClassName TaskObjectProjectContentTemplateServiceImpl + * @description: + * @author: hx + * @create: 2023-10-12 14:54 + * @Version 4.0 + **/ +@Service +public class TaskObjectProjectContentTemplateServiceImpl extends BaseServiceImpl implements ITaskObjectProjectContentTemplateService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java new file mode 100644 index 0000000..a05d730 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectProjectTemplateServiceImpl.java @@ -0,0 +1,16 @@ +package com.hnac.hzinfo.inspect.showTempalte.service.impl; + +import com.hnac.hzinfo.inspect.showTempalte.mapper.TaskObjectProjectTemplateMapper; +import com.hnac.hzinfo.inspect.showTempalte.service.ITaskObjectProjectTemplateService; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectProjectTemplateEntity; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +@Slf4j +public class TaskObjectProjectTemplateServiceImpl extends BaseServiceImpl implements ITaskObjectProjectTemplateService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java new file mode 100644 index 0000000..2d29e91 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskObjectTemplateServiceImpl.java @@ -0,0 +1,19 @@ +package com.hnac.hzinfo.inspect.showTempalte.service.impl; + +import com.hnac.hzinfo.inspect.showTempalte.mapper.TaskObjectTemplateMapper; +import com.hnac.hzinfo.inspect.showTempalte.service.ITaskObjectTemplateService; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskObjectTemplateEntity; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * @ClassName TaskObjectTemplateServiceImpl + * @description: + * @author: hx + * @create: 2023-10-12 13:34 + * @Version 4.0 + **/ +@Service +public class TaskObjectTemplateServiceImpl extends BaseServiceImpl implements ITaskObjectTemplateService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java new file mode 100644 index 0000000..6ec3039 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/showTempalte/service/impl/TaskTemplateServiceImpl.java @@ -0,0 +1,17 @@ +package com.hnac.hzinfo.inspect.showTempalte.service.impl; + + +import com.hnac.hzinfo.inspect.showTempalte.mapper.TaskTemplateMapper; +import com.hnac.hzinfo.inspect.showTempalte.service.ITaskTemplateService; +import com.hnac.hzinfo.inspect.showTemplate.entity.TaskTemplateEntity; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +@Slf4j +public class TaskTemplateServiceImpl extends BaseServiceImpl implements ITaskTemplateService { + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/CreateTaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/CreateTaskController.java new file mode 100644 index 0000000..f6c8258 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/CreateTaskController.java @@ -0,0 +1,39 @@ +package com.hnac.hzinfo.inspect.task.controller; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzinfo.inspect.request.GenerateTaskVO; +import com.hnac.hzinfo.inspect.task.service.ICreateTaskService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName CreateTaskController + * @description: + * @author: hx + * @create: 2023-10-12 17:31 + * @Version 4.0 + **/ +@RestController +@RequestMapping("/create/task") +@AllArgsConstructor +@Api(value = "创建巡检任务管理",tags = "创建巡检任务管理") +public class CreateTaskController extends BladeController { + + private final ICreateTaskService createTaskService; + + @PostMapping("/createShowTask") + @ApiOperation("生成演示数据") + @ApiOperationSupport(order = 1) + public R createShowTask(@RequestBody GenerateTaskVO request) { + createTaskService.createShowTask(request); + return R.success("成功！"); + } + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventRecordTemplateEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventRecordTemplateEntity.java new file mode 100644 index 0000000..66fe614 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventRecordTemplateEntity.java @@ -0,0 +1,20 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@TableName("hz_st_ex_event_record_template") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "巡检情况对象-演示模板", description = "") +public class EventRecordTemplateEntity extends EventRecordEntity implements Serializable { + + @ApiModelProperty("是否启用") + private Boolean enable; + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventTemplateEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventTemplateEntity.java new file mode 100644 index 0000000..1e68ce7 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/EventTemplateEntity.java @@ -0,0 +1,27 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @ClassName EventTemplateEntity + * @description: + * @author: hx + * @create: 2023-10-12 15:04 + * @Version 4.0 + **/ +@Data +@TableName("hz_st_ex_event_template") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "巡检任务情况-演示数据模板", description = "巡检任务情况-演示数据模板") +public class EventTemplateEntity extends EventEntity implements Serializable { + + @ApiModelProperty("是否启用") + private Boolean enable; + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ICreateTaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ICreateTaskService.java new file mode 100644 index 0000000..1f8bbcd --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ICreateTaskService.java @@ -0,0 +1,9 @@ +package com.hnac.hzinfo.inspect.task.service; + +import com.hnac.hzinfo.inspect.request.GenerateTaskVO; + +public interface ICreateTaskService { + + void createShowTask(GenerateTaskVO request); + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/CreateTaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/CreateTaskServiceImpl.java new file mode 100644 index 0000000..368d9da --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/CreateTaskServiceImpl.java @@ -0,0 +1,269 @@ +package com.hnac.hzinfo.inspect.task.service.impl; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Lists; +import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; +import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; +import com.hnac.hzinfo.inspect.plan.service.IPlanService; +import com.hnac.hzinfo.inspect.request.GenerateTaskVO; +import com.hnac.hzinfo.inspect.showTempalte.service.*; +import com.hnac.hzinfo.inspect.showTemplate.entity.*; +import com.hnac.hzinfo.inspect.task.entity.*; +import com.hnac.hzinfo.inspect.task.service.*; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.CollectionUtil; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.system.user.entity.User; +import org.springblade.system.user.feign.IUserClient; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * @ClassName CreateTaskServiceImpl + * @description: + * @author: hx + * @create: 2023-10-12 09:20 + * @Version 4.0 + **/ +@Service +@Slf4j +@AllArgsConstructor +public class CreateTaskServiceImpl implements ICreateTaskService { + + private final IUserClient userClient; + private final IPlanTemplateService planTemplateService; + private final IPlanService planService; + private final ITaskTemplateService taskTemplateService; + private final ITaskService taskService; + private final ITaskUserService taskUserService; + private final ITaskObjectTemplateService taskObjectTemplateService; + private final ITaskObjectService taskObjectService; + private final ITaskObjectProjectTemplateService taskObjectProjectTemplateService; + private final ITaskObjectProjectService taskObjectProjectService; + private final ITaskObjectProjectContentTemplateService taskObjectProjectContentTemplateService; + private final ITaskObjectProjectContentService taskObjectProjectContentService; + private final IEventTemplateService eventTemplateService; + private final IEventService eventService; + private final IEventRecordTemplateService eventRecordTemplateService; + private final IEventRecordService eventRecordService; + + + @Override + @Transactional + public void createShowTask(GenerateTaskVO request) { +// R> userListR = userClient.userListByDeptId(request.getAreaDeptId()); +// Assert.isTrue(userListR.isSuccess() && CollectionUtil.isNotEmpty(userListR.getData()),() ->{ +// throw new ServiceException("获取当前机构下用户列表失败!"); +// }); +// List userList = userListR.getData(); + User user = new User(); + user.setId(1699662065616064514L); + List userList = Lists.newArrayList(user); + List planList = planTemplateService.list(Wrappers.lambdaQuery().eq(PlanTemplateEntity::getEnable, true)); + planList.forEach(planTemplate -> this.generateTask(request,planTemplate,userList)); + } + + private void generateTask(GenerateTaskVO request,PlanTemplateEntity planTemplate,List userList) { + // 创建计划 + PlanEntity plan = this.convert(request, planTemplate, userList); + planService.save(plan); + // 创建任务 + List taskList = taskTemplateService.list( + Wrappers.lambdaQuery().eq(TaskTemplateEntity::getPlanId, planTemplate.getId()) + .eq(TaskTemplateEntity::getEnable, true) + ); + List dates = this.dateList(request.getStartDate(), request.getEndDate()); + if(CollectionUtil.isNotEmpty(dates)) { + dates.forEach(date -> { + taskList.forEach(taskTemplate -> { + TaskEntity task = this.convert(request, taskTemplate, userList,date,plan); + taskService.save(task); + // 创建任务执行人员 + TaskUserEntity taskUser = this.getUserByTaskId(request,task.getId(), userList.get(0).getId(), task.getPlanStartTime()); + taskUserService.save(taskUser); + // 创建任务执行对象 + List taskObjectTemplates = taskObjectTemplateService.list(Wrappers.lambdaQuery().eq(TaskObjectTemplateEntity::getTaskId, taskTemplate.getId()).eq(TaskObjectTemplateEntity::getEnable, true)); + List TaskObjectList = taskObjectTemplates.stream().map(taskObjectTemplate -> this.convert(request, taskObjectTemplate, userList,task.getId(),date)).collect(Collectors.toList()); + taskObjectService.saveBatch(TaskObjectList); + // 创建任务执行对象项目关联表 + List taskObjectProjectTemplates = taskObjectProjectTemplateService.list(Wrappers.lambdaQuery().eq(TaskObjectProjectTemplateEntity::getTaskId, taskTemplate.getId()).eq(TaskObjectProjectTemplateEntity::getEnable, true)); + List taskObjectProjectList = taskObjectProjectTemplates.stream().map(taskObjectProjectTemplate -> this.convert(request, taskObjectProjectTemplate, userList, task.getId(), date)).collect(Collectors.toList()); + taskObjectProjectService.saveBatch(taskObjectProjectList); + // 创建任务执行对象内容项目关联表 + List taskObjectProjectContentTemplates = taskObjectProjectContentTemplateService.list(Wrappers.lambdaQuery().eq(TaskObjectProjectContentTemplateEntity::getTaskId, taskTemplate.getId()).eq(TaskObjectProjectContentTemplateEntity::getEnable, true)); + List taskObjectProjectContentList = taskObjectProjectContentTemplates.stream().map(taskObjectProjectContentTemplate -> this.convert(request, taskObjectProjectContentTemplate, userList, task.getId(), date)).collect(Collectors.toList()); + taskObjectProjectContentService.saveBatch(taskObjectProjectContentList); + // 创建任务执行结果表 + List eventTemplates = eventTemplateService.list(Wrappers.lambdaQuery().eq(EventTemplateEntity::getTaskId, taskTemplate.getId()).eq(EventTemplateEntity::getEnable, true)); + eventTemplates.forEach(eventTemplate -> { + EventEntity event = this.convert(request, eventTemplate, userList, task.getId(), date); + eventService.save(event); + List eventRecordTemplates = eventRecordTemplateService.list(Wrappers.lambdaQuery().eq(EventRecordTemplateEntity::getEventId, eventTemplate.getId()).eq(EventRecordTemplateEntity::getEnable, true)); + List eventRecordList = eventRecordTemplates.stream().map(eventRecordTemplate -> this.convert(request, eventRecordTemplate, userList, event.getId(), date)).collect(Collectors.toList()); + eventRecordService.saveBatch(eventRecordList); + }); + }); + }); + } + } + + private EventRecordEntity convert(GenerateTaskVO request, EventRecordTemplateEntity eventRecordTemplate, List userList, Long eventId, LocalDate date) { + EventRecordEntity result = BeanUtil.copy(eventRecordTemplate,EventRecordEntity.class); + result.setId(null); + result.setEventId(eventId); + result.setCreateUser(userList.get(0).getId()); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setUpdateUser(userList.get(0).getId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setTenantId(null); + log.info("转换后的任务对象项目内容为：{}",JSON.toJSONString(result)); + return result; + } + + private EventEntity convert(GenerateTaskVO request, EventTemplateEntity eventTemplate, List userList, Long taskId, LocalDate date) { + EventTemplateEntity result = BeanUtil.copy(eventTemplate,EventTemplateEntity.class); + result.setId(null); + result.setTaskId(taskId); + result.setTitle(Optional.ofNullable(result.getTitle()).map(s -> s.replaceAll("stationName",request.getStationName())).orElse(null)); + result.setDescription(Optional.ofNullable(result.getDescription()).map(s -> s.replaceAll("stationName",request.getStationName())).orElse(null)); + result.setCreateUser(userList.get(0).getId()); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setUpdateUser(userList.get(0).getId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setTenantId(null); + log.info("转换后的任务对象项目内容为：{}",JSON.toJSONString(result)); + return result; + } + + private TaskObjectProjectContentEntity convert(GenerateTaskVO request, TaskObjectProjectContentTemplateEntity taskObjectProjectContentTemplate, List userList, Long taskId, LocalDate date) { + TaskObjectProjectContentEntity result = BeanUtil.copy(taskObjectProjectContentTemplate,TaskObjectProjectContentEntity.class); + result.setId(null); + result.setCode(CodeUtils.randomCode()); + result.setTaskId(taskId); + result.setName(result.getName().replaceAll("stationName",request.getStationName())); + result.setCreateUser(userList.get(0).getId()); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setUpdateUser(userList.get(0).getId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setTenantId(null); + log.info("转换后的任务对象项目内容为：{}",JSON.toJSONString(result)); + return result; + } + + private TaskObjectProjectEntity convert(GenerateTaskVO request, TaskObjectProjectTemplateEntity taskObjectProjectTemplate, List userList, Long taskId, LocalDate date) { + TaskObjectProjectEntity result = BeanUtil.copy(taskObjectProjectTemplate,TaskObjectProjectEntity.class); + result.setId(null); + result.setTaskId(taskId); + result.setCode(CodeUtils.randomCode()); + result.setName(result.getName().replaceAll("stationName",request.getStationName())); + result.setCreateUser(userList.get(0).getId()); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setUpdateUser(userList.get(0).getId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setTenantId(null); + log.info("转换后的任务对象项目为：{}",JSON.toJSONString(result)); + return result; + } + + private TaskObjectEntity convert(GenerateTaskVO request, TaskObjectTemplateEntity taskObjectTemplate, List userList,Long taskId,LocalDate date) { + TaskObjectEntity result = BeanUtil.copy(taskObjectTemplate,TaskObjectEntity.class); + result.setId(null); + result.setTaskId(taskId); + result.setCode(CodeUtils.randomCode()); + result.setName(result.getName().replaceAll("stationName",request.getStationName())); + result.setCreateUser(userList.get(0).getId()); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setUpdateUser(userList.get(0).getId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setTaskId(taskId); + result.setTenantId(null); + log.info("转换后的任务对象为：{}",JSON.toJSONString(result)); + return result; + } + + private TaskUserEntity getUserByTaskId(GenerateTaskVO request,Long taskId,Long userId,LocalDateTime claimTime) { + TaskUserEntity result = new TaskUserEntity(); + result.setUserId(userId); + result.setTaskId(taskId); + result.setClaimTime(claimTime); + result.setClaimStatus("1"); + result.setCreateUser(userId); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(claimTime.toLocalDate(),LocalTime.MIN))); + result.setUpdateUser(userId); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(claimTime.toLocalDate(),LocalTime.MIN))); + result.setTenantId(null); + return result; + } + + private TaskEntity convert(GenerateTaskVO request,TaskTemplateEntity taskTemplate,List userList,LocalDate date,PlanEntity plan) { + TaskEntity result = BeanUtil.copy(taskTemplate,TaskEntity.class); + result.setPlanId(plan.getId()); + result.setPlanName(plan.getName()); + result.setBatchNumber(DateUtil.format(date,"yyyy_MM_dd")+"N"); + result.setPlanStartTime(LocalDateTime.of(date,request.getStartTime())); + result.setPlanEndTime(LocalDateTime.of(date,request.getEndTime())); + result.setStartTime(LocalDateTime.of(date,request.getStartTime())); + result.setEndTime(LocalDateTime.of(date,request.getEndTime())); + result.setCreateUser(userList.get(0).getId()); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setUpdateUser(userList.get(0).getId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(date,LocalTime.MIN))); + result.setStartRemindTime(LocalDateTime.of(date,LocalTime.MIN)); + result.setEndRemindTime(LocalDateTime.of(date,LocalTime.MAX)); + result.setTenantId(null); + result.setId(null); + log.info("转换后的任务为：{}",JSON.toJSONString(result)); + return result; + } + + private PlanEntity convert(GenerateTaskVO request,PlanTemplateEntity planTemplate,List userList) { + PlanEntity result = BeanUtil.copy(planTemplate,PlanEntity.class); + result.setId(null); + result.setTenantId(null); + result.setCode(CodeUtils.randomCode()); + result.setName(result.getName().replaceAll("stationName",request.getStationName())); + result.setStartTime(request.getStartDate()); + result.setEndTime(request.getEndDate()); + result.setApprover(userList.get(0).getId()); + result.setApproveTime(LocalDateTime.of(request.getStartDate(),LocalTime.MIN)); + result.setCreateUser(userList.get(0).getId()); + result.setCreateDept(request.getAreaDeptId()); + result.setCreateTime(DateUtil.toDate(LocalDateTime.of(request.getStartDate(),LocalTime.MIN))); + result.setCreateUser(userList.get(0).getId()); + result.setUpdateUser(userList.get(0).getId()); + result.setUpdateTime(DateUtil.toDate(LocalDateTime.of(request.getStartDate(),LocalTime.MIN))); + result.setRouteData(result.getRouteData().replaceAll("stationName",request.getStationName())); + result.setRouteName(result.getRouteName().replaceAll("stationName",request.getStationName())); + result.setExecTimeJson(result.getExecTimeJson().replaceAll("startTime",DateUtil.format(request.getStartTime(),DateUtil.PATTERN_TIME)).replaceAll("endtTime",DateUtil.format(request.getEndTime(),DateUtil.PATTERN_TIME))); + log.info("转换后的计划为：{}", JSON.toJSONString(result)); + return result; + } + + private List dateList(LocalDate startDate,LocalDate endDate) { + List result = Lists.newArrayList(); + do { + //log.info(DateUtil.format(startDate,DateUtil.PATTERN_DATE)); + result.add(startDate); + startDate = startDate.plusDays(1); + } + while(startDate.isBefore(endDate.plusDays(1))); + return result; + } +}