From 726c2cede545f864f1d31a6de0fa1a10786c29d5 Mon Sep 17 00:00:00 2001 From: Wynne Date: Wed, 21 Jul 2021 14:50:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(core):=20=E6=A0=87=E7=AD=BE=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 标签模板唯一校验更新 --- .../serviceimpl/busi/SysLabelTemplateService.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) 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 bd5e4a4..1987ffb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java @@ -2,6 +2,7 @@ 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.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -18,7 +19,6 @@ 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.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -94,9 +94,9 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { @Override @ApiOperation(value = "软删除打印模板") - public void deleteWeaklySysLabelTemplateById(Long id,String userName) { - sysLabelTemplateRDao.deleteWeaklyById(id,userName); - sysLabelTemplateParamRDao.deleteWeaklyByProperty("templateId", id,userName); + public void deleteWeaklySysLabelTemplateById(Long id, String userName) { + sysLabelTemplateRDao.deleteWeaklyById(id, userName); + sysLabelTemplateParamRDao.deleteWeaklyByProperty("templateId", id, userName); } @Override @@ -114,6 +114,9 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { //暂时根据id和模板代码作为唯一性校验 StringBuffer where = new StringBuffer(); HqlPack.getNumNOEqualPack(sysLabelTemplate.getId(), "id", where); + // FIX 原始是删除 后改成软删 导致唯一校验存在问题 + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", where); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", where); HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", where); int count = sysLabelTemplateRDao.findByHqlWhereCount(where.toString()); if (count > 0) { @@ -156,20 +159,20 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { @Override public List listSysLabelTemplateDetail(SysLabelTemplate template) { List list = sysLabelTemplateRDao.findByHqlWhere(CoreHqlPack.packBeanSysLabelTemplate(template)); - if(list != null && list.size() > 0){ + if (list != null && list.size() > 0) { List ids = new ArrayList<>(list.size()); list.forEach(tmp -> ids.add(tmp.getId())); DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(ids,"templateId",packBean); + DdlPreparedPack.getInPackList(ids, "templateId", packBean); List paramList = sysLabelTemplateParamRDao.findByHqlWhere(packBean); - if(paramList != null && paramList.size() > 0){ + if (paramList != null && paramList.size() > 0) { for (SysLabelTemplateParam param : paramList) { for (SysLabelTemplate temp : list) { - if(temp.getId().equals(param.getTemplateId())){ + if (temp.getId().equals(param.getTemplateId())) { List params = temp.getLabelTemplateParamList(); - if(params == null){ + if (params == null) { params = new ArrayList<>(); } params.add(param); From ffd120a09401e3075dda02e31e4b8c3dadde1f99 Mon Sep 17 00:00:00 2001 From: Wynne Date: Fri, 23 Jul 2021 13:37:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(core):=20=E5=8E=BB=E9=99=A4impp?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去除impp日志 --- .../core/apiservice/schedulejob/CoreLogClearJob.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java index 8a4c022..f8223c6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreLogClearJob.java @@ -1,11 +1,8 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; -import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; import cn.estsh.impp.framework.boot.init.ApplicationProperties; -import cn.estsh.impp.framework.boot.util.RedisCacheTool; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.slf4j.Logger; @@ -13,9 +10,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Calendar; -import java.util.Date; - /** * @Description : * @Reference : 日志清除 @@ -39,11 +33,12 @@ public class CoreLogClearJob extends BaseImppScheduleJob { @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { - int to = RedisCacheTool.getSysConfigIntVal(CommonConstWords.LOG_STORAGE_DAYS, CommonConstWords.LOG_STORAGE_DAYS_DEFAULT); - Date thisTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -2 - to); - String startTime = TimeTool.getToday(thisTime) + " 00:00:00"; - String endTime = TimeTool.getToday(TimeTool.timeCalc(thisTime, Calendar.DAY_OF_MONTH, to)) + " 23:59:59"; - logService.actionCleanLog(startTime,endTime); + return; +// int to = RedisCacheTool.getSysConfigIntVal(CommonConstWords.LOG_STORAGE_DAYS, CommonConstWords.LOG_STORAGE_DAYS_DEFAULT); +// Date thisTime = TimeTool.timeCalc(new Date(), Calendar.DAY_OF_MONTH, -2 - to); +// String startTime = TimeTool.getToday(thisTime) + " 00:00:00"; +// String endTime = TimeTool.getToday(TimeTool.timeCalc(thisTime, Calendar.DAY_OF_MONTH, to)) + " 23:59:59"; +// logService.actionCleanLog(startTime,endTime); } } From bb0df5b50b73ee619d808d3fb24d8935434dcb7f Mon Sep 17 00:00:00 2001 From: Wynne Date: Fri, 23 Jul 2021 14:06:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(core):=20mq=E6=B6=88=E6=81=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mq消息返回值更新 --- .../i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java | 12 ++++++------ .../i3plus/core/apiservice/mq/ScheduleQueueReceiver.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java index eb3213c..1bd8cf9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java @@ -72,7 +72,7 @@ public class PojoVersionQueueReceiver { } @RabbitListener(queues = QUEUE_IMPP_POJO_VERSION) - public Boolean processImppMessage(Channel channel, Message message) { + public void processImppMessage(Channel channel, Message message) { boolean isNack = false; try { byte[] messageBody = message.getBody(); @@ -179,11 +179,11 @@ public class PojoVersionQueueReceiver { LOGGER.error("Pojo Version MQ ACK Error Message :{}", e.getMessage()); } } - if (isNack) { - return false; - } else { - return true; - } +// if (isNack) { +// return false; +// } else { +// return true; +// } } /** 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 02f9686..9c37fb4 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 @@ -61,7 +61,7 @@ public class ScheduleQueueReceiver { * @param message 消息 */ @RabbitListener(queues = PlatformConstWords.QUEUE_IMPP_SCHEDULE) - public Boolean processSchedule(String data, Channel channel, Message message) { + public void processSchedule(String data, Channel channel, Message message) { try { SysLogTaskTime logTaskTime = JsonUtilTool.decode(data, SysLogTaskTime.class); LOGGER.debug("【MQ-QUEUE_IMPP_SCHEDULE】数据接收成功：{}", logTaskTime); @@ -128,7 +128,7 @@ public class ScheduleQueueReceiver { //信息已处理 channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); - return true; +// return true; } catch (IOException e) { LOGGER.error("【MQ-IMPP_SCHEDULE_QUEUE】处理出错：{}", e.getMessage(), e); //丢弃这条消息 @@ -139,6 +139,6 @@ public class ScheduleQueueReceiver { e1.printStackTrace(); } } - return false; +// return false; } } From 004aab9426b8713eb3a3cbab800b0860bb65f7a1 Mon Sep 17 00:00:00 2001 From: Wynne Date: Fri, 23 Jul 2021 14:25:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(core):=20=E8=BF=98=E5=8E=9Fmq=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 还原mq返回值 --- .../i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java | 12 ++++++------ .../i3plus/core/apiservice/mq/ScheduleQueueReceiver.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java index 1bd8cf9..eb3213c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java @@ -72,7 +72,7 @@ public class PojoVersionQueueReceiver { } @RabbitListener(queues = QUEUE_IMPP_POJO_VERSION) - public void processImppMessage(Channel channel, Message message) { + public Boolean processImppMessage(Channel channel, Message message) { boolean isNack = false; try { byte[] messageBody = message.getBody(); @@ -179,11 +179,11 @@ public class PojoVersionQueueReceiver { LOGGER.error("Pojo Version MQ ACK Error Message :{}", e.getMessage()); } } -// if (isNack) { -// return false; -// } else { -// return true; -// } + if (isNack) { + return false; + } else { + return true; + } } /** 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 9c37fb4..02f9686 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 @@ -61,7 +61,7 @@ public class ScheduleQueueReceiver { * @param message 消息 */ @RabbitListener(queues = PlatformConstWords.QUEUE_IMPP_SCHEDULE) - public void processSchedule(String data, Channel channel, Message message) { + public Boolean processSchedule(String data, Channel channel, Message message) { try { SysLogTaskTime logTaskTime = JsonUtilTool.decode(data, SysLogTaskTime.class); LOGGER.debug("【MQ-QUEUE_IMPP_SCHEDULE】数据接收成功：{}", logTaskTime); @@ -128,7 +128,7 @@ public class ScheduleQueueReceiver { //信息已处理 channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); -// return true; + return true; } catch (IOException e) { LOGGER.error("【MQ-IMPP_SCHEDULE_QUEUE】处理出错：{}", e.getMessage(), e); //丢弃这条消息 @@ -139,6 +139,6 @@ public class ScheduleQueueReceiver { e1.printStackTrace(); } } -// return false; + return false; } }