修改医院管理的相关参数设置

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

@@ -45,10 +45,8 @@ public class ShiroConfig {
         filterMap.put("/doc.html", "anon");
         filterMap.put("/swagger-resources/**", "anon");
         filterMap.put("/captcha.jpg", "anon");
-//        filterMap.put("/costAccount/user/**","anon");
         filterMap.put("/costAccount/getHospArea/**","anon");
         filterMap.put("/costAccount/excel/**","anon");
-        filterMap.put("/costAccount/hosptail/**","anon");
         filterMap.put("/costAccount/login", "anon");
         filterMap.put("/**/*.jpg", "anon");
         filterMap.put("/**/*.png", "anon");

src/main/java/com/imed/costaccount/model/dto/HosptailDto.java → src/main/java/com/imed/costaccount/model/dto/HospitalDto.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author 李加喜
  * @Package com.imed.costaccount.model.dto
@@ -15,40 +17,25 @@ import lombok.Data;
  */
 @Data
 @ApiModel("操作院区参数dto参数")
-public class HosptailDto {
-    /**
-     * 医院或者病区Id
-     */
+public class HospitalDto {
+
     @ApiModelProperty(name = "id",value = "医院或者病区Id")
+    @NotNull(message = "医院/病区的id ")
     private Integer id;
-    /**
-     * 是否是院区(0不是 1是)
-     */
+
     @ApiModelProperty(name = "name",value = "医院或院区名称")
+    @NotNull(message = "医院/病区的名称不能为空")
     private String name;
-    /**
-     * 账号
-     */
-    @ApiModelProperty(name = "is_hosptail",value = "是否为院区（0.不是，1.是）默认为0")
+
+    @ApiModelProperty(name = "is_hospital",value = "是否为院区（0.不是，1.是）默认为0")
+    @NotNull(message = "是否为院区状态不能为空")
     private Integer isHospital;
-    /**
-     * 医院唯一标识
-     */
-    @ApiModelProperty(name = "sign",value = "如果是院区医院的id，默认为0")
-    private String sign;
-    /**
-     * 如果是院区医院的id，默认为0
-     */
+
     @ApiModelProperty(name = "parentId",value = "如果是院区医院的名称，默认为")
+    @NotNull(message = "医院/病区的名称不能为空")
     private Integer parentId;
-    /**
-     * 如果是院区医院的名称，默认为'
-     */
+
     @ApiModelProperty(name = "parentName",value = "医院唯一标识，院区不存在次内容")
+    @NotNull(message = "医院唯一标识parentName不能为空")
     private String parentName;
-    /**
-     * 创建时间13位时间戳
-     */
-    @ApiModelProperty(name = "createTime",value = "创建时间13位时间戳")
-    private Long createTime;
 }

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

@@ -0,0 +1,39 @@
+package com.imed.costaccount.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.dto
+ * @date 2021-07-27 15:33
+ */
+@Data
+@ApiModel("保存院区参数dto参数")
+public class HospitalSaveDto {
+
+    @ApiModelProperty(name = "name",value = "医院或院区名称")
+    @NotNull(message = "医院/病区的名称不能为空")
+    private String name;
+
+    @ApiModelProperty(name = "is_hospital",value = "是否为院区（0.不是，1.是）默认为0")
+    @NotNull(message = "是否为院区状态不能为空")
+    private Integer isHospital;
+
+    @ApiModelProperty(name = "parentId",value = "如果是院区医院的名称，默认为")
+    @NotNull(message = "医院/病区的名称不能为空")
+    private Integer parentId;
+
+    @ApiModelProperty(name = "parentName",value = "医院唯一标识，院区不存在次内容")
+    @NotNull(message = "医院唯一标识parentName不能为空")
+    private String parentName;
+
+    @ApiModelProperty(name = "sign",value = "医院唯一标识，院区不存在次内容")
+    private String sign;
+
+    @ApiModelProperty(name = "createTime",value = "创建时间")
+    private Long createTime;
+}

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

@@ -3,7 +3,8 @@ package com.imed.costaccount.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.Hospital;
-import com.imed.costaccount.model.dto.HosptailDto;
+import com.imed.costaccount.model.dto.HospitalDto;
+import com.imed.costaccount.model.dto.HospitalSaveDto;
 import com.imed.costaccount.model.vo.CommonVO;
 
 import java.util.List;
@@ -41,14 +42,14 @@ public interface HospitalService extends IService<Hospital> {
 
     /**
      * 添加医院信息
-     * @param hosptailDto
+     * @param hospitalSaveDto
      */
-    void saveHosptail(HosptailDto hosptailDto);
+    void saveHosptail(HospitalSaveDto hospitalSaveDto);
 
     /**
      * 修改医院信息
-     * @param hosptailDto
+     * @param hospitalDto
      */
-    void updateByHosptail(HosptailDto hosptailDto);
+    void updateByHosptail(HospitalDto hospitalDto);
 }
 

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

@@ -1,25 +1,23 @@
 package com.imed.costaccount.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.mapper.DepartmentMapper;
 import com.imed.costaccount.model.Department;
-import com.imed.costaccount.model.dto.DepartmentDto;
 import com.imed.costaccount.model.dto.DepartmentRequest;
 import com.imed.costaccount.model.vo.DepartmentVO;
 import com.imed.costaccount.service.DepartmentService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.Objects;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.util.StringUtils;
-
 @Service("departmentService")
 public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
 
@@ -92,8 +90,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         }
         baseMapper.deleteById(id);
         // 新增操作
-        department.setId(null);
-        department.setCreateTime(System.currentTimeMillis());
-        baseMapper.insert(department);
+        Department departmentResponse = BeanUtil.convertObj(departmentRequest, Department.class);
+        departmentResponse.setId(null);
+        departmentResponse.setCreateTime(System.currentTimeMillis());
+        baseMapper.insert(departmentResponse);
     }
 }

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

