代码优化

icssman-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -15,6 +15,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddDeptInfoVO;
+import com.diagbot.vo.DeleteDeptInfoVO;
 import com.diagbot.vo.GetDeptInfoDetialsVO;
 import com.diagbot.vo.GetDeptInfoVO;
 import com.diagbot.vo.UpdateDeptInfoVO;
@@ -88,18 +89,18 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
     /**
      * 删除科室信息
      *
-     * @param updateDeptInfoVO
+     * @param deleteDeptInfoVO
      * @return
      */
-    public Boolean deleteDeptInfo(UpdateDeptInfoVO updateDeptInfoVO) {
+    public Boolean deleteDeptInfo(DeleteDeptInfoVO deleteDeptInfoVO) {
         //判断科室是否已被删除
-        if(deptInfoIsDeletedStatus(updateDeptInfoVO.getId())){
+        if(deptInfoIsDeletedStatus(deleteDeptInfoVO.getId())){
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "科室已删除");
         }
         //删除操作
         DeptInfo deptInfo = new DeptInfo();
-        BeanUtil.copyProperties(updateDeptInfoVO, deptInfo);
+        BeanUtil.copyProperties(deleteDeptInfoVO, deptInfo);
         deptInfo.setModifier(UserUtils.getCurrentPrincipleID());
         deptInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
         deptInfo.setGmtModified(DateUtil.now());
@@ -167,7 +168,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @param deptId
      * @return
      */
-    public Boolean deptInfoIsDeletedStatus(String deptId){
+    public Boolean deptInfoIsDeletedStatus(Long deptId){
         QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",IsDeleteEnum.Y.getKey());
         queryWrapper.eq("id",deptId);

icssman-service/src/main/java/com/diagbot/vo/UpdateDeptInfoVO.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
 @Setter
 public class UpdateDeptInfoVO {
     @NotBlank(message = "请输入id")
-    private String id;
+    private Long id;
     /**
      * 科室名称
      */

icssman-service/src/main/java/com/diagbot/web/DeptInfoController.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.facade.DeptInfoFacade;
 import com.diagbot.vo.AddDeptInfoVO;
+import com.diagbot.vo.DeleteDeptInfoVO;
 import com.diagbot.vo.GetDeptInfoDetialsVO;
 import com.diagbot.vo.GetDeptInfoVO;
 import com.diagbot.vo.UpdateDeptInfoVO;
@@ -65,8 +66,8 @@ public class DeptInfoController {
     @PostMapping("/deleteDeptInfo")
     @SysLogger("deleteDeptInfo")
     @Transactional
-    public RespDTO<Boolean> deleteDeptInfo(@Valid @RequestBody UpdateDeptInfoVO updateDeptInfoVO) {
-        Boolean data = deptInfoFacade.deleteDeptInfo(updateDeptInfoVO);
+    public RespDTO<Boolean> deleteDeptInfo(@Valid @RequestBody DeleteDeptInfoVO deleteDeptInfoVO) {
+        Boolean data = deptInfoFacade.deleteDeptInfo(deleteDeptInfoVO);
         return RespDTO.onSuc(data);
     }