From b444a83f5f9a2d8efd169f43d87fb8f297f5d450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 21 Nov 2019 17:01:29 +0800 Subject: [PATCH] =?UTF-8?q?LAC=E8=B0=83=E6=95=B4=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8C=87=E4=BB=A4=E9=9B=86=E6=93=8D=E4=BD=9C=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20OPC=20UA=E5=B7=A5=E5=85=B7=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/busi/SysTaskPlanController.java | 5 +++-- .../cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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 a625351..8b85dff 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 @@ -153,7 +153,7 @@ public class SysTaskPlanController extends CoreBaseController { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail("定时任务已存在" + baseResultBean.getErrorMsg()) + .setErrorDetail("定时任务已存在 %s" , baseResultBean.getErrorMsg()) .build(); } @@ -162,10 +162,11 @@ public class SysTaskPlanController extends CoreBaseController { sysTask.getTaskClass(), sysTaskPlan.getName(), sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam()); if (!baseResultBean.isSuccess()) { + getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail("定时任务添加失败-" + baseResultBean.getErrorMsg()) + .setErrorDetail("定时任务添加失败- %s ", baseResultBean.getErrorMsg()) .build(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java index 6a1178c..8df0d7e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ResourceImportUtil.java @@ -29,7 +29,7 @@ import java.util.regex.Pattern; public class ResourceImportUtil { public static void main(String[] args) { - File file = new File("C:\\Users\\yunha\\Desktop\\191101_资源.xlsx"); + File file = new File("C:\\Users\\yunha\\Desktop\\资源文件.xlsx"); File sql = new File("C:\\Users\\yunha\\Desktop\\imppResource.sql"); int i = 1; try { @@ -173,7 +173,10 @@ public class ResourceImportUtil { sysLocaleResource.setLanguageNameRdd("English"); sysLocaleResource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.ENUM.getValue()); sysLocaleResource.setResourceKey(row.getCell(1).getStringCellValue()+":"+row.getCell(2).getStringCellValue()); - sysLocaleResource.setResourceValue(row.getCell(3).getStringCellValue()); + if(row.getCell(4)!= null) { + row.getCell(4).setCellType(CellType.STRING); + sysLocaleResource.setResourceValue(row.getCell(4).getStringCellValue()); + } System.out.println(sql(sysLocaleResource)); bufferWritter.write(sql(sysLocaleResource));