添加web登录后查询用户信息接口

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

 package com.pica.cloud.account.account.server.controller;
 
-
-import com.pica.cloud.account.account.server.entity.EncryptEntity;
-import com.pica.cloud.account.account.server.entity.LogLoginEntity;
-import com.pica.cloud.account.account.server.entity.LoginResult;
+import com.pica.cloud.account.account.server.entity.*;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
@@ -16,6 +13,7 @@ import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.utils.utils.CommonUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
@@ -154,4 +152,17 @@ public class LoginController extends AccountBaseController {
             throw new AccountException(AccountExceptionEnum.PICA_LOGIN_AGAIN);
         }
     }
+
+    @ApiOperation(value = "web登录获取用户信息")
+    @GetMapping("/login/web")
+    public PicaResponse<LoginResultWeb> getLoginResult() {
+        long doctorId = super.getDoctorIdByToken();
+        PICAPDoctor doctor = loginService.queryDoctor(doctorId);
+        LoginResultWeb resultWeb = new LoginResultWeb();
+        resultWeb.setPicapDoctor(doctor);
+        if (doctor.getStatus() != null) {
+            resultWeb.setCertifyDoc(doctor.getStatus().intValue());
+        }
+        return PicaResponse.toResponse(resultWeb);
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/entity/LoginResultWeb.java

+package com.pica.cloud.account.account.server.entity;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @author andong
+ * @create 2019/10/16
+ */
+@ApiModel
+public class LoginResultWeb {
+
+    private int certifyDoc = 1;
+    private int isExist = 1;
+    private PICAPDoctor picapDoctor;
+
+    public int getCertifyDoc() {
+        return certifyDoc;
+    }
+
+    public void setCertifyDoc(int certifyDoc) {
+        this.certifyDoc = certifyDoc;
+    }
+
+    public int getIsExist() {
+        return isExist;
+    }
+
+    public void setIsExist(int isExist) {
+        this.isExist = isExist;
+    }
+
+    public PICAPDoctor getPicapDoctor() {
+        return picapDoctor;
+    }
+
+    public void setPicapDoctor(PICAPDoctor picapDoctor) {
+        this.picapDoctor = picapDoctor;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/entity/PICAPDoctorEducation.java

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+/**
+ * @author andong
+ * @create 2019/10/16
+ */
+public class PICAPDoctorEducation {
+    private static final long serialVersionUID = 1L;
+    private Integer id = 0;
+    private Integer doctor_id = 0;
+    private String school_name = "";
+    private Integer major_id = 0;
+    private String major_name = "";
+    private String education_id = "";
+    private String education_name = "";
+    private String year = "";
+    private Integer delete_flag;
+    private Integer creat_id;
+    protected Date creat_time;
+    private Integer modify_id;
+    protected Date modify_time;
+    private Integer create_id;
+    protected Date create_time;
+
+
+    public String getMajor_name() {
+        return this.major_name;
+    }
+
+    public void setMajor_name(String major_name) {
+        this.major_name = major_name;
+    }
+
+    public String getEducation_name() {
+        return this.education_name;
+    }
+
+    public void setEducation_name(String education_name) {
+        this.education_name = education_name;
+    }
+
+    public Integer getId() {
+        return this.id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDoctor_id() {
+        return this.doctor_id;
+    }
+
+    public void setDoctor_id(Integer doctor_id) {
+        this.doctor_id = doctor_id;
+    }
+
+    public String getSchool_name() {
+        return this.school_name;
+    }
+
+    public void setSchool_name(String school_name) {
+        this.school_name = school_name;
+    }
+
+    public Integer getMajor_id() {
+        return this.major_id;
+    }
+
+    public void setMajor_id(Integer major_id) {
+        this.major_id = major_id;
+    }
+
+    public String getEducation_id() {
+        return this.education_id;
+    }
+
+    public void setEducation_id(String education_id) {
+        this.education_id = education_id;
+    }
+
+    public String getYear() {
+        return this.year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public Integer getCreate_id() {
+        return this.create_id;
+    }
+
+    public void setCreate_id(Integer create_id) {
+        this.create_id = create_id;
+    }
+
+    public Date getCreate_time() {
+        return this.create_time;
+    }
+
+    public void setCreate_time(Date create_time) {
+        this.create_time = create_time;
+    }
+
+    public Integer getDelete_flag() {
+        return this.delete_flag;
+    }
+
+    public void setDelete_flag(Integer delete_flag) {
+        this.delete_flag = delete_flag;
+    }
+
+    public Integer getCreat_id() {
+        return this.creat_id;
+    }
+
+    public void setCreat_id(Integer creat_id) {
+        this.creat_id = creat_id;
+    }
+
+    public Date getCreat_time() {
+        return this.creat_time;
+    }
+
+    public void setCreat_time(Date creat_time) {
+        this.creat_time = creat_time;
+    }
+
+    public Integer getModify_id() {
+        return this.modify_id;
+    }
+
+    public void setModify_id(Integer modify_id) {
+        this.modify_id = modify_id;
+    }
+
+    public Date getModify_time() {
+        return this.modify_time;
+    }
+
+    public void setModify_time(Date modify_time) {
+        this.modify_time = modify_time;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorMapper.java

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.mapper;
 
 import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.entity.DoctorEntity;
+import com.pica.cloud.account.account.server.entity.PICAPDoctor;
 import org.apache.ibatis.annotations.Param;
 
 public interface DoctorMapper {
@@ -69,4 +70,6 @@ public interface DoctorMapper {
      * @return
      */
     int unbindWeChat(@Param("acctId") int acctId);
+
+    PICAPDoctor queryDoctor(long doctorId);
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java

 package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.server.entity.LoginResult;
+import com.pica.cloud.account.account.server.entity.PICAPDoctor;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 
 public interface LoginService {
@@ -49,4 +50,6 @@ public interface LoginService {
      * @param request 参数模型
      */
     void bindWeChat(BaseRequest request);
+
+    PICAPDoctor queryDoctor(long doctorId);
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -17,6 +17,7 @@ import com.pica.cloud.account.account.server.util.TokenUtils;
 import com.pica.cloud.account.account.server.util.WeChatUtils;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.redis.ICacheClient;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -78,6 +78,20 @@ public class LoginServiceImpl implements LoginService {
     @Value("${weChatURL}")
     private String weChatURL;
 
+    private static final String DEFAULT_DOCTOR_PICTURE_URL = "/File/doctor_default.png";
+    public static Map<String, String> PIC_TYPE_MAP = new HashMap();
+    static {
+        PIC_TYPE_MAP.put("jpg", "FFD8FF");
+        PIC_TYPE_MAP.put("jpeg", "FFD8FF");
+        PIC_TYPE_MAP.put("png", "89504E47");
+        PIC_TYPE_MAP.put("gif", "47494638");
+        PIC_TYPE_MAP.put("bmp", "424D");
+        PIC_TYPE_MAP.put("png", "89504E470D0a1a0a0000");
+        PIC_TYPE_MAP.put("bmp", "424d228c010000000000");
+        PIC_TYPE_MAP.put("bmp", "424d8240090000000000");
+        PIC_TYPE_MAP.put("bmp", "424d8e1b030000000000");
+    }
+
     @Override
     public LoginResult login(BaseRequest request) {
         String mobile = request.getMobile();
@@ -308,4 +322,24 @@ public class LoginServiceImpl implements LoginService {
         accountWeChatInfoEntity.setLanguage(weChatUserInfoEntity.getLanguage());
         accountWeChatInfoMapper.insertSelective(accountWeChatInfoEntity);
     }
+
+    public PICAPDoctor queryDoctor(long doctorId) {
+        PICAPDoctor doctor = doctorInfoMapper.queryDoctor(doctorId);
+        doctor.setAvatar_image_url(this.processDoctorAvatar(doctor.getAvatar_image_url()));
+        return doctor;
+    }
+
+    private String processDoctorAvatar(String avatar_image_url) {
+        if (StringUtils.isEmpty(avatar_image_url)) {
+            return DEFAULT_DOCTOR_PICTURE_URL;
+        } else {
+            int pos = avatar_image_url.lastIndexOf(".");
+            if (pos < 0) {
+                return DEFAULT_DOCTOR_PICTURE_URL;
+            } else {
+                String ext = avatar_image_url.substring(pos + 1, avatar_image_url.length()).toLowerCase();
+                return !PIC_TYPE_MAP.containsKey(ext) ? DEFAULT_DOCTOR_PICTURE_URL : avatar_image_url;
+            }
+        }
+    }
 }

server/src/main/resources/bootstrap-dev.properties

@@ -27,6 +27,7 @@ ribbon.ConnectTimeout=60000
 #------------ Please don't change above configurations ------------
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
+#spring.jackson.default-property-inclusion=non_null
 memcached.url=192.168.130.230:11211
 #微信登陆
 weChatAppID=wx5103ed453ef2dbe8

server/src/main/resources/mybatis/DoctorMapper.xml

@@ -994,4 +994,17 @@
       set unionid = ''
       where acct_id = #{acctId}
     </update>
+
+    <select id="queryDoctor" resultType="com.pica.cloud.account.account.server.entity.PICAPDoctor" parameterType="java.lang.Long">
+        SELECT aa.id, aa.sex, aa.name, aa.mobile_phone, aa.status,
+        aa.type, aa.hospital_id, aa.department_id, aa.title_id,aa.card,
+        aa.hospital as hospital, aa.department, aa.title, aa.cert_image_url,
+        aa.avatar_image_url, aa.auth_time, aa.honor, aa.skills, aa.thumb_up_num, aa.email,
+        aa.qrcode, aa.nickname, aa.personal_sign, aa.delete_flag, aa.creat_id, aa.creat_time,
+        aa.modify_id, aa.modify_time, aa.praise_num, aa.password, aa.info, aa.rank, aa.province,
+        aa.city, aa.county, aa.invite_code, aa.gaoxueya_password, aa.sms_send_num, aa.total_sms_send_num,
+        aa.entire_flag, aa.doctor_project_type,aa.invite_start_time
+        FROM p_doctor aa
+        where aa.id = #{doctorId} and aa.delete_flag = 1
+    </select>
 </mapper>
\ No newline at end of file