diff --git a/.gitignore b/.gitignore index f56704b..c3d6523 100644 --- a/.gitignore +++ b/.gitignore @@ -3,12 +3,12 @@ ### Example user template # IntelliJ project files .gitignore -.idea -idea/*.xml -*.iml out gen target +.idea +.iml .jar .class -.md \ No newline at end of file +.md +.log \ No newline at end of file diff --git a/i3plus-core.iml b/i3plus-core.iml new file mode 100644 index 0000000..f409c0e --- /dev/null +++ b/i3plus-core.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-core-api/i3plus-core-api.iml b/modules/i3plus-core-api/i3plus-core-api.iml new file mode 100644 index 0000000..f42f64d --- /dev/null +++ b/modules/i3plus-core-api/i3plus-core-api.iml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml b/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml new file mode 100644 index 0000000..ffb866e --- /dev/null +++ b/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java index 2ba0cf6..cca5f45 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java @@ -192,7 +192,7 @@ public class ShiroAuthConfiguration { // @Bean(name = "sessionIdCookie") // public SimpleCookie getSessionIdCookie() { // LOGGER.info("【shiro-加载sessionIdCookie】"); -// SimpleCookie cookie = new SimpleCookie("sid"); +// SimpleCookie cookie = new SimpleCookie("userLoginSid"); // cookie.setHttpOnly(true); // cookie.setMaxAge(-1); // 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 decbb78..bcde74f 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("IMPP-Core加载开始..."); + LOGGER.info("【IMPP-Core开始加载基础数据...】"); systemInitService.loadAll(); } } 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 8a3e352..9cb85ea 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 @@ -8,19 +8,15 @@ import cn.estsh.i3plus.core.apiservice.util.ExcelUtil; import cn.estsh.i3plus.core.apiservice.util.FileUtil; import cn.estsh.i3plus.core.apiservice.util.ZipUtil; import cn.estsh.i3plus.platform.common.tool.StringTool; -import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -29,17 +25,13 @@ import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.netflix.discovery.converters.Auto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -73,7 +65,7 @@ public class SysOrderNoRuleController extends CoreBaseController { @PostMapping(value = "/insert") @ApiOperation(value = "新增单号规则") - public ResultBean insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule){ + public ResultBean insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule) { try { // 添加校验 validatorSysOrderNoRule(sysOrderNoRule); @@ -82,105 +74,105 @@ public class SysOrderNoRuleController extends CoreBaseController { sysOrderNoRule.setSerialNo(CommonEnumUtil.PARENT.DEFAULT.getValue()); sysOrderNoRuleService.insertSysOrderNoRule(sysOrderNoRule); - return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @PutMapping(value = "/update") @ApiOperation(value = "修改单号规则") - public ResultBean updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule){ + public ResultBean updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule) { try { ValidatorBean.beginValid(sysOrderNoRule) - .notNull("id",sysOrderNoRule.getId()) - .notNull("name",sysOrderNoRule.getName()) - .notNull("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode()) - .notNull("orderNoRule",sysOrderNoRule.getOrderNoRule()) - .checkNotZero("serialNoSeed",sysOrderNoRule.getSerialNoSeed()) - .checkNotZero("serialNoIncrement",sysOrderNoRule.getSerialNoIncrement()) - .checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength()) - .checkNotZero("isCycle",sysOrderNoRule.getIsCycle()); + .notNull("id", sysOrderNoRule.getId()) + .notNull("name", sysOrderNoRule.getName()) + .notNull("orderNoRuleCode", sysOrderNoRule.getOrderNoRuleCode()) + .notNull("orderNoRule", sysOrderNoRule.getOrderNoRule()) + .checkNotZero("serialNoSeed", sysOrderNoRule.getSerialNoSeed()) + .checkNotZero("serialNoIncrement", sysOrderNoRule.getSerialNoIncrement()) + .checkNotZero("serialNoLength", sysOrderNoRule.getSerialNoLength()) + .checkNotZero("isCycle", sysOrderNoRule.getIsCycle()); sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule); - return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @GetMapping(value = "/get/{id}") @ApiOperation(value = "根据id获取编号规则") - public ResultBean getSysOrderNoRuleById(@PathVariable("id") String idStr){ + public ResultBean getSysOrderNoRuleById(@PathVariable("id") String idStr) { try { - ValidatorBean.checkNotNull(idStr,"id不能为空"); + ValidatorBean.checkNotNull(idStr, "id不能为空"); SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr)); if (sysOrderNoRule != null) { - return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }else { + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } else { return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); } - }catch(ImppBusiException busExcep){ + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @DeleteMapping(value = "/delete/{id}") @ApiOperation(value = "根据id删除单号规则") - public ResultBean deleteSysOrderNoRuleById(@PathVariable("id") String idStr){ + public ResultBean deleteSysOrderNoRuleById(@PathVariable("id") String idStr) { try { - ValidatorBean.checkNotNull(idStr,"id不能为空"); + ValidatorBean.checkNotNull(idStr, "id不能为空"); sysOrderNoRuleService.deleteSysOrderNoRuleById(Long.parseLong(idStr)); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @GetMapping(value = "/query") @ApiOperation(value = "单号规则复杂查询，分页，排序") - public ResultBean querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager){ + public ResultBean querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager) { try { ListPager sysOrderNoRuleList = sysOrderNoRuleService.querySysOrderNoRuleByPager(sysOrderNoRule, pager); - return ResultBean.success("操作成功").setListPager(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + return ResultBean.success("操作成功").setListPager(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @PutMapping(value = "/status/{id}/{status}") @ApiOperation(value = "根据id修改规则状态") - public ResultBean updateSysOrderNoRuleStatusById(@PathVariable("id") String id,@PathVariable("status") Integer status){ + public ResultBean updateSysOrderNoRuleStatusById(@PathVariable("id") String id, @PathVariable("status") Integer status) { try { - ValidatorBean.checkNotNull(id,"code不能为空"); - ValidatorBean.checkNotZero(status,"code不能为空"); + ValidatorBean.checkNotNull(id, "code不能为空"); + ValidatorBean.checkNotZero(status, "code不能为空"); - sysOrderNoRuleService.updateSysOrderNoRuleCodeStatusById(Long.parseLong(id),status); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + sysOrderNoRuleService.updateSysOrderNoRuleCodeStatusById(Long.parseLong(id), status); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @DeleteMapping(value = "/batch-delete") @ApiOperation(value = "批量删除单号规则") - public ResultBean deleteSysOrderNoRuleByIds(String[] idsStr){ + public ResultBean deleteSysOrderNoRuleByIds(String[] idsStr) { try { - if(idsStr.length == 0){ + if (idsStr.length == 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) @@ -189,32 +181,32 @@ public class SysOrderNoRuleController extends CoreBaseController { } sysOrderNoRuleService.deleteSysOrderNoRuleByIds(StringTool.getArrayLong(idsStr)); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @PutMapping(value = "/batch-status") @ApiOperation(value = "根据id批量修改规则状态") - public ResultBean updateSysOrderNoRuleStatusByIds(String[] idsStr,Integer status){ + public ResultBean updateSysOrderNoRuleStatusByIds(String[] idsStr, Integer status) { try { - if(idsStr.length == 0){ + if (idsStr.length == 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) .setErrorDetail("请选择需要删除的资源。") .build(); } - ValidatorBean.checkIsNumber(status,"状态不能为空！"); + ValidatorBean.checkIsNumber(status, "状态不能为空！"); - sysOrderNoRuleService.updateSysOrderNoRuleByIds(StringTool.getArrayLong(idsStr),status); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + sysOrderNoRuleService.updateSysOrderNoRuleByIds(StringTool.getArrayLong(idsStr), status); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -239,7 +231,7 @@ public class SysOrderNoRuleController extends CoreBaseController { } // 数据校验 - if(colName==null || colName.length == 0){ + if (colName == null || colName.length == 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) @@ -256,22 +248,21 @@ public class SysOrderNoRuleController extends CoreBaseController { // 将excel导出至临时文件夹并上传 excelFile = new File(excelDir + File.separator + SysOrderNoRule.class.getSimpleName() + pager.getCurrentPage() + ".xls"); excelFile.createNewFile(); - ExcelUtil.exportData(excelFile, listPager.getObjectList(), SysOrderNoRule.class, colName); - result.add(sysFileService.uploadFile(excelFile)); pager.setCurrentPage(pager.getCurrentPage() + 1); } while (pager.getCurrentPage() <= pager.getTotalPages()); // 将所有excel文件打包 - if(isZip){ - zipFile = ZipUtil.zipFile(null, excelDir); - result.add(sysFileService.uploadFile(zipFile)); - ExcelUtil.sendStationLetter(result,getSessionUser().getUser().getId()); - return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result); - } else { - return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result); + zipFile = ZipUtil.zipFile(null, excelDir); + result.add(sysFileService.uploadFile(zipFile)); + + // 是否发送站内信 + if (isZip) { + ExcelUtil.sendStationLetter(result, getSessionUser().getUser().getId()); } + + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { @@ -281,7 +272,7 @@ public class SysOrderNoRuleController extends CoreBaseController { if (zipFile != null) { FileUtil.deletefile(zipFile.getPath()); } - if(excelDir != null){ + if (excelDir != null) { FileUtil.deletefile(excelDir.getPath()); } } @@ -289,36 +280,36 @@ public class SysOrderNoRuleController extends CoreBaseController { @PostMapping(value = "/import") @ApiOperation(value = "导入单号规则") - public ResultBean importSysOrderNoRule(@RequestParam("file") MultipartFile file){ + public ResultBean importSysOrderNoRule(@RequestParam("file") MultipartFile file) { try { - List sysOrderNoRuleList = ExcelUtil.importData(file.getOriginalFilename(),file.getInputStream(),SysOrderNoRule.class); + List sysOrderNoRuleList = ExcelUtil.importData(file.getOriginalFilename(), file.getInputStream(), SysOrderNoRule.class); // 初始化数据 - for (SysOrderNoRule sysOrderNoRule: sysOrderNoRuleList) { + 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()); - }catch(ImppBusiException busExcep){ + return ResultBean.success("导入成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @GetMapping(value = "/down-template") @ApiOperation(value = "下载导入模板") - public ResultBean downSysOrderNoRuleTemplate(){ + public ResultBean downSysOrderNoRuleTemplate() { try { FastDFSFile fastDFSFile = new FastDFSFile(SysOrderNoRule.class.getSimpleName() + "ImportTemplate.xls", - ExcelUtil.importTemplate(SysOrderNoRule.class),"xls"); + ExcelUtil.importTemplate(SysOrderNoRule.class), "xls"); String[] fileAbsolutePath = dfsClient.upload(fastDFSFile); // 保证系统文件表中 String filePath = dfsClient.getHostUi() + "/" + fileAbsolutePath[0] + "/" + fileAbsolutePath[1]; SysDictionary dictionary = sysDictionaryService.getSysDictionaryByParentCodeAndCode( - BaseConstWords.DICTIONARY_FILE_TYPE,fastDFSFile.getExt()); + BaseConstWords.DICTIONARY_FILE_TYPE, fastDFSFile.getExt()); SysFile sysFile = new SysFile(); sysFile.setDfsGroupName(fileAbsolutePath[0]); @@ -331,54 +322,55 @@ public class SysOrderNoRuleController extends CoreBaseController { sysFile.setDownloadNum(0); sysFileService.insertSysFile(sysFile); - return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); - }catch(ImppBusiException busExcep){ + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @GetMapping("/get-col") @ApiOperation(value = "获取单号规则字段") - public ResultBean getSysOrderNoRuleColName(){ + public ResultBean getSysOrderNoRuleColName() { try { - return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysOrderNoRule.class)); - }catch(ImppBusiException busExcep){ + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysOrderNoRule.class)); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } /** * 对象添加校验 + * * @param sysOrderNoRule 校验对象 * @throws NoSuchFieldException */ private void validatorSysOrderNoRule(SysOrderNoRule sysOrderNoRule) throws NoSuchFieldException { ValidatorBean.beginValid(sysOrderNoRule) - .notNull("name",sysOrderNoRule.getName()) - .notNull("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode()) - .notNull("orderNoRule",sysOrderNoRule.getOrderNoRule()) - .checkNotZero("serialNoSeed",sysOrderNoRule.getSerialNoSeed()) - .checkNotZero("serialNoIncrement",sysOrderNoRule.getSerialNoIncrement()) - .checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength()) - .checkNotZero("isCycle",sysOrderNoRule.getIsCycle()); + .notNull("name", sysOrderNoRule.getName()) + .notNull("orderNoRuleCode", sysOrderNoRule.getOrderNoRuleCode()) + .notNull("orderNoRule", sysOrderNoRule.getOrderNoRule()) + .checkNotZero("serialNoSeed", sysOrderNoRule.getSerialNoSeed()) + .checkNotZero("serialNoIncrement", sysOrderNoRule.getSerialNoIncrement()) + .checkNotZero("serialNoLength", sysOrderNoRule.getSerialNoLength()) + .checkNotZero("isCycle", sysOrderNoRule.getIsCycle()); } @GetMapping(value = "/get-order-no/{code}") @ApiOperation(value = "根据单号规则代码，生成单号") - public ResultBean getOrderNo(@PathVariable("code") String code){ + public ResultBean getOrderNo(@PathVariable("code") String code) { try { - ValidatorBean.checkNotNull(code,"code不能为空"); + ValidatorBean.checkNotNull(code, "code不能为空"); SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code); - return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index 900a6de..fd54c57 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -80,8 +80,7 @@ public class SysTaskController extends CoreBaseController { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) - .setErrorDetail("任务类不存在") - .setErrorSolution("请重新输入") + .setErrorDetail(resultBean.errorMsg) .build(); } 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 e96636e..3988c6c 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 @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.util.List; /** @@ -85,16 +84,16 @@ public class SysTaskPlanController extends CoreBaseController{ // 数据校验 ValidatorBean.beginValid(sysTaskPlan) .notNull("name", sysTaskPlan.getName()) - .notNull("groupName",sysTaskPlan.getGroupName()) - .notNull("taskCycleId",sysTaskPlan.getTaskCycleId()) - .notNull("taskId",sysTaskPlan.getTaskId()) + .notNull("groupName", sysTaskPlan.getGroupName()) + .notNull("taskCycleId", sysTaskPlan.getTaskCycleId()) + .notNull("taskId", sysTaskPlan.getTaskId()) .notNull("taskMethodType", sysTaskPlan.getTaskMethodType()); SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(sysTaskPlan.getTaskCycleId()); - ValidatorBean.checkNotNull(sysTaskCycle,"任务周期不存在"); + ValidatorBean.checkNotNull(sysTaskCycle, "任务周期不存在"); SysTask sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId()); - ValidatorBean.checkNotNull(sysTask,"任务不存在"); + ValidatorBean.checkNotNull(sysTask, "任务不存在"); // 设置冗余信息 sysTaskPlan.setTaskNameRdd(sysTask.getName()); @@ -107,7 +106,9 @@ public class SysTaskPlanController extends CoreBaseController{ sysTaskPlan.setTaskPlanStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); // 唯一检查 - BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).checkJobExists(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); + LOGGER.info("定时任务唯一校验 Name:{0}，GroupName:{1}", sysTaskPlan.getName(), sysTaskPlan.getGroupName()); + BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) + .checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if(baseResultBean.isSuccess()){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -118,8 +119,8 @@ public class SysTaskPlanController extends CoreBaseController{ // 添加至对应模块调度器中 baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).addTask(sysTask.getTaskPackage(), - sysTask.getTaskClass(),sysTaskPlan.getName(),sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(), - sysTaskPlan.getTaskPlanDescription()); + sysTask.getTaskClass(), sysTaskPlan.getName(), sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), + sysTaskPlan.getTaskPlanParam()); if (!baseResultBean.isSuccess()) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -132,7 +133,8 @@ public class SysTaskPlanController extends CoreBaseController{ // 立即执行 if(isExecute != null && isExecute){ - baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); + baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) + .executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if (!baseResultBean.isSuccess()) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -149,6 +151,12 @@ public class SysTaskPlanController extends CoreBaseController{ } } + /** + * 修改任务计划 + * @param sysTaskPlan 任务计划对象 + * @param isExecute 是否立即执行 + * @return 处理结果 + */ @PutMapping(value = "/update") @ApiOperation(value = "修改任务计划", notes = "任务计划") public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) { @@ -156,16 +164,16 @@ public class SysTaskPlanController extends CoreBaseController{ // 数据校验 ValidatorBean.beginValid(sysTaskPlan) .notNull("name", sysTaskPlan.getName()) - .notNull("groupName",sysTaskPlan.getGroupName()) - .notNull("taskCycleId",sysTaskPlan.getTaskCycleId()) - .notNull("taskId",sysTaskPlan.getTaskId()) + .notNull("groupName", sysTaskPlan.getGroupName()) + .notNull("taskCycleId", sysTaskPlan.getTaskCycleId()) + .notNull("taskId", sysTaskPlan.getTaskId()) .notNull("taskMethodType", sysTaskPlan.getTaskMethodType()); SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(sysTaskPlan.getTaskCycleId()); - ValidatorBean.checkNotNull(sysTaskCycle,"任务周期不存在"); + ValidatorBean.checkNotNull(sysTaskCycle, "任务周期不存在"); SysTask sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId()); - ValidatorBean.checkNotNull(sysTask,"任务不存在"); + ValidatorBean.checkNotNull(sysTask, "任务不存在"); sysTaskPlan.setTaskNameRdd(sysTask.getName()); sysTaskPlan.setTaskSoftTypeRdd(sysTask.getTaskSoftType()); @@ -176,12 +184,47 @@ public class SysTaskPlanController extends CoreBaseController{ sysTaskPlanService.updateSysTaskPlan(sysTaskPlan); + LOGGER.info("微服定时任务数据校验：name:{}, groupName:{}", sysTaskPlan.getName(), sysTaskPlan.getGroupName()); + BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) + .checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); + if(baseResultBean.isSuccess() && baseResultBean.getResultObject() != null && !(boolean)baseResultBean.getResultObject()){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("定时任务不存在") + .build(); + } else if(!baseResultBean.isSuccess()) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) + .setErrorDetail(baseResultBean.getErrorMsg()) + .build(); + } + // 修改对应模块中的定时任务 - getJobService(sysTaskPlan.getTaskSoftTypeRdd()).editTask(sysTask.getTaskPackage(),sysTask.getTaskClass(),sysTaskPlan.getName() - ,sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(),sysTaskPlan.getTaskPlanDescription()); + LOGGER.info("微服修改定时任务数据：taskPlan", sysTaskPlan.toString()); + baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) + .editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(), + sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam()); + if(!baseResultBean.isSuccess()){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) + .setErrorDetail(baseResultBean.getErrorMsg()) + .build(); + } + // 是否立即执行 if(isExecute != null && isExecute){ - getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); + baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), + sysTaskPlan.getGroupName()); + if(!baseResultBean.isSuccess()){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) + .setErrorDetail(baseResultBean.getErrorMsg()) + .build(); + } } return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan); }catch(ImppBusiException busExcep){ @@ -203,7 +246,7 @@ public class SysTaskPlanController extends CoreBaseController{ sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id)); getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); - return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).build(); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -244,7 +287,7 @@ public class SysTaskPlanController extends CoreBaseController{ @PutMapping(value = "/status/{id}/{status}") @ApiOperation(value = "修改任务计划状态", notes = "根据ID修改任务计划状态") - public ResultBean updateQuartzStatus(@PathVariable("id") String idStr,@PathVariable("status") Integer status) { + public ResultBean updateQuartzStatus(@PathVariable("id") String idStr, @PathVariable("status") Integer status) { try { // 数据校验 ValidatorBean.checkNotNull(idStr, "id 不能为空"); @@ -253,15 +296,15 @@ public class SysTaskPlanController extends CoreBaseController{ SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(idStr)); ValidatorBean.checkNotNull(sysTaskPlan, "定时任务计划不存在"); - sysTaskPlanService.updateSysTaskPlanStatus(Long.parseLong(idStr),status,AuthUtil.getSessionUser()); + sysTaskPlanService.updateSysTaskPlanStatus(Long.parseLong(idStr), status ,AuthUtil.getSessionUser()); // 停止或启用对应模块中的定时任务 if(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == status.intValue()){ - getJobService(sysTaskPlan.getTaskSoftTypeRdd()).pauseJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); + getJobService(sysTaskPlan.getTaskSoftTypeRdd()).resumeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); }else if(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == status.intValue()){ - getJobService(sysTaskPlan.getTaskSoftTypeRdd()).resumeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); + getJobService(sysTaskPlan.getTaskSoftTypeRdd()).pauseJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); } - return new ResultBean(true); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -270,10 +313,10 @@ public class SysTaskPlanController extends CoreBaseController{ } @GetMapping("/query") - @ApiOperation(value = "任务计划复杂查询，分页，排序",notes = "任务计划复杂查询，分页，排序") + @ApiOperation(value = "任务计划复杂查询，分页，排序", notes = "任务计划复杂查询，分页，排序") public ResultBean querySysTaskTimeByPager(SysTaskPlan taskTime, Pager pager){ try { - ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime,pager); + ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(taskTime, pager); return ResultBean.success("操作成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -291,17 +334,16 @@ public class SysTaskPlanController extends CoreBaseController{ SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id)); // 执行定时任务 - BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); + BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if(baseResultBean.isSuccess()){ return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ return ResultBean.fail("操作失败").setErrorMsg(baseResultBean.errorMsg); } - }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } -} \ No newline at end of file +} 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 312a13b..cf95b8d 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 @@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; import java.util.List; /** @@ -50,7 +49,8 @@ public class SysTaskPlanService implements ISysTaskPlanService { @ApiOperation(value = "新增任务计划", notes = "新增任务计划") public SysTaskPlan insertSysTaskPlan(SysTaskPlan sysTaskPlan) { // 唯一校验 - if (sysTaskPlanRDao.isExitByProperty(new String[]{"name", "groupName"}, new String[]{sysTaskPlan.getName(), sysTaskPlan.getGroupName()})) { + if (sysTaskPlanRDao.isExitByProperty(new String[]{"name", "groupName"}, + new String[]{sysTaskPlan.getName(), sysTaskPlan.getGroupName()})) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -75,8 +75,6 @@ public class SysTaskPlanService implements ISysTaskPlanService { @Override @ApiOperation(value = "修改任务计划", notes = "修改任务计划") public void updateSysTaskPlan(SysTaskPlan sysTaskPlan) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SysTaskPlan oldSysTaskPlan = sysTaskPlanRDao.getById(sysTaskPlan.getId()); // 更新关系表 @@ -142,8 +140,9 @@ public class SysTaskPlanService implements ISysTaskPlanService { @Override @ApiOperation(value = "查询任务计划", notes = "根据任务计划名称与组名称查询") public SysTaskPlan getSysTaskPlanByNameAndGroup(String name, String groupName) { - List sysTaskPlanList = sysTaskPlanRDao.findByProperty(new String[]{"name", "groupName"}, new Object[]{name, groupName}); - if (sysTaskPlanList != null && sysTaskPlanList.size() != 0) { + List sysTaskPlanList = sysTaskPlanRDao.findByProperty(new String[]{"name", "groupName"}, + new Object[]{name, groupName}); + if (sysTaskPlanList != null && sysTaskPlanList.isEmpty()) { return sysTaskPlanList.get(0); } return null; 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 c07d7c6..a1f353e 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 @@ -26,14 +26,12 @@ import org.slf4j.LoggerFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - import javax.persistence.EntityManager; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.*; @@ -82,8 +80,9 @@ public class ExcelUtil { * @param data 导出的数据 * @param exportClass 导出数据类型 * @param exportCol 需要导出的列 + * @return 导出文件 */ - public static File exportData(File excelFile,List data, Class exportClass, String[] exportCol) throws Exception { + public static File exportData(File excelFile, List data, Class exportClass, String[] exportCol) throws Exception { FileOutputStream fos = null; //创建HSSFWorkbook对象(excel的文档对象) HSSFWorkbook workbook = new HSSFWorkbook(); @@ -103,7 +102,7 @@ public class ExcelUtil { // 获取字段中文名 优先使用 OutputColumn.name for (int i = 0; i < exportCol.length; i++) { - for (int j = 0 ; j < allFields.length ; j++){ + for (int j = 0; j < allFields.length; j++){ if(exportCol[i].equals(allFields[j].getName())){ fields[i] = allFields[j]; @@ -141,8 +140,8 @@ public class ExcelUtil { if (outputColumn.refClass().isEnum()) { method = outputColumn.refClass().getDeclaredMethod( outputColumn.refForeignKey() + "Of" + StringTool.toUpperCaseFirstOne(outputColumn.value()), - outputColumn.refClass().getDeclaredMethod("get" - + StringTool.toUpperCaseFirstOne(outputColumn.refForeignKey())).getReturnType()); + outputColumn.refClass().getDeclaredMethod("get"+ + StringTool.toUpperCaseFirstOne(outputColumn.refForeignKey())).getReturnType()); cellValue = method.invoke(data.get(i), cellValue); }else if(outputColumn.refClass().equals(SysDictionary.class) && cellValue != null){ cellValue = sysDictionaryService.getSysDictionaryByParentCodeAndValue(outputColumn.refForeignKey(), String.valueOf(cellValue)).getName(); @@ -153,7 +152,7 @@ public class ExcelUtil { // excel 文本框最大长度 if(String.valueOf(cellValue).length() > 30000){ - hssfRow.createCell(j, CellType.STRING).setCellValue(String.valueOf(cellValue).substring(0,30000)); + hssfRow.createCell(j, CellType.STRING).setCellValue(String.valueOf(cellValue).substring(0, 30000)); }else{ hssfRow.createCell(j, CellType.STRING).setCellValue(String.valueOf(cellValue)); } @@ -180,7 +179,9 @@ public class ExcelUtil { * @param fileName 文件名 * @param inputStream 输入流 * @param importClass 导入类型 + * @param 实体 * @return 导入数据集合 + * @throws Exception */ public static List importData(String fileName, InputStream inputStream, Class importClass) throws Exception { List dataList = new ArrayList(); @@ -253,20 +254,20 @@ public class ExcelUtil { if (inputColumn.refClass().isEnum()) { method = inputColumn.refClass().getDeclaredMethod( inputColumn.value() + "Of" + StringTool.toUpperCaseFirstOne(inputColumn.refForeignKey()), - inputColumn.refClass().getDeclaredMethod("get" - + StringTool.toUpperCaseFirstOne(inputColumn.value())).getReturnType()); - cellValue = method.invoke(null,cellValue); + inputColumn.refClass().getDeclaredMethod("get"+ + StringTool.toUpperCaseFirstOne(inputColumn.value())).getReturnType()); + cellValue = method.invoke(null, cellValue); }else if(inputColumn.refClass().equals(SysDictionary.class) && cellValue != null){ cellValue = sysDictionaryService.getSysDictionaryByParentCodeAndName(inputColumn.refForeignKey(), String.valueOf(cellValue)).getName(); } else if(!inputColumn.refClass().equals(Object.class) && !inputColumn.refClass().equals(SysDictionary.class)){ cellValue = selectByProperty(inputColumn.refClass(), inputColumn.refForeignKey(), inputColumn.value(), cellValue); } }else{ - cellValue = getExcelCell(row.getCell(j),fields[j].getType()); + cellValue = getExcelCell(row.getCell(j), fields[j].getType()); } fields[j].setAccessible(true); - fields[j].set(obj,cellValue); + fields[j].set(obj, cellValue); } dataList.add(obj); } @@ -279,8 +280,8 @@ public class ExcelUtil { /** * 导入模板 - * - * @param exportClass + * @param exportClass 需要生成模板的类 + * @return 模板文件 */ public static byte[] importTemplate(Class exportClass) { File excelFile = null; @@ -347,8 +348,8 @@ public class ExcelUtil { /** * 获取实体列集合 - * @param pojoClass - * @return + * @param pojoClass 实体类 + * @return 列集合 */ public static Map getColName(Class pojoClass) { Map colName = new LinkedHashMap(); @@ -381,7 +382,7 @@ public class ExcelUtil { * @param value * @return */ - public static Object selectByProperty(Class persistentClass, String colName, String propertyName, Object value) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + public static Object selectByProperty(Class persistentClass, String colName, String propertyName, Object value) { String queryString = "select model." + colName + " from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; return entityManager.createQuery(queryString).setParameter(propertyName, value).getSingleResult(); diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index caa9081..7480623 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -7,7 +7,7 @@ impp.console.ip=http://192.168.1.56:8010 ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 -impp.cluster.fetch=true +impp.cluster.fetch=false #服务注册中心 impp.cluster.regist.center=http://192.168.1.56:8000/eureka/ #多注册中心 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index a6417a7..c692c62 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -10,7 +10,7 @@ desc.application.name=\u6838\u5fc3\u7ba1\u7406\u540e\u53f0 #当前项目版本 version=${project.version} #解决程序读配置文件乱码问题 -spring.message.encoding = UTF-8 +spring.message.encoding=UTF-8 #日志默认使用log4j2 logging.config=classpath:log4j2.xml diff --git a/modules/i3plus-core-apiservice/src/main/resources/mail.properties b/modules/i3plus-core-apiservice/src/main/resources/mail.properties deleted file mode 100644 index 88178ae..0000000 --- a/modules/i3plus-core-apiservice/src/main/resources/mail.properties +++ /dev/null @@ -1,5 +0,0 @@ -mail.host = smtphm.qiye.163.com -mail.port = 25 -mail.user = dongshang@estsh.com -mail.password = Aa111111 -mail.nick = 东尚消息 \ No newline at end of file