From 93b14796139aa5f9fa14267a00440cbb41f07225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 10 Oct 2019 15:05:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-apiservice/pom.xml | 5 ++++ .../controller/base/WhiteController.java | 6 ++-- .../controller/busi/SysFileController.java | 17 ++++++++---- .../busi/SysLabelTemplateController.java | 32 ++++++++++++++++++---- .../controller/busi/SysTaskController.java | 18 ++++++++++-- .../controller/busi/SysTaskPlanController.java | 11 ++++++-- .../apiservice/mq/MessageMailQueueReceiver.java | 12 ++++---- .../serviceimpl/busi/SysLabelTemplateService.java | 6 ++-- pom.xml | 6 ++++ 9 files changed, 86 insertions(+), 27 deletions(-) diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index ec75d52..c09eeb0 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -40,6 +40,11 @@ i3plus-icloud-form + + i3plus.icloud + i3plus-icloud-softswitch + + i3plus.pojo diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 682c8a8..ffecf03 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -252,13 +252,13 @@ public class WhiteController extends CoreBaseController { .notNull("fileOriginalName", sysFile.getFileOriginalName()); // 文件类型验证 - SysDictionary dictionary = dictionaryService.getSysDictionaryByParentCodeAndCode(BaseConstWords.DICTIONARY_FILE_TYPE, - StringTool.getStringFileSuffix(sysFile.getFileOriginalName(), false)); + SysDictionary dictionary = dictionaryService.getSysDictionaryByParentCodeAndValue(BaseConstWords.DICTIONARY_FILE_TYPE, + StringTool.getStringFileSuffix(sysFile.getFileOriginalName(), true)); if(dictionary == null){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode()) - .setErrorDetail("文件格式不支持") + .setErrorDetail("文件格式不支持 %s",sysFile.getFileOriginalName()) .setErrorSolution("请到字典管理中添加文件类型") .build(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index 3fe5deb..042a7bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -19,13 +19,20 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; 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.*; +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; @@ -218,7 +225,7 @@ public class SysFileController extends CoreBaseController{ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode()) - .setErrorDetail("文件格式不支持") + .setErrorDetail("文件格式不支持 %s",file.getOriginalFilename()) .setErrorSolution("请到字典管理中添加文件类型") .build(); } @@ -256,7 +263,7 @@ public class SysFileController extends CoreBaseController{ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode()) - .setErrorDetail("文件格式不支持") + .setErrorDetail("文件格式不支持 %s",file.getOriginalFilename()) .setErrorSolution("请到字典管理中添加文件类型") .build(); } @@ -365,7 +372,7 @@ public class SysFileController extends CoreBaseController{ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode()) - .setErrorDetail("文件格式不支持") + .setErrorDetail("文件格式不支持 %s",sysFile.getFileOriginalName()) .setErrorSolution("请到字典管理中添加文件类型") .build(); } 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 e682e41..9c5231f 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 @@ -7,6 +7,7 @@ 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.LabelTemplatePagerModel; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; import cn.estsh.impp.framework.base.controller.CoreBaseController; @@ -21,8 +22,14 @@ 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.*; - +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; /** @@ -58,7 +65,9 @@ public class SysLabelTemplateController extends CoreBaseController { .notNull("templateCode", sysLabelTemplate.getTemplateCode()) .notNull("templateName", sysLabelTemplate.getTemplateName()) .notNull("paramsPack", sysLabelTemplate.getParamsPack()) - .notNull("templateContent", sysLabelTemplate.getTemplateContent()); + .notNull("templateContent", sysLabelTemplate.getTemplateContent()) + .notNull("templateSoftType", sysLabelTemplate.getTemplateSoftType()) + .notNull("templateGroupId", sysLabelTemplate.getTemplateGroupId()); //修改初始化 ConvertBean.modelInitialize(sysLabelTemplate, user); @@ -120,7 +129,9 @@ public class SysLabelTemplateController extends CoreBaseController { .notNull("templateCode", sysLabelTemplate.getTemplateCode()) .notNull("templateName", sysLabelTemplate.getTemplateName()) .notNull("paramsPack", sysLabelTemplate.getParamsPack()) - .notNull("templateContent", sysLabelTemplate.getTemplateContent()); + .notNull("templateContent", sysLabelTemplate.getTemplateContent()) + .notNull("templateSoftType", sysLabelTemplate.getTemplateSoftType()) + .notNull("templateGroupId", sysLabelTemplate.getTemplateGroupId()); //添加初始化 ConvertBean.modelUpdate(sysLabelTemplate, user); @@ -205,7 +216,7 @@ public class SysLabelTemplateController extends CoreBaseController { */ @GetMapping("/query") @ApiOperation(value = "打印模板复杂查询，分页，排序",notes = "打印模板复杂查询，分页，排序") - public ResultBean querySysLabelTemplateByPager(SysLabelTemplate sysLabelTemplate,Pager pager) { + public ResultBean querySysLabelTemplateByPager(SysLabelTemplate sysLabelTemplate,Pager pager) { try { ListPager sysConfigListPager = sysLabelTemplateService.querySysLabelTemplateByPager(sysLabelTemplate,pager); return ResultBean.success("操作成功").setListPager(sysConfigListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -217,6 +228,17 @@ public class SysLabelTemplateController extends CoreBaseController { } /** + * 微服务打印模板复杂查询，分页，排序 + * @param labelTemplatePagerModel 查询条件,分页信息 + * @return 处理结果 + */ + @PostMapping("/cloud-query") + @ApiOperation(value = "微服务打印模板复杂查询，分页，排序",notes = "微服务打印模板复杂查询，分页，排序") + public ResultBean querySysLabelTemplateByPager(@RequestBody LabelTemplatePagerModel labelTemplatePagerModel) { + return querySysLabelTemplateByPager(labelTemplatePagerModel.getLabelTemplate(), labelTemplatePagerModel.getPager()); + } + + /** * 根据打印模板编号查询模板参数 * @param id 打印模板id * @return 处理结果 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 cc4e54f..2b7a535 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 @@ -4,7 +4,9 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; import cn.estsh.i3plus.icloud.andon.sdk.IAndonCommonCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnCommonCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesCommonCloud; +import cn.estsh.i3plus.icloud.softswitch.sdk.IBsCommonCloud; import cn.estsh.i3plus.icloud.wms.sdk.IWmsCommonCloud; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; @@ -19,7 +21,6 @@ import cn.estsh.impp.framework.base.service.ICommonService; 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; @@ -27,8 +28,13 @@ 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.*; - +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 java.util.List; /** @@ -63,6 +69,9 @@ public class SysTaskController extends CoreBaseController { @Autowired private IAndonCommonCloud andonCommonCloud; + @Autowired + private IBsCommonCloud bsCommonCloud; + /** * 获取对应软件模块的通用服务 * @param softType 软件模块 @@ -86,6 +95,9 @@ public class SysTaskController extends CoreBaseController { // ANDON } else if (softType == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()) { commonService = andonCommonCloud; + // SoftSwitch + } else if (softType == CommonEnumUtil.SOFT_TYPE.SOFTSWITCH.getValue()) { + commonService = bsCommonCloud; } return commonService; } 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 351dc37..31b856a 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; import cn.estsh.i3plus.icloud.andon.sdk.IAndonScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud; import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud; +import cn.estsh.i3plus.icloud.softswitch.sdk.IBsScheduleJobCloud; import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; @@ -73,6 +74,9 @@ public class SysTaskPlanController extends CoreBaseController { @Autowired private IAndonScheduleJobCloud andonScheduleJobCloud; + @Autowired + private IBsScheduleJobCloud bsScheduleJobCloud; + /** * 根据来源切换定时任务服务 * @@ -95,8 +99,11 @@ public class SysTaskPlanController extends CoreBaseController { } else if (source == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()) { quartzJobService = mesPcnScheduleJobCloud; // ANDON - } else if(source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()){ + } else if (source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()) { quartzJobService = andonScheduleJobCloud; + // SoftSwitch + } else if (source == CommonEnumUtil.SOFT_TYPE.SOFTSWITCH.getValue()) { + quartzJobService = bsScheduleJobCloud; } return quartzJobService; } @@ -427,7 +434,7 @@ public class SysTaskPlanController extends CoreBaseController { * @return 处理结果 */ @GetMapping(value = "/refresh/{id}") - @ApiOperation(value = "立即执行", notes = "立即执行") + @ApiOperation(value = "全部刷新", notes = "全部刷新") public ResultBean refreshTaskPlan(boolean isSkipDisablePlan) { try { List sysTaskPlanList = sysTaskPlanService.listSysTaskPlan(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java index 8266d5c..eae017b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.util.MailUtil; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.JsonUtilTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; @@ -21,7 +22,6 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Component; - import java.io.IOException; /** @@ -61,7 +61,7 @@ public class MessageMailQueueReceiver { if (msg.getMessageSendTime() == null) { msg.setMessageSendTime(TimeTool.getNowTime(true)); } - + ConvertBean.serviceModelInitialize(msg,msg.getMessageSenderNameRdd()); msg = sysMessageService.insertSysMessage(msg); // 设置邮件主题内容及收件人 @@ -75,7 +75,7 @@ public class MessageMailQueueReceiver { // 判断是否为系统紧急提示 微服注册状态提示 mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue()); // 次数过于频繁 - mailUtil.send(); + mailUtil.send(); } else if (msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue()) { //判断是否为外部邮件 @@ -118,9 +118,9 @@ public class MessageMailQueueReceiver { LOGGER.error("【MQ-QUEUE_IMPP_MESSAGE_MAIL】处理出错：{}", e.getMessage(), e); //丢弃这条消息 try { - if(msg.getId() != null) { - sysMessageService.deleteSysMessageById(msg.getId()); - } +// if(msg.getId() != null) { +// sysMessageService.deleteSysMessageById(msg.getId()); +// } // 未成功处理，重新发送 //channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true); //todo 此处对邮件持久化，通过参数设置，是否还需要重复重新发送 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 501fc25..0db1135 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 @@ -188,9 +188,9 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { 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); + DdlPackBean ddlPackBean = CoreHqlPack.packHqlSysLabelTemplate(sysLabelTemplate); + pager = PagerHelper.getPager(pager, sysLabelTemplateRDao.findByHqlWhereCount(ddlPackBean)); + return new ListPager(sysLabelTemplateRDao.findByHqlWherePage(ddlPackBean, pager), pager); } } diff --git a/pom.xml b/pom.xml index 22eb50d..8d5202a 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,12 @@ ${project.version} + + i3plus.icloud + i3plus-icloud-softswitch + ${project.version} + + i3plus.pojo