insertList = new ArrayList<>(userJsonObject.size());
+ SysRefUserMessage refUserMessage;
+
+ for (String user : userJsonObject.keySet()) {
+ refUserMessage = new SysRefUserMessage();
+ refUserMessage.setMessageId(msg.getId());
+ refUserMessage.setMessageSoftType(msg.getMessageSoftType());
+ refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
+ refUserMessage.setMessageTypeRdd(msg.getMessageType());
+ refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());
+ refUserMessage.setReceiverId(Long.parseLong(user));
+ refUserMessage.setReceiverNameRdd(userJsonObject.get(user).toString());
+ refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
+ refUserMessage.setReceiverTime(TimeTool.getNowTime(true));
+ refUserMessage.setIsUrgent(msg.getIsUrgent());
+
+ insertList.add(refUserMessage);
+ }
+
+ sysMessageService.insertSysRefUserMessage(insertList);
+ }
+
+ // 消息处理完成
+ LOGGER.info("【MQ-{}】站内信{} DeliveryTag:{} 处理成功", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,
+ msg, message.getMessageProperties().getDeliveryTag());
+ channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+ } catch (IOException 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/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java
index 1c55c81..3e65da5 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.core.apiservice.mq;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
+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;
@@ -19,6 +21,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.util.stream.Collectors;
/**
* @Description : 定时任务通道业务处理
@@ -37,10 +40,14 @@ public class ScheduleQueueReceiver {
private ISysTaskPlanService sysTaskPlanService;
@Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
private RabbitTemplate rabbitTemplate;
/**
* 定时任务通道处理
+ *
* @param logTaskTime
* @param channel
* @param message
@@ -48,9 +55,9 @@ public class ScheduleQueueReceiver {
@RabbitListener(queues = PlatformConstWords.IMPP_SCHEDULE_QUEUE)
public void processSchedule(SysLogTaskTime logTaskTime, Channel channel, Message message) {
try {
- LOGGER.info("【MQ-IMPP_SCHEDULE_QUEUE】数据接收成功：{}",logTaskTime);
+ LOGGER.info("【MQ-IMPP_SCHEDULE_QUEUE】数据接收成功：{}", logTaskTime);
// 跟新最后执行时间 及 任务状态
- SysTaskPlan taskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(logTaskTime.getName(),logTaskTime.getGroupName());
+ SysTaskPlan taskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(logTaskTime.getName(), logTaskTime.getGroupName());
if (taskPlan != null) {
taskPlan.setLastRunDateTime(logTaskTime.getCreateDatetime());
taskPlan.setTaskPlanExecNum(taskPlan.getTaskPlanExecNumValue() + 1);
@@ -60,6 +67,7 @@ public class ScheduleQueueReceiver {
// 添加定时任务日志
logTaskTime.setTaskPlanId(taskPlan.getId());
+ logTaskTime.setTaskSoftTypeRdd(taskPlan.getTaskSoftTypeRdd());
logTaskTime.setTaskCycleNameRdd(taskPlan.getTaskCycleNameRdd());
logTaskTime.setTaskCycleExpsRdd(taskPlan.getTaskCycleExpsRdd());
sysTaskPlanService.logInsertSysLogTaskTime(logTaskTime);
@@ -69,12 +77,13 @@ public class ScheduleQueueReceiver {
&& CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == taskPlan.getIsNotice()) {
// 设置通知邮件内容
SysMessage sysMessage = new SysMessage();
- sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
+ sysMessage.setMessageSoftType(logTaskTime.getTaskSoftTypeRdd());
+ sysMessage.setMessageType(taskPlan.getNoticeMethod());
sysMessage.setMessageSenderNameRdd("系统管理员");
sysMessage.setMessageTitle("任务计划失败通知");
sysMessage.setMessageContent(
String.format("管理员 您好：
任务计划(Name: %s,GroupName: %s）执行失败,详细信息请查看定时任务日志(ID: %s).
",
- taskPlan.getName(),taskPlan.getGroupName(),logTaskTime.getId())
+ taskPlan.getName(), taskPlan.getGroupName(), logTaskTime.getId())
);
sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
sysMessage.setMessageSendTime(TimeTool.getNowTime(true));
@@ -84,27 +93,33 @@ public class ScheduleQueueReceiver {
if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == taskPlan.getIsInternalUser()) {
sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue());
sysMessage.setMessageReceiversNameRdd(taskPlan.getNoticeChannel());
- }else{
+ } else {
sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue());
+ // 设置收件人名称
+ String[] messageReceiver = taskPlan.getNoticeChannel().split(",");
+ String receiversName = sysUserService.findSysUserByIds(StringTool.getArrayLong(messageReceiver))
+ .stream().map(e -> e.getUserName()).collect(Collectors.joining(","));
+
+ sysMessage.setMessageReceiversNameRdd(receiversName);
}
// 发送到对应处理队列
- if(taskPlan.getNoticeMethod() != null && ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == taskPlan.getNoticeMethod().intValue()){
- rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE,sysMessage);
- }else{
- rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
+ if (taskPlan.getNoticeMethod() != null && ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == taskPlan.getNoticeMethod().intValue()) {
+ rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE, sysMessage);
+ } else {
+ rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, sysMessage);
}
}
}
//信息已处理
- channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
+ channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
} catch (IOException e) {
- LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}",e.getMessage(),e);
+ LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}", e.getMessage(), e);
//丢弃这条消息
try {
// 未成功处理，重新发送
- channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true);
+ 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/schedulejob/wms/WmsDualTransStockJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/wms/WmsDualTransStockJob.java
index b269d7b..40e2ca3 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
@@ -1,13 +1,11 @@
package cn.estsh.i3plus.core.apiservice.schedulejob.wms;
-import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud;
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;
-import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description : 定时处理库存移动单信息
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileAttachService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileAttachService.java
new file mode 100644
index 0000000..ce69b8e
--- /dev/null
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileAttachService.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysFileAttachService;
+import cn.estsh.i3plus.pojo.platform.bean.SysFileAttach;
+import cn.estsh.i3plus.pojo.platform.repository.SysFileAttachRepository;
+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-04-12 19:43
+ * @Modify:
+ **/
+@Service
+public class SysFileAttachService implements ISysFileAttachService {
+
+ public static final Logger LOGGER = LoggerFactory.getLogger(SysFileAttachService.class);
+
+ @Autowired
+ private SysFileAttachRepository sysFileAttachRDao;
+
+ @Override
+ @ApiOperation(value = "添加附件信息")
+ public SysFileAttach insertSysFileAttach(SysFileAttach sysFileAttach) {
+ return sysFileAttachRDao.insert(sysFileAttach);
+ }
+
+ @Override
+ @ApiOperation(value = "根据id删除附件信息")
+ public void deleteSysFileAttachById(Long id) {
+ sysFileAttachRDao.deleteById(id);
+ }
+
+ @Override
+ @ApiOperation(value = "根据id删除附件信息")
+ public List findSysFileAttachByRefId(Long refId) {
+ return sysFileAttachRDao.findByProperty("refId",refId);
+ }
+
+ @Override
+ @ApiOperation(value = "根据id删除附件信息")
+ public void deleteSysFileAttachByRefId(Long refId) {
+ sysFileAttachRDao.deleteByProperty("refId",refId);
+ }
+}
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java
index 61e849d..9c27d4f 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java
@@ -8,6 +8,7 @@ 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.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
import cn.estsh.i3plus.pojo.platform.repository.SysLabelTemplateParamRepository;
@@ -115,10 +116,10 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
// 更新打印模板
sysLabelTemplateRDao.update(sysLabelTemplate);
- int effect = sysLabelTemplateParamRDao.deleteByProperty("templateId", sysLabelTemplate.getId());
+ sysLabelTemplateParamRDao.deleteByProperty("templateId", sysLabelTemplate.getId());
// 判断模板参数是否存在，存在就进行数据操作
- if (StringUtils.isNotBlank(sysLabelTemplate.getParamsPack()) && effect > 1) {
+ if (StringUtils.isNotBlank(sysLabelTemplate.getParamsPack())) {
// 更新打印模板参数
SysLabelTemplateParam templateParam;
String[] paramArr = sysLabelTemplate.getParamsPack().trim().split(",");
@@ -175,4 +176,16 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
templateModel.setTemplateParamList(listSysLabelTemplateParam(labelTemplateId));
return templateModel;
}
+
+ @Override
+ @ApiOperation(value = "修改打印模板状态",notes = "修改打印模板状态")
+ public void updateSysLabelTemplateStatus(Long id, int status, SessionUser user) {
+ SysLabelTemplate sysLabelTemplate = sysLabelTemplateRDao.getById(id);
+ sysLabelTemplate.setIsValid(status);
+ sysLabelTemplate.setModifyUser(user.getUserName());
+
+ //添加初始化
+ ConvertBean.modelUpdate(sysLabelTemplate, user);
+ sysLabelTemplateRDao.update(sysLabelTemplate);
+ }
}
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 37a1452..989ef3d 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
@@ -1,24 +1,25 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
-import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.platform.bean.SysFile;
+import cn.estsh.i3plus.pojo.platform.bean.SysFileAttach;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
-import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysRefUserMessageRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
+import cn.estsh.i3plus.pojo.platform.repository.*;
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 cn.estsh.impp.framework.boot.util.ImppRedis;
+import com.netflix.discovery.converters.Auto;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashMap;
import java.util.List;
/**
@@ -51,6 +51,12 @@ public class SysMessageService implements ISysMessageService {
@Autowired
private SysUserRepository sysUserRDao;
+ @Autowired
+ private SysFileAttachRepository sysFileAttachRDao;
+
+ @Autowired
+ private SysFileRepository sysFileRDao;
+
/**
* rabbitMQ队列
*/
@@ -75,6 +81,7 @@ public class SysMessageService implements ISysMessageService {
public void deleteSysMessageById(Long id) {
LOGGER.info("消息 SYS_MESSAGE id:{}",id);
sysRefUserMessageRDao.deleteByProperty("messageId",id);
+ sysFileAttachRDao.deleteByProperty("refId",id);
sysMessageRDao.deleteById(id);
}
@@ -83,6 +90,20 @@ public class SysMessageService implements ISysMessageService {
public void updateSysMessage(SysMessage sysMessage){
LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage);
sysMessageRDao.update(sysMessage);
+
+ // 更新附件信息
+ sysFileAttachRDao.deleteByProperty("refId",sysMessage.getId());
+ if(sysMessage.getSysFileAttachList() != null){
+ SysFile sysFile;
+ for (SysFileAttach sysFileAttach : sysMessage.getSysFileAttachList()) {
+ sysFile = sysFileRDao.getById(sysFileAttach.getFileId());
+ if(sysFile == null){
+ sysFileAttach.setRefId(sysMessage.getId());
+ sysFileAttach.setFileNameRdd(sysFile.getName());
+ sysFileAttach.setFilePathRdd(sysFile.getFilePath());
+ }
+ }
+ }
}
@Override
@@ -107,9 +128,9 @@ public class SysMessageService implements ISysMessageService {
pager = PagerHelper.getPager(pager, sysMessageRDao.listCount());
return new ListPager(sysMessageRDao.listPager(pager),pager);
}else {
- String hqlPack = CoreHqlPack.packHqlSysMessage(sysMessage);
+ DdlPackBean hqlPack = CoreHqlPack.packHqlSysMessage(sysMessage);
pager = PagerHelper.getPager(pager, sysMessageRDao.findByHqlWhereCount(hqlPack));
- return new ListPager(sysMessageRDao.findByHqlWherePage(hqlPack + sysMessage.orderBy(),pager),pager);
+ return new ListPager(sysMessageRDao.findByHqlWherePage(hqlPack,pager),pager);
}
}
@@ -136,11 +157,20 @@ public class SysMessageService implements ISysMessageService {
@ApiOperation(value = "添加消息并发送")
public void doSendSysMessage(SysMessage sysMessage) {
// 判断消息类型推送到对应的队列
- if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageType().intValue()){
+ if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageTypeValue()){
rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE,sysMessage);
- }else{
+ }else if(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue() == sysMessage.getMessageTypeValue()){
rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK,sysMessage);
+ } else if(ImppEnumUtil.MESSAGE_TYPE.SWEB_NOTICE.getValue() == sysMessage.getMessageTypeValue()){
+ rabbitTemplate.convertAndSend(PlatformConstWords.SWEB_NOTICE_QUEUE,sysMessage);
+ } else {
+ throw ImppExceptionBuilder.newInstance()
+ .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+ .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+ .setErrorDetail("消息类型不存在")
+ .setErrorSolution("请重新设置消息类型")
+ .build();
}
}
@@ -172,13 +202,33 @@ public class SysMessageService implements ISysMessageService {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
- .setErrorDetail("数据不存在")
+ .setErrorDetail("用户消息不存在")
.build();
}
- sysRefUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.READ.getValue());
- sysRefUserMessageRDao.update(sysRefUserMessage);
- return sysMessageRDao.getById(sysRefUserMessage.getMessageId());
+ SysMessage sysMessage = sysMessageRDao.getById(sysRefUserMessage.getMessageId());
+ if (sysMessage == null){
+ throw ImppExceptionBuilder.newInstance()
+ .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+ .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+ .setErrorDetail("消息主体不存在")
+ .build();
+ }
+
+ // 更新状态消息状态以及阅读数量
+ if(sysRefUserMessage.getMessageStatusValue() == ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()) {
+ sysRefUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.READ.getValue());
+ sysRefUserMessageRDao.update(sysRefUserMessage);
+
+ // 阅读数累加1
+ sysMessage.setReadCount(sysMessage.getReadCount() + 1);
+ sysMessageRDao.update(sysMessage);
+ }
+
+ // 查询附件信息
+ sysMessage.setSysFileAttachList(sysFileAttachRDao.findByProperty("refId",sysMessage.getId()));
+
+ return sysMessage;
}
@Override
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java
index a7e5fa0..35dc88f 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java
@@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
+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;
@@ -13,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepositor
import cn.estsh.i3plus.pojo.platform.repository.SysRefTaskCyclePlanRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository;
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 cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -75,34 +77,35 @@ public class SysTaskPlanService implements ISysTaskPlanService {
@Override
@ApiOperation(value = "修改任务计划", notes = "修改任务计划")
public void updateSysTaskPlan(SysTaskPlan sysTaskPlan) {
- SysTaskPlan oldSysTaskPlan = sysTaskPlanRDao.getById(sysTaskPlan.getId());
+ SysTaskPlan originSysTaskPlan = sysTaskPlanRDao.getById(sysTaskPlan.getId());
// 更新关系表
sysRefTaskCyclePlanRDao.updateByProperties(new String[]{"taskPlanName", "taskPlanGroupName"},
- new String[]{oldSysTaskPlan.getName(), oldSysTaskPlan.getGroupName()},
- "taskCycleId", oldSysTaskPlan.getTaskCycleId()
+ new String[]{originSysTaskPlan.getName(), originSysTaskPlan.getGroupName()},
+ "taskCycleId", originSysTaskPlan.getTaskCycleId()
);
- oldSysTaskPlan.setTaskCycleId(sysTaskPlan.getTaskCycleId());
- oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd());
- oldSysTaskPlan.setTaskCycleExpsRdd(sysTaskPlan.getTaskCycleExpsRdd());
- oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd());
- oldSysTaskPlan.setTaskPlanExecNum(sysTaskPlan.getTaskPlanExecNum());
- oldSysTaskPlan.setTaskMethodType(sysTaskPlan.getTaskMethodType());
- oldSysTaskPlan.setTaskId(sysTaskPlan.getTaskId());
- oldSysTaskPlan.setTaskNameRdd(sysTaskPlan.getTaskNameRdd());
- oldSysTaskPlan.setTaskSoftTypeRdd(sysTaskPlan.getTaskSoftTypeRdd());
- oldSysTaskPlan.setTaskPlanParam(sysTaskPlan.getTaskPlanParam());
- oldSysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskPlan.getTaskCycleStartDateTimeRdd());
- oldSysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskPlan.getTaskCycleEndDateTimeRdd());
- oldSysTaskPlan.setTaskPlanDescription(sysTaskPlan.getTaskPlanDescription());
- oldSysTaskPlan.setLastRunDateTime(sysTaskPlan.getLastRunDateTime());
- oldSysTaskPlan.setIsNotice(sysTaskPlan.getIsNotice());
- oldSysTaskPlan.setIsInternalUser(sysTaskPlan.getIsInternalUser());
- oldSysTaskPlan.setNoticeChannel(sysTaskPlan.getNoticeChannel());
- oldSysTaskPlan.setNoticeMethod(sysTaskPlan.getNoticeMethod());
- oldSysTaskPlan.setTaskPlanStatus(sysTaskPlan.getTaskPlanStatus());
- sysTaskPlanRDao.update(oldSysTaskPlan);
+ originSysTaskPlan.setTaskCycleId(sysTaskPlan.getTaskCycleId());
+ originSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd());
+ originSysTaskPlan.setTaskCycleExpsRdd(sysTaskPlan.getTaskCycleExpsRdd());
+ originSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd());
+ originSysTaskPlan.setTaskPlanExecNum(sysTaskPlan.getTaskPlanExecNum());
+ originSysTaskPlan.setTaskMethodType(sysTaskPlan.getTaskMethodType());
+ originSysTaskPlan.setTaskId(sysTaskPlan.getTaskId());
+ originSysTaskPlan.setTaskNameRdd(sysTaskPlan.getTaskNameRdd());
+ originSysTaskPlan.setTaskSoftTypeRdd(sysTaskPlan.getTaskSoftTypeRdd());
+ originSysTaskPlan.setTaskPlanParam(sysTaskPlan.getTaskPlanParam());
+ originSysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskPlan.getTaskCycleStartDateTimeRdd());
+ originSysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskPlan.getTaskCycleEndDateTimeRdd());
+ originSysTaskPlan.setTaskPlanDescription(sysTaskPlan.getTaskPlanDescription());
+ originSysTaskPlan.setLastRunDateTime(sysTaskPlan.getLastRunDateTime());
+ originSysTaskPlan.setIsNotice(sysTaskPlan.getIsNotice());
+ originSysTaskPlan.setIsInternalUser(sysTaskPlan.getIsInternalUser());
+ originSysTaskPlan.setNoticeChannel(sysTaskPlan.getNoticeChannel());
+ originSysTaskPlan.setNoticeMethod(sysTaskPlan.getNoticeMethod());
+
+
+ sysTaskPlanRDao.update(originSysTaskPlan);
}
@Override
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java
index 66dcc19..077fec0 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java
@@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysToolRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysToolTypeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -46,18 +47,35 @@ public class SysToolService implements ISysToolService {
@ApiOperation(value = "新增硬件信息")
public SysTool insertSysTool(SysTool tool) {
// 查询硬件类型名称
- //todo 压测关闭校验提高处理速度
-// LOGGER.info("硬件类型 TOOL_TYPE :{}", tool);
-// SysToolType toolType = toolTypeRDao.getById(tool.getToolTypeId());
-// ValidatorBean.checkNotNull(toolType);
-//
-// tool.setToolTypeNameRdd(toolType.getName());
-//
-// LOGGER.info("硬件 TOOL tool:{}",tool);
+ LOGGER.info("硬件类型 TOOL_TYPE :{}", tool);
+ SysToolType toolType = toolTypeRDao.getById(tool.getToolTypeId());
+ ValidatorBean.checkNotNull(toolType);
+
+ tool.setToolTypeNameRdd(toolType.getName());
+
+ LOGGER.info("硬件 TOOL tool:{}",tool);
return toolRDao.insert(tool);
}
@Override
+ public SysTool saveSysTool(SysTool tool) {
+ return toolRDao.save(tool);
+ }
+
+ @Override
+ public SysTool insertTestSysTool(SysTool tool, Boolean autoFill) {
+ SysTool temp;
+ if(autoFill == null){
+ temp = toolRDao.insert(tool);
+ } else if (autoFill) {
+ temp = toolRDao.insert(tool, autoFill);
+ } else {
+ temp = toolRDao.insert(tool, autoFill);
+ }
+ return temp;
+ }
+
+ @Override
@ApiOperation(value = "删除硬件信息",notes = "根据 ID 删除硬件信息")
public int deleteSysToolById(Long id) {
LOGGER.info("硬件 TOOL id:{}",id);
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
index 521ddd8..74694fc 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
@@ -9,11 +9,13 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.EncryptTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*;
@@ -550,6 +552,13 @@ public class SysUserService implements ISysUserService {
return sessionUser;
}
+ @Override
+ public List findSysUserByIds(Long[] ids) {
+ DdlPackBean ddlPackBean = new DdlPackBean();
+ DdlPreparedPack.getInPackArray(ids, "id", ddlPackBean);
+ return sysUserRDao.findByHqlWhere(ddlPackBean);
+ }
+
/**
* 账号数据排序
* 创建时间 角色升序
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java
index 7d3b262..40d5e4d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java
@@ -60,14 +60,21 @@ public class TestService implements ITestService {
ListPager list = new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager);
LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
- DdlPackBean packBean = new DdlPackBean();
- DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
- DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean);
- DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean);
- DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean);
- DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean);
- DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean);
- DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean);
+// DdlPackBean packBean = new DdlPackBean();
+// DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
+// DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean);
+// DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean);
+// DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean);
+// DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean);
+// DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean);
+// DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean);
+
+ DdlPackBean packBean = CoreHqlPack.packDdlSysUser(user);
+ System.out.println("getPackedHql=="+packBean.getPackedHql());
+ System.out.println("getPackedHqlAll=="+packBean.getPackedHqlAll());
+ System.out.println("getHqlAppend=="+packBean.getHqlAppend());
+ System.out.println("getWhereAppend=="+packBean.getWhereAppend());
+ System.out.println("getOrderByStr=="+packBean.getOrderByStr());
pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean));
list = new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager);
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java
index 4bc4f46..148f249 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java
@@ -43,7 +43,7 @@ public class OrderNoMakeUtil {
String serialNoFormatStr = MessageFormat.format(PlatformConstWords.SERIAL_NO_FORMAT, orderNoRule.getSerialNoLength());
// 判断是否首次生成（SerialNo初始值-1）
- if (orderNoRule.getSerialNo() > 0) {
+ if (orderNoRule.getSerialNo() > 0 && orderNo.indexOf(PlatformConstWords.SERIAL_NO) != -1) {
String newNo = orderNo.substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO));
String oldNo = orderNoRule.getOrderNo().substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO));
// 前缀（日期）不同后是否重置流水号
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 4a23146..c192f67 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -174,6 +174,11 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=update
spring.jpa.show-sql=true
################ MQ队列处理 ################
+# 站内信
impp.mq.queue.letter = true
+# 邮件
impp.mq.queue.mail = true
-impp.mq.queue.schedule = true
\ No newline at end of file
+# 定时任务
+impp.mq.queue.schedule = true
+# SWEB通知处理队列
+impp.mq.queue.sweb.notice = true
\ No newline at end of file
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
index a398a1f..570caf2 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@@ -169,6 +169,11 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=update
spring.jpa.show-sql=true
################ MQ队列处理 ################
+# 站内信
impp.mq.queue.letter = true
+# 邮件
impp.mq.queue.mail = true
-impp.mq.queue.schedule = true
\ No newline at end of file
+# 定时任务
+impp.mq.queue.schedule = true
+# SWEB通知处理队列
+impp.mq.queue.sweb.notice = true
\ No newline at end of file
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
index ae86098..58c0d05 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
@@ -175,6 +175,11 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=update
spring.jpa.show-sql=true
################ MQ队列处理 ################
+# 站内信
impp.mq.queue.letter = true
+# 邮件
impp.mq.queue.mail = true
-impp.mq.queue.schedule = true
\ No newline at end of file
+# 定时任务
+impp.mq.queue.schedule = true
+# SWEB通知处理队列
+impp.mq.queue.sweb.notice = true
\ No newline at end of file
diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestAutoFillData.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestAutoFillData.java
new file mode 100644
index 0000000..fa8316a
--- /dev/null
+++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestAutoFillData.java
@@ -0,0 +1,54 @@
+package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService;
+import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
+import cn.estsh.i3plus.pojo.platform.bean.SysTool;
+import cn.estsh.i3plus.pojo.platform.repository.SysToolRepository;
+import com.alibaba.fastjson.JSON;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.annotation.Transient;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-04-04 16:53
+ * @Modify:
+ **/
+public class TestAutoFillData extends TestBase {
+
+ @Autowired
+ private ISysToolService sysToolService;
+
+ @Autowired
+ private SysToolRepository sysToolRepository;
+
+ @Test
+ @Transient
+ public void testAutoFillDataInsert(){
+ SysTool sysTool = new SysTool();
+ // 自动注入默认值
+ System.out.println(JSON.toJSONString(sysTool));
+ sysTool = sysToolService.insertTestSysTool(sysTool, true);
+ System.out.println(JSON.toJSONString(sysTool));
+
+ // 不注入默认值
+ sysTool = new SysTool();
+ System.out.println(JSON.toJSONString(sysTool));
+ sysTool = sysToolService.insertTestSysTool(sysTool, false);
+ System.out.println(JSON.toJSONString(sysTool));
+
+ // 默认insert不显示设置
+ sysTool = new SysTool();
+ System.out.println(JSON.toJSONString(sysTool));
+ sysTool = sysToolService.insertTestSysTool(sysTool,null);
+ System.out.println(JSON.toJSONString(sysTool));
+ }
+
+ public void testAutoFilDataSave(){
+ SysTool sysTool = new SysTool();
+ sysToolService.saveSysTool(sysTool);
+ }
+
+}
diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java
index 55718e7..221660d 100644
--- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java
+++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java
@@ -3,23 +3,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.platform.common.tool.EncryptTool;
import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*;
-import com.alibaba.fastjson.JSON;
-import io.swagger.models.auth.In;
import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jdom2.Document;
-import org.jdom2.JDOMException;
-import org.jdom2.input.SAXBuilder;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -27,7 +18,7 @@ import java.util.List;
/**
* 系统数据初始化
*/
-public class TestExcelPermission extends TestBase {
+public class TestExcelPermission extends cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase {
//public class TestExcelPermission {
public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class);