From c2e658bf9f2e80049a8f8d20a309ec3a28820549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 25 Jun 2019 15:15:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96=20EXCEL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/CoreCommonController.java | 112 --------------------- .../controller/busi/SysConfigController.java | 6 +- .../controller/busi/SysTaskCycleController.java | 2 +- .../serviceimpl/busi/SysTaskCycleService.java | 4 +- 4 files changed, 6 insertions(+), 118 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java index 52ff420..8477326 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java @@ -1,44 +1,10 @@ package cn.estsh.i3plus.core.apiservice.controller.base; -import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; -import cn.estsh.i3plus.platform.common.tool.ExcelTool; -import cn.estsh.i3plus.platform.common.tool.FileTool; -import cn.estsh.i3plus.platform.common.tool.ZipTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; -import cn.estsh.i3plus.pojo.base.bean.ListPager; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.model.common.ExportDataModel; -import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; import cn.estsh.impp.framework.base.controller.BaseCommonController; -import cn.estsh.impp.framework.boot.exception.ImppBusiException; -import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.util.ImppRedis; -import cn.estsh.impp.framework.boot.util.ResultBean; -import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.mvc.method.RequestMappingInfo; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; - -import java.io.*; -import java.util.*; - -import org.springframework.web.method.HandlerMethod; -import springfox.documentation.spring.web.json.Json; - -import javax.annotation.Resource; -import javax.persistence.EntityManager; -import javax.servlet.http.HttpServletResponse; /** * @Description :通用功能服务 @@ -51,82 +17,4 @@ import javax.servlet.http.HttpServletResponse; @Api(description = "通用功能服务") @RequestMapping(PlatformConstWords.BASE_URL +"/common") public class CoreCommonController extends BaseCommonController { - - - @Autowired - private EntityManager entityManager; - - @Resource(name="redisRes") - private ImppRedis redisRes; - - @Autowired - private RequestMappingHandlerMapping requestMappingHandlerMapping; - - @PostMapping("/test-mapping") - @ApiOperation("根据路径寻找Controller") - public ResultBean exportData(ExportDataModel exportDataModel, HttpServletResponse response){ - try { - ValidatorBean.beginValid(exportDataModel) - .notNull("className",exportDataModel.getClassName()) - .notNull("exportData",exportDataModel.getExportData()); - - ExcelTool excelTool = new ExcelTool(entityManager, redisRes); - Class entityClass = Class.forName(exportDataModel.getClassName()); - String[] colName = new String[ExcelTool.getColName(entityClass).size()]; - ExcelTool.getColName(entityClass).keySet().toArray(colName); - List dataList = JSONArray.parseArray(exportDataModel.getExportData(), entityClass); - - // 数据校验 - if (colName == null || colName.length == 0) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) - .setErrorDetail("导出列不能为空") - .build(); - } - - // 将excel导出至临时文件夹 - File excelFile = new File(System.getProperty("java.io.tmpdir") + File.separator + entityClass.getSimpleName()+".xls"); - excelFile.createNewFile(); - excelTool.exportData(excelFile, dataList, entityClass, colName); - - - InputStream targetStream = new DataInputStream(new FileInputStream(excelFile)); - response.setContentType("application/octet-stream;"); - response.setHeader("Content-Disposition", "attachment;fileName=" + excelFile.getName()); // 设置文件名 - response.addHeader("Pargam", "no-cache"); - response.addHeader("Cache-Control", "no-cache"); - - BufferedInputStream bis = null; - OutputStream os = null; - try { - bis = new BufferedInputStream(targetStream); - os = response.getOutputStream(); - byte[] buffer = new byte[1024]; - int i = bis.read(buffer); - while (i != -1) { - os.write(buffer, 0, i); - i = bis.read(buffer); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (bis != null) { - try { - os.close(); - bis.close(); - targetStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - excelFile.delete(); - return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - return ResultBean.fail(busExcep); - } 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/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index 50b8130..728398b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -301,9 +301,9 @@ public class SysConfigController extends CoreBaseController { if(mailConfig.getMailSwitch() != CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) - .setErrorDetail("字典不存在") - .setErrorSolution("请重新输入字典id") + .setErrorCode(ImppExceptionEnum.MAIL_SERVER_NOT_OPEN_ERROR.getCode()) + .setErrorDetail(ImppExceptionEnum.MAIL_SERVER_NOT_OPEN_ERROR.getDescription()) + .setErrorSolution("开启邮件服务") .build(); } 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 a927f17..904b930 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService; import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -17,7 +18,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.quartz.IQuartzJobService; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; import cn.estsh.impp.framework.boot.util.ResultBean; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java index 46aec15..81ea363 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java @@ -56,8 +56,8 @@ public class SysTaskCycleService implements ISysTaskCycleService { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("存在关联任务计划【" + refExpressionTriggerList.get(0).getTaskPlanName() - + refExpressionTriggerList.get(0).getTaskPlanGroupName() + "】，无法删除") + .setErrorDetail("存在关联任务计划【 名称："+refExpressionTriggerList.get(0).getTaskPlanName() + +"，组名称："+ refExpressionTriggerList.get(0).getTaskPlanGroupName() + "】，无法删除") .setErrorSolution("请重新选择") .build(); } From bb0f8f86c9ab366cb593b21a0bad622df5c8a1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 26 Jun 2019 16:12:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20=E4=BB=BB=E5=8A=A1=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/busi/SysFileController.java | 14 +++++++------- .../apiservice/controller/busi/SysTaskCycleController.java | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index bf2a37d..16a16c6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; @@ -14,7 +15,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -61,7 +61,7 @@ public class SysFileController extends CoreBaseController{ */ @PutMapping(value = "/update") @ApiOperation(value = "修改文件资源", notes = "修改文件资源") - public ResultBean updateSysFile(SysFile sysFile){ + public ResultBean updateSysFile(SysFile sysFile){ try { // 条件验证 ValidatorBean.beginValid(sysFile) @@ -112,7 +112,7 @@ public class SysFileController extends CoreBaseController{ */ @GetMapping(value = "/list") @ApiOperation(value = "查询全部文件资源", notes = "查询全部文件资源") - public ResultBean findSysFileAll(){ + public ResultBean findSysFileAll(){ try { List sysFileList = sysFileService.listSysFile(); return ResultBean.success("操作成功") @@ -132,7 +132,7 @@ public class SysFileController extends CoreBaseController{ */ @GetMapping(value = "/get/{id}") @ApiOperation(value = "根据id查询文件资源", notes = "根据id查询文件资源") - public ResultBean getSysFileById(@PathVariable("id") String id){ + public ResultBean getSysFileById(@PathVariable("id") String id){ try { ValidatorBean.checkIsNumber(id, "id必须为数字[" + id + "]"); @@ -157,7 +157,7 @@ public class SysFileController extends CoreBaseController{ */ @GetMapping(value = "/query") @ApiOperation(value = "文件资源复杂查询，分页，排序", notes = "文件资源复杂查询，分页，排序") - public ResultBean querySysFileByPager(SysFile sysFile, Pager pager){ + public ResultBean querySysFileByPager(SysFile sysFile, Pager pager){ try { ListPager sysFileListPager = sysFileService.querySysFileByPager(sysFile, pager); return ResultBean.success("操作成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -201,7 +201,7 @@ public class SysFileController extends CoreBaseController{ */ @PostMapping("/upload") @ApiOperation(value = "文件上传", notes = "文件上传") - public ResultBean singleFileUpload(@RequestParam("file") MultipartFile file) { + public ResultBean singleFileUpload(@RequestParam("file") MultipartFile file) { try { startMultiService(); @@ -353,7 +353,7 @@ public class SysFileController extends CoreBaseController{ */ @GetMapping("/get-file-code/{code}") @ApiOperation(value = "根据文件代码查询文件信息") - public ResultBean getSysFileByFileCode(@PathVariable("code") String fileCode) { + public ResultBean getSysFileByFileCode(@PathVariable("code") String fileCode) { try { // 条件验证 ValidatorBean.checkNotNull(fileCode, "文件代码不能为空"); 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 904b930..e3a00ca 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 @@ -151,6 +151,8 @@ public class SysTaskCycleController extends CoreBaseController { return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); + } catch (ParseException parseException) { + return ResultBean.fail("表达式错误"); } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); }