Merge branch 'master' into dev

pom.xml

@@ -18,22 +18,25 @@
     </properties>
 
     <dependencies>
-        <!--日志-->
+<!--        &lt;!&ndash;日志&ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-log4j2</artifactId>-->
+<!--            <version>2.2.4.RELEASE</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-            <version>2.2.4.RELEASE</version>
+            <artifactId>spring-boot-starter-logging</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-logging</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
         </dependency>
 
         <dependency>

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

@@ -66,5 +66,11 @@ public interface CostNumberBedSetService extends IService<CostNumberBedSet> {
      * @return
      */
     List<ReportFormVO> getReportNumberBedStatus(Integer reportType, Long hospId, Integer id);
+
+    /**
+     * 删除诊次/床日成本设置
+     * @param idList idList
+     */
+    void deleteByIds(List<Long> idList);
 }
 

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

@@ -48,5 +48,11 @@ public interface CostOtherPaymentsDataService extends IService<CostOtherPayments
      * @return
      */
     List<CostOtherPaymentsData> getByMonth(int year, int month, Long hospId);
+
+    /**
+     * 批量删除全院其他收支设置数据
+     * @param idList
+     */
+    void deleteByIds(List<Long> idList);
 }
 

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

@@ -52,5 +52,11 @@ public interface CostOtherPaymentsService extends IService<CostOtherPayments> {
      * @return
      */
     List<CostOtherPaymentsVO> getAll(Long hospId);
+
+    /**
+     *  删除全院其他收支设置数据
+     * @param asList
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -21,5 +21,11 @@ public interface CostResponsibilityDepartmentService extends IService<CostRespon
      * @return
      */
     List<CostDepartmentVO> getByResponsibilityId(Integer responsibilityId);
+
+    /**
+     * 批量删除责任中心科室损益信息
+     * @param idList 责任中心科室对应的Id集合
+     */
+    void deleteByIds(List<Integer> idList);
 }
 

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

@@ -57,5 +57,10 @@ public interface CostShareLevelService extends IService<CostShareLevel> {
 
     List<Long> getMaxId(Long hospId);
 
+    /**
+     * 删除分摊等级的数据
+     * @param idList 分摊层级的id
+     */
+    void deleteByIds(List<Integer> idList);
 }
 

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

@@ -77,5 +77,11 @@ public interface CostShareParamService extends IService<CostShareParam> {
      * @return
      */
     String getByCode(String shareParamCode, Long hospId);
+
+    /**
+     * 批量删除分摊参数
+     * @param asList
+     */
+    void deleteByIds(List<Integer> asList);
 }
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.DepartmentProfitFile;
 
+import java.util.List;
+
 /**
  * 科室经营报表
  *
@@ -30,5 +32,11 @@ public interface DepartmentProfitFileService extends IService<DepartmentProfitFi
      * @param hospId 医院ID
      */
     void addDepartmentProfitFile(String date, Integer reportType, Long hospId);
+
+    /**
+     *  批量删除科室损益数据
+     * @param idList 科室损益的Id的集合
+     */
+    void deleteByIds(List<Long> idList);
 }
 

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

@@ -55,5 +55,11 @@ public interface DepartmentService extends IService<Department> {
      * @return
      */
     Result importDepartment(List<List<Object>> read, Long hospId);
+
+    /**
+     * 批量删除科室信息
+     * @param idList 科室Id集合
+     */
+    void deleteByIds(List<Integer> idList);
 }
 

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

@@ -3,6 +3,8 @@ package com.imed.costaccount.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.model.FileRecord;
 