@@ -9,7 +9,8 @@ import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.HospitalMapper;
 import com.imed.costaccount.model.Hospital;
-import com.imed.costaccount.model.dto.HosptailDto;
+import com.imed.costaccount.model.dto.HospitalDto;
+import com.imed.costaccount.model.dto.HospitalSaveDto;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.HosptailVO;
 import com.imed.costaccount.service.HospitalService;
@@ -24,6 +25,9 @@ import java.util.List;
 import java.util.Objects;
 
 
+/**
+ * @author 11290
+ */
 @Service("hosptailService")
 public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> implements HospitalService {
 
@@ -50,13 +54,11 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     /**
      * 添加医院信息
      *
-     * @param hosptailDto
+     * @param hospitalSaveDto
      */
     @Override
-    public void saveHosptail(HosptailDto hosptailDto) {
-        hosptailDto.setCreateTime(System.currentTimeMillis());
-        // TODO 可能需要补充没有传递的数据
-        Hospital hospital = BeanUtil.convertObj(hosptailDto, Hospital.class);
+    public void saveHosptail(HospitalSaveDto hospitalSaveDto) {
+        Hospital hospital = BeanUtil.convertObj(hospitalSaveDto, Hospital.class);
         hospital.setCreateTime(System.currentTimeMillis());
         baseMapper.insert(hospital);
     }
@@ -64,19 +66,21 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     /**
      * 修改医院信息
      *
-     * @param hosptailDto
+     * @param hospitalDto
      */
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
-    public void updateByHosptail(HosptailDto hosptailDto) {
+    public void updateByHosptail(HospitalDto hospitalDto) {
         Hospital hospital = baseMapper.selectOne(new QueryWrapper<Hospital>().lambda().
-                eq(!StringUtils.isEmpty(hosptailDto.getId()), Hospital::getId, hosptailDto.getId()));
+                eq(!StringUtils.isEmpty(hospitalDto.getId()), Hospital::getId, hospitalDto.getId()));
         if (Objects.isNull(hospital)) {
             throw new CostException("不存在相关医院信息");
         }
         baseMapper.deleteById(hospital.getId());
-        Hospital hospitalRequest = BeanUtil.convertObj(hospital, Hospital.class);
+        Hospital hospitalRequest = BeanUtil.convertObj(hospitalDto, Hospital.class);
         hospitalRequest.setId(null);
+        hospitalRequest.setCreateTime(System.currentTimeMillis());
+        hospitalRequest.setSign(hospital.getSign());
         baseMapper.insert(hospitalRequest);
     }
 

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

@@ -4,7 +4,8 @@ import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.User;
-import com.imed.costaccount.model.dto.HosptailDto;
+import com.imed.costaccount.model.dto.HospitalDto;
+import com.imed.costaccount.model.dto.HospitalSaveDto;
 import com.imed.costaccount.service.HospitalService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -67,8 +68,8 @@ public class HospitalController {
      */
     @PostMapping("/save")
     @ApiOperation("保存医院信息")
-    public Result save(@RequestBody HosptailDto hosptailDto){
-        hospitalService.saveHosptail(hosptailDto);
+    public Result save(@RequestBody HospitalSaveDto hospitalSaveDto){
+        hospitalService.saveHosptail(hospitalSaveDto);
         return Result.ok();
     }
 
@@ -78,9 +79,9 @@ public class HospitalController {
      */
     @PutMapping("/update")
     @ApiOperation("修改医院信息")
-    public Result update(@RequestBody HosptailDto hosptailDto){
+    public Result update(@RequestBody HospitalDto hospitalDto){
         // 作废操作
-        hospitalService.updateByHosptail(hosptailDto);
+        hospitalService.updateByHosptail(hospitalDto);
         return Result.ok();
     }