Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支

xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/HealthConsultationService.java

@@ -33,7 +33,7 @@ public interface HealthConsultationService {
     /**
      * 单查科室人员
      *
-     * @param departmentId 科室id
+     * @param hospitalPersonInfo 科室id
      * @return AjaxResult
      */
     List<HospitalPersonInfo> selectHospitalPerson(HospitalPersonInfo hospitalPersonInfo);

xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalpersoninfo/HospitalPersonInfo.java

@@ -6,12 +6,6 @@ import com.xinelu.common.custominterface.Insert;
 import com.xinelu.common.custominterface.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,6 +14,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * 健康咨询-科室人员信息对象 hospital_person_info
  *
@@ -33,6 +32,7 @@ import org.hibernate.validator.constraints.Length;
 @ApiModel(value = "健康咨询-科室人员信息对象", description = "hospital_person_info")
 public class HospitalPersonInfo extends BaseDomain implements Serializable {
     private static final long serialVersionUID = 8750821883343940709L;
+
     /**
      * 主键id
      */
@@ -75,6 +75,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "科室人员联系电话")
     @Excel(name = "科室人员联系电话")
+    @NotBlank(message = "科室人员联系电话不能为空！", groups = {Insert.class, Update.class})
     private String personPhone;
 
     /**
@@ -85,7 +86,10 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
     @NotBlank(message = "科室人员地址不能为空！", groups = {Insert.class, Update.class})
     @Length(max = 300, message = "科室人员地址不能超过300位", groups = {Insert.class, Update.class})
     private String personAddress;
-    /**性别*/
+
+    /**
+     * 性别
+     */
     private String sex;
 
     /**
@@ -129,6 +133,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
     /**
      * 科室人员头像地址
      */
+    @NotBlank(message = "科室人员头像地址不能为空", groups = {Insert.class, Update.class})
     private String personPictureUrl;
 
     /**

xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java

@@ -18,16 +18,6 @@ import com.xinelu.manage.mapper.hospitalpersoninfo.HospitalPersonInfoMapper;
 import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
 import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
 import com.xinelu.system.mapper.SysUserMapper;
-import java.io.File;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.BooleanUtils;
@@ -35,6 +25,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.io.File;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * 健康咨询-科室人员信息Service业务层处理
  *
@@ -78,7 +75,8 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
         return hospitalPersonInfoMapper.selectHospitalPersonInfoList(hospitalPersonInfo);
     }
 
-	@Override public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) {
+    @Override
+    public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) {
         return hospitalPersonInfoMapper.selectList(hospitalPersonInfo);
     }
 
@@ -114,6 +112,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
             return AjaxResult.error("咨询费用不能为0或者负数，请重新输入");
         }
         //创建人 创建时间 科室人员编码
+        hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone());
         hospitalPersonInfo.setPersonCode(Constants.PERSON_CODE + generateSystemCodeUtil.generateSystemCode(Constants.PERSON_CODE));
         hospitalPersonInfo.setCreateTime(LocalDateTime.now());
         hospitalPersonInfo.setCreateBy(SecurityUtils.getUsername());
@@ -136,8 +135,9 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
         }
         // 保存到sys_user表
         SysUser sysUser = new SysUser();
-		sysUser.setUserName(hospitalPersonInfo.getPersonAccount());
+        sysUser.setUserName(hospitalPersonInfo.getPersonPhone());
-		sysUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
+        sysUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
+        sysUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
         sysUser.setNickName(hospitalPersonInfo.getPersonName());
         sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
         sysUser.setHospitalId(hospitalPersonInfo.getHospitalId());
@@ -169,6 +169,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
 		    return AjaxResult.error("咨询费用不能为0或者负数，请重新输入");
 	    }
         //修改人 修改时间
+        hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone());
         hospitalPersonInfo.setUpdateTime(LocalDateTime.now());
         hospitalPersonInfo.setUpdateBy(SecurityUtils.getUsername());
         hospitalPersonInfoMapper.updateHospitalPersonInfo(hospitalPersonInfo);
@@ -178,8 +179,9 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
         List<SysUser> userList = userMapper.selectUserList(sysUser);
         if (CollectionUtils.isEmpty(userList)) {
             SysUser newUser = new SysUser();
-			newUser.setUserName(hospitalPersonInfo.getPersonAccount());
+            newUser.setUserName(hospitalPersonInfo.getPersonPhone());
-			newUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
+            newUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
+            newUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
             newUser.setNickName(hospitalPersonInfo.getPersonName());
             newUser.setHospitalPersonId(hospitalPersonInfo.getId());
             newUser.setHospitalId(hospitalPersonInfo.getHospitalId());
@@ -188,8 +190,9 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
             userMapper.insertUser(newUser);
         } else {
             SysUser updUser = userList.get(0);
-			updUser.setUserName(hospitalPersonInfo.getPersonAccount());
+            updUser.setUserName(hospitalPersonInfo.getPersonPhone());
-			updUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
+            updUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
+            updUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
             updUser.setNickName(hospitalPersonInfo.getPersonName());
             updUser.setHospitalPersonId(hospitalPersonInfo.getId());
             updUser.setHospitalId(hospitalPersonInfo.getHospitalId());
@@ -351,6 +354,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
 
     /**
      * 修改医生手机号和密码
+     *
      * @param hospitalPersonInfo
      * @return
      */
@@ -360,11 +364,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
     }
 
     /**
+     * @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo
      * @Author mengkuiliang
      * @Description 根据科室人员编码查询人员信息
      * @Date 2023-10-20 020 14:37
      * @Param [personCode]
-     * @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo
      **/
     @Override
     public HospitalPersonInfo getByPersonCode(String personCode, String status) {
@@ -372,11 +376,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
     }
 
     /**
+     * @return void
      * @Author mengkuiliang
      * @Description 新增
      * @Date 2023-10-20 020 14:54
      * @Param [body]
-     * @return void
      **/
     @Override
     public int insert(HospitalPersonInfo body) {
@@ -384,11 +388,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
     }
 
     /**
+     * @return int
      * @Author mengkuiliang
      * @Description 根据科室人员编号更新
      * @Date 2023-10-20 020 15:02
      * @Param [hospitalPersonInfo]
-     * @return int
      **/
     @Override
     public int updateByPersonCode(HospitalPersonInfo hospitalPersonInfo) {