gengyang 5 лет назад
Родитель
Сommit
6cd8035917

+ 0 - 3
src/main/java/com/mokamrp/privates/config/DataHubConfiguration.java

@@ -28,9 +28,6 @@ public class DataHubConfiguration {
             @Value("${datahub.accessid}") String accessId,
             @Value("${datahub.accesssecret}") String accessKey
     ) {
-        System.out.println("配置文件");
-        System.out.println(accessId);
-        System.out.println(accessKey);
         if (datahubClient == null) {
             synchronized (DataHubConfiguration.class) {
                 if (datahubClient == null) {

+ 2 - 0
src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.xml

@@ -136,11 +136,13 @@
             b.gender as  external_gender,
             b.corp_name as external_corp_name,
             b.corp_full_name as external_corp_full_name,
+            d.wx_corpid as wxCorpid,
             c.wx_user_id as follow_userid
         FROM
             mc_work_contact_employee AS a
         LEFT JOIN mc_work_contact AS b ON a.contact_id = b.id
         LEFT JOIN mc_work_employee AS c ON a.employee_id = c.id
+        LEFT JOIN mc_corp AS d ON d.id = a.corp_id
         <where>
             ${ew.sqlSegment}
         </where>

+ 13 - 0
src/main/java/com/mokamrp/privates/mapper/vo/WorkContactEmployeeHubVo.java

@@ -27,6 +27,19 @@ public class WorkContactEmployeeHubVo {
     private String followRemarkMobiles;
     private String followAddWay;
     private String followTagId;
+    private String wxCorpid;
+
+    public void setFollowCreateTime(String followCreateTime) {
+        this.followCreateTime = followCreateTime;
+    }
+
+    public String getWxCorpid() {
+        return wxCorpid;
+    }
+
+    public void setWxCorpid(String wxCorpid) {
+        this.wxCorpid = wxCorpid;
+    }
 
     public Integer getId() {
         return id;

+ 2 - 1
src/main/java/com/mokamrp/privates/tast/DatahubJobTask.java

@@ -109,6 +109,7 @@ public class DatahubJobTask {
             if(vo.getFollowCreateTime() != null && !vo.getFollowCreateTime().isEmpty()){
                 createtime = date2TimeStamp(vo.getFollowCreateTime(),"yyyy-MM-dd HH:mm:ss");
             }
+
             data.setField("external_userid", vo.getExternalUserid());
             data.setField("external_name", vo.getExternalName());
             data.setField("external_type", vo.getExternalType());
@@ -116,6 +117,7 @@ public class DatahubJobTask {
             data.setField("external_corp_name", vo.getExternalCorpName());
             data.setField("external_corp_full_name", vo.getExternalCorpFullName());
             data.setField("external_gender", vo.getExternalGender());
+            data.setField("wx_corpid", vo.getExternalCorpFullName());
             data.setField("follow_userid", vo.getFollowUserid());
             data.setField("follow_remark", vo.getFollowRemark());
             data.setField("follow_createtime", createtime);
@@ -128,7 +130,6 @@ public class DatahubJobTask {
             recordEntries.add(recordEntry);
         }
 
-        // 生成十条数据
         try {
             PutRecordsResult result = datahubClient.putRecords(project, topic, recordEntries);
             int i = result.getFailedRecordCount();