+import java.util.List;
+
 /**
  * 文件记录
  *
@@ -11,6 +13,10 @@ import com.imed.costaccount.model.FileRecord;
  * @date 2021-09-01 15:49:14
  */
 public interface FileRecordService extends IService<FileRecord> {
-
+    /**
+     *  批量删除文件
+     * @param asList
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -61,6 +61,12 @@ public interface HospitalService extends IService<Hospital> {
 
     Hospital getByName(String str);
 
+    /**
+     * 批量珊瑚医院的数据
+     * @param idList 医院的Id集合
+     */
+    void deleteByIds(List<Integer> idList);
+
 //    /**
 //     * 校验是否是本院下人员,并且返回对应的院区id
 //     * @param hospId

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

@@ -49,5 +49,11 @@ public interface MenuService extends IService<Menu> {
      * @return
      */
     List<NavVO> getNav(User user);
+
+    /**
+     *  批量删除菜单
+     * @param idList 菜单Id的集合
+     */
+    void deleteByIds(List<Long> idList);
 }
 

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

@@ -58,5 +58,11 @@ public interface ProductService extends IService<Product> {
      * @return
      */
     Result importProduct(List<List<Object>> read, Long hospId);
+
+    /**
+     * 批量删除收入成本数据
+     * @param asList 成本的Id集合
+     */
+    void deleteByIds(List<Integer> asList);
 }
 

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

@@ -1,10 +1,9 @@
 package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.imed.costaccount.model.dto.CopyReportDTO;
+import com.imed.costaccount.model.ReportRelation;
 import com.imed.costaccount.model.dto.ReportRelationDTO;
 import com.imed.costaccount.model.vo.RelationVO;
-import com.imed.costaccount.model.ReportRelation;
 
 import java.util.List;
 
@@ -58,5 +57,11 @@ public interface ReportRelationService extends IService<ReportRelation> {
      * @return {@link RelationVO}
      */
     List<RelationVO> getResponsibilities(Long reportId, Long hospId);
+
+    /**
+     *  批量删除分摊层级的数据
+     * @param asList 分摊层级的Id集合
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -7,6 +7,8 @@ import com.imed.costaccount.model.dto.RoleEditDTO;
 import com.imed.costaccount.model.dto.RoleSaveDTO;
 import com.imed.costaccount.model.Role;
 
+import java.util.List;
+
 /**
  * 角色
  *
@@ -41,5 +43,10 @@ public interface RoleService extends IService<Role> {
      */
     void updateRole(RoleEditDTO roleEditDTO, Long userId);
 
+    /**
+     * 批量删除角色信息
+     * @param asList 角色的Id集合
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -83,5 +83,11 @@ public interface ShareParamValueService extends IService<ShareParamValue> {
      * @return 某月成本分摊参数值
      */
     List<ShareParamValue> getListByYearAndMonth(Integer year, Integer month, Long hospId);
+
+    /**
+     * 成本分摊参数值批量删除
+     * @param asList id集合
+     */
+    void deleteByIds(List<Long> asList);
 }
 

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

@@ -76,5 +76,11 @@ public interface UserService extends IService<User> {
      * @return 用户名称，如果不存在返回空字符串
      */
     String getUsernameByIdAndHospId(Long createUserId, Long hospId);
+
+    /**
+     * 批量删除用户集合
+     * @param asList idList
+     */
+    void deleteByIds(List<Integer> asList);
 }
 

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

@@ -279,5 +279,16 @@ public class CostNumberBedSetServiceImpl extends ServiceImpl<CostNumberBedSetMap
         return roots;
     }
 
