change model

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

@@ -158,7 +158,7 @@ public class LoginServiceImpl implements LoginService {
         if(expertInfoResp == null){
             return "用户信息不存在";
         }
-        ExpertInfoAppResp expertInfoAppResp = loginServicesClient.getZhuanJiaInfoAppById(expertInfoResp.getBaseGuid());
+        ExpertInfoAppResp expertInfoAppResp = loginServicesClient.getZhuanJiaInfoAppById(expertInfoResp.getZhuanJiaGuid());
         if(expertInfoAppResp == null){
             return "该用户还没有设置密码";
         }
@@ -184,9 +184,9 @@ public class LoginServiceImpl implements LoginService {
         String uuidKey = UUID.randomUUID().toString();
 
         ZhuanJiaUser zhuanJiaUser = convert2ZhuanjiaUser( expertInfoResp );
-        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getBaseGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
+        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getZhuanJiaGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
 
-        String token = JwtUtils.createToken(expertInfoResp.getBaseGuid(),uuidKey);
+        String token = JwtUtils.createToken(expertInfoResp.getZhuanJiaGuid(),uuidKey);
         //6.返回token
         return token;
     }
@@ -216,9 +216,9 @@ public class LoginServiceImpl implements LoginService {
         String uuidKey = UUID.randomUUID().toString();
 
         ZhuanJiaUser zhuanJiaUser = convert2ZhuanjiaUser( expertInfoResp );
-        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getBaseGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
+        redisTemplate.opsForValue().set(TokenConstants.LOGIN_USER_KEY_ + expertInfoResp.getZhuanJiaGuid(), zhuanJiaUser, 48, TimeUnit.HOURS);
 
-        String token = JwtUtils.createToken(expertInfoResp.getBaseGuid(),uuidKey);
+        String token = JwtUtils.createToken(expertInfoResp.getZhuanJiaGuid(),uuidKey);
 
         return token;
     }
@@ -235,17 +235,21 @@ public class LoginServiceImpl implements LoginService {
 
 
       private ZhuanJiaUser convert2ZhuanjiaUser(ExpertInfoResp expertInfoResp){
-        if( expertInfoResp == null ){
-            return null;
-        }
-
-        ZhuanJiaUser zhuanJiaUser = new ZhuanJiaUser();
-
-
-
-
-//      TODO weisong
-
-        return zhuanJiaUser;
+          if( expertInfoResp == null ){
+              return null;
+          }
+
+          ZhuanJiaUser zhuanJiaUser = new ZhuanJiaUser();
+          zhuanJiaUser.setZhuanJiaGuid(expertInfoResp.getZhuanJiaGuid());
+          zhuanJiaUser.setMobile(expertInfoResp.getMobile());
+          zhuanJiaUser.setShenFenZheng(expertInfoResp.getShenFenZheng());
+          zhuanJiaUser.setShiFouYiFaZhuanJia(expertInfoResp.getShiFouYiFaZhuanJia());
+          zhuanJiaUser.setZhuanJiaCode(expertInfoResp.getZhuanJiaCode());
+          zhuanJiaUser.setSuoShuBuMeng(expertInfoResp.getSuoShuBuMeng());
+          zhuanJiaUser.setZhuanJiaName(expertInfoResp.getZhuanJiaName());
+          zhuanJiaUser.setZhuanJiaShiXiangGuid(expertInfoResp.getZhuanJiaShiXiangGuid());
+          zhuanJiaUser.setZhuanJiaZhuangTai(expertInfoResp.getZhuanJiaZhuangTai());
+
+          return zhuanJiaUser;
       }
 }

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 String  baseGuid;
-    private String  mobile;
-    private String  shengfenzheng;
-    private String  password;
+
+    private static final long serialVersionUID = -1L;
+
+    private String  shenFenZheng;
+
+    private Long subjectId;
+
+    private String subjectName;
+
+    private String subjectCode;
+
+    private Integer subjectType;
+
+    private String tenantId_;
+
+    private String tenantName;
+
+    private String authPassWithImport;
+
+    private String zhuanJiaGuid;
+
+    private String zhuanJiaShiXiangGuid;
+
+    private String zhuanJiaName;
+
+    private String zhuanJiaCode;
+
+    private Short zhuanJiaZhuangTai;
+
+    private Boolean shiFouYiFaZhuanJia;
+
+    private String birthday;
+
+    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;
+
+    private Short shenPiZhuangTai;
+
+    private String shenPiRen;
+
+    private String shenPiYiJian;
+
+    private Long shenPiShiJian;
+
+    private Short shenQingLeiXing;
+
+    private Short bianGengXuHao;
+
+    private Boolean isDeleted;
+
+    private String creatorName;
+
+    private Long createTime;
+
+    private String modifierName;
+
+    private Long modifyTime;
+
+    private String tuiKuYuanYin;
+
+    private List<String> auths; //权限
+
+    private String zhangHao;
+
+    private String password;
+
+    private String chouQuNum;
+
+    private Boolean isImport;
+
+    private Boolean isXiuGai;
+
+    private String fanMianFuJianGuids;
+
+    private Long leiJiFenZhi;
+
+    private Long leiJiZhanTingTime;
+
+    private Long ziDongZanTingEndTime;
+
+    private Long ziDongZanTingStartTime;
+
+    // 专家聘任期，单位年
+    private Short zhuanjiaQinRenQi;
+
+    // 聘期开始时间
+    private Long pinqiStartTime;
+
+    // 聘期结束时间
+    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;//机构代码扫描件
+
+
+    private String suoShuZhaoBiaoDaiLi;//所属的招标代理导入的，记录招标代理的jgdm,形成独自的库。注册的专家设置为平台的机构代码
+
+    //@JiLuField(name = "手机国际区号")
+    private String mobileGuoJiQuHao;
+
+    /*--------------------东风系统 增加结束 ------------------------*/
+
+    /****************20180530*******************/
+
+    /**
+     * author yanjw
+     * 2019-04-26
+     */
+    //
+    private BigDecimal kaoShiFenShu;
+
+    private Long leiJiJiaFen;
+
+    private Short jiDu;
+
+    //20200916 2.0新加
+    private String jinJiLianXiRenGuid;
+    private String jinJiLianXiRenName;
+    private String jinJiLianXiRenPhone;
+
+    //@JiLuField(name = "是否资深专家")
+    private Boolean isSenior;//是否資深專家
+
+    //@JiLuField(name = "单位GUID")
+    private String danweiGuid;//单位GUID
+
+    //20221019 是否合格
+    private Boolean isQualified;
+
+    // 是否阅读入库承诺书
+    private Boolean isReadRuKuPromise;
+    // 阅读入库承诺书时间
+    private Long readRuKuPromiseTime;
+
+    /**
+     * 评标专业
+     */
+    private String zhuanYeGuid;
+
+    private String zhengJianType;
+
+    /**
+     * 应急状态（0=冻结，1=正常）
+     */
+    //@JiLuField(name = "应急状态")
+    private Integer yingJiZhuangTai;
+
+    /****************20180530*******************/
+
+    /**
+     * 银行卡正面扫描件
+     */
+    private String yinHangKaFileGuid;
+
+
+    //专家所在地区
+    private String zhuanJiaSuoZaiDiNames;
+
+    private String zhuanJiaSuoZaiDiGuids;
+
+    //专家类型
+    private Short zhuanJiaType;
+
+    // 所属专业库（1-新一级专业,2-老一级专业）
+    private String professionLevel;
+
+    // 专家分类：1：一类，2：二类
+    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级
+    private Short zhuanJiaFenJi;
+
+
+    //二开-廉洁意见书
+    private String lianJieYiJianShuFuJianGuid;
+    //二开-是否存在生效期内的廉洁处理意见
+    private Boolean isHasLianJieChuLiYiJian;
+    // 二开-AD域账号
+    private String adAccount;
+    // 二开-专家综合编号
+    private String zhuanJiaZongHeBianHao;
+    // 二开-是否存在生效期内的廉洁处理意见
+    private Boolean hasLianJieChuLiYiJian;
+    // 二开-集团公司二级单位编号
+    private String jiTuanErJiDanWeiCode;
+    // 二开-集团公司二级单位名称
+    private String jiTuanErJiDanWeiName;
+    // 二开-所在其他专家库
+    private String suoZaiQitaZhuanJiaKu;
+    // 二开-获奖情况
+    private String huoJiangQingKuang;
+    // 二开-资历条件
+    private String zhuanJiaZiZhiTiaoJian;
+    // 二开-工作备注
+    private String gongZuoBeiZhu;
+
+    private Boolean isTuiSongSJTJ;//是否已推送到数据统计平台
+    private Integer tuiSongShiBaiCiShuSJTJ;//推送到数据统计平台失败次数
+    private String pingBiaoChangZhuDiQuName;
+
+
 }