Browse Source

2023-07-04,设备和质量修改

java8
杨奉源 3 years ago
parent
commit
3f4ca0c803
  1. 4
      src/main/java/com/xujie/sys/config/ShiroConfig.java
  2. 9
      src/main/java/com/xujie/sys/modules/pms/controller/EamObjectController.java
  3. 4
      src/main/java/com/xujie/sys/modules/pms/service/EamObjectService.java
  4. 7
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java
  5. 2
      src/main/resources/mapper/pms/EamObjectMapper.xml

4
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 {

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

4
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

7
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<SysOssEntity> getFileData = eamObjectMapper.getFileData(id);
if(getFileData.size() == 0){
throw new RuntimeException("该文件不存在,请刷新列表");
}
@ -220,5 +220,4 @@ public class EamObjectServiceImpl implements EamObjectService {
}
}

2
src/main/resources/mapper/pms/EamObjectMapper.xml

@ -109,7 +109,7 @@
</delete>
<select id="getFileData" resultType="SysOssEntity">
select url,file_name from sys_oss where id=#{id}
select url,file_name,new_file_name from sys_oss where id = #{id}
</select>
</mapper>
Loading…
Cancel
Save