导出模板添加token

src/main/java/com/imed/costaccount/service/CostIncomeFileService.java

@@ -39,5 +39,12 @@ public interface CostIncomeFileService extends IService<CostIncomeFile> {
      * @return
      */
     PageUtils queryList(Integer current, Integer pageSize, String name, Long hospId);
+
+    /**
+     * 撤销导入
+     * @param id
+     * @param hospId
+     */
+    void deleteImport(Integer id, Long hospId);
 }
 

src/main/java/com/imed/costaccount/service/impl/CostIncomeFileServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.constants.NumberConstant;
@@ -16,15 +17,24 @@ import com.imed.costaccount.model.vo.CostIncomeFileVO;
 import com.imed.costaccount.model.vo.IncomeErrorMessage;
 import com.imed.costaccount.service.CostIncomeFileService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Objects;
 
 
 @Service("costIncomeFileService")
 public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper, CostIncomeFile> implements CostIncomeFileService {
 
+//    private final CostIncomeGroupService costIncomeGroupService;
+//
+//    public CostIncomeFileServiceImpl(CostIncomeGroupService costIncomeGroupService) {
+//        this.costIncomeGroupService = costIncomeGroupService;
+//    }
+
     /**
      * 保存文件上传记录
      * @param list 文件数据
@@ -93,4 +103,21 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
         pageUtils.setList(costIncomeFileVOList);
         return pageUtils;
     }
+
+    /**
+     * 撤销导入
+     *
+     * @param id
+     * @param hospId
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteImport(Integer id, Long hospId) {
+        CostIncomeFile costIncomeFile = this.getById(id);
+        if (Objects.isNull(costIncomeFile)){
+            throw new CostException(500,"文件记录不存在");
+        }
+        // 根据文件的Id 和 医院Id获取数据
+
+    }
 }

src/main/java/com/imed/costaccount/web/CostIncomeFileController.java

@@ -41,8 +41,16 @@ public class CostIncomeFileController {
     }
 
     /**
-     * 撤销
+     * 撤销导入
+     * 这个文件的Id
      */
+    @PostMapping("/deleteImport")
+    @ApiOperation("撤销导入")
+    public Result deleteImport(Integer id){
+        Long hospId = UserContext.getHospId();
+        costIncomeFileService.deleteImport(id,hospId);
+        return Result.ok();
+    }
     /**
      * 信息
      */

src/main/java/com/imed/costaccount/web/ExcelController.java

@@ -10,11 +10,12 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.token.JwtUtil;
+import com.imed.costaccount.common.token.RedisUtil;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.common.util.UserContext;
 import com.imed.costaccount.constants.NumberConstant;
 import com.imed.costaccount.model.*;
-import com.imed.costaccount.model.dto.ImportDataByFileTypeDto;
 import com.imed.costaccount.service.*;
 import com.imed.costaccount.service.impl.DepartmentServiceImpl;
 import com.imed.costaccount.service.impl.ProductServiceImpl;
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/costAccount/excel")
 public class ExcelController {
-
+    private final JwtUtil jwtUtil;
     private final UserService userService;
 
     private final DepartmentServiceImpl departmentService;
@@ -62,7 +63,7 @@ public class ExcelController {
     private final CostIncomeGroupService costIncomeGroupService;
 
 
-    public ExcelController(UserService userService, DepartmentServiceImpl departmentService, ProductServiceImpl productService, AccountingService accountingService, AccountingProductService accountingProductService, ResponsibilityDepartmentService responsibilityDepartmentService, CostShareParamService costShareParamService, CostIncomeGroupService costIncomeGroupService) {
+    public ExcelController(UserService userService, DepartmentServiceImpl departmentService, ProductServiceImpl productService, AccountingService accountingService, AccountingProductService accountingProductService, ResponsibilityDepartmentService responsibilityDepartmentService, CostShareParamService costShareParamService, CostIncomeGroupService costIncomeGroupService, RedisUtil redisUtil, JwtUtil jwtUtil) {
         this.userService = userService;
         this.departmentService = departmentService;
         this.productService = productService;
@@ -71,6 +72,7 @@ public class ExcelController {
         this.responsibilityDepartmentService = responsibilityDepartmentService;
         this.costShareParamService = costShareParamService;
         this.costIncomeGroupService = costIncomeGroupService;
+        this.jwtUtil = jwtUtil;
     }
 
     @ApiOperation("用户导出模板设置")
@@ -245,8 +247,13 @@ public class ExcelController {
      */
     @ApiOperation("收入数据导出模板设置")
     @GetMapping("/getImportIncomeProductAccountTemplate")
-    public void getImportProductAccountTemplate(HttpServletResponse response) throws IOException {
-        Long hospId = UserContext.getHospId();
+    public void getImportProductAccountTemplate(HttpServletResponse response,String token) throws IOException {
+        int userId = jwtUtil.getUserId(token);
+        User user = userService.getById(userId);
+        if (Objects.isNull(user)){
+            throw new CostException(500,"用户不存在");
+        }
+        Long hospId = user.getHospId();
         String uuid = UUID.randomUUID().toString();
         String url = System.getProperty("java.io.tmpdir") + File.separator + uuid + File.separator + uuid + ".xls";
         FileUtil.del(FileUtil.file(url));