From b1a6ea2581f6eb9ade26f10a5eb60784cd8cf20b Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:19:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0mes=E3=80=81mes-pcn?= =?UTF-8?q?=E3=80=81sweb=E4=B8=89=E4=B8=AA=E5=BE=AE=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 30eb423..decbb78 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java @@ -26,7 +26,7 @@ public class AppStartSystemInit implements CommandLineRunner { @Override public void run(String... args) throws Exception { - LOGGER.info(" Start Core Init Thread "); + LOGGER.info("IMPP-Core加载开始..."); systemInitService.loadAll(); } } From 14e85f58a8796201d2ec175eba8e817fd2c0c92b Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 21 Mar 2019 09:53:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/SysLabelTemplateService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 0d0ba94..9916716 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 @@ -82,6 +82,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { @ApiOperation(value = "删除打印模板",notes = "删除打印模板") public void deleteSysLabelTemplateById(Long id) { sysLabelTemplateRDao.deleteById(id); + sysLabelTemplateParamRDao.deleteByProperty("templateId", id); } @Override @@ -113,8 +114,10 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { // 更新打印模板 sysLabelTemplateRDao.update(sysLabelTemplate); + int effect = sysLabelTemplateParamRDao.deleteByProperty("templateId", sysLabelTemplate.getId()); + // 判断模板参数是否存在，存在就进行数据操作 - if (StringUtils.isNotBlank(sysLabelTemplate.getParamsPack())) { + if (StringUtils.isNotBlank(sysLabelTemplate.getParamsPack()) && effect > 1) { // 更新打印模板参数 SysLabelTemplateParam templateParam; String[] paramArr = sysLabelTemplate.getParamsPack().trim().split(","); @@ -124,8 +127,8 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { templateParam.setTemplateParam(paramItem); templateParam.setTemplateId(sysLabelTemplate.getId()); templateParam.setTemplateParamText(paramItem); - ConvertBean.serviceModelUpdate(templateParam, AuthUtil.getSessionUser().getUserName()); - sysLabelTemplateParamRDao.update(templateParam); + ConvertBean.serviceModelInitialize(templateParam, AuthUtil.getSessionUser().getUserName()); + sysLabelTemplateParamRDao.insert(templateParam); } } }