Browse Source

增加按明文同步刷新

zhouy 3 months ago
parent
commit
b3c55cdcb8

+ 8 - 0
qywx-sdk/src/main/java/com/usoftchina/qywx/sdk/dto/GetUserInfoResp.java

@@ -33,4 +33,12 @@ public class GetUserInfoResp extends BaseResp {
 //    public void setDeviceId(String deviceId) {
 //        DeviceId = deviceId;
 //    }
+    @Override
+    public String toString() {
+        return "GetUserInfoResp{" +
+                "userid='" + userid + '\'' +
+                ", errcode=" + errcode +
+                ", errmsg='" + errmsg + '\'' +
+                '}';
+    }
 }

+ 1 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/manage/controller/QywxAddrBookController.java

@@ -118,7 +118,7 @@ public class QywxAddrBookController {
         }
         try {
             DataSourceHolder.set(dataCenter);
-            return Result.success(addrBookSdk.convert_openUserId(employeeService.getAll().stream().map(Employee::getEm_qywx).collect(Collectors.toList())));
+            return Result.success(employeeService.convert_openUserId());
         } finally {
             DataSourceHolder.clear();
         }

+ 21 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/service/UasEmployeeService.java

@@ -534,7 +534,10 @@ public class UasEmployeeService extends AbstractService {
         for (Employee employee : employeeList) {
             try {
                 GetUserInfoResp getUserInfoResp = addrBookSdk.getUserInfoByMobile(employee.getEm_mobile());
-                employee.setEm_plainqywx(getUserInfoResp.getUserid());
+                logger.info("syncAll_UpGrade query Employee:{}, mobile{},qywxReQ:{} ", employee.getEm_name() , employee.getEm_mobile(), getUserInfoResp.toString());
+                if(StringUtils.hasText(getUserInfoResp.getUserid())) {
+                    employee.setEm_plainqywx(getUserInfoResp.getUserid());
+                }
                 logger.info("syncAll_UpGrade query Employee:{}, mobile{},qywx:{} ", employee.getEm_name() , employee.getEm_mobile(), employee.getEm_plainqywx());
             }catch (Exception e){
                 logger.error("syncAll_UpGrade error:",e);
@@ -553,4 +556,21 @@ public class UasEmployeeService extends AbstractService {
 
 
     }
+    public Object convert_openUserId(){
+        List<Employee> employeeList = queryForBeanList("select * from employee where em_statuscode='AUDITED' and em_plainqywx is not null and em_qywx is null", Employee.class);
+        //通过手机号查找userID信息
+        if(!employeeList.isEmpty()) {
+            GetUserOpenIDListResp getUserOpenIDListResp = addrBookSdk.convert_openUserId(employeeList.stream().map(Employee::getEm_plainqywx).collect(Collectors.toList()));
+            List<GetUserOpenIDListResp.OpenUser> userList = getUserOpenIDListResp.getOpen_userid_list();
+            for (GetUserOpenIDListResp.OpenUser openUser : userList) {
+                Employee employee = employeeList.stream().filter(emp->StringUtils.hasText(emp.getEm_plainqywx())&&emp.getEm_plainqywx().equals(openUser.getUserid())).findFirst().orElse(null);
+                if(employee!= null){
+                    employee.setEm_qywx(openUser.getOpen_userid());
+                    setQywxWithPlain(employee);
+                }
+            }
+            return getUserOpenIDListResp;
+        }
+        return null;
+    }
 }