From 984ec34d2f76bff59c997a46f3a09975166d89ce Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 12 Mar 2019 16:21:02 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=8B=A5=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=A4=B1=E8=B4=A5=E5=90=8E=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 3c3197d..dfda033 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 @@ -113,7 +113,10 @@ public class MessageMailQueueReceiver { //丢弃这条消息 try { // 未成功处理，重新发送 - channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true); + //channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true); + //todo 此处对邮件持久化，通过参数设置，是否还需要重复重新发送 + // 改为接收成功 + channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); } catch (IOException e1) { e1.printStackTrace(); } From b60ed385ec868afda568f2b8b8ac456c10a0b933 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 12 Mar 2019 18:24:44 +0800 Subject: [PATCH 02/13] =?UTF-8?q?MQ=20=E7=AB=99=E5=86=85=E4=BF=A1=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysMessageService.java | 10 + .../apiservice/mq/MessageLetterQueueReceiver.java | 212 ++++++++++++++++----- .../mq/MessageLetterQueueReceiverHandler.java | 66 +++++++ .../apiservice/mq/MessageMailQueueReceiver.java | 67 +++---- .../serviceimpl/busi/SysMessageService.java | 14 ++ 5 files changed, 285 insertions(+), 84 deletions(-) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiverHandler.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java index f595bbc..4cf8ad1 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java @@ -24,6 +24,9 @@ public interface ISysMessageService { @ApiOperation(value = "添加消息") SysMessage insertSysMessage(SysMessage sysMessage); + @ApiOperation(value = "添加消息") + List insertSysMessage(List sysMessage); + /** * 删除消息 * @param id @@ -77,6 +80,13 @@ public interface ISysMessageService { SysRefUserMessage insertSysRefUserMessage(SysRefUserMessage refUserMessage); /** + * 添加用户消息关系 + * @param refList + */ + @ApiOperation(value = "添加用户消息关系") + List insertSysRefUserMessage(List refList); + + /** * 添加消息并发送 * @param sysMessage * @return diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java index 6fddb50..5dd8efc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java @@ -1,14 +1,18 @@ package cn.estsh.i3plus.core.apiservice.mq; +import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.websocket.MessageWebSocket; +import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +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.i3plus.pojo.platform.bean.SysRefUserMessage; import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.rabbitmq.client.Channel; import org.apache.commons.lang3.StringUtils; @@ -16,11 +20,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Component; import java.io.IOException; +import java.util.ArrayList; import java.util.List; /** @@ -37,78 +43,180 @@ public class MessageLetterQueueReceiver { @Autowired ISysMessageService sysMessageService; + @Autowired ISysUserService sysUserService; + @Autowired + private IPersonnelService personnelService; + + @Autowired + private RabbitTemplate rabbitTemplate; + + private static final ObjectMapper MAPPER = new ObjectMapper(); + /** * 站内信处理队列 - * * @param msg * @param channel * @param message 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....)); */ @RabbitListener(queues = PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE) public void processImppMessage(SysMessage msg, Channel channel, Message message) { - try { - LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功：{}", msg); + LOGGER.info("【MQ-{}】 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, msg); + LOGGER.info("【MQ-{}】 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, msg); + LOGGER.info("【MQ-{}】 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, msg); + try { msg = sysMessageService.insertSysMessage(msg); - LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功：{}", msg); + if (!StringUtils.isBlank(msg.getMessageReceiversId())) { + String[] userIds = msg.getMessageReceiversId().split(","); - // 收件人信息 - String[] messageReceiver = new String[0]; - String[] receiverName = new String[0]; - if (msg.getMessageReceiversId() != null) { - messageReceiver = msg.getMessageReceiversId().split(","); - receiverName = new String[messageReceiver.length]; - } + if(userIds != null && userIds.length > 0){ + List userList = personnelService.findSysUserByIds(StringTool.getArrayLong(userIds)); - SysRefUserMessage refUserMessage; - SysUser sysUser; - List userMessage; - ObjectMapper mapper = new ObjectMapper(); - - for (int i = 0; i < messageReceiver.length; i++) { - sysUser = sysUserService.getSysUserById(Long.parseLong(messageReceiver[i])); - if(sysUser != null) { - receiverName[i] = sysUser.getUserName(); - - refUserMessage = new SysRefUserMessage(); - refUserMessage.setMessageId(msg.getId()); - refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); - refUserMessage.setMessageTypeRdd(msg.getMessageType()); - refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); - refUserMessage.setReceiverId(sysUser.getId()); - refUserMessage.setReceiverNameRdd(sysUser.getUserName()); - refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); - refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); - refUserMessage.setIsUrgent(msg.getIsUrgent()); - - sysMessageService.insertSysRefUserMessage(refUserMessage); - - userMessage = sysMessageService.findSysRefUserMessageByUserIdAndStatus(sysUser.getId(), - ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); - MessageWebSocket.sendMessage(sysUser.getUserInfoId(), - mapper.writeValueAsString(userMessage) - ); - } - } + if(userList != null && userList.size() > 0){ + List names = new ArrayList<>(userList.size()); + List insertList = new ArrayList<>(userList.size()); + SysRefUserMessage refUserMessage; - msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ",")); - sysMessageService.updateSysMessage(msg); + for (SysUser user : userList){ + refUserMessage = new SysRefUserMessage(); + refUserMessage.setMessageId(msg.getId()); + refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); + refUserMessage.setMessageTypeRdd(msg.getMessageType()); + refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); + refUserMessage.setReceiverId(user.getId()); + refUserMessage.setReceiverNameRdd(user.getUserName()); + refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); + refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); + refUserMessage.setIsUrgent(msg.getIsUrgent()); - //信息已处理 - channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); - } catch (IOException e) { - LOGGER.error("【MQ-IMPP_MESSAGE_LETTER_QUEUE】处理出错：{}", e.getMessage(), e); - //丢弃这条消息 + names.add(user.getUserName()); + insertList.add(refUserMessage); + } + + List refList = sysMessageService.insertSysRefUserMessage(insertList); + + // 站内信使用 Web Socket 推送 + if(refList != null && refList.size() > 0){ + for (SysRefUserMessage userMessage : refList) { + MessageWebSocket.sendMessage(userMessage.getReceiverId(), MAPPER.writeValueAsString(userMessage)); + } + } + + // 更新冗余信息 + msg.setMessageReceiversNameRdd(StringUtils.join(names,",")); + sysMessageService.updateSysMessage(msg); + } + } + } + }catch (Exception e){ + printErrorMessage(e,Exception.class, msg); + }finally { try { - // 未成功处理，重新发送 - channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, true); - } catch (IOException e1) { - e1.printStackTrace(); + // 消息处理完成 + LOGGER.info("【MQ-{}】站内信{} DeliveryTag:{} 处理成功", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, msg,message.getMessageProperties().getDeliveryTag()); + channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); + }catch (IOException e){ + printErrorMessage(e,IOException.class, msg); + }catch (Exception e){ + printErrorMessage(e,Exception.class, msg); } } } + + + private void printErrorMessage(Exception e,Class zlass,SysMessage msg){ + Long time = System.currentTimeMillis(); + LOGGER.error("【MQ-{}】{} 异常代码:{} 消息内容{},处理出错：{}", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, time, zlass, msg, e.getMessage()); + LOGGER.info("【MQ-{}】{} 异常代码:{} 消息内容{},处理出错：{}", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, time, zlass, msg, e.getMessage()); + e.printStackTrace(); + + //TODO MQ发生异常邮件通知 。 + SysMessage sysMessage = new SysMessage(); + sysMessage.setMessageSenderNameRdd("系统管理员"); + sysMessage.setMessageTitle("【IMPP-MQ异常】站内信消息推送失败"); + sysMessage.setMessageContent("推送站内信["+zlass+"]错误异常代码:"+time); + sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); + sysMessage.setMessageSendTime(TimeTool.getNowTime(true)); + sysMessage.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue()); + sysMessage.setMessageReceiversNameRdd("yunhao.wang@estsh.com,wei.peng@estsh.com"); + rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE,sysMessage); + } + + +// /** +// * 站内信处理队列 +// * +// * @param msg +// * @param channel +// * @param message 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....)); +// */ +// @RabbitListener(queues = PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE) +// public void processImppMessage(SysMessage msg, Channel channel, Message message) { +// try { +// LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功：{}", msg); +// +// msg = sysMessageService.insertSysMessage(msg); +// +// LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功：{}", msg); +// +// // 收件人信息 +// String[] messageReceiver = new String[0]; +// String[] receiverName = new String[0]; +// if (msg.getMessageReceiversId() != null) { +// messageReceiver = msg.getMessageReceiversId().split(","); +// receiverName = new String[messageReceiver.length]; +// } +// +// SysRefUserMessage refUserMessage; +// SysUser sysUser; +// List userMessage; +// ObjectMapper mapper = new ObjectMapper(); +// +// for (int i = 0; i < messageReceiver.length; i++) { +// sysUser = sysUserService.getSysUserById(Long.parseLong(messageReceiver[i])); +// if(sysUser != null) { +// receiverName[i] = sysUser.getUserName(); +// +// refUserMessage = new SysRefUserMessage(); +// refUserMessage.setMessageId(msg.getId()); +// refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); +// refUserMessage.setMessageTypeRdd(msg.getMessageType()); +// refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); +// refUserMessage.setReceiverId(sysUser.getId()); +// refUserMessage.setReceiverNameRdd(sysUser.getUserName()); +// refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); +// refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); +// refUserMessage.setIsUrgent(msg.getIsUrgent()); +// +// sysMessageService.insertSysRefUserMessage(refUserMessage); +// +// userMessage = sysMessageService.findSysRefUserMessageByUserIdAndStatus(sysUser.getId(), +// ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); +// MessageWebSocket.sendMessage(sysUser.getUserInfoId(), +// mapper.writeValueAsString(userMessage) +// ); +// } +// } +// +// msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ",")); +// sysMessageService.updateSysMessage(msg); +// +// //信息已处理 +// channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); +// } catch (IOException e) { +// LOGGER.error("【MQ-IMPP_MESSAGE_LETTER_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/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiverHandler.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiverHandler.java new file mode 100644 index 0000000..dc2c3a3 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiverHandler.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.core.apiservice.mq; + +import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; +import cn.estsh.i3plus.core.apiservice.websocket.MessageWebSocket; +import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +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.i3plus.pojo.platform.bean.SysRefUserMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.rabbitmq.client.Channel; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitHandler; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 站内信队列处理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-15 22:35 + * @Modify: + **/ +@Component +@RabbitListener(queues = PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK) +public class MessageLetterQueueReceiverHandler { + + private static final Logger LOGGER = LoggerFactory.getLogger(MessageLetterQueueReceiverHandler.class); + + @RabbitHandler + public void handleMessage(byte[] message){ + LOGGER.info("【MQ-{}】handleMessage(byte[] message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + LOGGER.info("【MQ-{}】handleMessage(byte[] message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + LOGGER.info("【MQ-{}】handleMessage(byte[] message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + } + + @RabbitHandler + public void handleMessage(String message){ + LOGGER.info("【MQ-{}】handleMessage(String message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + LOGGER.info("【MQ-{}】handleMessage(String message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + LOGGER.info("【MQ-{}】handleMessage(String message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + } + + @RabbitHandler + public void handleMessage(SysMessage message){ + LOGGER.info("【MQ-{}】handleMessage(SysMessage message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + LOGGER.info("【MQ-{}】handleMessage(SysMessage message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + LOGGER.info("【MQ-{}】handleMessage(SysMessage message) 数据接收成功：{}",PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK, message); + } + +} 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 3c3197d..30b2797 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 @@ -64,48 +64,51 @@ public class MessageMailQueueReceiver { mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType())); mailUtil.setBody(msg.getMessageContent()); - if(msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue()){ - // 判断是否为系统紧急提示 微服注册状态提示 - mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue()); - // 次数过于频繁 + if(msg.getMessageReceiverType() != null){ + if(msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue()){ + // 判断是否为系统紧急提示 微服注册状态提示 + mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue()); + // 次数过于频繁 // mailUtil.send(); - } else if(msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue()){ - //判断是否为外部邮件 - mailUtil.setTo(StringUtils.split(msg.getMessageReceiversNameRdd(),",")); - mailUtil.send(); + } else if(msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue()){ + //判断是否为外部邮件 + mailUtil.setTo(StringUtils.split(msg.getMessageReceiversNameRdd(),",")); + mailUtil.send(); - } else if (msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()) { - // 收件人信息 - String[] messageReceiver = msg.getMessageReceiversId().split(","); - String[] receiverName = new String[messageReceiver.length]; + } else if (msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()) { + // 收件人信息 + String[] messageReceiver = msg.getMessageReceiversId().split(","); + String[] receiverName = new String[messageReceiver.length]; - SysRefUserMessage refUserMessage; - SysUser sysUser; + SysRefUserMessage refUserMessage; + SysUser sysUser; - for (int i = 0; i < messageReceiver.length; i++) { - sysUser = sysUserService.getSysUserById(Long.parseLong(messageReceiver[i])); - receiverName[i] = sysUser.getUserName(); + for (int i = 0; i < messageReceiver.length; i++) { + sysUser = sysUserService.getSysUserById(Long.parseLong(messageReceiver[i])); + receiverName[i] = sysUser.getUserName(); - refUserMessage = new SysRefUserMessage(); - refUserMessage.setMessageId(msg.getId()); - refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); - refUserMessage.setMessageTypeRdd(msg.getMessageType()); - refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); - refUserMessage.setReceiverId(sysUser.getId()); - refUserMessage.setReceiverNameRdd(sysUser.getUserName()); - refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); - refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); + refUserMessage = new SysRefUserMessage(); + refUserMessage.setMessageId(msg.getId()); + refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); + refUserMessage.setMessageTypeRdd(msg.getMessageType()); + refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); + refUserMessage.setReceiverId(sysUser.getId()); + refUserMessage.setReceiverNameRdd(sysUser.getUserName()); + refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); + refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); - sysMessageService.insertSysRefUserMessage(refUserMessage); + sysMessageService.insertSysRefUserMessage(refUserMessage); - mailUtil.setTo(sysUser.getUserEmail()); - mailUtil.send(); - } + mailUtil.setTo(sysUser.getUserEmail()); + mailUtil.send(); + } - msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ",")); - sysMessageService.updateSysMessage(msg); + msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ",")); + sysMessageService.updateSysMessage(msg); + } } + //信息已处理 channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); } catch (Exception e) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index a69b8e8..ed8e024 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -64,6 +64,13 @@ public class SysMessageService implements ISysMessageService { } @Override + @ApiOperation(value = "添加消息") + public List insertSysMessage(List list) { + return sysMessageRDao.saveAll(list); + } + + + @Override @ApiOperation(value = "删除消息") public void deleteSysMessageById(Long id) { LOGGER.info("消息 SYS_MESSAGE id:{}",id); @@ -120,6 +127,12 @@ public class SysMessageService implements ISysMessageService { } @Override + @ApiOperation(value = "添加用户消息关系") + public List insertSysRefUserMessage(List refList) { + return sysRefUserMessageRDao.saveAll(refList); + } + + @Override @ApiOperation(value = "添加消息并发送") public void doSendSysMessage(SysMessage sysMessage) { // 判断消息类型推送到对应的队列 @@ -127,6 +140,7 @@ public class SysMessageService implements ISysMessageService { rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE,sysMessage); }else{ rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage); + rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage); } } From 7b88c6cc336a51a162fda0917d70a82b23096ca6 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 12 Mar 2019 18:37:40 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=BE=AE=E6=9C=8D=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysBarcodeRuleService.java | 72 ++++++++++ ...tController.java => DemoTestingController.java} | 80 ++++++++++- .../controller/busi/SysBarcodeRuleController.java | 149 +++++++++++++++++++++ .../apiservice/controller/busi/TestThread.java | 31 ----- .../core/apiservice/controller/busi/Text.java | 61 --------- .../serviceimpl/busi/SysBarcodeRuleService.java | 103 ++++++++++++++ .../core/apiservice/util/BarcodeParseUtil.java | 71 ++++++++++ 7 files changed, 470 insertions(+), 97 deletions(-) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysBarcodeRuleService.java rename modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/{busi/TestController.java => DemoTestingController.java} (93%) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestThread.java delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/Text.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysBarcodeRuleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysBarcodeRuleService.java new file mode 100644 index 0000000..2a068ce --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysBarcodeRuleService.java @@ -0,0 +1,72 @@ +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.platform.bean.SysBarcodeRule; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +/** + * @Description : 条码规则服务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-03-12 16:01 + * @Modify: + **/ +public interface ISysBarcodeRuleService { + + /** + * 添加条码规则 + * @param barcodeRule + */ + @ApiOperation(value = "新增条码规则信息") + SysBarcodeRule insertSysBarcodeRule(SysBarcodeRule barcodeRule); + + /** + * 修改条码规则 + * @param barcodeRule + */ + @ApiOperation(value = "更新条码规则信息") + void updateSysBarcodeRule(SysBarcodeRule barcodeRule); + + /** + * 查找全部条码规则 + * @return + */ + @ApiOperation(value = "查询所有条码规则信息",notes = "查询所有条码规则信息") + List listSysBarcodeRule(); + + /** + * 根据id查找条码规则 + * @param id + * @return + */ + @ApiOperation(value = "查询条码规则信息",notes = "根据ID查询条码规则信息") + SysBarcodeRule getSysBarcodeRuleById(Long id); + + /** + * 根据id删除条码规则 + * @param id + * @return + */ + @ApiOperation(value = "根据id删除条码规则",notes = "根据id删除条码规则") + void deleteSysBarcodeRuleById(Long id); + + /** + * 根据规则代码查询条码规则 + * @param code + * @return + */ + @ApiOperation(value = "根据规则代码查询条码规则",notes = "根据规则代码查询条码规则") + SysBarcodeRule getSysBarcodeRuleByCode(String code); + + /** + * 条码规则复杂查询分页排序 + * @param barcodeRule + * @param pager + * @return + */ + @ApiOperation(value = "根据规则代码查询条码规则",notes = "根据规则代码查询条码规则") + ListPager querySysBarcodeRuleByPager(SysBarcodeRule barcodeRule, Pager pager); +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java similarity index 93% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java index 0192f6e..d2e9845 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java @@ -1,6 +1,8 @@ -package cn.estsh.i3plus.core.apiservice.controller.busi; +package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.busi.*; +import cn.estsh.i3plus.core.apiservice.controller.busi.ComputePi; +import cn.estsh.i3plus.core.apiservice.controller.busi.PersonnelController; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; @@ -31,10 +33,10 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.persistence.EntityManager; +import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -50,8 +52,8 @@ import java.util.UUID; @RestController @Api(description = "IMPP性能测试") @RequestMapping("/impp/white/sys-test") -public class TestController { - public static final Logger LOGGER = LoggerFactory.getLogger(TestController.class); +public class DemoTestingController { + public static final Logger LOGGER = LoggerFactory.getLogger(DemoTestingController.class); String TEXT = "飓风黑兹尔是1954年大西洋飓风季期间造成死亡人数最多、经济损失最惨重的飓风。这场风暴夺走了海地多达1000人的生命，然后又以四级飓风强度从南、北卡罗莱纳州边境附近袭击美国，造成95人丧生。之后黑兹尔转变成温带风暴，但仍然致使81人遇难，其中大部分来自多伦多。由于风暴造成了重大人员伤亡和财产损失，其名称“黑兹尔”因此从大西洋风暴命名名单上退役。黑兹尔摧毁了海地40%的咖啡树和50%的可可作物，对当地经济的影响持续了数年之久。飓风在南、北卡罗莱纳州登陆，冲击点附近的大部分海滨住宅被毁。气旋从北卡罗莱纳州沿大西洋海岸北上，先后影响了弗吉尼亚州、西弗吉尼亚州、马里兰州、特拉华州、新泽西州、宾夕法尼亚州和纽约州，产生的阵风时速有近160公里，造成的经济损失高达3.08亿美元。多伦多市内及周边有许多溪流溢出，导致严重的洪涝灾害。加拿大遭受的损失达到1.35亿加拿大元。由于缺少应对热带气旋的经验，加上风暴强度的保持时间异常之长，多伦多所受影响的严重程度是前所未有的"; @@ -1053,10 +1055,78 @@ public class TestController { public void MakeSql(String path,int page,int pageSize){ try { for (int i = 0; i < page; i++) { - Text.printUsage(path,pageSize, i); + printSql(path,pageSize, i); } } catch (IOException e) { e.printStackTrace(); } } + + public static final String DATA_TEXT = "党的十八大提出，倡导富强、民主、文明、和谐，倡导自由、平等、公正、法治，倡导爱国、敬业、诚信、友善，积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标，自由、平等、公正、法治是社会层面的价值取向，爱国、敬业、诚信、友善是公民个人层面的价值准则，这24个字是社会主义核心价值观的基本内容。"; + + /** + * + * @param path + * @param num + * @param index + * @throws IOException + */ + public static void printSql(String path, int num, int index) throws IOException { + + File dir = new File(path+File.separator+"tool"+File.separator+"temp" + (index / 10)); + if (!dir.exists()) { + System.out.println(dir.mkdirs()); + } + File f = new File(path+File.separator+"tool"+File.separator+"temp" + (index / 10) + File.separator+"insert" + index + ".sql"); + FileWriter fw = new FileWriter(f); + BufferedWriter out = new BufferedWriter(fw); + try { + + SysTool sysTool; + StringBuffer sb; + SnowflakeIdMaker snf = new SnowflakeIdMaker(); + for (int i = 0; i < num; i++) { + sb = new StringBuffer(); + sb.append("insert into sys_tool (id,name,tool_type_name_rdd,tool_type_id,tool_ip,tool_port,tool_description) values "); + sysTool = new SysTool(); + sysTool.setId(snf.nextId() + System.currentTimeMillis()); + sysTool.setName(RandomStringUtils.random(10, DATA_TEXT)); + sysTool.setToolTypeNameRdd(RandomStringUtils.random(10, DATA_TEXT)); + sysTool.setToolTypeId(System.currentTimeMillis()); + sysTool.setToolIp(RandomStringUtils.random(10, DATA_TEXT)); + sysTool.setToolPort((int) (Math.random() * i)); + sysTool.setToolDescription(RandomStringUtils.random(10, DATA_TEXT)); + sysTool.setCreateDatetime(TimeTool.getNowTime(true)); + sysTool.setModifyDatetime(TimeTool.getNowTime(true)); + + sb.append("(" + sysTool.getId() + ",'" + sysTool.getName() + "','" + sysTool.getToolTypeNameRdd() + "'," + sysTool.getToolTypeId() + ",'" + + sysTool.getToolIp() + "'," + sysTool.getToolPort() + ",'" + sysTool.getToolDescription() + "');"); + out.write(sb.toString()); + } + + } finally { + out.close(); + } + } } +class TestThread implements Runnable { + + private Thread t; + private int piLength = 0; + + public TestThread (int piLength){ + this.piLength = piLength; + } + + @Override + public void run() { + ComputePi.computePi(piLength); + } + + public void start () { + if (t == null) { + t = new Thread (this); + t.start (); + } + } +} \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java new file mode 100644 index 0000000..c806378 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java @@ -0,0 +1,149 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysBarcodeRuleService; +import cn.estsh.i3plus.core.apiservice.util.BarcodeParseUtil; +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.platform.bean.SessionUser; +import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; +import cn.estsh.i3plus.pojo.platform.bean.SysConfig; +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.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * @Description :条码规则管理服务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-03-12 16:00 + * @Modify: + **/ +@RestController +@Api(description = "条码规则管理服务") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-barcode-rule") +public class SysBarcodeRuleController extends CoreBaseController { + + public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); + + @Autowired + private ISysBarcodeRuleService sysBarcodeRuleService; + + @PostMapping("/insert") + @ApiOperation(value = "添加条码规则",notes = "添加条码规则") + public ResultBean insertSysBarcodeRule(SysBarcodeRule sysBarcodeRule) { + try { + // 条件验证 + ValidatorBean.beginValid(sysBarcodeRule) + .notNull("name",sysBarcodeRule.getName()) + .notNull("barcodeRuleCode",sysBarcodeRule.getBarcodeRuleCode()) + .notNull("barcodeRule",sysBarcodeRule.getBarcodeRule()); + + sysBarcodeRuleService.insertSysBarcodeRule(sysBarcodeRule); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping("/update") + @ApiOperation(value = "修改条码规则",notes = "修改条码规则") + public ResultBean updateSysBarcodeRule(SysBarcodeRule sysBarcodeRule) { + try { + // 条件验证 + ValidatorBean.beginValid(sysBarcodeRule) + .notNull("name",sysBarcodeRule.getName()) + .notNull("barcodeRuleCode",sysBarcodeRule.getBarcodeRuleCode()) + .notNull("barcodeRule",sysBarcodeRule.getBarcodeRule()); + + sysBarcodeRuleService.updateSysBarcodeRule(sysBarcodeRule); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping("/delete/{id}") + @ApiOperation(value = "删除条码规则",notes = "删除条码规则") + public ResultBean deleteSysBarcodeRuleById(@PathVariable("id") String idStr) { + try { + // 条件验证 + ValidatorBean.checkNotNull(idStr,"id不能为空"); + SysBarcodeRule sysBarcodeRule = sysBarcodeRuleService.getSysBarcodeRuleById(Long.parseLong(idStr)); + if(sysBarcodeRule == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("条码规则不存在") + .setErrorSolution("请重新输入条码id") + .build(); + } + + sysBarcodeRuleService.deleteSysBarcodeRuleById(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); + } + } + + @GetMapping("/query") + @ApiOperation(value = "条码规则分页复杂查询",notes = "条码规则分页复杂查询") + public ResultBean querySysBarcodeRuleByPager(SysBarcodeRule sysBarcodeRule, Pager pager) { + try { + ListPager listPager = sysBarcodeRuleService.querySysBarcodeRuleByPager(sysBarcodeRule,pager); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping("/parser") + @ApiOperation(value = "解析条码规则",notes = "解析条码规则") + public ResultBean querySysBarcodeRuleByPager(String ruleCode, String barcode) { + try { + // 条件验证 + ValidatorBean.checkNotNull(ruleCode,"规则代码不能为空"); + SysBarcodeRule sysBarcodeRule = sysBarcodeRuleService.getSysBarcodeRuleByCode(ruleCode); + if(sysBarcodeRule == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("条码规则不存在") + .setErrorSolution("请重新输入条码id") + .build(); + } + + // 解析条码规则 + Map resultMap = BarcodeParseUtil.parse(sysBarcodeRule,barcode); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resultMap); + }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/TestThread.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestThread.java deleted file mode 100644 index 54f1394..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TestThread.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.controller.busi; - -/** - * @Description : - * @Reference : - * @Author : yunhao - * @CreateDate : 2019-02-19 18:13 - * @Modify: - **/ -public class TestThread implements Runnable { - - private Thread t; - private int piLength = 0; - - public TestThread (int piLength){ - this.piLength = piLength; - } - - @Override - public void run() { - ComputePi.computePi(piLength); - } - - public void start () { - if (t == null) { - t = new Thread (this); - t.start (); - } - } -} - diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/Text.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/Text.java deleted file mode 100644 index ad86ad6..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/Text.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.controller.busi; - -import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import cn.estsh.i3plus.pojo.platform.bean.SysTool; -import org.apache.commons.lang3.RandomStringUtils; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; - -/** - * @Description : 性能测试 - * @Reference : - * @Author : yunhao - * @CreateDate : 2019-02-19 11:41 - * @Modify: - **/ -public class Text { - public static final String TEXT = "党的十八大提出，倡导富强、民主、文明、和谐，倡导自由、平等、公正、法治，倡导爱国、敬业、诚信、友善，积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标，自由、平等、公正、法治是社会层面的价值取向，爱国、敬业、诚信、友善是公民个人层面的价值准则，这24个字是社会主义核心价值观的基本内容。"; - - public static void printUsage(String path, int num, int index) throws IOException { - - File dir = new File(path+File.separator+"tool"+File.separator+"temp" + (index / 10)); - if (!dir.exists()) { - System.out.println(dir.mkdirs()); - } - File f = new File(path+File.separator+"tool"+File.separator+"temp" + (index / 10) + File.separator+"insert" + index + ".sql"); - FileWriter fw = new FileWriter(f); - BufferedWriter out = new BufferedWriter(fw); - try { - - SysTool sysTool; - StringBuffer sb; - SnowflakeIdMaker snf = new SnowflakeIdMaker(); - for (int i = 0; i < num; i++) { - sb = new StringBuffer(); - sb.append("insert into sys_tool (id,name,tool_type_name_rdd,tool_type_id,tool_ip,tool_port,tool_description) values "); - sysTool = new SysTool(); - sysTool.setId(snf.nextId() + System.currentTimeMillis()); - sysTool.setName(RandomStringUtils.random(10, TEXT)); - sysTool.setToolTypeNameRdd(RandomStringUtils.random(10, TEXT)); - sysTool.setToolTypeId(System.currentTimeMillis()); - sysTool.setToolIp(RandomStringUtils.random(10, TEXT)); - sysTool.setToolPort((int) (Math.random() * i)); - sysTool.setToolDescription(RandomStringUtils.random(10, TEXT)); - sysTool.setCreateDatetime(TimeTool.getNowTime(true)); - sysTool.setModifyDatetime(TimeTool.getNowTime(true)); - - sb.append("(" + sysTool.getId() + ",'" + sysTool.getName() + "','" + sysTool.getToolTypeNameRdd() + "'," + sysTool.getToolTypeId() + ",'" - + sysTool.getToolIp() + "'," + sysTool.getToolPort() + ",'" + sysTool.getToolDescription() + "');"); - out.write(sb.toString()); - } - - } finally { - out.close(); - } - } - -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java new file mode 100644 index 0000000..190700e --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysBarcodeRuleService; +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.platform.bean.SysBarcodeRule; +import cn.estsh.i3plus.pojo.platform.repository.SysBarcodeRuleRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import io.swagger.annotations.ApiOperation; +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 : yunhao + * @CreateDate : 2019-03-12 16:13 + * @Modify: + **/ +@Service +public class SysBarcodeRuleService implements ISysBarcodeRuleService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysBarcodeRuleService.class); + + @Autowired + private SysBarcodeRuleRepository sysBarcodeRuleRDao; + + @Override + @ApiOperation(value = "新增条码规则信息") + public SysBarcodeRule insertSysBarcodeRule(SysBarcodeRule barcodeRule) { + // 数据校验 + if (sysBarcodeRuleRDao.isExitByProperty("barcodeRuleCode",barcodeRule.getBarcodeRuleCode())) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("规则代码已存在") + .setErrorSolution("请重新输入规则代码") + .build(); + } + + return sysBarcodeRuleRDao.insert(barcodeRule); + } + + @Override + @ApiOperation(value = "更新条码规则信息") + public void updateSysBarcodeRule(SysBarcodeRule barcodeRule) { + List list = sysBarcodeRuleRDao.findByHqlWhere(CoreHqlPack.packHqlSysBarcodeRuleCode(barcodeRule)); + if (list == null && list.size() == 0) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("规则代码已存在") + .setErrorSolution("请重新输入规则代码") + .build(); + } + + sysBarcodeRuleRDao.update(barcodeRule); + } + + @Override + @ApiOperation(value = "查询所有条码规则信息",notes = "查询所有条码规则信息") + public List listSysBarcodeRule() { + return sysBarcodeRuleRDao.list(); + } + + @Override + @ApiOperation(value = "查询条码规则信息",notes = "根据ID查询条码规则信息") + public SysBarcodeRule getSysBarcodeRuleById(Long id) { + return sysBarcodeRuleRDao.getById(id); + } + + @Override + @ApiOperation(value = "根据id删除条码规则",notes = "根据id删除条码规则") + public void deleteSysBarcodeRuleById(Long id) { + sysBarcodeRuleRDao.deleteById(id); + } + + @Override + @ApiOperation(value = "根据规则代码查询条码规则",notes = "根据规则代码查询条码规则") + public SysBarcodeRule getSysBarcodeRuleByCode(String code) { + return sysBarcodeRuleRDao.getByProperty("barcodeRuleCode",code); + } + + @Override + @ApiOperation(value = "根据规则代码查询条码规则",notes = "根据规则代码查询条码规则") + public ListPager querySysBarcodeRuleByPager(SysBarcodeRule barcodeRule, Pager pager) { + if(barcodeRule == null) { + pager = PagerHelper.getPager(pager, sysBarcodeRuleRDao.listCount()); + return new ListPager(sysBarcodeRuleRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysBarcodeRule(barcodeRule); + pager = PagerHelper.getPager(pager, sysBarcodeRuleRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysBarcodeRuleRDao.findByHqlWherePage(hqlPack + barcodeRule.orderBy(),pager),pager); + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java new file mode 100644 index 0000000..05c5bbb --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.core.apiservice.util; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Description : 字符串解析 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-03-12 14:41 + * @Modify: + **/ +public class BarcodeParseUtil { + + /** + * 按指定规则解析条码 + * @param barcodeRule + * @param barcode + * @return + */ + public static Map parse(SysBarcodeRule barcodeRule,String barcode){ + // 数据有效性校验 + if(barcodeRule == null || barcode == null){ + return null; + }else if(barcodeRule.getBarcodeRule() == null || barcodeRule.getBarcodeSeparator() == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("条码规则不完善！") + .build(); + } + + // 分隔条码信息 + String[] barcodeKey = barcodeRule.getBarcodeRule().split(barcodeRule.getBarcodeSeparator()); + String[] barcodeValue = barcode.split(barcodeRule.getBarcodeSeparator()); + + if(barcodeKey.length != barcodeValue.length){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("条码与规则不匹配！") + .build(); + } + + // 匹配条码数据 + HashMap barcodeMap = new HashMap<>(); + for (int i = 0; i < barcodeKey.length; i++) { + barcodeMap.put(barcodeKey[i],barcodeValue[i]); + } + return barcodeMap; + } + + public static void main(String[] args) { + SysBarcodeRule barcodeRule = new SysBarcodeRule(); + barcodeRule.setName("测试条码规则"); + barcodeRule.setBarcodeRuleCode("Barcode"); + barcodeRule.setBarcodeRule("orderNo/groupId/num"); + barcodeRule.setBarcodeSeparator("/"); + barcodeRule.setBarcodeRuleDescription("描述"); + + Map barcode= parse(barcodeRule,"99/99/99"); + + System.out.println(barcode); + } + +} From b0af7e5de03aaad357621366298b55a22cfd580b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 12 Mar 2019 18:46:11 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index ed8e024..398613b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -140,7 +140,7 @@ public class SysMessageService implements ISysMessageService { rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE,sysMessage); }else{ rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage); - rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage); + rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK,sysMessage); } } From c5b16f1e99097d53ebb28853f540d07ea596dd46 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 12 Mar 2019 19:29:17 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=20=E6=93=8D=E4=BD=9C=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DemoExceptionController.java | 2 +- .../controller/DemoResourceController.java | 10 +++++----- .../controller/base/WhiteController.java | 2 +- .../controller/busi/PersonnelController.java | 14 +++++++------- .../controller/busi/SysConfigController.java | 20 ++++++++++---------- .../controller/busi/SysDashboardController.java | 10 +++++----- .../controller/busi/SysDepartmentController.java | 10 +++++----- .../controller/busi/SysDictionaryController.java | 20 ++++++++++---------- .../controller/busi/SysFileController.java | 14 +++++++------- .../busi/SysLocaleLanguageController.java | 4 ++-- .../busi/SysLocaleResourceController.java | 4 ++-- .../controller/busi/SysLogOperateController.java | 10 +++++----- .../controller/busi/SysLogSystemController.java | 10 +++++----- .../controller/busi/SysLogTaskTimeController.java | 8 ++++---- .../controller/busi/SysMenuController.java | 4 ++-- .../controller/busi/SysMessageController.java | 22 +++++++++++----------- .../controller/busi/SysOrderNoRuleController.java | 6 +++--- .../controller/busi/SysOrganizeController.java | 4 ++-- .../controller/busi/SysPositionController.java | 10 +++++----- .../controller/busi/SysRoleController.java | 4 ++-- .../controller/busi/SysTaskController.java | 2 +- .../controller/busi/SysTaskCycleController.java | 6 +++--- .../controller/busi/SysTaskPlanController.java | 4 ++-- .../controller/busi/SysToolController.java | 12 ++++++------ .../controller/busi/SysToolTypeController.java | 12 ++++++------ .../controller/busi/SysUserController.java | 2 +- .../controller/busi/SysUserInfoController.java | 12 ++++++------ 27 files changed, 119 insertions(+), 119 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java index fde4bbc..740c24c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java @@ -45,7 +45,7 @@ public class DemoExceptionController { }else if(type == 2){ throw new SQLException("测试数据库异常"); }else { - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 7322623..8ff7b99 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -103,7 +103,7 @@ public class DemoResourceController extends CoreBaseController { //修改条件 ConvertBean.modelUpdate(lang,user); systemResourceService.updateSysLocaleLanguage(lang); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep).build(); }catch(Exception e){ @@ -173,7 +173,7 @@ public class DemoResourceController extends CoreBaseController { SysLocaleResource res = systemResourceService.getSysLocaleResourceByLanguage(resourceType, langCode, resKey); LOGGER.info("获取的资源：" + res); - return ResultBean.success("保存成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultObject(res); }catch(ImppBusiException busExcep){ @@ -221,7 +221,7 @@ public class DemoResourceController extends CoreBaseController { SysUser user = userService.getSysUserById(key); System.out.println("1==="+user.toString()); - return ResultBean.success("保存成功"); + return ResultBean.success("操作成功"); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -240,7 +240,7 @@ public class DemoResourceController extends CoreBaseController { SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); System.out.println("2==="+userInfo.toString()); - return ResultBean.success("保存成功"); + return ResultBean.success("操作成功"); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -266,7 +266,7 @@ public class DemoResourceController extends CoreBaseController { SysUserInfo userInfo = userInfoServicer.getSysUserInfoById(key); // System.out.println("2==="+userInfo); - return ResultBean.success("保存成功"); + return ResultBean.success("操作成功"); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ 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 a66ae66..101cc9e 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 @@ -71,7 +71,7 @@ public class WhiteController extends CoreBaseController { public ResultBean listSysLocaleLanguage(){ try { List sysLocaleLanguageList = sysLocaleLanguageService.findSysLocaleLanguageByStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 0a04177..051f433 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -117,7 +117,7 @@ public class PersonnelController extends CoreBaseController { // 关系 刷新 refreshRef(user, info, model); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -197,7 +197,7 @@ public class PersonnelController extends CoreBaseController { personnelService.saveSysUser(user); personnelService.saveSysUserInfo(userInfo); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -229,7 +229,7 @@ public class PersonnelController extends CoreBaseController { // 关系 刷新 refreshRef(user, null, model); personnelService.saveSysUser(user); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -309,7 +309,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(new Long[]{info.getId()},getSessionUser().getUserName()); personnelService.deleteSysUser(new Long[]{info.getUserId()},getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -347,7 +347,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(infoIds,getSessionUser().getUserName()); personnelService.deleteSysUser(userIds,getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -370,7 +370,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(new Long[]{user.getUserInfoId()},getSessionUser().getUserName()); personnelService.deleteSysUser(new Long[]{user.getId()},getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -408,7 +408,7 @@ public class PersonnelController extends CoreBaseController { personnelService.deleteSysUserInfo(infoIds,getSessionUser().getUserName()); personnelService.deleteSysUser(userIds,getSessionUser().getUserName()); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index 4859363..fe1e6a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -72,7 +72,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.insertSysConfig(sysConfig); systemInitService.loadSysConfig(); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -97,7 +97,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.deleteSysConfigById(Long.parseLong(idStr)); systemInitService.loadSysConfig(); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -124,7 +124,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.updateSysConfig(sysConfig); systemInitService.loadSysConfig(); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -137,7 +137,7 @@ public class SysConfigController extends CoreBaseController { public ResultBean findSysConfigAll(){ try { List sysConfigList = sysConfigService.ListSysConfig(); - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultList(sysConfigList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -155,7 +155,7 @@ public class SysConfigController extends CoreBaseController { SysConfig sysConfig = sysConfigService.getSysConfigById(Long.parseLong(id)); if (sysConfig != null) { - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); @@ -172,7 +172,7 @@ public class SysConfigController extends CoreBaseController { public ResultBean querySysConfigByPager(SysConfig sysConfig,Pager pager) { try { ListPager sysConfigListPager = sysConfigService.querySysConfigByPager(sysConfig,pager); - return ResultBean.success("查询成功").setListPager(sysConfigListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysConfigListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -190,7 +190,7 @@ public class SysConfigController extends CoreBaseController { if(sysConfig == null){ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } else{ - return ResultBean.success("查询成功").setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -207,7 +207,7 @@ public class SysConfigController extends CoreBaseController { if(sysConfig == null){ return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } else{ - return ResultBean.success("查询成功").setResultList(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysConfig).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -225,7 +225,7 @@ public class SysConfigController extends CoreBaseController { sysConfigService.updateSysConfigByCode(code,value); systemInitService.loadSysConfig(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -267,7 +267,7 @@ public class SysConfigController extends CoreBaseController { try { ValidatorBean.checkNotNull(group,"参数组不能为空"); List sysConfigList = sysConfigService.findSysConfigByGroup(group); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysConfigList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysConfigList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java index a5d6e83..e87a7ae 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java @@ -72,7 +72,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(dashboardData); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); }catch(Exception e){ @@ -99,7 +99,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -129,7 +129,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -159,7 +159,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -208,7 +208,7 @@ public class SysDashboardController extends CoreBaseController { redisCore.putHashMap(redisKey, dashboardData, 500); } - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultMap(dashboardData); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index 9fe63fd..0a6986c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -72,7 +72,7 @@ public class SysDepartmentController extends CoreBaseController { } departmentService.insertSysDepartment(department); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -101,7 +101,7 @@ public class SysDepartmentController extends CoreBaseController { } departmentService.updateSysDepartment(department); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -159,7 +159,7 @@ public class SysDepartmentController extends CoreBaseController { }else{ list = departmentService.findSysDepartmentByPager(department, pager); } - return ResultBean.success("查询成功").setListPager(list).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(list).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -175,7 +175,7 @@ public class SysDepartmentController extends CoreBaseController { ValidatorBean.checkNotNull(id, "id为空。"); departmentService.deleteSysDepartmentById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -196,7 +196,7 @@ public class SysDepartmentController extends CoreBaseController { .build(); } departmentService.deleteSysDepartmentByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 1f5d165..b29a18e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -60,7 +60,7 @@ public class SysDictionaryController extends CoreBaseController{ sysDictionary.setIsDefault(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); sysDictionaryService.insertSysDictionary(sysDictionary); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -85,7 +85,7 @@ public class SysDictionaryController extends CoreBaseController{ ConvertBean.modelUpdate(sysDictionary,user); sysDictionaryService.updateSysDictionary(sysDictionary); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -117,7 +117,7 @@ public class SysDictionaryController extends CoreBaseController{ } sysDictionaryService.deleteSysDictionaryById(Long.parseLong(idStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -130,7 +130,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean findSysDictionaryAll() { try { List sysDictionaryList = sysDictionaryService.listSysDictionary(); - return ResultBean.success("查询成功").setResultList(sysDictionaryList) + return ResultBean.success("操作成功").setResultList(sysDictionaryList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -148,7 +148,7 @@ public class SysDictionaryController extends CoreBaseController{ SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(Long.parseLong(id)); if (sysDictionary != null) { - return ResultBean.success("查询成功").setResultObject(sysDictionary).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysDictionary).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("字典不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -164,7 +164,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) { try { List sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code); - return ResultBean.success("查询成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -187,7 +187,7 @@ public class SysDictionaryController extends CoreBaseController{ resultMap.put("8",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_POLITICAL_STATUS)); resultMap.put("9",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)); - return ResultBean.success("查询成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -200,7 +200,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { try { ListPager sysDictionaryListPager = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager); - return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -213,7 +213,7 @@ public class SysDictionaryController extends CoreBaseController{ public ResultBean findSysDictionaryByTop() { try { List sysDictionaryList = sysDictionaryService.findSysDictionaryByTop(); - return ResultBean.success("查询成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -233,7 +233,7 @@ public class SysDictionaryController extends CoreBaseController{ .build(); } sysDictionaryService.deleteSysDictionaryByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ 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 a34cafc..b5afd31 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 @@ -66,7 +66,7 @@ public class SysFileController extends CoreBaseController{ .notNull("name",sysFile.getName()); sysFileService.updateSysFile(sysFile); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -79,7 +79,7 @@ public class SysFileController extends CoreBaseController{ public ResultBean deleteSysFileById(@PathVariable("id") String id){ try { sysFileService.deleteSysFileById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -92,7 +92,7 @@ public class SysFileController extends CoreBaseController{ public ResultBean findSysFileAll(SysFile sysFile){ try { List sysFileList = sysFileService.listSysFile(); - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultList(sysFileList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -109,7 +109,7 @@ public class SysFileController extends CoreBaseController{ ValidatorBean.checkIsNumber(id,"id必须为数字"); SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(id)); - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultObject(sysFile) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -124,7 +124,7 @@ public class SysFileController extends CoreBaseController{ public ResultBean querySysFileByPager(SysFile sysFile, Pager pager){ try { ListPager sysFileListPager = sysFileService.querySysFileByPager(sysFile,pager); - return ResultBean.success("查询成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -145,7 +145,7 @@ public class SysFileController extends CoreBaseController{ } sysFileService.deleteSysFileByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -274,7 +274,7 @@ public class SysFileController extends CoreBaseController{ sysFile.setFileTypeName(dictionary.getName()); sysFile = sysFileService.insertSysFile(sysFile); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 718a978..e8794a2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -124,7 +124,7 @@ public class SysLocaleLanguageController extends CoreBaseController { public ResultBean listSysLocaleLanguage(){ try { List sysLocaleLanguageList = sysLocaleLanguageService.listSysLocaleLanguage(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -137,7 +137,7 @@ public class SysLocaleLanguageController extends CoreBaseController { public ResultBean querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager){ try { ListPager sysLocaleLanguageListPager = sysLocaleLanguageService.querySysLocaleLanguageByPager(sysLocaleLanguage,pager); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index b414a52..1f7ac89 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -132,7 +132,7 @@ public class SysLocaleResourceController extends CoreBaseController { public ResultBean listSysLocaleResource(){ try { List sysLocaleLanguageList = sysLocaleResourceService.listSysLocaleResource(); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -145,7 +145,7 @@ public class SysLocaleResourceController extends CoreBaseController { public ResultBean querySysLocaleResourceByPager(SysLocaleResource sysLocaleResource, Pager pager){ try { ListPager sysLocaleLanguageListPager = sysLocaleResourceService.querySysLocaleResourceByPager(sysLocaleResource,pager); - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysLocaleLanguageListPager); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 28c8ace..33b42f1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -63,7 +63,7 @@ public class SysLogOperateController extends CoreBaseController { public ResultBean insertSysLogOperateController(SysLogOperate logOperate){ try { logOperateService.insertSysLogOperate(logOperate); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -79,7 +79,7 @@ public class SysLogOperateController extends CoreBaseController { ValidatorBean.checkNotNull(id,"id不能为空！"); logOperateService.deleteSysLogOperateById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -92,7 +92,7 @@ public class SysLogOperateController extends CoreBaseController { public ResultBean findSysLogOperateAll(){ try { List logOperateList = logOperateService.listSysLogOperate(); - return ResultBean.success("查询成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(logOperateList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -106,7 +106,7 @@ public class SysLogOperateController extends CoreBaseController { try{ SysLogOperate logOperate = logOperateService.getSysLogOperateById(Long.parseLong(id)); if (logOperate != null) { - return ResultBean.success("查询成功") + return ResultBean.success("操作成功") .setResultObject(logOperate) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { @@ -125,7 +125,7 @@ public class SysLogOperateController extends CoreBaseController { public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){ try { ListPager logSystemList = logOperateService.querySysLogOperateByPager(logOperate, pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 047e84a..f2c1cbe 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -59,7 +59,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean insertSysLogSystem(SysLogSystem logSystem) { try { logSystemService.insertSysLogSystem(logSystem); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -75,7 +75,7 @@ public class SysLogSystemController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id不能为空"); logSystemService.deleteSysLogSystemById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -88,7 +88,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean findSysLogSystemAll(){ try { List logSystemList = logSystemService.listSysLogSystem(); - return ResultBean.success("查询成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -101,7 +101,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean getSysLogSystemById(String id){ try { SysLogSystem logSystem = logSystemService.getSysLogSystemById(Long.parseLong(id)); - return ResultBean.success("查询成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(logSystem).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -120,7 +120,7 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){ try { ListPager logSystemList = logSystemService.querySysLogSystemByPager(logSystem, pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java index db37eda..874f7a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java @@ -39,7 +39,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ public ResultBean insertSyslogTaskTime(SysLogTaskTime sysLogTaskTime) { try { logTaskTimeService.insertSysLogTaskTime(sysLogTaskTime); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -55,7 +55,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id不能为空"); logTaskTimeService.deleteSysLogTaskTimeById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -69,7 +69,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ try { SysLogTaskTime logTaskTime = logTaskTimeService.getSysLogTaskTimeById(Long.parseLong(id)); if (logTaskTime != null) { - return ResultBean.success("查询成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("日志不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -91,7 +91,7 @@ public class SysLogTaskTimeController extends CoreBaseController{ public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ try { ListPager logSystemList = logTaskTimeService.querySysLogTaskTimeByPager(sysLogTaskTime, pager); - return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ 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 05e9325..6af671d 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 @@ -93,7 +93,7 @@ public class SysMenuController extends CoreBaseController { } sysMenuService.updateSysMenu(menu); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep).build(); } catch (Exception e) { @@ -215,7 +215,7 @@ public class SysMenuController extends CoreBaseController { .build(); } sysMenuService.deleteSysMenuByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 9059c0f..b5da61d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -66,7 +66,7 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()); sysMessageService.doSendSysMessage(sysMessage); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -82,7 +82,7 @@ public class SysMessageController extends CoreBaseController { ValidatorBean.checkNotNull(id,"id不能为空"); sysMessageService.deleteSysMessageById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -104,7 +104,7 @@ public class SysMessageController extends CoreBaseController { .checkNotZero("messageType",sysMessage.getMessageType()); sysMessageService.updateSysMessage(sysMessage); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -117,7 +117,7 @@ public class SysMessageController extends CoreBaseController { public ResultBean findSysMessageAll(){ try { List sysMessageList = sysMessageService.listSysMessage(); - return ResultBean.success("查询成功").setResultList(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -131,7 +131,7 @@ public class SysMessageController extends CoreBaseController { try { SysMessage sysMessage = sysMessageService.getSysMessageById(Long.parseLong(idStr)); if (sysMessage != null) { - return ResultBean.success("查询成功").setResultObject(sysMessage).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysMessage).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -147,7 +147,7 @@ public class SysMessageController extends CoreBaseController { public ResultBean querySysMessageByPager(SysMessage sysMessage, Pager pager){ try { ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager); - return ResultBean.success("查询成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -169,7 +169,7 @@ public class SysMessageController extends CoreBaseController { .build(); } sysMessageService.deleteSysMessageByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -186,7 +186,7 @@ public class SysMessageController extends CoreBaseController { sysRefUserMessage.setReceiverId(getSessionUser().getUser().getId()); ListPager userMessageList = sysMessageService.querySysRefUserMessageByPager(sysRefUserMessage,pager); - return ResultBean.success("查询成功").setListPager(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -203,7 +203,7 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageSenderId(getSessionUser().getUser().getId()); ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager); - return ResultBean.success("查询成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -217,7 +217,7 @@ public class SysMessageController extends CoreBaseController { try { List userMessageList = sysMessageService.findSysRefUserMessageByUserIdAndStatus(getSessionUser().getUser().getId(), ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); - return ResultBean.success("查询成功").setResultList(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(userMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -313,7 +313,7 @@ public class SysMessageController extends CoreBaseController { sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()); sysMessageService.doSendSysMessage(sysMessage); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index 71f1679..8a3e352 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -121,7 +121,7 @@ public class SysOrderNoRuleController extends CoreBaseController { SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr)); if (sysOrderNoRule != null) { - return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -152,7 +152,7 @@ public class SysOrderNoRuleController extends CoreBaseController { public ResultBean querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager){ try { ListPager sysOrderNoRuleList = sysOrderNoRuleService.querySysOrderNoRuleByPager(sysOrderNoRule, pager); - return ResultBean.success("查询成功").setListPager(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -375,7 +375,7 @@ public class SysOrderNoRuleController extends CoreBaseController { ValidatorBean.checkNotNull(code,"code不能为空"); SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code); - return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index b9be58b..4e1a3a9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -86,7 +86,7 @@ public class SysOrganizeController extends CoreBaseController{ } organizeService.updateSysOrganize(organize); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -184,7 +184,7 @@ public class SysOrganizeController extends CoreBaseController{ } organizeService.deleteSysOrganizeByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 0a8ed72..4956522 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -61,7 +61,7 @@ public class SysPositionController extends CoreBaseController { } SysPosition pos = positionService.insertSysPosition(position); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultObject(pos); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -91,7 +91,7 @@ public class SysPositionController extends CoreBaseController { } positionService.updateSysPosition(position); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -137,7 +137,7 @@ public class SysPositionController extends CoreBaseController { ValidatorBean.beginValid(position) .notNull("id",position.getId()); - return ResultBean.success("查询成功").setResultObject(position).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(position).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -153,7 +153,7 @@ public class SysPositionController extends CoreBaseController { ValidatorBean.checkNotNull(id,"id为空"); positionService.deleteSysPositionById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -174,7 +174,7 @@ public class SysPositionController extends CoreBaseController { .build(); } positionService.deleteSysPositionByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index cc5827e..3108cce 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -81,7 +81,7 @@ public class SysRoleController extends CoreBaseController{ ConvertBean.modelUpdate(role, AuthUtil.getSessionUser()); sysRoleService.updateSysRole(role); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -291,7 +291,7 @@ public class SysRoleController extends CoreBaseController{ .build(); } sysRoleService.deleteSysRoleByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); 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 a8b27d8..ac35073 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 @@ -145,7 +145,7 @@ public class SysTaskController extends CoreBaseController { .build(); } sysTaskService.deleteSysTaskByIds(StringTool.getArrayLong(idsStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception 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 4206b7a..29bfb02 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 @@ -144,7 +144,7 @@ public class SysTaskCycleController extends CoreBaseController{ SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(Long.parseLong(id)); if (sysTaskCycle != null) { - return ResultBean.success("查询成功").setResultObject(sysTaskCycle).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(sysTaskCycle).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -160,7 +160,7 @@ public class SysTaskCycleController extends CoreBaseController{ public ResultBean querySysTaskCycleByPager(SysTaskCycle taskTimeExpression, Pager pager){ try { ListPager listPager = sysTaskCycleService.querySysTaskCycleByPager(taskTimeExpression,pager); - return ResultBean.success("查询成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -181,7 +181,7 @@ public class SysTaskCycleController extends CoreBaseController{ } sysTaskCycleService.deleteSysTaskCycleByIds(StringTool.getArrayLong(idsStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ 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 904de23..8f41740 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 @@ -165,7 +165,7 @@ public class SysTaskPlanController extends CoreBaseController{ SysTaskPlan taskTime = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id)); if (taskTime != null) { - return ResultBean.success("查询成功").setResultObject(taskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(taskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("任务计划不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -198,7 +198,7 @@ public class SysTaskPlanController extends CoreBaseController{ public ResultBean querySysTaskTimeByPager(SysTaskPlan taskTime, Pager pager){ try { ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime,pager); - return ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index fe1eb2f..a89e3bf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -69,7 +69,7 @@ public class SysToolController extends CoreBaseController{ tool.setToolStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); toolService.insertSysTool(tool); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -97,7 +97,7 @@ public class SysToolController extends CoreBaseController{ ConvertBean.modelUpdate(tool,user); toolService.updateSysTool(tool); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -112,7 +112,7 @@ public class SysToolController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id不能为空"); toolService.deleteSysToolById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -142,7 +142,7 @@ public class SysToolController extends CoreBaseController{ SysTool tool = toolService.getSysToolById(Long.parseLong(id)); if (tool != null) { - return ResultBean.success("查询成功").setResultObject(tool).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(tool).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("硬件不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -158,7 +158,7 @@ public class SysToolController extends CoreBaseController{ public ResultBean querySysToolByPager(SysTool tool, Pager pager){ try { ListPager sysSysToolListPager = toolService.querySysToolByPager(tool,pager); - return ResultBean.success("查询成功").setListPager(sysSysToolListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysSysToolListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -191,7 +191,7 @@ public class SysToolController extends CoreBaseController{ .build(); } toolService.deleteSysToolByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 12489de..76f0859 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -53,7 +53,7 @@ public class SysToolTypeController extends CoreBaseController{ ConvertBean.modelInitialize(toolType, AuthUtil.getSessionUser()); toolTypeService.insertSysToolType(toolType); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -75,7 +75,7 @@ public class SysToolTypeController extends CoreBaseController{ ConvertBean.modelUpdate(toolType,user); toolTypeService.updateSysToolType(toolType); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -98,7 +98,7 @@ public class SysToolTypeController extends CoreBaseController{ } toolTypeService.deleteSysToolTypeById(Long.parseLong(idStr)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); @@ -129,7 +129,7 @@ public class SysToolTypeController extends CoreBaseController{ SysToolType toolType = toolTypeService.getSysToolTypeById(Long.parseLong(id)); if (toolType != null) { - return ResultBean.success("查询成功").setResultObject(toolType).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(toolType).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("硬件不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -145,7 +145,7 @@ public class SysToolTypeController extends CoreBaseController{ public ResultBean querySysToolTypeByPager(SysToolType toolType, Pager pager){ try { ListPager sysDictionaryListPager = toolTypeService.querySysToolTypeByPager(toolType,pager); - return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); @@ -166,7 +166,7 @@ public class SysToolTypeController extends CoreBaseController{ .build(); } toolTypeService.deleteSysToolTypeByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 6be7b5b..e41dd95 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -293,7 +293,7 @@ public class SysUserController extends CoreBaseController{ } sysUserService.deleteBatchSysUserById(StringTool.getArrayLong(ids),AuthUtil.getSessionUser()); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index d49a53e..e0b400a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -81,7 +81,7 @@ public class SysUserInfoController extends CoreBaseController{ sysUserInfoService.refreshRefUserOrganize(info.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -106,7 +106,7 @@ public class SysUserInfoController extends CoreBaseController{ sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); - return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -122,7 +122,7 @@ public class SysUserInfoController extends CoreBaseController{ ValidatorBean.checkNotNull(id,"id为空"); sysUserInfoService.deleteSysUserInfoById(Long.parseLong(id)); - return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -168,7 +168,7 @@ public class SysUserInfoController extends CoreBaseController{ .notNull("id",userInfo.getId()); if(userInfo != null){ - return ResultBean.success("查询成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultObject(userInfo).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } @@ -192,7 +192,7 @@ public class SysUserInfoController extends CoreBaseController{ .build(); } sysUserInfoService.deleteSysUserInfoByIds(StringTool.getArrayLong(ids)); - return ResultBean.success("删除成功") + return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -378,7 +378,7 @@ public class SysUserInfoController extends CoreBaseController{ @ApiOperation(value = "获取用户可导出字段") public ResultBean getSysUserInfoColName(){ try { - return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysUserInfo.class)); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysUserInfo.class)); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ From 89242cb04df2fbf612c6c0789a65ac4ad8a2a421 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 13 Mar 2019 10:45:01 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=A7=A3=E6=9E=90Demo=20=E5=85=83=E7=B4=A0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java index 190700e..9ddbdc2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysBarcodeRuleService.java @@ -52,7 +52,7 @@ public class SysBarcodeRuleService implements ISysBarcodeRuleService { @ApiOperation(value = "更新条码规则信息") public void updateSysBarcodeRule(SysBarcodeRule barcodeRule) { List list = sysBarcodeRuleRDao.findByHqlWhere(CoreHqlPack.packHqlSysBarcodeRuleCode(barcodeRule)); - if (list == null && list.size() == 0) { + if (list.size() > 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) From 98c7df45289240ada03c7e2b241e493a0a6d1a1c Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 14 Mar 2019 15:21:40 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=A7=A3=E6=9E=90-=E7=89=B9=E6=AE=8A=E5=88=86=E9=9A=94?= =?UTF-8?q?=E7=AC=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java index 05c5bbb..7c310de 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java @@ -35,6 +35,11 @@ public class BarcodeParseUtil { .build(); } + //特殊分隔符处理 + barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\|","\\\\|")); + barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\.","\\\\.")); + barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\\\","\\\\\\\\")); + // 分隔条码信息 String[] barcodeKey = barcodeRule.getBarcodeRule().split(barcodeRule.getBarcodeSeparator()); String[] barcodeValue = barcode.split(barcodeRule.getBarcodeSeparator()); @@ -59,11 +64,11 @@ public class BarcodeParseUtil { SysBarcodeRule barcodeRule = new SysBarcodeRule(); barcodeRule.setName("测试条码规则"); barcodeRule.setBarcodeRuleCode("Barcode"); - barcodeRule.setBarcodeRule("orderNo/groupId/num"); - barcodeRule.setBarcodeSeparator("/"); + barcodeRule.setBarcodeRule("SN\\ORGANIZE_CODE\\PART_NO\\QTY\\UNIT"); + barcodeRule.setBarcodeSeparator("\\"); barcodeRule.setBarcodeRuleDescription("描述"); - Map barcode= parse(barcodeRule,"99/99/99"); + Map barcode= parse(barcodeRule,"99\\99\\99\\99\\99"); System.out.println(barcode); } From 0a857b88579ad262821ce0da04687a6dba713f93 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Sat, 16 Mar 2019 17:25:30 +0800 Subject: [PATCH 08/13] =?UTF-8?q?schedule=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=B0=83=E6=95=B4=EF=BC=8Cfallback=E7=86=94=E6=96=AD?= =?UTF-8?q?=E6=9C=BA=E5=88=B6=E6=94=B9=E4=B8=BAfactory=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/DemoCloudController.java | 4 +- .../controller/DemoScheduleController.java | 107 +++++++++++++++------ .../core/apiservice/mq/I3CoreQueueConfig.java | 8 ++ .../core/apiservice/mq/I3CoreQueueReceiver.java | 34 +++++++ .../core/apiservice/schedulejob/DemoCloudJob.java | 29 ++++++ .../schedulejob/wms/WmsDualTransStockJob.java | 4 - .../i3plus/core/apiservice/websocket/TestMain.java | 36 +++++++ 7 files changed, 188 insertions(+), 34 deletions(-) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java index a9770db..971b16c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java @@ -46,7 +46,7 @@ public class DemoCloudController { @GetMapping(value="/test") @ApiOperation(value="core测试",notes = "core测试") public BaseResultBean testCore(String test) { - LOGGER.info("{}：{}，【impp-core接受数据】{}",ipAddress,serverPort,test); + LOGGER.info("iWmsDemoCloud:{},ip:{},port:{}，【impp-core接受数据】{}",iWmsDemoCloud,ipAddress,serverPort,test); //return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return BaseResultBean.buildBaseResultBean(true,""); } @@ -54,7 +54,7 @@ public class DemoCloudController { @GetMapping(value="/test-wms") @ApiOperation(value="wms测试",notes = "wms测试") public ResultBean testWms(String test) { - LOGGER.info("【{}：{}，impp-core接受数据 -> wms】{}",ipAddress,serverPort,test); + LOGGER.info("iWmsDemoCloud:{},ip:{},port:{}，【impp-core接受数据】{}",iWmsDemoCloud,ipAddress,serverPort,test); BaseResultBean result = iWmsDemoCloud.testWms(test); if(result.isSuccess()){ 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 4ed2ae2..65b2493 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 @@ -1,6 +1,8 @@ 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.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; @@ -33,74 +35,123 @@ public class DemoScheduleController extends CoreBaseController{ @Autowired private ScheduleTool scheduleTool; + @Autowired + private IWmsScheduleJobCloud wmsScheduleJobCloud; + @GetMapping(value="/list-task") @ApiOperation(value="查询定时任务",notes="查询所有定时任务") - public ResultBean listTask(){ - List taskList = scheduleTool.queryJobList(); - for(TaskInfo ti : taskList){ - System.out.println(ti); + 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("任务列表为空"); + } } - return new ResultBean(true,""); + return new ResultBean(true,taskList); } @GetMapping(value="/add-task") @ApiOperation(value="添加定时任务",notes="添加定时任务") - public ResultBean addTask(String packageName,String className,String jobName,String jobGroup,String cronExpression){ - //String packageName = "cn.estsh.impp.framework.boot.quartz.job"; - //String className = "ImppJob"; - - scheduleTool.addJob(new TaskInfo(packageName,className,jobName,jobGroup,cronExpression,"测试任务")); + 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新任务"); + } return new ResultBean(true,""); } @GetMapping(value="/delete-task") @ApiOperation(value="删除定时任务",notes="删除定时任务") - public ResultBean deleteTask(String jobName,String jobGroup){ - scheduleTool.deleteJob(jobName,jobGroup); + public ResultBean deleteTask(int sourceType,String jobName,String jobGroup){ + if(sourceType == 1) { + scheduleTool.deleteJob(jobName,jobGroup); + }else if(sourceType == 2){ + wmsScheduleJobCloud.deleteTask(jobName,jobGroup); + } - return new ResultBean(true,""); + return new ResultBean(true); } @GetMapping(value="/pause-task") @ApiOperation(value="暂停定时任务",notes="暂停定时任务") - public ResultBean pauseJob(String jobName,String jobGroup){ - scheduleTool.pauseJob(jobName,jobGroup); + public ResultBean pauseJob(int sourceType,String jobName,String jobGroup){ + if(sourceType == 1) { + scheduleTool.pauseJob(jobName,jobGroup); + }else if(sourceType == 2){ + wmsScheduleJobCloud.pauseJob(jobName,jobGroup); + } - return new ResultBean(true,""); + return new ResultBean(true); } @GetMapping(value="/resume-task") @ApiOperation(value="继续定时任务",notes="继续定时任务") - public ResultBean resumeJob(String jobName,String jobGroup){ - scheduleTool.resumeJob(jobName,jobGroup); + public ResultBean resumeJob(int sourceType,String jobName,String jobGroup){ + if(sourceType == 1) { + scheduleTool.resumeJob(jobName,jobGroup); + }else if(sourceType == 2){ + wmsScheduleJobCloud.resumeJob(jobName,jobGroup); + } - return new ResultBean(true,""); + return new ResultBean(true); } @GetMapping(value="/exceute-task") @ApiOperation(value="立即执行定时任务",notes="立即执行定时任务") - public ResultBean excuteJob(String jobName,String jobGroup){ - scheduleTool.executeJob(jobName,jobGroup); + public ResultBean excuteJob(int sourceType,String jobName,String jobGroup){ + if(sourceType == 1) { + scheduleTool.executeJob(jobName,jobGroup); + }else if(sourceType == 2){ + wmsScheduleJobCloud.excuteJob(jobName,jobGroup); + } - return new ResultBean(true,""); + return new ResultBean(true); } @GetMapping(value="/stand-by-schedule") @ApiOperation(value="定时器待机",notes="定时器待机") - public ResultBean restartJob(String jobName,String jobGroup){ - scheduleTool.standBySchedule(); + public ResultBean restartJob(int sourceType,String jobName,String jobGroup){ + if(sourceType == 1) { + scheduleTool.standBySchedule(); + }else if(sourceType == 2){ + wmsScheduleJobCloud.standBySchedule(); + } - return new ResultBean(true,""); + return new ResultBean(true); } @GetMapping(value="/start-schedule") @ApiOperation(value="启动定时器",notes="启动定时器") - public ResultBean startSchedule(String jobName,String jobGroup){ - scheduleTool.startSchedule(); + public ResultBean startSchedule(int sourceType,String jobName,String jobGroup){ + if(sourceType == 1) { + scheduleTool.startSchedule(); + }else if(sourceType == 2){ + wmsScheduleJobCloud.startSchedule(); + } - return new ResultBean(true,""); + return new ResultBean(true); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java index ae90aa1..3ed39bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java @@ -63,4 +63,12 @@ public class I3CoreQueueConfig { //LOGGER.info("【DEMO_RETURN_QUEUE队列】"); return new Queue(DEMO_RETURN_QUEUE); } + + //测试wms微服队列 + public static final String DEMO_CLOUD_WMS = "DEMO_CLOUD_WMS"; + @Bean + public Queue getDemoCloudWmsQueue() throws Exception { + //LOGGER.info("【DEMO_CLOUD_WMS】"); + return new Queue(DEMO_CLOUD_WMS); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java index 2636dba..78dab44 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueReceiver.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.core.apiservice.mq; +import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.IOException; @@ -20,6 +23,9 @@ import java.io.IOException; public class I3CoreQueueReceiver { private static final Logger LOGGER = LoggerFactory.getLogger(I3CoreQueueReceiver.class); + @Autowired + IWmsDemoCloud iWmsDemoCloud; + /** * 系统邮件处理队列 * @param msg @@ -46,6 +52,34 @@ public class I3CoreQueueReceiver { } } + /** + * 微服处理队列 + * @param msg + * @param channel + * @param message + * 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....)); + */ + @RabbitListener(queues = I3CoreQueueConfig.DEMO_CLOUD_WMS) + public void processCloud(String msg, Channel channel, Message message) { + try { + LOGGER.info("【MQ-DEMO_CLOUD_WMS】数据接收成功：{}",msg); + BaseResultBean result = iWmsDemoCloud.testWms(msg); + LOGGER.info("微服返回结果：{}",result); + + //信息已处理 + channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); + } catch (IOException e) { + LOGGER.error("【MQ-DEMO_CLOUD_WMS】处理出错：{}",e.getMessage(),e); + //丢弃这条消息 + try { + // 未成功处理，重新发送 + channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } + /********************* 消息队列处理demo *******************/ 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 new file mode 100644 index 0000000..3fcb9f8 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.core.apiservice.schedulejob; + +import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; +import cn.estsh.impp.framework.boot.init.ApplicationProperties; +import io.swagger.annotations.ApiOperation; +import org.quartz.JobExecutionContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * @Description : + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-12 17:51 + * @Modify: + **/ +@ApiOperation("测试微服定时任务demo") +public class DemoCloudJob extends BaseImppScheduleJob { + public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class); + + public DemoCloudJob() { + super(DemoJob.class,"测试微服定时任务demo"); + } + + @Override + public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { + System.out.println("==============测试微服定时任务demo==========="); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java index f12127b..b269d7b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java @@ -24,13 +24,9 @@ public class WmsDualTransStockJob extends BaseImppScheduleJob { super(WmsDualTransStockJob.class,"定时处理库存移动单信息"); } - @Autowired - private IWmsScheduleJobCloud scheduleJobCloud; - @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { System.out.println("定时任务被执行"); LOGGER.info("projectName：{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort()); - scheduleJobCloud.dualMovementJob(); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java index fe7fc2d..17a8767 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/TestMain.java @@ -1,8 +1,11 @@ package cn.estsh.i3plus.core.apiservice.websocket; +import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang3.RandomStringUtils; +import java.util.Random; + /** * @Description : * @Reference : @@ -16,5 +19,38 @@ public class TestMain { System.out.println(RandomStringUtils.random(15, true, false)); // StringEscapeUtils.escapeHtml(); + /*long workerIdBits = 5L; + long maxWorkerId = -1L ^ (-1L << workerIdBits); + System.out.println("5 --> "+maxWorkerId); + + workerIdBits = 6L; + maxWorkerId = -1L ^ (-1L << workerIdBits); + System.out.println("6 --> "+maxWorkerId); + + workerIdBits = 8L; + maxWorkerId = -1L ^ (-1L << workerIdBits); + System.out.println("8 --> " + maxWorkerId);*/ + + int wId = new Random().nextInt(29) + 1; + System.out.println("random id -> "+wId); + SnowflakeIdMaker m = new SnowflakeIdMaker(wId,3); + m = new SnowflakeIdMaker(wId,3); + + int i = 0; + long id; + int c = 0; + + long l1 = System.currentTimeMillis(); + while(i < 1000){ + if(m.nextId() < 0) { + System.out.println("======="+m.nextId()); + c++; + }else{ + //System.out.println(m.nextId()); + } + i++; + } + System.out.println("耗时：" + (System.currentTimeMillis()-l1)); + System.out.println("====end====error:" + c); } } From 76bacc59f09dcc9594e0f19ef253588aec862e22 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 18 Mar 2019 16:23:39 +0800 Subject: [PATCH 09/13] =?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 10/13] =?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 11/13] =?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 12/13] =?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/ From ffb6a92e487129531676afc7fe4d5372414a4ace Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 18 Mar 2019 19:53:30 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysDictionaryService.java | 6 ++-- .../controller/busi/SysDictionaryController.java | 39 ++++++++++++++-------- .../serviceimpl/busi/SysDictionaryService.java | 18 +++++----- .../core/apiservice/util/BarcodeParseUtil.java | 2 +- 4 files changed, 39 insertions(+), 26 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java index 9f1d1fa..dcb3ed9 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java @@ -53,12 +53,12 @@ public interface ISysDictionaryService { SysDictionary getSysDictionaryById(Long id); /** - * 根据父级代码查询字典项信息 + * 根据微服务与父级代码查询字典项 * @param parentCode * @return */ - @ApiOperation(value = "根据父级代码查询字典项信息") - List findSysDictionaryByParentCode(String parentCode); + @ApiOperation(value = "根据微服务与父级代码查询字典项") + List findSysDictionaryBySoftTypeAndParentCode(Integer softType,String parentCode); /** * 字典复杂查询，分页，排序 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index b29a18e..36dc533 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -53,6 +53,7 @@ public class SysDictionaryController extends CoreBaseController{ ValidatorBean.beginValid(sysDictionary) .notNull("id",sysDictionary.getId()) .notNull("name",sysDictionary.getName()) + .notNull("softType",sysDictionary.getSoftType()) .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) .notNull("dictionaryValue",sysDictionary.getDictionaryValue()); @@ -78,6 +79,7 @@ public class SysDictionaryController extends CoreBaseController{ // 条件验证 ValidatorBean.beginValid(sysDictionary) .notNull("name",sysDictionary.getName()) + .notNull("softType",sysDictionary.getSoftType()) .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) .notNull("dictionaryValue",sysDictionary.getDictionaryValue()); @@ -159,11 +161,11 @@ public class SysDictionaryController extends CoreBaseController{ } } - @GetMapping(value = "/find/{code}") - @ApiOperation(value = "根据父级code查询字典项", notes = "根据父级code查询字典项") - public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) { + @GetMapping(value = "/find/{softType}/{code}") + @ApiOperation(value = "根据微服务与父级code查询字典项", notes = "根据微服务与父级code查询字典项") + public ResultBean findSysDictionaryByParentCode(@PathVariable("softType")Integer softType,@PathVariable("code") String code) { try { - List sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code); + List sysDictionaryList = sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(softType,code); return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -176,16 +178,25 @@ public class SysDictionaryController extends CoreBaseController{ @ApiOperation(value = "查询跟用户相关所有字典") public ResultBean findSysDictionaryUserInfo() { try { - Map resultMap = new HashMap<>(); - resultMap.put("1",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_SEX)); - resultMap.put("2",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_FILE_TYPE)); - resultMap.put("3",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_MARRIAGE)); - resultMap.put("4",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EDUCATION)); - resultMap.put("5",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_NATIONALITY)); - resultMap.put("6",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_CERTIFICATE_TYPE)); - resultMap.put("7",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)); - resultMap.put("8",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_POLITICAL_STATUS)); - resultMap.put("9",sysDictionaryService.findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)); + Map resultMap = new HashMap<>(); + resultMap.put("1", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_SEX)); + resultMap.put("2", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_FILE_TYPE)); + resultMap.put("3", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_MARRIAGE)); + resultMap.put("4", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EDUCATION)); + resultMap.put("5", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_NATIONALITY)); + resultMap.put("6", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_CERTIFICATE_TYPE)); + resultMap.put("7", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EMPLOYEE_GRADE)); + resultMap.put("8", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_POLITICAL_STATUS)); + resultMap.put("9", sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(), BaseConstWords.DICTIONARY_EMPLOYEE_TYPE)); return ResultBean.success("操作成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 3ddda96..eb728f1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -40,9 +40,10 @@ public class SysDictionaryService implements ISysDictionaryService { @Override @ApiOperation(value = "添加字典") public void insertSysDictionary(SysDictionary sysDictionary) { - long repeatCodeCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode()); - long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId","dictionaryValue"}, - new Object[]{sysDictionary.getParentId(),sysDictionary.getDictionaryValue()}); + long repeatCodeCount = sysDictionaryRDao.findByPropertyCount(new String[]{"dictionaryCode", "softType"}, + new Object[]{sysDictionary.getDictionaryCode(), sysDictionary.getSoftType()}); + long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId", "dictionaryValue", "softType"}, + new Object[]{sysDictionary.getParentId(), sysDictionary.getDictionaryValue(), sysDictionary.getSoftType()}); if (repeatCodeCount > 0 || repeatValueCount > 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -87,8 +88,8 @@ public class SysDictionaryService implements ISysDictionaryService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("字典代码已存在") - .setErrorSolution("请重新输入字典代码") + .setErrorDetail("字典代码或字典值已存在") + .setErrorSolution("请重新输入字典代码或字典值") .build(); } @@ -132,9 +133,9 @@ public class SysDictionaryService implements ISysDictionaryService { @Override @ApiOperation(value = "根据父级代码查询字典项信息") - public List findSysDictionaryByParentCode(String parentCode) { + public List findSysDictionaryBySoftTypeAndParentCode(Integer softType,String parentCode) { LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode); - return sysDictionaryRDao.findByProperty("parentCodeRdd",parentCode); + return sysDictionaryRDao.findByProperty(new String[]{"softType", "parentCodeRdd"}, new Object[]{softType, parentCode}); } @Override @@ -173,7 +174,8 @@ public class SysDictionaryService implements ISysDictionaryService { @Override @ApiOperation(value = "检出文件名称是否符合系统规范") public boolean checkFileName(String fileName) { - List list = findSysDictionaryByParentCode(BaseConstWords.DICTIONARY_FILE_TYPE); + List list = findSysDictionaryBySoftTypeAndParentCode(CommonEnumUtil.SOFT_TYPE.CORE.getValue(), + BaseConstWords.DICTIONARY_FILE_TYPE); if(list != null && list.size()> 0){ String suffix = StringTool.getStringFileSuffix(fileName,true); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java index 7c310de..f0a8d61 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/BarcodeParseUtil.java @@ -36,9 +36,9 @@ public class BarcodeParseUtil { } //特殊分隔符处理 + barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\\\","\\\\\\\\")); barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\|","\\\\|")); barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\.","\\\\.")); - barcodeRule.setBarcodeSeparator(barcodeRule.getBarcodeSeparator().replaceAll("\\\\","\\\\\\\\")); // 分隔条码信息 String[] barcodeKey = barcodeRule.getBarcodeRule().split(barcodeRule.getBarcodeSeparator());