+    /**
+     * 删除诊次/床日成本设置
+     *
+     * @param idList 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/CostOtherPaymentsDataServiceImpl.java

@@ -162,4 +162,15 @@ public class CostOtherPaymentsDataServiceImpl extends ServiceImpl<CostOtherPayme
                         .eq(CostOtherPaymentsData::getHospId, hospId)
         );
     }
+
+    /**
+     * 批量删除全院其他收支设置数据
+     *
+     * @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/CostOtherPaymentsServiceImpl.java

@@ -121,4 +121,15 @@ public class CostOtherPaymentsServiceImpl extends ServiceImpl<CostOtherPaymentsM
         List<CostOtherPayments> costOtherPaymentsList = this.list(new QueryWrapper<CostOtherPayments>().lambda().eq(CostOtherPayments::getHospId, hospId));
         return BeanUtil.convertList(costOtherPaymentsList, CostOtherPaymentsVO.class);
     }
+
+    /**
+     * 删除全院其他收支设置数据
+     *
+     * @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/CostResponsibilityDepartmentServiceImpl.java

@@ -14,6 +14,8 @@ import com.imed.costaccount.common.util.BeanUtil;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -53,4 +55,15 @@ public class CostResponsibilityDepartmentServiceImpl extends ServiceImpl<CostRes
         });
         return departVOList;
     }
+
+    /**
+     * 批量删除责任中心科室损益信息
+     *
+     * @param idList 责任中心科室对应的Id集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Integer> idList) {
+        this.removeByIds(idList);
+    }
 }

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

@@ -157,4 +157,15 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
         List<Long> ids = baseMapper.getMaxIds(hospId);
         return ids;
     }
+
+    /**
+     * 删除分摊等级的数据
+     *
+     * @param idList 分摊层级的id
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Integer> idList) {
+        this.removeByIds(idList);
+    }
 }

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

@@ -248,4 +248,15 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
         }
         return one.getShareParamName();
     }
+
+    /**
+     * 批量删除分摊参数
+     *
+     * @param asList 分摊参数的Id集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Integer> asList) {
+        this.removeByIds(asList);
+    }
 }

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

@@ -92,4 +92,15 @@ public class DepartmentProfitFileServiceImpl extends ServiceImpl<DepartmentProfi
         this.save(departmentProfitFile);
     }
 
+    /**
+     * 批量删除科室损益数据
+     *
+     * @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/DepartmentServiceImpl.java

@@ -112,6 +112,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         department.setId(null);
         department.setCreateTime(System.currentTimeMillis());
         baseMapper.insert(department);
+        int a=10/0;
     }
 
     /**
@@ -223,4 +224,15 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             return Result.build(200, "有" + realDepartments.size() + "条数据已存在，未被导入", null);
         }
     }
+
+    /**
+     * 批量删除科室信息
+     *
+     * @param idList 科室Id集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Integer> idList) {
+        this.removeByIds(idList);
+    }
 }

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

@@ -1,16 +1,28 @@
 package com.imed.costaccount.service.impl;
 
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import com.imed.costaccount.mapper.FileRecordMapper;
 import com.imed.costaccount.model.FileRecord;
 import com.imed.costaccount.service.FileRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 
 @Service("fileRecordService")
 public class FileRecordServiceImpl extends ServiceImpl<FileRecordMapper, FileRecord> implements FileRecordService {
 
 
+    /**
+     * 批量删除文件
+     *
+     * @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/HospitalServiceImpl.java

@@ -219,6 +219,17 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
         return one;
     }
 
+    /**
+     * 批量珊瑚医院的数据
+     *
+     * @param idList 医院的Id集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Integer> idList) {
+        this.removeByIds(idList);
+    }
+
     //    /**
 //     * 校验是否是本院下人员,并且返回对应的院区id
 //     *

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

@@ -195,6 +195,17 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
         return vos;
     }
 
+    /**
+     * 批量删除菜单
+     *
+     * @param idList 菜单Id的集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Long> idList) {
+        this.removeByIds(idList);
+    }
+
     private List<NavVO> getSon(NavVO parentNavVO, List<NavVO> list) {
         return list.stream().filter(o -> parentNavVO.getMenuId().equals(o.getParentId()))
                 .peek(i -> {

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

@@ -217,4 +217,15 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             return Result.build(200, "有" + realProducts.size() + "条数据已存在，未被导入", null);
         }
     }
+
+    /**
+     * 批量删除收入成本数据
+     *
+     * @param idList 成本的Id集合
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Integer> idList) {
+        this.removeByIds(idList);
+    }
 }

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

@@ -85,10 +85,22 @@ public class ReportRelationServiceImpl extends ServiceImpl<ReportRelationMapper,
      * @param hospId   医院id
      * @return {@link RelationVO}
      */
+    @Override
     public List<RelationVO> getResponsibilities(Long reportId, Long hospId) {
         return baseMapper.getResponsibilities(reportId, hospId);
     }
 
+    /**
+     * 批量删除分摊层级的数据
+     *
+     * @param asList 分摊层级的Id集合
+     */
+    @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/RoleServiceImpl.java

@@ -114,4 +114,15 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
         log.info("byId:{}", byId);
         this.updateById(byId);
     }
+
+    /**
+     * 批量删除角色信息
+     *
+     * @param asList 角色的Id集合
+     */
+    @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/ShareParamValueServiceImpl.java

@@ -515,4 +515,15 @@ public class ShareParamValueServiceImpl extends ServiceImpl<ShareParamValueMappe
     public List<ShareParamValue> getListByYearAndMonth(Integer year, Integer month, Long hospId) {
         return baseMapper.getListByYearAndMonth(year, month, hospId);
     }
+
+    /**
+     * 成本分摊参数值批量删除
+     *
+     * @param asList id集合
+     */
+    @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

@@ -300,4 +300,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         return one.getName();
     }
