From 3f4ca0c8034c28a916c9651e24e0fd2d16c2ff27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Tue, 4 Jul 2023 16:16:54 +0800 Subject: [PATCH] =?UTF-8?q?2023-07-04=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xujie/sys/config/ShiroConfig.java | 4 ++-- .../sys/modules/pms/controller/EamObjectController.java | 9 ++++----- .../xujie/sys/modules/pms/service/EamObjectService.java | 4 ++-- .../modules/pms/service/Impl/EamObjectServiceImpl.java | 7 +++---- src/main/resources/mapper/pms/EamObjectMapper.xml | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/xujie/sys/config/ShiroConfig.java b/src/main/java/com/xujie/sys/config/ShiroConfig.java index d8ab7eef..7dca2ec7 100644 --- a/src/main/java/com/xujie/sys/config/ShiroConfig.java +++ b/src/main/java/com/xujie/sys/config/ShiroConfig.java @@ -1,4 +1,4 @@ - + package com.xujie.sys.config; @@ -20,7 +20,7 @@ import java.util.Map; /** * Shiro配置 * - * + * */ @Configuration public class ShiroConfig { diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java index 1922485f..492f457a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java @@ -5,6 +5,7 @@ import com.xujie.sys.common.utils.PageUtils; import com.xujie.sys.common.utils.R; import com.xujie.sys.modules.oss.entity.SysOssEntity; import com.xujie.sys.modules.pms.data.EamObjectData; +import com.xujie.sys.modules.pms.data.QcDetailInformationData; import com.xujie.sys.modules.pms.service.EamObjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -74,9 +75,7 @@ public class EamObjectController { @RequestMapping(value = "deleteEamObject") public R deleteEamObject(@RequestBody EamObjectData inData) { eamObjectService.deleteEamObject(inData); - return R.ok() - .put("code", 200) - .put("msg", "操作成功!"); + return R.ok().put("code", 200).put("msg", "操作成功!"); } @@ -89,8 +88,8 @@ public class EamObjectController { * @return R * @throw */ - @GetMapping("/downLoadObjectFile/{id}") - public void downLoadObjectFile(@PathVariable("id") Integer id, HttpServletResponse response) throws UnsupportedEncodingException { + @PostMapping(value = "/downLoadObjectFile") + public void downLoadObjectFile(@RequestParam("id") Integer id, HttpServletResponse response) throws UnsupportedEncodingException { eamObjectService.downLoadObjectFile(id,response); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java index 8bc3a9ce..67f2f4d4 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java @@ -52,8 +52,8 @@ public interface EamObjectService { /** * @Description TODO - * @Title downLoadObjectFile - * @param inData + * @Title downLoadObjectFile + * @param * @author rq * @date 2023/4/3 15:40 * @return void diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java index ce00da0d..6fc5695e 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java @@ -1,6 +1,5 @@ package com.xujie.sys.modules.pms.service.Impl; -import cn.hutool.log.Log; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.graphbuilder.math.func.LogFunction; @@ -12,7 +11,9 @@ import com.xujie.sys.modules.pms.data.GetParamInData; import com.xujie.sys.modules.pms.mapper.EamObjectMapper; import com.xujie.sys.modules.pms.service.EamObjectService; import com.xujie.sys.modules.report.dao.ProcedureDao; +import org.apache.commons.logging.Log; import org.apache.poi.ss.formula.functions.LogicalFunction; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,6 +45,7 @@ public class EamObjectServiceImpl implements EamObjectService { @Autowired private ProcedureDao procedureDao; + private org.slf4j.Logger logger = LoggerFactory.getLogger(getClass()); @Override public PageUtils getEamObjectList(EamObjectData inData) { @@ -184,10 +186,8 @@ public class EamObjectServiceImpl implements EamObjectService { @Override public void downLoadObjectFile(Integer id, HttpServletResponse response) throws UnsupportedEncodingException { - //处理路径和名称 List getFileData = eamObjectMapper.getFileData(id); - if(getFileData.size() == 0){ throw new RuntimeException("该文件不存在，请刷新列表"); } @@ -220,5 +220,4 @@ public class EamObjectServiceImpl implements EamObjectService { } - } diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml index e3ba01a8..65667b25 100644 --- a/src/main/resources/mapper/pms/EamObjectMapper.xml +++ b/src/main/resources/mapper/pms/EamObjectMapper.xml @@ -109,7 +109,7 @@