diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java index 49c01aa..7f091de 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskService.java @@ -77,4 +77,12 @@ public interface ISysTaskService { */ @ApiOperation(value = "任务管理复杂查询，分页，排序",notes = "任务管理复杂查询，分页，排序") ListPager querySysTaskByPager(SysTask sysTask, Pager pager); + + /** + * 根据code查询任务 + * @param code + * @return + */ + @ApiOperation(value = "根据code查询任务",notes = "根据code查询任务") + SysTask getSysTaskByCode(String code); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java index 69388b8..68180c7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java @@ -238,6 +238,29 @@ public class SysLabelTemplateController extends CoreBaseController { } /** + * 根据打印模板编号查询模板 + * @param organizeCode 工厂代码 + * @return 处理结果 + */ + @GetMapping("/get-all") + @ApiOperation(value = "查询所有有效的模板数据同步到PCN微服务",notes = "查询所有有效的模板数据同步到PCN微服务") + public ResultBean getSysLabelTemplateInfoByCode(@RequestParam("organizeCode") String organizeCode, + @RequestParam("modifyDateTime") String modifyDateTime) { + try { + ValidatorBean.checkNotNull(organizeCode, "工厂代码不能为空"); + ValidatorBean.checkNotNull(modifyDateTime, "修改时间"); + + return ResultBean.success("操作成功") + .setResultObject(sysLabelTemplateService.getLabelTemplateInfoByCode(organizeCode, modifyDateTime)) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + /** * 根据编号修改打印模板状态 * @param id 模板id * @param status 模板状态 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index ee10760..19b399c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.exception.BaseImppException; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.ExcelTool; import cn.estsh.i3plus.platform.common.tool.StringTool; @@ -361,6 +362,8 @@ public class SysMenuController extends CoreBaseController { .setResultList(sysMenuService.refreshSysMenu(list)); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); + }catch(BaseImppException busExcep){ + return ResultBean.fail(busExcep); }catch(Exception e){ return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index 5ef528e..067cf1a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -245,4 +245,25 @@ public class SysTaskController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + /** + * 根据code查询任务 + * @return + */ + @GetMapping(value = "/get-code") + @ApiOperation(value = "根据code查询任务", notes = "根据code查询任务") + public ResultBean getSysTaskByCode(String code) { + try { + ValidatorBean.checkNotNull(code, "任务代码不能为空"); + + SysTask sysTask = sysTaskService.getSysTaskByCode(code); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(sysTask); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index 97e0519..e524a81 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -231,7 +231,7 @@ public class SysTaskCycleController extends CoreBaseController { */ @GetMapping(value = "/list") @ApiOperation(value = "查询所有任务周期信息", notes = "查询所有任务周期信息") - public ResultBean findSysTaskCycle() { + public ResultBean findSysTaskCycle() { try { List list = sysTaskCycleService.listSysTaskCycle(); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java index ffca3b0..4cc7a8d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java @@ -30,13 +30,8 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.List; /** @@ -115,7 +110,7 @@ public class SysTaskPlanController extends CoreBaseController { */ @PostMapping(value = "/insert") @ApiOperation(value = "新增任务计划", notes = "任务计划") - public ResultBean insertSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) { + public ResultBean insertSysTaskTime(@RequestBody SysTaskPlan sysTaskPlan, Integer isExecute) { try { startMultiService(); @@ -184,6 +179,7 @@ public class SysTaskPlanController extends CoreBaseController { .build(); } } + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -201,7 +197,7 @@ public class SysTaskPlanController extends CoreBaseController { */ @PutMapping(value = "/update") @ApiOperation(value = "修改任务计划", notes = "任务计划") - public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) { + public ResultBean updateSysTaskTime(@RequestBody SysTaskPlan sysTaskPlan, Integer isExecute) { try { startMultiService(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java index 5d1006c..80d7e82 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java @@ -23,7 +23,9 @@ import java.util.Date; * @Modify: **/ public class CoreLogClearJob extends BaseImppScheduleJob { + public static final Logger LOGGER = LoggerFactory.getLogger(CoreLogClearJob.class); + private static final long serialVersionUID = 2706787898778108791L; public CoreLogClearJob() { super(CoreLogClearJob.class,"日志清除"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java index 93815e0..6eaa7fc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java @@ -19,10 +19,12 @@ import org.springframework.beans.factory.annotation.Autowired; **/ @ApiOperation("通用消息推送job") public class CoreMessagePushJob extends BaseImppScheduleJob { + public static final Logger LOGGER = LoggerFactory.getLogger(CoreMessagePushJob.class); + private static final long serialVersionUID = -8458291754519027369L; public CoreMessagePushJob() { - super(CoreMessagePushJob.class,"通用消息推送job"); + super(CoreMessagePushJob.class, "通用消息推送job"); } /** @@ -33,6 +35,6 @@ public class CoreMessagePushJob extends BaseImppScheduleJob { @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { - rabbitTemplate.convertAndSend(getJobParam(),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + rabbitTemplate.convertAndSend(getJobParam(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java index 537e121..c57a1a9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java @@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory; @ApiOperation("测试微服定时任务demo") public class DemoCloudJob extends BaseImppScheduleJob { public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class); + private static final long serialVersionUID = 6565382987595461305L; public DemoCloudJob() { super(DemoJob.class, "测试微服定时任务demo"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index edc4a5e..4793845 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -1,16 +1,13 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; -import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.init.ApplicationProperties; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; @ApiOperation("定时任务demo") public class DemoJob extends BaseImppScheduleJob { public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class); + private static final long serialVersionUID = 2582480740831583839L; public DemoJob() { super(DemoJob.class,"定时任务demo"); @@ -44,19 +42,14 @@ public class DemoJob extends BaseImppScheduleJob { .setErrorSolution("请检查异常通知邮件") .build(); } + try { + if(getJobParam() != null && StringUtils.isNotBlank(getJobParam())) { + Thread.sleep(Long.parseLong(getJobParam())); + } + } catch (InterruptedException e) { + e.printStackTrace(); + } System.out.println("定时任务被执行"); LOGGER.info("projectName：{},port:{}", applicationProperties.getApplicationName(),applicationProperties.getServerPort()); - - SysMessage sysMessage = new SysMessage(); - sysMessage.setMessageTitle("定时邮件发送"); - sysMessage.setMessageContent("定时任务name："+context.getJobDetail().getKey().getName() + - "定时任务groupName："+context.getJobDetail().getKey().getGroup() + - "定时邮件内容"+TimeTool.getNowTime(true)); - sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue()); - sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); - sysMessage.setMessageReceiversId(PlatformConstWords.CONTACT_MAIL); - sysMessage.setMessageReceiversNameRdd(PlatformConstWords.CONTACT_MAIL); - sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue()); - sysMessageService.doSendSysMessage(sysMessage); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java index 46e8f73..117a72b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java @@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; **/ public class TestCRUDPressure extends BaseImppScheduleJob { + private static final long serialVersionUID = -5611654157756961800L; @Autowired private ISysToolService sysToolService; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index ce83b24..2007466 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -18,6 +18,7 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +52,7 @@ public class SysFileServiceImpl implements ISysFileService { @ApiOperation(value = "新增资源信息") public SysFile insertSysFile(SysFile sysFile) { LOGGER.info("文件资源 SYS_FILE :{}", sysFile); - if (sysFile.getFileCode() != null) { + if (StringUtils.isNotBlank(sysFile.getFileCode())) { SysFile fileCode = sysFileRDao.getByProperty("fileCode", sysFile.getFileCode()); if (fileCode != null) { throw ImppExceptionBuilder.newInstance() @@ -81,7 +82,7 @@ public class SysFileServiceImpl implements ISysFileService { } // 文件代码唯一校验 - if (sysFile.getFileCode() != null) { + if (StringUtils.isNotBlank(sysFile.getFileCode())) { List list = sysFileRDao.findByHqlWhere(CoreHqlPack.packHqlSysFileCode(sysFile)); if (list != null && list.size() > 0) { throw ImppExceptionBuilder.newInstance() diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java index a967f9b..31af7cc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java @@ -2,10 +2,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLabelTemplateService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; 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.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.model.platform.LabelTemplateModel; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -23,6 +25,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -177,6 +182,18 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { } @Override + @ApiOperation(value = "查询所有有效的模板数据同步到PCN微服务", notes = "查询所有有效的模板数据同步到PCN微服务") + public LabelTemplateModel getLabelTemplateInfoByCode(String organizeCode, String modifyDateTime) { + LabelTemplateModel templateModel = new LabelTemplateModel(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String endDate = simpleDateFormat.format(new Date()); + DdlPreparedPack.timeBuilder(modifyDateTime, endDate, "modifyDatetime", packBean, true); + templateModel.setTemplateParamList(sysLabelTemplateParamRDao.findByHqlWhere(packBean)); + return templateModel; + } + + @Override @ApiOperation(value = "修改打印模板状态", notes = "修改打印模板状态") public void updateSysLabelTemplateStatus(Long id, int status, SessionUser user) { SysLabelTemplate sysLabelTemplate = sysLabelTemplateRDao.getById(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java index df89a9b..5110f43 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskService.java @@ -135,4 +135,9 @@ public class SysTaskService implements ISysTaskService { return new ListPager(sysTaskRDao.findByHqlWherePage(hqlPack + sysTask.orderBy(),pager),pager); } } + + @Override + public SysTask getSysTaskByCode(String code) { + return sysTaskRDao.getByProperty("taskCode",code); + } }