1

suishenbang-admin/src/main/java/com/dgtly/web/controller/tool/BuildController.java

@@ -1,8 +1,11 @@
 package com.dgtly.web.controller.tool;
 
+import com.dgtly.sync.utils.CustomerAccessTokenUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.dgtly.common.core.controller.BaseController;
 
@@ -23,4 +26,15 @@ public class BuildController extends BaseController
     {
         return prefix + "/build";
     }
+
+
+@Autowired
+CustomerAccessTokenUtil customerAccessTokenUtil;
+
+
+    @PostMapping("/getToken")
+public String getToken(){
+  return   customerAccessTokenUtil.getAccessToken();
+}
+
 }

suishenbang-admin/src/main/resources/application-uat.yml

@@ -57,7 +57,7 @@ qiyeweixin:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 10000
+  port: 10003
   servlet:
     # 应用的访问路径
     context-path: /oneportal

suishenbang-admin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: uat
 
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod

suishenbang-api/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: uat
 
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -66,7 +66,7 @@ public class RyTask
         analysisDiyCustomerComponent.analyDiyCustomer();
     }
     public void analyDiyCustomer1(){
-        analysisDiyCustomerComponent.analyDiyCustomer1();
+        analysisDiyCustomerComponent.analyDiyCustomer2();
     }
     /**
      * @description: 获取TUC仿石漆服务商人员

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -220,6 +220,68 @@ public class AnalysisDiyCustomerComponent {
         }
         return null;
     }
+
+    public void analyDiyCustomer2() {
+        //老板角色
+        if(roleIds==null){
+            Long roleId = Long.parseLong(configService.selectConfigByKey("libang.customer.roleid"));
+            roleIds = new Long[]{roleId};
+        }
+
+        Map<String,Customers> chainsMap = customersMapper.selectCustomerMapByChainsCode();
+
+        List<SyncFailDetail> failDetails = new ArrayList<>();
+        SyncLog syncLog = new SyncLog();
+        syncLog.setStartTime(new Date());
+        String packageId = "diycustomer"+syncLog.getStartTime().getTime();
+        syncLog.setPackageId(packageId);
+        long total = 0;
+        long success = 0;
+        Set<String> loginNameSet = sysUserService.selectAllUserLoginName();
+        Set<String> diyNameSet = sysUserService.selectDiyUserLoginName();
+
+        String managerJson ="";
+        try{
+            managerJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.MANAGER,null));
+        }catch (Exception e){
+            log.error("获取经销商经理接口错误！");
+            customerAccessTokenUtil.reSetToken();
+            throw e;
+        }
+
+        JSONObject mjson = JSONObject.parseObject(managerJson);
+
+
+       int code = mjson.getInteger("code");
+        if(code==0){
+            JSONArray MANAGER = new JSONArray();
+            MANAGER.addAll(mjson.getJSONArray("userlist"));
+            success+=buildSysUser(MANAGER,loginNameSet,diyNameSet,1,failDetails,packageId,chainsMap);
+            total+=mjson.getJSONArray("userlist").size();
+        }
+
+
+        String homeCustomerJson ="";
+        try{
+            homeCustomerJson = HttpUtils.sendSSLGet(customerAccessTokenUtil.getUrl(UrlType.HOMEDECORATION,null));
+        }catch (Exception e){
+            log.error("获取家装顾问师经销商人员接口错误！");
+            customerAccessTokenUtil.reSetToken();
+            throw e;
+        }
+
+        JSONObject homeJson = JSONObject.parseObject(homeCustomerJson);
+        code = homeJson.getInteger("code");
+        if(code==0){
+            JSONArray homeCustomer = new JSONArray();
+            homeCustomer.addAll(homeJson.getJSONArray("userlist"));
+            success+=buildSysUser(homeCustomer,loginNameSet,diyNameSet,9,failDetails,packageId,chainsMap);
+            total+=homeCustomer.size();
+        }
+    }
+
+
+
     /**
      * 获取并解析DIY经销商用户
      * 因为经销商用户并不涉及用信息更新等方面 所以只插入不更新

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUserExt.java

@@ -1,6 +1,7 @@
 package com.dgtly.system.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.dgtly.common.annotation.Excel;
@@ -14,6 +15,7 @@ import java.util.Date;
  * @author qxp
  * @date 2020-07-29
  */
+//@JsonInclude(JsonInclude.Include.ALWAYS)
 public class SysUserExt extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -40,6 +42,7 @@ public class SysUserExt extends BaseEntity
     private String bossName;
 
     /** 经销商所属门店代码 */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String customerCode;
 
     /** 是否是经销商负责人 1是  0不是*/