From 10b82dbea25997a64f77fbcbe7bdfa8fca348b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 14 Jun 2019 16:29:59 +0800 Subject: [PATCH] =?UTF-8?q?WMS=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/message/WMSMessageController.java | 153 +++++++++++++++++++++ .../core/apiservice/mq/WYHQueueReceiver.java | 49 +++++++ .../busi/TestSysLocaleResourceService.java | 45 ++++++ 3 files changed, 247 insertions(+) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/WYHQueueReceiver.java create mode 100644 modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java new file mode 100644 index 0000000..497d266 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java @@ -0,0 +1,153 @@ +package cn.estsh.i3plus.core.apiservice.controller.message; + +import cn.estsh.i3plus.core.apiservice.controller.base.BaseMessageController; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.model.platform.MessagePagerModel; +import cn.estsh.i3plus.pojo.model.platform.RefUserMessagePagerModel; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Description : SWEB消息管理服务 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-25 19:03 + * @Modify : + **/ +@RestController +@RequestMapping(PlatformConstWords.BASE_URL +"/wms") +@Api(description = "消息管理服务") +public class WMSMessageController extends CoreBaseController { + + @Autowired + private BaseMessageController baseSysMessage; + + + /*************************************************** WMS系统消息 **************************************************/ + + /** + * WMS - 新增消息 + * @param sysMessage + * @return + */ + @PostMapping(value = "/sys-message/insert") + @ApiOperation(value = "新增消息",notes = "新增消息") + public ResultBean insertSysMessage(@RequestBody SysMessage sysMessage){ + sysMessage = sysMessage == null ? new SysMessage() : sysMessage; + sysMessage.setMessageSoftType(CommonEnumUtil.SOFT_TYPE.WMS.getValue()); + + return baseSysMessage.basaeInsertSysMessage(sysMessage); + } + + /** + * WMS - 删除消息 + * @param id + * @return + */ + @DeleteMapping("/sys-message/delete/{id}") + @ApiOperation(value = "根据id删除消息",notes = "根据id删除消息") + public ResultBean deleteSysMessageById(@PathVariable("id") String id){ + return baseSysMessage.baseDeleteSysMessageById(id); + } + + /** + * WMS - 修改消息 + * @param sysMessage + * @return + */ + @PutMapping("/sys-message/update") + @ApiOperation(value = "修改信息",notes = "修改信息") + public ResultBean updateSysMessage(SysMessage sysMessage){ + sysMessage = sysMessage == null ? new SysMessage() : sysMessage; + sysMessage.setMessageSoftType(CommonEnumUtil.SOFT_TYPE.WMS.getValue()); + return baseSysMessage.baseUpdateSysMessage(sysMessage); + } + + /** + * WMS - 根据id查询消息 + * @param idStr 消息id + * @return 处理结果 + */ + @GetMapping(value = "/sys-message/get/{id}") + @ApiOperation(value = "根据id查询消息",notes = "根据id查询消息") + public ResultBean getSysMessageById(@PathVariable("id") String idStr){ + return baseSysMessage.baseGetSysMessageById(idStr); + } + + /** + * WMS - 分页带条件查询 + * @param messagePagerModel 分页以及条件信息 + * @return 处理结果 + */ + @PostMapping(value = "/sys-message/query") + @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序") + public ResultBean querySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel){ + return baseSysMessage.baseQuerySysMessageByPager(messagePagerModel); + } + + /** + * WMS - 批量删除 + * @param ids ids数组 + * @return 处理结果 + */ + @DeleteMapping("/sys-message/batch-delete") + @ApiOperation(value = "批量删除消息",notes = "批量删除消息") + public ResultBean deleteSysMessageByIds(String[] ids){ + return baseSysMessage.baseDeleteSysMessageByIds(ids); + } + + /*********************************************** WMS用户系统消息 *********************************************/ + + /** + * WMS - 根据用户消息id查询消息 + * @param idStr + * @return 处理结果 + */ + @GetMapping(value = "/user-message/get/{id}") + @ApiOperation(value = "根据用户消息id查询消息",notes = "根据用户消息id查询消息") + public ResultBean getUserMessageById(@PathVariable("id") String idStr){ + return baseSysMessage.baseGetUserMessageById(idStr); + } + + /** + * WMS - 批量切换消息状态 + * @param ids ids数组 + * @param status 状态 + * @return 处理结果 + */ + @PutMapping("/user-message/batch-status") + @ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态") + public ResultBean updateSysMessageStatusByIds(String[] ids,Integer status){ + return baseSysMessage.baseUpdateSysMessageStatusByIds(ids, status); + } + + /** + * 用户消息复杂查询，分页，排序 + * @param refUserMessagePagerModel 查询条件及分页信息 + * @return 处理结果 + */ + @PostMapping(value = "/user-message/query") + @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序") + public ResultBean querySysRefUserMessageByPager(@RequestBody RefUserMessagePagerModel refUserMessagePagerModel){ + return baseSysMessage.baseQuerySysRefUserMessageByPager(refUserMessagePagerModel); + } + + /** + * 用户消息删除 + * @param idStr 用户消息id + * @return 处理结果 + */ + @DeleteMapping(value = "/user-message/delete/{id}") + @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序") + public ResultBean deleteSysRefUserMessageById(@PathVariable("id") String idStr){ + return baseSysMessage.baseDeleteSysRefUserMessageById(idStr); + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/WYHQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/WYHQueueReceiver.java new file mode 100644 index 0000000..303141d --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/WYHQueueReceiver.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.core.apiservice.mq; + +import com.rabbitmq.client.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +/** + * @Description : 定时任务通道业务处理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-12-20 21:56 + * @Modify: + **/ +@Component +public class WYHQueueReceiver { + + private static final Logger LOGGER = LoggerFactory.getLogger(WYHQueueReceiver.class); + + + /** + * 定时任务通道处理 + * + * @param data 系统消息信息 + * @param channel 通道 + * @param message 消息 + */ + @RabbitListener(queues = "WYH") + public void processSchedule(String data, Channel channel, Message message) { + try { + System.out.println("队列消息接受成功========" + data); + //信息已处理 + channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); + } catch (IOException e) { + LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}", e.getMessage(), e); + //丢弃这条消息 + try { + // 未成功处理，重新发送 + channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, true); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java new file mode 100644 index 0000000..7e6b1d9 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java @@ -0,0 +1,45 @@ +package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; +import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; +import cn.estsh.i3plus.platform.common.tool.ExcelTool; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.io.File; +import java.io.IOException; +import java.util.Date; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-05-22 16:37 + * @Modify: + **/ +public class TestSysLocaleResourceService extends TestBase { + + @Autowired + ISysLocaleResourceService sysLocaleResourceService; + + @Test + public void exportSysLocaleResourceData() throws IOException { + SysLocaleResource ds = new SysLocaleResource(); + System.out.println(ExcelTool.getColName(SysLocaleResource.class)); + String[] colName = new String[]{ + "resourceType","languageCode","languageNameRdd","resourceKey","resourceValue","isSystem" + }; + File file = File.createTempFile(SysLocaleResource.class.getSimpleName() + new Date().getTime(), "Tp.xls"); + try { + ExcelTool.exportData(file,sysLocaleResourceService.listSysLocaleResource(),SysLocaleResource.class,colName); + System.out.println(file.getPath()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void main(String[] args) { + System.out.println(ExcelTool.getColName(SysLocaleResource.class)); + } +}