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/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);