设置删除逻辑

src/main/java/com/imed/costaccount/common/config/CorsConfig.java

@@ -26,9 +26,12 @@ public class CorsConfig implements WebMvcConfigurer {
         CorsConfiguration configuration = new CorsConfiguration();
         // 允许跨域的域名，如果要携带cookie，不能写*。*：代表所有域名都可以跨域访问
         configuration.addAllowedOrigin("*");
-        configuration.setAllowCredentials(true); // 允许携带cookie
-        configuration.addAllowedMethod("*"); // 代表所有的请求方法：GET POST PUT Delete。。。。
-        configuration.addAllowedHeader("*"); // 允许携带任何头信息
+        // 允许携带cookie
+        configuration.setAllowCredentials(true);
+        // 代表所有的请求方法：GET POST PUT Delete。。。。
+        configuration.addAllowedMethod("*");
+        // 允许携带任何头信息
+        configuration.addAllowedHeader("*");
 
         // 初始化cors配置源对象
         UrlBasedCorsConfigurationSource configurationSource = new UrlBasedCorsConfigurationSource();

src/main/java/com/imed/costaccount/common/shiro/OAuth2Filter.java

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Slf4j
+// 作用域多例
 @Scope("prototype")
 @Component
 public class  OAuth2Filter extends AuthenticatingFilter {

src/main/java/com/imed/costaccount/model/vo/AccountProductVO.java

@@ -33,5 +33,6 @@ public class AccountProductVO {
 
     @ApiModelProperty(name = "child",value = "子对象")
     @JsonInclude(JsonInclude.Include.NON_NULL)
+    // 注解表示为空的话 该字段不进行显示
     private List<AccountProductVO> child;
 }

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

@@ -89,5 +89,11 @@ public interface CostAccountShareService extends IService<CostAccountShare> {
     List<CostAccountShare> getByResponsibility(String responsibilityCode, Long hospId);
 
     List<CostAccountShare> getByShareLevelSort(List<Integer> levelSorts, Long hospId);
+
+    /**
+     * 删除成本分摊参数对应数据
+     * @param asList id集合
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -3,6 +3,8 @@ package com.imed.costaccount.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.model.CostCostingCollection;
 
+import java.util.List;
+
 /**
  * 成本数据归集后列表
  *
@@ -11,6 +13,11 @@ import com.imed.costaccount.model.CostCostingCollection;
  * @date 2021-08-18 15:27:02
  */
 public interface CostCostingCollectionService extends IService<CostCostingCollection> {
+    /**
+     * 归集后的数据删除
+     * @param idList
+     */
+    void deleteByIds(List<Long> idList);
     /**
      * 分摊后报表输出
      * @param writer

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

@@ -6,6 +6,8 @@ import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.CostDepartmentProfit;
 import org.apache.poi.ss.usermodel.Sheet;
 
+import java.util.List;
+
 /**
  * 科室损益计算
  *
@@ -47,5 +49,11 @@ public interface CostDepartmentProfitService extends IService<CostDepartmentProf
      * @param reportType
      */
     void getDepartProfitReport(String date, Long hospId, Integer reportType);
+
+    /**
+     *  删除科室损益数据
+     * @param asList
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -5,6 +5,7 @@ import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.CostIncomeFile;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.vo.IncomeErrorMessage;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -55,5 +56,11 @@ public interface CostIncomeFileService extends IService<CostIncomeFile> {
      * @return
      */
     List<IncomeErrorMessage> getErrorList(Long id, Long hospId);
+
+    /**
+     *  文件记录删除
+     * @param idList
+     */
+    void deleteByIds(@Param("idList") List<Long> idList);
 }
 

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

@@ -48,5 +48,11 @@ public interface CostIncomeGroupService extends IService<CostIncomeGroup> {
      * @return {@link Result}
      */
     Result importDataByIncomeData(List<List<Object>> read, User user, MultipartFile file, Integer year, Integer month);
+
+    /**
+     * 删除收入归集的数据
+     * @param asList
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
-import com.imed.costaccount.common.util.UserContext;
+import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.mapper.AccountingMapper;
 import com.imed.costaccount.mapper.AccountingProductMapper;
 import com.imed.costaccount.mapper.ProductMapper;
@@ -17,7 +17,6 @@ import com.imed.costaccount.model.dto.AccountProductSaveDTO;
 import com.imed.costaccount.model.vo.AccountProductVO;
 import com.imed.costaccount.model.vo.ProductVO;
 import com.imed.costaccount.service.AccountingProductService;
-import com.imed.costaccount.common.util.BeanUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -77,9 +76,9 @@ public class AccountingProductServiceImpl extends ServiceImpl<AccountingProductM
     /**
      * 递归处理
      *
-     * @param accountVO
-     * @param list
-     * @return
+     * @param accountVO  第一层结构对象
+     * @param list 全部数据对象
+     * @return 树形结构对象
      */
     private List<AccountProductVO> getAccountTree(AccountProductVO accountVO, List<AccountProductVO> list) {
         List<AccountProductVO> accountVOS = new ArrayList<>();

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

@@ -444,4 +444,15 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
         );
     }
 
+    /**
+     * 删除成本分摊参数对应数据
+     *
+     * @param idList id集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Long> idList) {
+        this.removeByIds(idList);
+    }
+
 }

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

@@ -7,6 +7,10 @@ import com.imed.costaccount.service.CostCostingCollectionService;
 import com.imed.costaccount.service.CostShareLevelService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 @Slf4j
 @Service("costCostingCollectionService")
@@ -18,6 +22,17 @@ public class CostCostingCollectionServiceImpl extends ServiceImpl<CostCostingCol
         this.costShareLevelService = costShareLevelService;
     }
 
+    /**
+     * 归集后的数据删除
+     *
+     * @param idList
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Long> idList) {
+        this.removeByIds(idList);
+    }
+
 //    /**
 //     * 分摊后报表输出
 //     * 测试数据

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

@@ -423,6 +423,17 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
         writer.close();
     }
 
+    /**
+     * 删除科室损益数据
+     *
+     * @param idList 科室损益的Id的集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Long> idList) {
+        this.removeByIds(idList);
+    }
+
     /**
      * 按照会计科目进行计算
      *

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

@@ -205,4 +205,15 @@ public class CostIncomeFileServiceImpl extends ServiceImpl<CostIncomeFileMapper,
         return incomeErrorMessageList;
     }
 
+    /**
+     * 文件记录删除
+     *
+     * @param idList 文件记录的Id集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Long> idList) {
+        this.removeByIds(idList);
+    }
+
 }

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

@@ -303,6 +303,17 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
         return null;
     }
 
+    /**
+     * 删除收入归集的数据
+     *
+     * @param asList
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Long> asList) {
+        this.removeByIds(asList);
+    }
+
 
     /**
      * 检验数据

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

@@ -156,7 +156,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * @param userDto
      */
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+
     public void updateByUser(UserDto userDto) {
         User userOne = (User) SecurityUtils.getSubject().getPrincipal();
         User user = baseMapper.selectOne(new QueryWrapper<User>().lambda().like(

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

@@ -130,9 +130,9 @@ public class CostAccountShareController {
      * 删除
      */
     @PostMapping("/delete")
-    @ApiOperation("删除责任中心成本数据")
+    @ApiOperation("删除成本分摊参数对应数据")
     public Result delete(@RequestBody Long[] ids){
-		costAccountShareService.removeByIds(Arrays.asList(ids));
+        costAccountShareService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -5,7 +5,6 @@ import com.imed.costaccount.model.CostCostingCollection;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.service.CostCostingCollectionService;
 import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -69,9 +68,9 @@ public class CostCostingCollectionController {
     /**
      * 删除
      */
-    @RequestMapping("/delete")
+    @PostMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		costCostingCollectionService.removeByIds(Arrays.asList(ids));
+        costCostingCollectionService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
     /**

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

@@ -104,9 +104,9 @@ public class CostDepartmentProfitController {
     /**
      * 删除
      */
-    @RequestMapping("/delete")
+    @PostMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		costDepartmentProfitService.removeByIds(Arrays.asList(ids));
+        costDepartmentProfitService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 }

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

@@ -91,9 +91,9 @@ public class CostIncomeFileController {
     /**
      * 删除
      */
-    @RequestMapping("/delete")
+    @PostMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		costIncomeFileService.removeByIds(Arrays.asList(ids));
+        costIncomeFileService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -74,7 +74,7 @@ public class CostIncomeGroupController {
      */
     @PostMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		costIncomeGroupService.removeByIds(Arrays.asList(ids));
+        costIncomeGroupService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -65,7 +65,6 @@ public class DepartmentController {
     @PostMapping("/save")
     @ApiOperation("保存科室相关信息")
     public Result save(@RequestBody @Valid DepartmentRequest departmentRequest){
-
 		departmentService.addDepartment(departmentRequest);
         return Result.ok();
     }

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

@@ -10,6 +10,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -77,6 +79,7 @@ public class UserController {
      */
     @PostMapping("/update")
     @ApiOperation("修改用户的信息")
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public Result update(@RequestBody @Valid UserDto userDto){
         userService.updateByUser(userDto);
         return Result.ok();