+
+    /**
+     * 批量删除用户集合
+     *
+     * @param asList idList
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void deleteByIds(List<Integer> asList) {
+        this.removeByIds(asList);
+    }
 }

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

@@ -85,7 +85,7 @@ public class CostNumberBedSetController {
     @PostMapping("/delete")
     @ApiOperation("根据Id的集合删除")
     public Result delete(@RequestBody Long[] ids){
-		costNumberBedSetService.removeByIds(Arrays.asList(ids));
+        costNumberBedSetService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
     /**

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

@@ -90,7 +90,7 @@ public class CostOtherPaymentsController {
     @PostMapping("/delete")
     @ApiOperation("删除全院其他收支设置数据")
     public Result delete(@RequestBody Long[] ids){
-		costOtherPaymentsService.removeByIds(Arrays.asList(ids));
+        costOtherPaymentsService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -81,7 +81,7 @@ public class CostOtherPaymentsDataController {
     @PostMapping("/delete")
     @ApiOperation("批量删除全院其他收支数据")
     public Result delete(@RequestBody Long[] ids){
-		costOtherPaymentsDataService.removeByIds(Arrays.asList(ids));
+        costOtherPaymentsDataService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -79,7 +79,7 @@ public class CostResponsibilityDepartmentController {
      */
     @PostMapping("/delete")
     public Result delete(@RequestBody Integer[] ids){
-		costResponsibilityDepartmentService.removeByIds(Arrays.asList(ids));
+        costResponsibilityDepartmentService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -90,7 +90,7 @@ public class CostShareLevelController {
     @PostMapping("/delete")
     @ApiOperation("删除分摊层级数据")
     public Result delete(@RequestBody Integer[] ids){
-		costShareLevelService.removeByIds(Arrays.asList(ids));
+        costShareLevelService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -113,7 +113,7 @@ public class CostShareParamController {
     @PostMapping("/delete")
     @ApiOperation("删除分摊参数信息")
     public Result delete(@RequestBody Integer[] ids){
-		costShareParamService.removeByIds(Arrays.asList(ids));
+        costShareParamService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -85,7 +85,7 @@ public class DepartmentController {
     @PostMapping("/delete")
     @ApiOperation("删除科室信息")
     public Result delete(@RequestBody Integer[] ids){
-		departmentService.removeByIds(Arrays.asList(ids));
+        departmentService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -91,7 +91,7 @@ public class DepartmentProfitFileController {
      */
     @RequestMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		departmentProfitFileService.removeByIds(Arrays.asList(ids));
+        departmentProfitFileService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -203,7 +203,6 @@ public class ExcelController extends AbstractController{
             return departmentService.importDepartment(read, hospId);
         } catch (IOException e) {
             e.printStackTrace();
-            ;
             throw new CostException(500, "导入失败");
         }
     }

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

@@ -67,7 +67,7 @@ public class FileRecordController {
      */
     @RequestMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		fileRecordService.removeByIds(Arrays.asList(ids));
+        fileRecordService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -101,7 +101,7 @@ public class HospitalController {
     @PostMapping("/delete")
     @ApiOperation("删除医院信息")
     public Result delete(@RequestBody Integer[] ids){
-        hospitalService.removeByIds(Arrays.asList(ids));
+        hospitalService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -65,7 +65,7 @@ public class MenuController extends AbstractController {
     @ApiOperation("删除某个菜单")
     @PostMapping("/delete")
     public Result delete(@RequestBody Long[] menuIds) {
-        menuService.removeByIds(Arrays.asList(menuIds));
+        menuService.deleteByIds(Arrays.asList(menuIds));
         return Result.ok();
     }
 

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

@@ -72,7 +72,7 @@ public class ProductController {
     @ApiOperation("删除成本项目")
     @PostMapping("/delete")
     public Result delete(@RequestBody Integer[] ids){
-		productService.removeByIds(Arrays.asList(ids));
+        productService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -1,20 +1,14 @@
 package com.imed.costaccount.web;
 
-import java.util.Arrays;
-import java.util.Map;
-
 import com.imed.costaccount.common.util.Result;
+import com.imed.costaccount.model.ReportRelation;
 import com.imed.costaccount.model.User;
+import com.imed.costaccount.service.ReportRelationService;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import com.imed.costaccount.model.ReportRelation;
-import com.imed.costaccount.service.ReportRelationService;
+import java.util.Arrays;
 
 
 /**
@@ -72,7 +66,7 @@ public class ReportRelationController {
      */
     @RequestMapping("/delete")
     public Result delete(@RequestBody Long[] ids){
-		reportRelationService.removeByIds(Arrays.asList(ids));
+        reportRelationService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -65,7 +65,7 @@ public class RoleController extends AbstractController {
     @ApiOperation("删除")
     @PostMapping("/delete")
     public Result delete(@RequestBody Long[] roleIds) {
-        roleService.removeByIds(Arrays.asList(roleIds));
+        roleService.deleteByIds(Arrays.asList(roleIds));
         return Result.ok();
     }
 

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

@@ -2,15 +2,12 @@ package com.imed.costaccount.web;
 
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
-import com.imed.costaccount.model.ShareParamValue;
-import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.CopyShareParamValueDTO;
 import com.imed.costaccount.model.dto.ShareParamValueEditDTO;
 import com.imed.costaccount.model.dto.ShareParamValueSaveDTO;
 import com.imed.costaccount.service.ShareParamValueService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -82,7 +79,7 @@ public class ShareParamValueController extends AbstractController {
     @ApiOperation("删除某条数据")
     @PostMapping("/delete")
     public Result delete(@RequestBody Long[] ids) {
-        shareParamValueService.removeByIds(Arrays.asList(ids));
+        shareParamValueService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

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

@@ -91,7 +91,7 @@ public class UserController {
     @PostMapping("/delete")
     @ApiOperation("删除用户的信息")
     public Result delete(@RequestBody Integer[] ids){
-        userService.removeByIds(Arrays.asList(ids));
+        userService.deleteByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
       url: jdbc:mysql://112.124.59.133:3306/cost_account?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 #      url: jdbc:mysql://127.0.0.1:3306/cost_account?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
       username: root
-      password: imed!@#$
+      password: xywl2021!
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -52,7 +52,7 @@ mybatis-plus:
 #日志
 # log config
 logging:
-  config: classpath:log4j2.xml
+  #config: classpath:log4j2.xml
   level:
     io.swagger.models.parameters.AbstractSerializableParameter: error
 ####本地文件相关配置

src/main/resources/application.yml

@@ -18,7 +18,7 @@ mybatis-plus:
 #日志
 # log config
 logging:
-  config: classpath:log4j2.xml
+  #config: classpath:log4j2.xml
   level:
     io.swagger.models.parameters.AbstractSerializableParameter: error
 

src/main/resources/logback-spring.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <contextName>logback-spring-demo-dev</contextName>
+    <property name="pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg %n"/>
+    <property name="pattern-color" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%thread] %highlight(%-5level) %green(%logger{50}) - %highlight(%msg) %n"/>
+    <property name="LOG_HOME" value="logs"/>
+
+    <!-- 控制台输出 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 控制台输出-带颜色 -->
+    <appender name="CONSOLE-WITH-COLOR" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${pattern-color}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 文件输出 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_HOME}/all.%d.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="infoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--如果只是想要 Info 级别的日志，只是过滤 info 还是会输出 Error 日志，因为 Error 的级别高，
+            所以我们使用下面的策略，可以避免输出 Error 的日志-->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!--过滤 Error-->
+            <level>ERROR</level>
+            <!--匹配到就禁止-->
+            <onMatch>DENY</onMatch>
+            <!--没有匹配到就允许-->
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+        <File>${LOG_HOME}/log.log</File>
+        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
+            <FileNamePattern>${LOG_HOME}/info.%d{yyyy-MM-dd}.%i.log.gz</FileNamePattern>
+            <!-- 单个日志文件最多 100MB -->
+            <maxFileSize>100MB</maxFileSize>
+            <!--只保留最近30天的日志-->
+            <maxHistory>30</maxHistory>
+            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
+        <!--日志输出编码格式化-->
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="errorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--如果只是想要 Error 级别的日志，那么需要过滤一下，默认是 info 级别的，ThresholdFilter-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
+            如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
+            的日志改名为今天的日期。即，<File> 的日志都是当天的。
+        -->
+        <File>${LOG_HOME}/error.log</File>
+        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
+            <FileNamePattern>${LOG_HOME}/error.%d{yyyy-MM-dd}.%i.log.gz</FileNamePattern>
+            <!-- 单个日志文件最多 100MB -->
+            <maxFileSize>100MB</maxFileSize>
+            <!--只保留最近30天的日志-->
+            <maxHistory>30</maxHistory>
+            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
+        <!--日志输出编码格式化-->
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+
+
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE-WITH-COLOR"/>
+        <appender-ref ref="FILE"/>
+    </root>
+
+    <logger name="com.example.logbackdemo.IndexAction" level="info" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
+</configuration>