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));