修复登录bug

docus-client-interface/src/main/java/com/docus/server/api/recovery/RcvSysUserApi.java

@@ -1,5 +1,6 @@
 package com.docus.server.api.recovery;
 
+import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.dto.recovery.rcvsysuser.AddRcvSysUserDTO;
@@ -37,7 +38,7 @@ public interface RcvSysUserApi {
      * @return
      */
     @PostMapping("/login")
-    String login(@RequestBody LoginRcvSysUserDTO loginRcvSysUserDTO);
+    CommonResult<String> login(@RequestBody LoginRcvSysUserDTO loginRcvSysUserDTO);
 
     /**
      * 退出登录

docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java

@@ -1,5 +1,6 @@
 package com.docus.server.controller;
 
+import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.infrastructure.web.request.SearchDTO;
 import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.api.recovery.RcvSysUserApi;
@@ -35,8 +36,9 @@ public class RcvSysUserController implements RcvSysUserApi {
     @Override
     @ApiOperation("登录")
     @IgnoreValidate
-    public String login(LoginRcvSysUserDTO userDTO) {
+    public CommonResult<String> login(LoginRcvSysUserDTO userDTO) {
-        return iRcvSysUserService.doLogin(userDTO.getUserName(), userDTO.getUserPwd());
+        String token = iRcvSysUserService.doLogin(userDTO.getUserName(), userDTO.getUserPwd());
+        return CommonResult.success(token, "登录成功");
     }
 
     @ApiOperation("退出登录")

docus-recovery/src/main/java/com/docus/server/convert/RcvBasicConvert.java

@@ -1,6 +1,7 @@
 package com.docus.server.convert;
 
 import com.docus.core.util.DateUtil;
+import com.docus.core.util.ListUtils;
 import com.docus.infrastructure.web.response.PageResult;
 import com.docus.server.dto.recovery.rcvbasic.AddRcvBasicDTO;
 import com.docus.server.dto.recovery.rcvbasic.EditRcvBasicDTO;
@@ -9,12 +10,14 @@ import com.docus.server.entity.recovery.RcvBasic;
 import com.docus.server.vo.recovery.rcvbasic.RcvBasicVO;
 import com.docus.server.vo.recovery.rcvbasic.SearchRcvBasicVO;
 import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 import org.springframework.beans.BeanUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static com.docus.core.util.DateUtil.PATTERN_DATETIME;
 
@@ -38,6 +41,28 @@ public interface RcvBasicConvert {
     @Mappings({})
     List<RcvBasic> convertAddDOList(List<AddRcvBasicDTO> addRcvBasicDTO);
 
+    @Mappings({})
+    RcvBasic convertDO(AddRcvBasicDTO addRcvBasicDTO, @MappingTarget RcvBasic rcvBasic);
+
+
+    default List<RcvBasic> convertUpdateDOList(List<AddRcvBasicDTO> updateDataList, List<RcvBasic> rcvBasicsDO) {
+        Map<Long, AddRcvBasicDTO> idToDOMap = ListUtils.toMap(updateDataList, AddRcvBasicDTO::getId);
+
+        List<RcvBasic> basics = new ArrayList<>();
+
+        for (RcvBasic rcvBasic : rcvBasicsDO) {
+            Long id = rcvBasic.getId();
+            if (idToDOMap.containsKey(id)) {
+                AddRcvBasicDTO addRcvBasicDTO = idToDOMap.get(id);
+                basics.add(RcvBasicConvert.INSTANCE.convertDO(addRcvBasicDTO, rcvBasic));
+            }
+        }
+
+        return basics;
+
+    }
+
+
     @Mappings({})
     List<RcvBasic> convertEditDOList(List<EditRcvBasicDTO> editRcvBasicDTO);
 
@@ -72,5 +97,6 @@ public interface RcvBasicConvert {
         return AddRcvBasicDTO;
     }
 
+
 }
 

docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java

@@ -364,7 +364,11 @@ public class RcvBasicServiceImpl implements IRcvBasicService {
             p.setRecoveryState(RecoveryStateEnum.RECYCLED_WAITING);
         });
 
-        List<RcvBasic> update = RcvBasicConvert.INSTANCE.convertAddDOList(updateDataList);
+
+        List<Long> ids = ListUtils.distinctSelect(updateDataList, AddRcvBasicDTO::getId);
+        List<RcvBasic> rcvBasicsDO = iRcvBasicDao.findByIds(ids);
+
+        List<RcvBasic> update = RcvBasicConvert.INSTANCE.convertUpdateDOList(updateDataList, rcvBasicsDO);
 
         iRcvBasicDao.saveBatch(insert, IBaseDao.DEFAULT_BATCH_SIZE);
         iRcvBasicDao.updateBatchById(update, IBaseDao.DEFAULT_BATCH_SIZE);

docus-recovery/src/main/java/com/docus/server/validate/MedicalImportExcelValidator.java

@@ -48,9 +48,9 @@ public class MedicalImportExcelValidator {
                 throw new BaseException("患者姓名不能为空");
             }
 
-            if (Func.isBlank(medicalInfoExcelModel.getAttendingName())) {
+//            if (Func.isBlank(medicalInfoExcelModel.getAttendingName())) {
-                throw new BaseException("住院医师不能为空");
+//                throw new BaseException("住院医师不能为空");
-            }
+//            }
 
             String excelModelDisDate = medicalInfoExcelModel.getDisDate();
             if (Func.isBlank(excelModelDisDate)) {