居民-密码接口

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -26,13 +26,13 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    /**
	 * saas配置id
	 */
    @NotNull(message = "saasid不可为空")
//    @NotNull(message = "saasid不可为空")
	private String saasId;
    /**
	 * 身份证号
	 */
    @NotNull(message = "身份证号不可为空")
//    @NotNull(message = "身份证号不可为空")
	private String idcard;
    /**
@@ -53,19 +53,19 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    /**
	 * 生日
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date birthday;
    /**
	 * 性别，1男，2女
	 */
    @Range(min = 1, max = 2, message = "1-男，2-女")
//    @Range(min = 1, max = 2, message = "1-男，2-女")
	private Integer sex;
    /**
	 * 手机号
	 */
    @Length(min = 11,max = 11,message = "手机号长度为11位")
//    @Length(min = 11,max = 11,message = "手机号长度为11位")
	private String mobile;
    /**
@@ -118,6 +118,11 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
     */
    private String streetName;
    /**
     * 地址
     */
    private String address;
    /**
     * 居住省代码
     */
@@ -391,6 +396,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.streetName = streetName;
    }
    @Column(name = "committee_code")
    public String getCommitteeCode() {
        return committeeCode;
    }
@@ -399,6 +405,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.committeeCode = committeeCode;
    }
    @Column(name = "committee_name")
    public String getCommitteeName() {
        return committeeName;
    }
