From 23e9b4091fcae44ca1995bc54efda773b31fab68 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 22 Feb 2019 11:47:26 +0800 Subject: [PATCH] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iservice/busi/ISysLocaleLanguageService.java | 3 ++ .../controller/base/WhiteController.java | 4 +- .../busi/SysLocaleLanguageController.java | 4 +- .../controller/busi/SysOrderNoRuleController.java | 11 ++++- .../controller/busi/SysTaskCycleController.java | 2 +- .../controller/busi/SysTaskPlanController.java | 1 + .../core/apiservice/daoimpl/ReportDaoImpl.java | 1 + .../apiservice/mq/MessageMailQueueReceiver.java | 4 +- .../core/apiservice/schedulejob/DemoJob.java | 4 +- .../serviceimpl/busi/SysConfigService.java | 2 +- .../serviceimpl/busi/SysDictionaryService.java | 10 +++++ .../serviceimpl/busi/SysLocaleLanguageService.java | 47 +++++++++++++++++++++- .../serviceimpl/busi/SysTaskPlanService.java | 32 ++++++++++++--- .../i3plus/core/apiservice/util/ExcelUtil.java | 16 +++----- 14 files changed, 113 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java index 1d9d40d..f7c0479 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java @@ -45,4 +45,7 @@ public interface ISysLocaleLanguageService { @ApiOperation(value = "根据语言id批量修改语言状态") void updateSysLocaleLanguageStatusByIds(Long[] ids,Integer status); + + @ApiOperation(value = "根据语言状态查询语言信息") + List findSysLocaleLanguageByStatus(Integer status); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 4d1012f..e3d1a07 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -59,10 +59,10 @@ public class WhiteController extends CoreBaseController { private IPersonnelService personnelService; @GetMapping(value = "/sys-locale-language/list") - @ApiOperation(value = "查询全部系统语言",notes = "查询全部系统语言") + @ApiOperation(value = "查询可用语言",notes = "查询可用语言") public ResultBean listSysLocaleLanguage(){ try { - List sysLocaleLanguageList = sysLocaleLanguageService.listSysLocaleLanguage(); + List sysLocaleLanguageList = sysLocaleLanguageService.findSysLocaleLanguageByStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 57fb717..bca4457 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -142,7 +142,7 @@ public class SysLocaleLanguageController extends CoreBaseController { @ApiOperation(value = "根据id批量删除") public ResultBean deleteSysLocaleLanguageByIds(String[] idsStr){ try { - if(idsStr.length == 0){ + if(idsStr == null || idsStr.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) @@ -180,7 +180,7 @@ public class SysLocaleLanguageController extends CoreBaseController { @ApiOperation(value = "根据批量修改语言状态") public ResultBean updateSysLocaleLanguageStatusByIds(String[] idsStr,Integer status){ try { - if(idsStr.length == 0){ + if(idsStr == null || idsStr.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index 37e86cd..71f1679 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -281,7 +281,9 @@ public class SysOrderNoRuleController extends CoreBaseController { if (zipFile != null) { FileUtil.deletefile(zipFile.getPath()); } - FileUtil.deletefile(excelDir.getPath()); + if(excelDir != null){ + FileUtil.deletefile(excelDir.getPath()); + } } } @@ -290,8 +292,13 @@ public class SysOrderNoRuleController extends CoreBaseController { public ResultBean importSysOrderNoRule(@RequestParam("file") MultipartFile file){ try { List sysOrderNoRuleList = ExcelUtil.importData(file.getOriginalFilename(),file.getInputStream(),SysOrderNoRule.class); + // 初始化数据 + for (SysOrderNoRule sysOrderNoRule: sysOrderNoRuleList) { + sysOrderNoRule.setOrderNoRuleStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + sysOrderNoRule.setSerialNo(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } sysOrderNoRuleService.insertSysOrderNoRuleList(sysOrderNoRuleList); - return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("导入成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index c28f74e..4206b7a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -114,7 +114,7 @@ public class SysTaskCycleController extends CoreBaseController{ } sysTaskCycleService.deleteSysTaskCycleById(Long.parseLong(idStr)); - return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ 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 9fb32e2..d0b4fa2 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 @@ -81,6 +81,7 @@ public class SysTaskPlanController extends CoreBaseController{ if(isExecute != null && isExecute){ sysTaskPlanService.executeSysTaskPlan(sysTaskPlan); } + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java index ed7893f..4f844bc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java @@ -36,6 +36,7 @@ public class ReportDaoImpl implements IReportDao { } } } + entityManager.clear(); return queryObject.getResultList(); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java index d2afbb4..a06fb5c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java @@ -42,6 +42,7 @@ public class MessageMailQueueReceiver { ISysConfigService sysConfigService; @Autowired MailUtil mailUtil; + /** * 系统邮件处理队列 * @param msg @@ -61,7 +62,8 @@ public class MessageMailQueueReceiver { mailUtil.setBody(msg.getMessageContent()); // 发送给系统配置中的紧急联系人 mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue()); - mailUtil.send(); + // 次数过于频繁 +// mailUtil.send(); } else if(PlatformConstWords.EXTERNAL_MAIL.equals(msg.getMessageReceiversId())){ //判断是否为外部邮件 mailUtil.setSubject(msg.getMessageTitle()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index 3cde5b5..047a4b7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -38,7 +38,9 @@ public class DemoJob extends BaseImppScheduleJob { SysMessage sysMessage = new SysMessage(); sysMessage.setMessageTitle("定时邮件发送"); - sysMessage.setMessageContent("定时邮件内容"+TimeTool.getNowTime(true)); + sysMessage.setMessageContent("定时任务name："+context.getJobDetail().getKey().getName() + +"定时任务groupName："+context.getJobDetail().getKey().getGroup() + +"定时邮件内容"+TimeTool.getNowTime(true)); sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue()); sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); sysMessage.setMessageReceiversId(PlatformConstWords.CONTACT_MAIL); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java index b33b313..edeeb7a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java @@ -102,7 +102,7 @@ public class SysConfigService implements ISysConfigService { @Override @ApiOperation(value = "根据code修改系统配置") public void updateSysConfigByCode(String code, String value) { - SysConfigRDao.updateByProperties("configCode",value,"configValue",value); + SysConfigRDao.updateByProperties("configCode",code,"configValue",value); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 3039946..52f23bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -92,6 +92,16 @@ public class SysDictionaryService implements ISysDictionaryService { .build(); } + // 数据反填 + SysDictionary newSysDict = sysDictionaryRDao.getById(sysDictionary.getParentId()); + newSysDict.setName(sysDictionary.getName()); + newSysDict.setDictionaryCode(sysDictionary.getDictionaryCode()); + newSysDict.setParentId(sysDictionary.getParentId()); + newSysDict.setDictionarySort(sysDictionary.getDictionarySort()); + newSysDict.setDictionaryValueType(sysDictionary.getDictionaryValueType()); + newSysDict.setDictionaryValue(sysDictionary.getDictionaryValue()); + newSysDict.setDictionaryDescription(sysDictionary.getDictionaryDescription()); + // 查询父级字典名称 if (sysDictionary.getParentId() != null && sysDictionary.getParentId() > 0) { LOGGER.info("字典 SYS_DICTIONARY parentId:{}", sysDictionary.getParentId()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java index 08feda6..14498be 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java @@ -87,7 +87,13 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getById(id); ValidatorBean.checkNotNull(sysLocaleLanguage,"需要删除的资源不存在"); - if(sysLocaleResourceRDao.isExitByProperty("languageCode",sysLocaleLanguage.getLanguageCode())){ + if(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == sysLocaleLanguage.getIsDefault().intValue()){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("默认语言不允许删除") + .build(); + } else if(sysLocaleResourceRDao.isExitByProperty("languageCode",sysLocaleLanguage.getLanguageCode())){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -121,7 +127,15 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { @Override @ApiOperation(value = "根据id批量删除系统语言",notes = "根据id批量删除系统语言") public void deleteSysLocaleLanguageByIds(Long[] ids) { - if(sysLocaleResourceRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("id",ids)) > 0){ + // 判断批量数据中是否存在默认语言 + List list = sysLocaleLanguageRDao.findByHqlWhere(CoreHqlPack.packHqlSysLocaleLanguageExistDefaultByIds(ids)); + if (list.size() > 0) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("默认语言不允许删除") + .build(); + } else if(sysLocaleResourceRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("id",ids)) > 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -150,12 +164,41 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { @Override @ApiOperation(value = "根据语言id修改语言状态") public void updateSysLocaleLanguageStatusById(Long id, Integer status) { + SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getById(id); + ValidatorBean.checkNotNull(sysLocaleLanguage,"需要删除的资源不存在"); + + // 判断是否禁用默认语言 + if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == status.intValue() + && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == sysLocaleLanguage.getIsDefault().intValue()) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("默认语言不允许禁用") + .build(); + } + sysLocaleLanguageRDao.updateByProperties("id",id,"languageStatus",status); } @Override @ApiOperation(value = "根据语言id批量修改语言状态") public void updateSysLocaleLanguageStatusByIds(Long[] ids, Integer status) { + // 判断批量数据禁用时是否存在默认语言 + List list = sysLocaleLanguageRDao.findByHqlWhere(CoreHqlPack.packHqlSysLocaleLanguageExistDefaultByIds(ids)); + if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == status.intValue() && list.size() > 0) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("默认语言不允许禁用") + .build(); + } + sysLocaleLanguageRDao.updateByHqlWhere(CoreHqlPack.packHqlIds("id",ids),"languageStatus",status); } + + @Override + @ApiOperation(value = "根据语言状态查询语言信息") + public List findSysLocaleLanguageByStatus(Integer status) { + return sysLocaleLanguageRDao.findByProperty("isDefault",status); + } } 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 76a414d..7b8f361 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 @@ -52,7 +52,7 @@ public class SysTaskPlanService implements ISysTaskPlanService { @Override @ApiOperation(value = "新增任务计划",notes = "新增任务计划") - public SysTaskPlan insertSysTaskPlan(SysTaskPlan sysTaskPlan, SysTaskCycle sysTaskCycle,SysTask sysTask) { + public SysTaskPlan insertSysTaskPlan(SysTaskPlan sysTaskPlan, SysTaskCycle sysTaskCycle,SysTask sysTask){ try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 唯一校验 @@ -98,21 +98,34 @@ public class SysTaskPlanService implements ISysTaskPlanService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode()) + .setErrorDetail(e.getMessage()) .build(); } catch (ParseException e) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode()) + .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode()) .setErrorDetail("表达式起止时间错误") .setErrorSolution("请更改表达式起止时间") .build(); } catch (ClassNotFoundException e) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode()) .setErrorDetail("定时任务包名及类名不正确") .setErrorSolution("请重新输入定时任务包名及类名") .build(); + } catch (RuntimeException e){ + String message; + if(e.getMessage().indexOf("CronExpression") == 0){ + message = "时间周期表达式错误"; + }else { + message = e.getMessage(); + } + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode()) + .setErrorDetail(message) + .build(); } return sysTaskPlan; } @@ -169,9 +182,18 @@ public class SysTaskPlanService implements ISysTaskPlanService { scheduler.scheduleJob(jobDetail, triggerSet, true); } catch (SchedulerException e) { - e.printStackTrace(); + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode()) + .setErrorDetail(e.getMessage()) + .build(); } catch (ParseException e) { - e.printStackTrace(); + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode()) + .setErrorDetail("表达式起止时间错误") + .setErrorSolution("请更改表达式起止时间") + .build(); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java index d2de4b4..e1945f9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java @@ -83,7 +83,7 @@ public class ExcelUtil { * @param exportClass 导出数据类型 * @param exportCol 需要导出的列 */ - public static File exportData(File excelFile,List data, Class exportClass, String[] exportCol) { + public static File exportData(File excelFile,List data, Class exportClass, String[] exportCol) throws Exception { FileOutputStream fos = null; //创建HSSFWorkbook对象(excel的文档对象) HSSFWorkbook workbook = new HSSFWorkbook(); @@ -164,13 +164,6 @@ public class ExcelUtil { workbook.write(fos); fos.flush(); return excelFile; - } catch (Exception e) { - e.printStackTrace(); - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.IO_EXCEPTION_FILE.getCode()) - .setErrorDetail("Excel 导出错误") - .build(); } finally { try { workbook.close(); @@ -189,7 +182,7 @@ public class ExcelUtil { * @param importClass 导入类型 * @return 导入数据集合 */ - public static List importData(String fileName, InputStream inputStream, Class importClass) { + public static List importData(String fileName, InputStream inputStream, Class importClass) throws Exception { List dataList = new ArrayList(); String fileType = StringTool.getStringFileSuffix(fileName, false); @@ -253,6 +246,7 @@ public class ExcelUtil { // 判断是否存在引用关系 if (fields[j].isAnnotationPresent(AnnoOutputColumn.class)) { inputColumn = fields[j].getAnnotation(AnnoOutputColumn.class); + row.getCell(j).setCellType(CellType.STRING); cellValue = row.getCell(j).getStringCellValue(); // 判断是否为枚举字段 @@ -277,8 +271,8 @@ public class ExcelUtil { dataList.add(obj); } - } catch (Exception e){ - e.printStackTrace(); + } finally { + inputStream.close(); } return dataList; }