From 76bacc59f09dcc9594e0f19ef253588aec862e22 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 16:23:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iservice/busi/ISysLabelTemplateService.java | 75 ++++++++ .../busi/SysLabelTemplateController.java | 214 +++++++++++++++++++++ .../serviceimpl/busi/SysLabelTemplateService.java | 173 +++++++++++++++++ 3 files changed, 462 insertions(+) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java new file mode 100644 index 0000000..02abcf0 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java @@ -0,0 +1,75 @@ +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.model.platform.LabelTemplateModel; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +/** + * @Description : 打印模板服务接口 + * @Reference : + * @Author : siliter + * @Date : 2019-03-18 9:25 + * @Modify : + **/ +public interface ISysLabelTemplateService { + + /** + * 添加打印模板 + * @param sysLabelTemplate + */ + @ApiOperation(value = "添加打印模板") + void insertSysLabelTemplate(SysLabelTemplate sysLabelTemplate); + + /** + * 删除打印模板 + * @param id + */ + @ApiOperation(value = "删除打印模板") + void deleteSysLabelTemplateById(Long id); + + /** + * 修改打印模板 + * @param sysLabelTemplate + */ + @ApiOperation(value = "修改打印模板") + void updateSysLabelTemplate(SysLabelTemplate sysLabelTemplate); + + /** + * 查询全部打印模板 + */ + @ApiOperation(value = "查询全部打印模板") + List ListSysLabelTemplate(); + + /** + * 根据id查询打印模板 + * @param id + */ + @ApiOperation(value = "根据id查询打印模板") + SysLabelTemplate getSysLabelTemplateById(Long id); + + /** + * 打印模板复杂查询分页排序 + * @param sysLabelTemplate + * @param pager + * @return + */ + @ApiOperation(value = "打印模板复杂查询分页排序") + ListPager querySysLabelTemplateByPager(SysLabelTemplate sysLabelTemplate, Pager pager); + + /** + * 根据模板编号查询模板参数 + */ + @ApiOperation(value = "根据模板编号查询模板参数") + List listSysLabelTemplateParam(String labelTemplateId); + + /** + * 根据模板编号查询模板信息 + */ + @ApiOperation(value = "根据模板编号查询模板信息") + LabelTemplateModel getLabelTemplateInfoById(String labelTemplateId); +} 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 new file mode 100644 index 0000000..25228b6 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java @@ -0,0 +1,214 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLabelTemplateService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +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.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.model.platform.LabelTemplateModel; +import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.Api; +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; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description : 打印模板管理服务 + * @Reference : + * @Author : siliter + * @Date : 2019-03-18 13:15 + * @Modify : + **/ +@RestController +@Api(description = "打印模板管理服务") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-label-template") +public class SysLabelTemplateController extends CoreBaseController { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLabelTemplateController.class); + + @Autowired + private ISysLabelTemplateService sysLabelTemplateService; + + @PostMapping("/insert") + @ApiOperation(value = "添加打印模板",notes = "添加打印模板") + public ResultBean insertSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + try { + // 登录用户 + SessionUser user = AuthUtil.getSessionUser(); + + // 条件验证 + ValidatorBean.beginValid(sysLabelTemplate) + .notNull("templateCode", sysLabelTemplate.getTemplateCode()) + .notNull("templateName", sysLabelTemplate.getTemplateName()) + .notNull("paramsPack", sysLabelTemplate.getParamsPack()) + .notNull("templateContent", sysLabelTemplate.getTemplateContent()); + + //修改初始化 + ConvertBean.modelInitialize(sysLabelTemplate, user); + + sysLabelTemplateService.insertSysLabelTemplate(sysLabelTemplate); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping(value = "/delete/{id}") + @ApiOperation(value = "根据id删除打印模板", notes = "根据id删除打印模板") + public ResultBean deleteSysLabelTemplate(@PathVariable("id") String idStr) { + try { + // 条件验证 + ValidatorBean.checkNotNull(idStr,"id不能为空"); + if(sysLabelTemplateService.getSysLabelTemplateById(Long.parseLong(idStr)) == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("打印模板不存在") + .setErrorSolution("请检查打印模板编号") + .build(); + } + + sysLabelTemplateService.deleteSysLabelTemplateById(Long.parseLong(idStr)); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改打印模板",notes = "修改打印模板") + public ResultBean updateSysLabelTemplate(SysLabelTemplate sysLabelTemplate){ + try { + // 登录用户 + SessionUser user = AuthUtil.getSessionUser(); + + // 条件验证 + ValidatorBean.beginValid(sysLabelTemplate) + .notNull("templateCode", sysLabelTemplate.getTemplateCode()) + .notNull("templateName", sysLabelTemplate.getTemplateName()) + .notNull("paramsPack", sysLabelTemplate.getParamsPack()) + .notNull("templateContent", sysLabelTemplate.getTemplateContent()); + + //添加初始化 + ConvertBean.modelUpdate(sysLabelTemplate, user); + + sysLabelTemplateService.updateSysLabelTemplate(sysLabelTemplate); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板") + public ResultBean findSysConfigAll(){ + try { + List sysLabelTemplateList = sysLabelTemplateService.ListSysLabelTemplate(); + return ResultBean.success("操作成功") + .setResultList(sysLabelTemplateList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/get/{id}") + @ApiOperation(value = "根据id查询打印模板",notes = "根据id查询打印模板") + public ResultBean getSysLabelTemplateById(@PathVariable("id") String id){ + try { + ValidatorBean.checkNotNull(id,"id不能为空"); + + SysLabelTemplate sysLabelTemplate = sysLabelTemplateService.getSysLabelTemplateById(Long.parseLong(id)); + if (sysLabelTemplate != null) { + return ResultBean.success("操作成功") + .setResultObject(sysLabelTemplate).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }else { + return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); + } + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping("/query") + @ApiOperation(value = "打印模板复杂查询，分页，排序",notes = "打印模板复杂查询，分页，排序") + public ResultBean querySysLabelTemplateByPager(SysLabelTemplate sysLabelTemplate,Pager pager) { + try { + ListPager sysConfigListPager = sysLabelTemplateService.querySysLabelTemplateByPager(sysLabelTemplate,pager); + return ResultBean.success("操作成功").setListPager(sysConfigListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping("/find-template-id/{id}") + @ApiOperation(value = "根据打印模板编号查询模板参数",notes = "根据打印模板编号查询模板参数") + public ResultBean getSysLabelTemplateByTemplateId(@PathVariable("id") String id) { + try { + if (StringUtils.isBlank(id)) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("打印模板编号为空") + .setErrorSolution("请检查打印模板编号") + .build(); + } + + return ResultBean.success("操作成功").setResultList(sysLabelTemplateService.listSysLabelTemplateParam(id)) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping("/get-template-info/{id}") + @ApiOperation(value = "根据打印模板编号查询模板",notes = "根据打印模板编号查询模板") + public ResultBean getSysLabelTemplateInfoById(@PathVariable("id") String id) { + try { + if (StringUtils.isBlank(id)) { + throw ImppExceptionBuilder.newInstance() + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorDetail("打印模板编号为空") + .setErrorSolution("请检查打印模板编号") + .build(); + } + + return ResultBean.success("操作成功").setResultObject(sysLabelTemplateService.getLabelTemplateInfoById(id)) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }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/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java new file mode 100644 index 0000000..0d0ba94 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java @@ -0,0 +1,173 @@ +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.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.HqlPack; +import cn.estsh.i3plus.pojo.model.platform.LabelTemplateModel; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; +import cn.estsh.i3plus.pojo.platform.repository.SysLabelTemplateParamRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysLabelTemplateRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +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; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description : 打印模板服务接口实现 + * @Reference : + * @Author : siliter + * @Date : 2019-03-18 9:25 + * @Modify : + **/ +@Service +public class SysLabelTemplateService implements ISysLabelTemplateService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLabelTemplateService.class); + + @Autowired + private SysLabelTemplateRepository sysLabelTemplateRDao; + + @Autowired + private SysLabelTemplateParamRepository sysLabelTemplateParamRDao; + + @Override + @ApiOperation(value = "添加打印模板",notes = "添加打印模板") + public void insertSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + // 根据模板代码进行唯一性校验 + int count = sysLabelTemplateRDao.findByHqlWhereCount(CoreHqlPack.packHqlSysLabelTemplate(sysLabelTemplate)); + if (count > 0) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("打印模板已存在") + .setErrorSolution("请检查打印模板") + .build(); + } + + SysLabelTemplate insertResult = sysLabelTemplateRDao.insert(sysLabelTemplate); + // 新增打印模板成功 + if (insertResult != null) { + // 判断模板参数是否存在，存在就进行数据操作 + String paramPack = sysLabelTemplate.getParamsPack(); + if (StringUtils.isNotBlank(paramPack)) { + // 新增打印模板参数 + SysLabelTemplateParam templateParam; + String[] paramArr = paramPack.trim().split(","); + for (String paramItem : paramArr) { + templateParam = new SysLabelTemplateParam(); + templateParam.setTemplateCode(sysLabelTemplate.getTemplateCode()); + templateParam.setTemplateId(insertResult.getId()); + templateParam.setTemplateParam(paramItem); + templateParam.setTemplateParamText(paramItem); + ConvertBean.serviceModelInitialize(templateParam, AuthUtil.getSessionUser().getUserName()); + sysLabelTemplateParamRDao.insert(templateParam); + } + } + } + } + + @Override + @ApiOperation(value = "删除打印模板",notes = "删除打印模板") + public void deleteSysLabelTemplateById(Long id) { + sysLabelTemplateRDao.deleteById(id); + } + + @Override + @ApiOperation(value = "修改打印模板",notes = "修改打印模板") + public void updateSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + SysLabelTemplate updateBefore = sysLabelTemplateRDao.getById(sysLabelTemplate.getId()); + if (updateBefore == null) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.WMS.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("打印模板不存在") + .build(); + } + + //暂时根据id和模板代码作为唯一性校验 + StringBuffer where = new StringBuffer(); + HqlPack.getNumNOEqualPack(sysLabelTemplate.getId(), "id", where); + HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", where); + int count = sysLabelTemplateRDao.findByHqlWhereCount(where.toString()); + if (count > 0) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("打印模板已存在") + .setErrorSolution("请检查打印模板") + .build(); + } + + // 更新打印模板 + sysLabelTemplateRDao.update(sysLabelTemplate); + + // 判断模板参数是否存在，存在就进行数据操作 + if (StringUtils.isNotBlank(sysLabelTemplate.getParamsPack())) { + // 更新打印模板参数 + SysLabelTemplateParam templateParam; + String[] paramArr = sysLabelTemplate.getParamsPack().trim().split(","); + for (String paramItem : paramArr) { + templateParam = new SysLabelTemplateParam(); + templateParam.setTemplateCode(sysLabelTemplate.getTemplateCode()); + templateParam.setTemplateParam(paramItem); + templateParam.setTemplateId(sysLabelTemplate.getId()); + templateParam.setTemplateParamText(paramItem); + ConvertBean.serviceModelUpdate(templateParam, AuthUtil.getSessionUser().getUserName()); + sysLabelTemplateParamRDao.update(templateParam); + } + } + } + + @Override + @ApiOperation(value = "查询打印模板",notes = "查询打印模板") + public List ListSysLabelTemplate() { + return sysLabelTemplateRDao.list(); + } + + @Override + @ApiOperation(value = "根据编号打印模板",notes = "根据编号打印模板") + public SysLabelTemplate getSysLabelTemplateById(Long id) { + return sysLabelTemplateRDao.getById(id); + } + + @Override + @ApiOperation(value = "复杂分页查询打印模板",notes = "复杂分页查询打印模板") + public ListPager querySysLabelTemplateByPager(SysLabelTemplate sysLabelTemplate, Pager pager) { + if(sysLabelTemplate == null) { + pager = PagerHelper.getPager(pager, sysLabelTemplateRDao.listCount()); + return new ListPager(sysLabelTemplateRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysLabelTemplate(sysLabelTemplate); + pager = PagerHelper.getPager(pager, sysLabelTemplateRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysLabelTemplateRDao.findByHqlWherePage(hqlPack + sysLabelTemplate.orderBy(), pager), pager); + } + } + + @Override + @ApiOperation(value = "根据模板编号查询模板参数",notes = "根据模板编号查询模板参数") + public List listSysLabelTemplateParam(String labelTemplateId) { + SysLabelTemplateParam templateParam = new SysLabelTemplateParam(); + templateParam.setTemplateId(Long.parseLong(labelTemplateId)); + return sysLabelTemplateParamRDao.findByHqlWhere(CoreHqlPack.packHqlSysLabelTemplateParams(templateParam)); + } + + @Override + public LabelTemplateModel getLabelTemplateInfoById(String labelTemplateId) { + LabelTemplateModel templateModel = new LabelTemplateModel(); + templateModel.setLabelTemplate(sysLabelTemplateRDao.getById(Long.parseLong(labelTemplateId))); + templateModel.setTemplateParamList(listSysLabelTemplateParam(labelTemplateId)); + return templateModel; + } +} From 3457079a52813e5b8e5035a34e5f9429d3dca572 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 18 Mar 2019 18:46:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DemoScheduleController.java | 99 ++++++++-------------- 1 file changed, 36 insertions(+), 63 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java index 65b2493..8629f7a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java @@ -2,11 +2,12 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; -import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.quartz.IQuartzJobService; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; import cn.estsh.impp.framework.boot.quartz.TaskInfo; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Description : + * @Description : 定时任务调用demo * @Reference : * @Author : alwaysfrin * @CreateDate : 2018-09-26 10:34 @@ -38,32 +39,33 @@ public class DemoScheduleController extends CoreBaseController{ @Autowired private IWmsScheduleJobCloud wmsScheduleJobCloud; + /** + * 根据来源切换定时任务服务 + * @param source CommonEnumUtil.SOFT_TYPE + * @return + */ + private IQuartzJobService getJobService(int source){ + IQuartzJobService quartzJobService = scheduleTool; + + if(source == CommonEnumUtil.SOFT_TYPE.CORE.getValue()){ + //平台定时任务 + quartzJobService = scheduleTool; + }else if(source == CommonEnumUtil.SOFT_TYPE.WMS.getValue()){ + quartzJobService = wmsScheduleJobCloud; + } + return quartzJobService; + } + @GetMapping(value="/list-task") @ApiOperation(value="查询定时任务",notes="查询所有定时任务") public ResultBean listTask(int sourceType){ - List taskList = null; - if(sourceType == 1) { - //本地任务 - taskList = ScheduleTool.queryJobList(scheduleTool.getScheduler()); - if(taskList != null) { - for (TaskInfo ti : taskList) { - LOGGER.info("任务：{}",ti); - } - }else{ - LOGGER.info("任务列表为空"); - } - }else if(sourceType == 2){ - //wms任务 - BaseResultBean baseResult = wmsScheduleJobCloud.listTask(); - LOGGER.info("任务数量：{}",baseResult.getResultList().size()); - taskList = baseResult.getResultList(); - if (taskList != null) { - for (TaskInfo ti : taskList) { - LOGGER.info("任务：{}",ti); - } - } else { - LOGGER.info("任务列表为空"); + List taskList = getJobService(sourceType).listTask().getResultList(); + if(taskList != null) { + for (TaskInfo ti : taskList) { + LOGGER.info("任务：{}",ti); } + }else{ + LOGGER.info("任务列表为空"); } return new ResultBean(true,taskList); @@ -73,23 +75,14 @@ public class DemoScheduleController extends CoreBaseController{ @ApiOperation(value="添加定时任务",notes="添加定时任务") public ResultBean addTask(int sourceType, String packageName,String className,String jobName,String jobGroup,String cronExpression){ - if(sourceType == 1) { - scheduleTool.addJob(new TaskInfo(packageName,className,jobName,jobGroup,cronExpression,"测试任务")); - }else if(sourceType == 2){ - wmsScheduleJobCloud.addTask(packageName,className,jobName,jobGroup,cronExpression,"wms新任务"); - } - + this.getJobService(sourceType).addTask(packageName,className,jobName,jobGroup,cronExpression,"wms新任务"); return new ResultBean(true,""); } @GetMapping(value="/delete-task") @ApiOperation(value="删除定时任务",notes="删除定时任务") public ResultBean deleteTask(int sourceType,String jobName,String jobGroup){ - if(sourceType == 1) { - scheduleTool.deleteJob(jobName,jobGroup); - }else if(sourceType == 2){ - wmsScheduleJobCloud.deleteTask(jobName,jobGroup); - } + this.getJobService(sourceType).deleteTask(jobName,jobGroup); return new ResultBean(true); } @@ -97,11 +90,7 @@ public class DemoScheduleController extends CoreBaseController{ @GetMapping(value="/pause-task") @ApiOperation(value="暂停定时任务",notes="暂停定时任务") public ResultBean pauseJob(int sourceType,String jobName,String jobGroup){ - if(sourceType == 1) { - scheduleTool.pauseJob(jobName,jobGroup); - }else if(sourceType == 2){ - wmsScheduleJobCloud.pauseJob(jobName,jobGroup); - } + this.getJobService(sourceType).pauseJob(jobName,jobGroup); return new ResultBean(true); } @@ -109,23 +98,15 @@ public class DemoScheduleController extends CoreBaseController{ @GetMapping(value="/resume-task") @ApiOperation(value="继续定时任务",notes="继续定时任务") public ResultBean resumeJob(int sourceType,String jobName,String jobGroup){ - if(sourceType == 1) { - scheduleTool.resumeJob(jobName,jobGroup); - }else if(sourceType == 2){ - wmsScheduleJobCloud.resumeJob(jobName,jobGroup); - } + this.getJobService(sourceType).resumeJob(jobName,jobGroup); return new ResultBean(true); } - @GetMapping(value="/exceute-task") + @GetMapping(value="/execeute-task") @ApiOperation(value="立即执行定时任务",notes="立即执行定时任务") - public ResultBean excuteJob(int sourceType,String jobName,String jobGroup){ - if(sourceType == 1) { - scheduleTool.executeJob(jobName,jobGroup); - }else if(sourceType == 2){ - wmsScheduleJobCloud.excuteJob(jobName,jobGroup); - } + public ResultBean executeJob(int sourceType,String jobName,String jobGroup){ + this.getJobService(sourceType).executeJob(jobName,jobGroup); return new ResultBean(true); } @@ -133,11 +114,7 @@ public class DemoScheduleController extends CoreBaseController{ @GetMapping(value="/stand-by-schedule") @ApiOperation(value="定时器待机",notes="定时器待机") public ResultBean restartJob(int sourceType,String jobName,String jobGroup){ - if(sourceType == 1) { - scheduleTool.standBySchedule(); - }else if(sourceType == 2){ - wmsScheduleJobCloud.standBySchedule(); - } + this.getJobService(sourceType).standBySchedule(); return new ResultBean(true); } @@ -146,11 +123,7 @@ public class DemoScheduleController extends CoreBaseController{ @GetMapping(value="/start-schedule") @ApiOperation(value="启动定时器",notes="启动定时器") public ResultBean startSchedule(int sourceType,String jobName,String jobGroup){ - if(sourceType == 1) { - scheduleTool.startSchedule(); - }else if(sourceType == 2){ - wmsScheduleJobCloud.startSchedule(); - } + this.getJobService(sourceType).startSchedule(); return new ResultBean(true); } From 8c42a886ee2b30c906c62a34a6ffe56ab87c4b8f Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 18 Mar 2019 19:11:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index caa9081..cacede1 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ #项目端口 server.port=8100 #本机ip -impp.server.ip=192.168.1.56 +impp.server.ip=192.168.1.20 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://192.168.1.56:8010 +impp.console.ip=http://192.168.1.20:8010 ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://192.168.1.56:8000/eureka/ +impp.cluster.regist.center=http://192.168.1.20:8000/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ From 33de5b5291ebd7ea4d8bf559407e98cdad946df0 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 18 Mar 2019 19:53:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index cacede1..caa9081 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ #项目端口 server.port=8100 #本机ip -impp.server.ip=192.168.1.20 +impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://192.168.1.20:8010 +impp.console.ip=http://192.168.1.56:8010 ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://192.168.1.20:8000/eureka/ +impp.cluster.regist.center=http://192.168.1.56:8000/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/