@@ -407,7 +414,16 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.committeeName = committeeName;
    }
	@Column(name = "points")
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    @Column(name = "points")
    public String getPoints() {
        return points;
    }

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -470,6 +470,8 @@ public class BaseRequestMapping {
        public static final String completeInfo  = "/completeInfo";
        public static final String getCompletedInfo  = "/getCompletedInfo";
        public static final String idcardOccupied  = "/idcardOccupied";
        public static final String updateMobile  = "/updateMobile";
        public static final String resetPassword  = "/resetPassword";
    }
   /**
@@ -481,6 +483,7 @@ public class BaseRequestMapping {
        public static final String bindMedicareCard  = "/bindMedicareCard";
        public static final String bindPatientIDCard  = "/bindPatientIDCard";
        public static final String bindSocialSecurityCard  = "/bindSocialSecurityCard";
        public static final String unBindCard  = "/unBindCard";
    }

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientEndpoint.java

@@ -4,7 +4,6 @@ import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.sms.SmsDO;
import com.yihu.jw.entity.base.sms.SmsTemplateDO;
import com.yihu.jw.patient.service.personal_Info.PatientService;
import com.yihu.jw.patient.util.ConstantUtils;
import com.yihu.jw.restmodel.base.patient.BasePatientVO;
import com.yihu.jw.restmodel.base.sms.SmsVO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -96,15 +95,31 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "完善信息")
    public Envelop completeInfo(@ApiParam(name = "jsonData", value = "jsonData数据", required = true) @RequestParam String jsonData,
                                @ApiParam(name = "headPortrait", value = "头像", required = false) @RequestParam MultipartFile headPortrait) throws Exception {
        return success(patientService.completePatientDetails(headPortrait,jsonData));
        return success(patientService.completePatientDetails(headPortrait, jsonData));
    }
    @GetMapping(value = BaseRequestMapping.BasePatient.sendCaptcha)
    @PostMapping(value = BaseRequestMapping.BasePatient.updateMobile)
    @ApiOperation(value = "修改手机号")
    public Envelop updateMobile(@ApiParam(name = "id", value = "居民标识", required = true) @RequestParam String id,
                                @ApiParam(name = "newMobile", value = "新的手机号", required = true) @RequestParam String newMobile,
                                @ApiParam(name = "captcha", value = "验证码", required = true) @RequestParam String captcha) throws Exception {
        return success(patientService.updateMobile(id, newMobile, captcha));
    }
    @PostMapping(value = BaseRequestMapping.BasePatient.resetPassword)
    @ApiOperation(value = "设置密码")
    public Envelop updatePasswd(@ApiParam(name = "id", value = "居民标识", required = true) @RequestParam String id,
                                @ApiParam(name = "password", value = "密码", required = true) @RequestParam String password) throws Exception {
        return success(patientService.resetPassword(id, password));
    }
    @GetMapping(value = BaseRequestMapping.BasePatient.getCompletedInfo)
    @ApiOperation(value = "查询完善后信息详情")
    public ObjEnvelop<BasePatientVO> getCompletedInfo(
            @ApiParam(name = "id", value = "居民标识")
            @RequestParam(value = "id", required = true) String id) throws Exception {
        return success(patientService.getCompletedDetails(id),BasePatientVO.class);
        return success(patientService.getCompletedDetails(id), BasePatientVO.class);
    }
    @GetMapping(value = BaseRequestMapping.BasePatient.sendCaptcha)
@@ -114,7 +129,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "mobile", required = true) String mobile,
            @ApiParam(name = "type", value = "短信验证码类型", required = true)
            @RequestParam(value = "type") SmsTemplateDO.Type type) throws Exception {
        SmsDO smsDO = baseSmsGatewayService.send(clientId, type,mobile);
        SmsDO smsDO = baseSmsGatewayService.send(clientId, type, mobile);
        return success(smsDO, SmsVO.class);
    }

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientMedicareCardEndpoint.java

@@ -78,6 +78,14 @@ public class PatientMedicareCardEndpoint extends EnvelopRestEndpoint {
        return success("success");
    }
    @PostMapping(value = BaseRequestMapping.PatientMedicareCard.unBindCard)
    @ApiOperation(value = "解除绑定卡")
    public Envelop unBindCard(
            @ApiParam(name = "cardId", value = "卡片id", required = true) @RequestParam String cardId) throws Exception {
        patientMedicareCardService.unBindCard(cardId);
        return success("success");
    }
    @GetMapping(value = BaseRequestMapping.PatientMedicareCard.queryCardById)
    @ApiOperation(value = "获取绑定的卡")
    public ListEnvelop queryCard(
@@ -100,7 +108,8 @@ public class PatientMedicareCardEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            @RequestParam(value = "size") int
                    size) throws Exception {
        List<PatientMedicareCardDO> patientMedicareCards = patientMedicareCardService.search(fields, filters, sorts, page, size);
        int count = (int) patientMedicareCardService.getCount(filters);
        return success(patientMedicareCards, count, page, size, PatientMedicareCardVO.class);

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/FeedbackEndpoint.java

@@ -39,16 +39,6 @@ public class FeedbackEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private FeedbackService feedbackService;
    @PostMapping(value = BaseRequestMapping.Feedback.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<FeedbackVO> create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        FeedbackDO feedback = toEntity(jsonData, FeedbackDO.class);
        feedback = feedbackService.save(feedback);
        return success(feedback, FeedbackVO.class);
    }
    @PostMapping(value = BaseRequestMapping.AccountAppeal.CREATE)
    @ApiOperation(value = "创建反馈")
    public ObjEnvelop<FeedbackVO> create(

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/PatientApplyLogService.java

@@ -3,6 +3,8 @@ package com.yihu.jw.patient.service.myFamily;
import com.yihu.jw.entity.myFamily.PatientApplyLog;
import com.yihu.jw.patient.dao.myFamily.PatientApplyLogDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author liuwenbin on 2018/11/30.

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientService.java

@@ -9,16 +9,21 @@ import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientService;
import com.yihu.jw.patient.util.ConstantUtils;
import com.yihu.jw.restmodel.iot.common.UploadVO;
import com.yihu.jw.sms.service.BaseSmsService;
import com.yihu.utils.security.MD5;
import org.apache.commons.lang3.StringUtils;
import org.csource.common.MyException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.List;
/**
@@ -37,6 +42,8 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
    @Autowired
    private FileUploadService fileUploadService;
    @Value("fastDFS.fastdfs_file_url")
    private String fastdfsUrl;
    /**
     * 设置登录密码
     * @param id
@@ -116,6 +123,18 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
        //如果未上传头像，使用默认头像
        if(null == headPortrait){
            patientDO.setPhoto("default");
        }else{
            UploadVO uploadedFile = null;
            try {
                uploadedFile = fileUploadService.uploadImg(headPortrait.getInputStream(),headPortrait.getOriginalFilename(),headPortrait.getSize(),fastdfsUrl);
            } catch (NoSuchAlgorithmException e) {
                e.printStackTrace();
            } catch (IOException e) {
                e.printStackTrace();
            } catch (MyException e) {
                e.printStackTrace();
            }
            patientDO.setPhoto(uploadedFile.getFullUrl());
        }
        Assert.notNull(patientDO.getName(),"姓名不可为空！");
        Assert.notNull(patientDO.getSex(),"性别不可为空！");
@@ -149,7 +168,7 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
        if(null == patient){
            throw new PatientNotFoundException("居民不存在!");
        }
       return StringUtils.isEmpty(patient.getIdcard());
       return !StringUtils.isEmpty(patient.getIdcard());
    }
    /**