Merge branch 'master' of http://git.gdatac.com/sundelong/cnooc_zydeepen-cggl_expert-manage-miniapp

src/main/java/com/cnooc/expert/auth/service/impl/LoginServiceImpl.java

@@ -7,6 +7,7 @@ import com.cnooc.expert.common.exception.BusinessException;
 import com.cnooc.expert.common.exception.GlobalErrorCodeConstants;
 import com.cnooc.expert.common.utils.JwtUtils;
 import com.cnooc.expert.common.utils.Sm2Util;
+import com.cnooc.expert.common.utils.UserUtils;
 import com.cnooc.expert.common.utils.ValidUtils;
 import com.cnooc.expert.external.expert.auth.service.LoginServicesClient;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoAppResp;
@@ -194,7 +195,7 @@ public class LoginServiceImpl implements LoginService {
 
         ZhuanJiaUser zhuanJiaUser = convert2ZhuanjiaUser( expertInfoResp );
         redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getZhuanJiaGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
-
+        UserUtils.setUserId(zhuanJiaUser);
         String token = JwtUtils.createToken(expertInfoResp.getZhuanJiaGuid(),uuidKey);
         //6.返回token
         return token;
@@ -223,10 +224,11 @@ public class LoginServiceImpl implements LoginService {
         }
         //3.生成相应的uuid作为redis的key
         String uuidKey = UUID.randomUUID().toString();
-
+        //expertInfoResp = new ExpertInfoResp();
+        //expertInfoResp.setZhuanJiaGuid("1234");
         ZhuanJiaUser zhuanJiaUser = convert2ZhuanjiaUser( expertInfoResp );
         redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getZhuanJiaGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
-
+        UserUtils.setUserId(zhuanJiaUser);
         String token = JwtUtils.createToken(expertInfoResp.getZhuanJiaGuid(),uuidKey);
 
         return token;

src/main/java/com/cnooc/expert/external/expert/model/request/ExpertInfoAppReq.java

 package com.cnooc.expert.external.expert.model.request;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class ExpertInfoAppReq {
     private String baseGuid;
     private String password;

src/main/java/com/cnooc/expert/external/expert/model/request/ExpertInfoReq.java

 package com.cnooc.expert.external.expert.model.request;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class ExpertInfoReq {
     private String  baseGuid;
     private String  mobile;

src/main/java/com/cnooc/expert/external/expert/model/response/ExpertInfoResp.java

 package com.cnooc.expert.external.expert.model.response;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
-import java.beans.Transient;
 import java.math.BigDecimal;
 import java.util.List;
 
 @Data
 public class ExpertInfoResp {
 
-    private static final long serialVersionUID = -1L;
-
     private String  shenFenZheng;
 
     private Long subjectId;
@@ -46,111 +40,76 @@ public class ExpertInfoResp {
 
     private Boolean sex;
 
-    /*//@JiLuField(name="年龄")*/
     private Short age;
 
-    //@JiLuField(name = "移动电话")
     private String mobile;
 
-    //@JiLuField(name = "常用邮箱")
     private String email;
 
-    //@JiLuField(name = "政治面貌")
     private String zhengZhiMianMao;
 
-    //@JiLuField(name = "外语程度")
     private String waiYuChengDu;//东风去掉该字段
 
-    //@JiLuField(name = "在职学历")//东风修改为 非全日制学历
     private String xueLi;
 
-    //@JiLuField(name = "全日制学历")//东风修改位为全日制学历
     private String xueWei;
 
-    ////@JiLuField(name="最高学历专业")
     private String xueLiZhuanYe;//东风去掉该字段
 
-    ////@JiLuField(name="最高学位专业")//东风去掉该字段
     private String xueWeiZhuanYe;
 
-    //@JiLuField(name = "毕业院校")
     private String biYeYuanXiao;
 
-    //@JiLuField(name = "毕业时间")
     private String graduationDate;
 
-    //@JiLuField(name = "居住地地址")
     private String jiaTingDiZhi;  //通讯地址
 
-    //@JiLuField(name = "住宅邮编")
     private String jiaTingPost;
 
-    //@JiLuField(name = "住宅电话")
     private String jiaTingPhone;
 
-    //@JiLuField(name = "工作状态")
     private Short gongZuoZhuangTai;
 
-    //@JiLuField(name = "供职单位（工作单位）")
     private String gongZuoDanWei;
 
-    //@JiLuField(name = "统一社会信用代码(组织机构代码)")
     private String gongZuoDanWeiBH;
 
-    //@JiLuField(name = "单位地址（工作单位地址）")
     private String gongZuoDanWeiDiZhi;
 
-    //@JiLuField(name = "办公电话")
     private String gongZuoPhone;
 
-    //@JiLuField(name = "职务")
     private String gongZuoZhiWu;
 
-    //@JiLuField(name = "单位邮编")
     private String gongZuoPost;
 
-    //@JiLuField(name = "所学专业")
     private String gongZuoZhuanYeName;//所学专业
 
-    //@JiLuField(name = "任职年限")
     private String gongZuoZhuanYeYears;
 
-    /*//@JiLuField(name="专家级别")*/
     private Short pingBiaoTuiJianLX;//东风修改为专家级别
 
-    //@JiLuField(name = "评标地区")
     private String pingBiaoChangZhuDiQu;
 
-    ////@JiLuField(name="其他地区")
     private String pingBiaoQiTaDiQu;
 
-    ////@JiLuField(name="应急地区")
     private String pingBiaoYingJiDiQu;
 
-    //@JiLuField(name = "愿意应急")
     private Boolean pingBiaoIsYingJi;
 
-    //@JiLuField(name = "专业经历")
     private String zhuanYeJingLi;
 
-    //@JiLuField(name = "参与项目")
     private String canYuXiangMu;
 
-    //@JiLuField(name = "担任其他专家")
     private String danRenQiTaZhuanJia;
 
-    //@JiLuField(name = "专业特长")
     private String zhuanYeTeChang;
 
-    //@JiLuField(name = "不能入选情况")
     private String buNengRuXuanQingKong;
 
-    //@JiLuField(name = "附件")
     private String fuJianGuids;
 
     private Long ruKuTime;
 
-    ////@JiLuField(name="照片")
     private String photoGuid;
 
     private Long tiJiaoTime;
@@ -211,33 +170,27 @@ public class ExpertInfoResp {
     private Long pinqiEndTime;
 
     /*--------------------东风系统 增加开始 ------------------------*/
-    //@JiLuField(name = "银行卡号")
     private String yinHangKa;
-    //@JiLuField(name = "开户银行")
+
     private String yinHang;
-    //@JiLuField(name = "开户支行")
+
     private String yinHang1;
 
-    //@JiLuField(name = "民族")
+
     private String minZu;
 
-    //@JiLuField(name = "健康情况")
     private String jianKangZhuangKuang;
 
     private String sfzFileGuid;//身份证扫描件
 
-    //@JiLuField(name = "传真")
     private String fax;
 
     private String byzFileGuid;//毕业证扫描件
 
-    //@JiLuField(name = "所在部门")
     private String suoShuBuMeng;//所在部门
 
-    //@JiLuField(name = "所属行业")
     private String suoShuHangYe;
 
-    //@JiLuField(name = "城市")
     private String city;
 
     private String jgdmFileGuid;//机构代码扫描件
@@ -245,7 +198,6 @@ public class ExpertInfoResp {
 
     private String suoShuZhaoBiaoDaiLi;//所属的招标代理导入的，记录招标代理的jgdm,形成独自的库。注册的专家设置为平台的机构代码
 
-    //@JiLuField(name = "手机国际区号")
     private String mobileGuoJiQuHao;
 
     /*--------------------东风系统 增加结束 ------------------------*/
@@ -268,10 +220,8 @@ public class ExpertInfoResp {
     private String jinJiLianXiRenName;
     private String jinJiLianXiRenPhone;
 
-    //@JiLuField(name = "是否资深专家")
     private Boolean isSenior;//是否資深專家
 
-    //@JiLuField(name = "单位GUID")
     private String danweiGuid;//单位GUID
 
     //20221019 是否合格
@@ -292,7 +242,6 @@ public class ExpertInfoResp {
     /**
      * 应急状态（0=冻结，1=正常）
      */
-    //@JiLuField(name = "应急状态")
     private Integer yingJiZhuangTai;
 
     /****************20180530*******************/
@@ -318,30 +267,23 @@ public class ExpertInfoResp {
     private Short zhuanJiaFenLei;
 
     // 二开-集团内外专家,0:集团内专家,1:集团外专家
-    //@JiLuField(name = "集团内外专家")
     private Boolean inGroup;
 
     // 其他联系方式
-    //@JiLuField(name = "其他联系方式")
-   // @Column(name = "qita_lianxi_fangshi")
     private String qiTaLianXiFangShi;
     // 是否拥有职业资格
-    //@JiLuField(name = "是否拥有职业资格")
-   // @Column(name = "is_zhiyezige")
+
     private Boolean isZhiYeZiGe;
     // 专家来源类型，0:自主入库,1:指定邀请,2:导入邀请'
-    //@JiLuField(name = "专家来源类型，0:自主入库,1:指定邀请,2:导入邀请'")
-   // @Column(name = "zhuanjia_source_type")
+
     private Short zhuanJiaSourceType;
 
     // 所属单位名称
-    //@JiLuField(name = "所属单位名称")
-   // @Column(name = "suoshudanwei_name")
+
     private String suoShuDanWeiName;
 
     // 工作时间
-    //@JiLuField(name = "工作时间")
-   // @Column(name = "gongzuo_time")
+
     private Long gongZuoTime;
 
     //专家分级 10 A级 20 B级 默认B级