慧监理，慧项管接口优化

takai-system/src/main/java/com/takai/system/service/impl/JkApiServiceImpl.java

@@ -119,9 +119,9 @@ public class JkApiServiceImpl implements IJkApiService {
 
     private static final OkHttpClient client = new OkHttpClient();
 
-    public static final String HXG_PROJECT_AND_STAFF = "用户";
+    public static final String HXG_PROJECT_AND_STAFF = "项目和成员";
 
-    public static final String HJL_PROJECT_AND_STAFF = "用户";
+    public static final String HJL_PROJECT_AND_STAFF = "项目和成员";
 
     public static final String HXG = "f47ac10b58cc4372a5670e06f141669d";
 
@@ -239,13 +239,13 @@ public class JkApiServiceImpl implements IJkApiService {
 
     @Override
     public void getHxgProjectAndStaff() throws IOException {
-        JSONArray dataList = getProjectApiData(jkConfig.getHxgProjectAndStaff(),HXG_PROJECT_AND_STAFF);
+        JSONArray dataList = getProjectApiData(jkConfig.getHxgProjectAndStaff(),HXG_PROJECT_AND_STAFF,"03,04");
         buildAndSaveSysProjectAndStaff(dataList,HXG);
     }
 
     @Override
     public void getHjlProjectAndStaff() throws IOException {
-        JSONArray dataList = getProjectApiData(jkConfig.getHjlProjectAndStaff(),HJL_PROJECT_AND_STAFF);
+        JSONArray dataList = getProjectApiData(jkConfig.getHjlProjectAndStaff(),HJL_PROJECT_AND_STAFF,"02,06");
         buildAndSaveSysProjectAndStaff(dataList,HJL);
 
     }
@@ -259,7 +259,7 @@ public class JkApiServiceImpl implements IJkApiService {
             allowedProductTypes.add("03");
             allowedProductTypes.add("04");
             allowedProductTypes.add("06");
-            logger.info("获取的数据条数："+projectList.size());
+            log.info("获取的数据条数："+projectList.size());
             projectList = projectList.stream()
                     // 过滤条件：Member 非 null + productType 非 null + 在允许集合中
                     .filter(projectWebApiBo -> projectWebApiBo != null
@@ -267,7 +267,7 @@ public class JkApiServiceImpl implements IJkApiService {
                             && allowedProductTypes.contains(projectWebApiBo.getProductType()))
                     // 收集为新列表（不修改原 memberList，避免影响其他业务逻辑）
                     .collect(Collectors.toList());
-            logger.info("筛选出来的数据条数："+projectList.size());
+            log.info("筛选出来的数据条数："+projectList.size());
             int projectNum = 0;
             int projectStaffNum = 0;
             // 遍历解析结果，验证数据
@@ -280,10 +280,10 @@ public class JkApiServiceImpl implements IJkApiService {
                 sysProject.setProjectType(project.getProType());
                 sysProject.setProductType(project.getProductType());
                 SysProject dbProject = projectService.selectSysProjectByProjectPid(project.getProCode());
-                logger.info("获取项目："+ project +"获取项目："+dbProject);
+                log.info("获取项目："+ project +"获取项目："+dbProject);
                 if(null == dbProject) {
                     projectService.insertSysProject(sysProject);
-                    logger.info("新增项目数据条数："+projectNum);
+                    log.info("新增项目数据条数："+projectNum);
                     projectNum++;
                 }
 
@@ -303,11 +303,11 @@ public class JkApiServiceImpl implements IJkApiService {
                             sysProjectStaff.setId(String.valueOf(snowflakeDigitGenerator.nextId()));
                             projectStaffMapper.insertSysProjectStaff(sysProjectStaff);
                             //projectStaffService.insertSysProjectStaff(sysProjectStaff);
-                            logger.info("新增项目数据条数："+projectStaffNum);
+                            log.info("新增项目成员数据条数："+projectStaffNum);
                             projectStaffNum++;
                         }
                     }
-                    logger.info("获取员工："+member +"获取用户："+sysUser);
+                    log.info("获取项目成员："+member +"获取用户是否存在："+sysUser);
                     member = null;
                     sysProjectStaff = null;
                 }
@@ -315,14 +315,14 @@ public class JkApiServiceImpl implements IJkApiService {
                 sysProject = null;
             }
             if(sourceFrom.equals(HJL)){
-                logger.info("项目同步任务同步慧监理项目数据"+projectNum+"条");
-                logger.info("项目同步任务同步慧监理项目成员数据"+projectStaffNum+"条");
+                log.info("项目同步任务同步慧监理项目数据"+projectNum+"条");
+                log.info("项目同步任务同步慧监理项目成员数据"+projectStaffNum+"条");
             } else {
-                logger.info("项目同步任务同步慧项管项目数据"+projectNum+"条");
-                logger.info("项目同步任务同步慧项管项目成员数据"+projectStaffNum+"条");
+                log.info("项目同步任务同步慧项管项目数据"+projectNum+"条");
+                log.info("项目同步任务同步慧项管项目成员数据"+projectStaffNum+"条");
             }
         } catch (Exception e) {
-            System.err.println("FastJSON2 解析失败：" + e.getMessage());
+            log.error("FastJSON2 解析失败：" + e.getMessage());
             e.printStackTrace();
         }
     }
@@ -369,10 +369,10 @@ public class JkApiServiceImpl implements IJkApiService {
         return objectList;
     }
 
-    public JSONArray getProjectApiData(String url,String objectName) throws IOException {
+    public JSONArray getProjectApiData(String url,String objectName,String productType) throws IOException {
         JSONArray jsonArray = new JSONArray();
         logger.info("获取建科"+objectName+"请求url：" + url);
-        Request request = buildPostRequest(url);
+        Request request = buildPostRequest(url,productType);
         try {
             OkHttpClient okHttpClient = buildOkHttpClient();
             Response response = okHttpClient.newCall(request).execute();
@@ -508,9 +508,10 @@ public class JkApiServiceImpl implements IJkApiService {
         logger.info("请求body：{}", requestBodyJson);
         return request;
     }
-    private Request buildPostRequest(String url) {
+    private Request buildPostRequest(String url,String productType) {
         Map<String, Object> requestBodyMap = new HashMap<>();
         requestBodyMap.put("projectCode", "");
+        requestBodyMap.put("productType", productType);
         // 将 Map 转换为 JSON 字符串
         String requestBodyJson = JSON.toJSONString(requestBodyMap);