07 29 02 fix_add login codes

src/main/java/com/imed/costaccount/common/aop/LogAspect.java

@@ -24,7 +24,7 @@
 //public class LogAspect {
 //
 //    /**
-//     * ..表示包及子包 该方法代表controller层的所有方法  TODO 路径需要根据自己项目定义
+//     * ..表示包及子包 该方法代表controller层的所有方法
 //     */
 //    @Pointcut("execution(public * com.imed.costaccount.web.*.*(..))")
 //    public void controllerMethod() {

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

@@ -46,7 +46,7 @@ public class ShiroConfig {
         filterMap.put("/swagger-resources/**", "anon");
         filterMap.put("/captcha.jpg", "anon");
         filterMap.put("/costAccount/getHospArea/**","anon");
-        filterMap.put("/costAccount/excel/**","anon");
+        filterMap.put("/costAccount/excel/getImportUserTemplate","anon");
         filterMap.put("/costAccount/login", "anon");
         filterMap.put("/**/*.jpg", "anon");
         filterMap.put("/**/*.png", "anon");

src/main/java/com/imed/costaccount/common/util/Result.java

@@ -38,44 +38,11 @@ public class Result {
         return new Result(status, msg, data, ok);
     }
 
-//    public static Result ok(ResultCodeEnum codeEnum, Object data) {
-//        return new Result(codeEnum, data);
-//    }
 
     public static Result ok(Object data) {
         return new Result(data);
     }
 
-    public static Result ok() {
-        return new Result(null);
-    }
-
-//    public static Result error(int code, String msg) {
-//
-//    }
-
-//    public static Result errorMsg(String msg) {
-//        return new Result(500, msg, null);
-//    }
-//    public static Result errorMsg(int code,String msg) {
-//        return new Result(code, msg, null);
-//    }
-//
-//    public static Result errorMap(Object data) {
-//        return new Result(501, "error", data);
-//    }
-//
-//    public static Result errorTokenMsg(String msg) {
-//        return new Result(502, msg, null);
-//    }
-//
-//    public static Result errorException(String msg) {
-//        return new Result(555, msg, null);
-//    }
-//
-//    public static Result errorUserQQ(String msg) {
-//        return new Result(556, msg, null);
-//    }
 
     public Result() {
 

src/main/java/com/imed/costaccount/model/dto/AccountingSaveDTO.java

@@ -21,4 +21,6 @@ public class AccountingSaveDTO {
 
     @NotNull(message = "会计科目类型不能为空")
     private Integer accountingType;
+
+    private Integer isBaseCode;
 }

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

@@ -58,5 +58,15 @@ public interface HospitalService extends IService<Hospital> {
      * @return
      */
     List<HospitalAllVO> getAll();
+
+    Hospital getByName(String str);
+
+//    /**
+//     * 校验是否是本院下人员,并且返回对应的院区id
+//     * @param hospId
+//     * @param str
+//     * @return
+//     */
+//    Integer getByNameAndCheck(Integer hospId, String str);
 }
 

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

@@ -115,6 +115,14 @@ public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, Account
         accounting.setParentId(parentId);
         accounting.setAllParentIds(allParentIds);
         accounting.setCreateTime(System.currentTimeMillis());
+        // 如果是支出类型
+        if (accountingSaveDTO.getAccountingType().equals(2)) {
+            Integer isBaseCode = accountingSaveDTO.getIsBaseCode();
+            if (Objects.isNull(isBaseCode)) {
+                throw new CostException(500, "支出类型需要选择是否固定支出成本");
+            }
+            accounting.setIsBaseCost(isBaseCode);
+        }
         this.save(accounting);
 
     }

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

@@ -50,8 +50,8 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
         List<Hospital> records = pages.getRecords();
         List<HospitalVO> hospitalVOList = BeanUtil.convertList(records, HospitalVO.class);
 
-        hospitalVOList.forEach(i->{
-            if (NumberConstant.ZERO.equals(i.getIsHospital())){
+        hospitalVOList.forEach(i -> {
+            if (NumberConstant.ZERO.equals(i.getIsHospital())) {
                 i.setParentId(null);
                 i.setParentName(null);
             }
@@ -142,7 +142,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     @Override
     public List<HospitalAllVO> getAll() {
         List<Hospital> hospitals = baseMapper.selectList(new QueryWrapper<Hospital>().lambda()
-        .eq(Hospital::getIsHospital,NumberConstant.ONE));
+                .eq(Hospital::getIsHospital, NumberConstant.ONE));
         List<HospitalAllVO> hospitalAllVOList = BeanUtil.convertList(hospitals, HospitalAllVO.class);
         return hospitalAllVOList;
     }
@@ -192,5 +192,39 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
         return one;
     }
 
+    @Override
+    public Hospital getByName(String str) {
+        Hospital one = this.getOne(
+                new LambdaQueryWrapper<Hospital>()
+//                        .select(Hospital::getId, Hospital::getName)
+                        .eq(Hospital::getName, str)
+                        .last("limit 1")
+        );
+        if (Objects.isNull(one)) {
+            throw new CostException("当前医院名称为：" + str + "不存在");
+        }
+        return one;
+    }
 
+    //    /**
+//     * 校验是否是本院下人员,并且返回对应的院区id
+//     *
+//     * @param hospId
+//     * @param str
+//     * @return
+//     */
+//    @Override
+//    public Integer getByNameAndCheck(Integer hospId, String str) {
+//        // 得到这个hospId 相关的所有医院或院区id
+//        Hospital byId = this.getById(hospId);
+//        if (Objects.isNull(byId)) {
+//            throw new CostException(500, "当前医院不存在");
+//        }
+//        Integer isHospital = byId.getIsHospital();
+//        List<Integer>
+//        // 是医院
+//        if (isHospital == 0) {
+//
+//        }
+//    }
 }

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

@@ -31,7 +31,9 @@ import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -49,6 +51,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     private final RedisUtil redisUtil;
 
+    private Map<String, Integer> map = new ConcurrentHashMap<>();
+
     public UserServiceImpl(JwtUtil jwtUtil, HospitalService hosptailService, RedisUtil redisUtil) {
         this.jwtUtil = jwtUtil;
         this.hosptailService = hosptailService;
@@ -212,9 +216,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 if (StrUtil.isBlank(str)) {
                     errRowNums.add("" + (i + 5));
                 }
+
                 if (j == 0) {
-                    // TODO: 2021/7/27 查询到具体院区
-                    user.setHospId(8);
+                    Hospital hospital = hosptailService.getByName(str);
+                    user.setHospId(hospital.getId());
                 } else if (j == 1) {
                     user.setName(str);
                 } else if (j == 2) {
@@ -248,6 +253,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return Result.build(200, "有" + realUsers.size() + "条数据已存在，未被导入", null);
     }
 
+//    /**
+//     * 校验是否是本院下人员,并且返回对应的院区id
+//     * @param hospId
+//     * @param str
+//     * @return
+//     */
+//    private Integer getByNameAndCheck(Integer hospId, String str) {
+//        Integer thisHospAreaId = this.hosptailService.getByNameAndCheck(hospId, str);
+//        return thisHospAreaId;
+//    }
+
     /**
      * 退出登录
      *

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

@@ -60,7 +60,7 @@ public class ExcelController {
         writer.passCurrentRow();
         writer.merge(2, 2, 0, 4, "测试医院用户导入", false);
         writer.passCurrentRow();
-        writer.writeRow(Arrays.asList("院区","姓名", "账户", "密码","手机号码"));
+        writer.writeRow(Arrays.asList("院区","姓名", "工号", "密码","手机号码"));
 
         // 写入响应
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");