update code

yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceGroup.java

@@ -111,6 +111,17 @@ public class SurProjectAttendanceGroup extends BaseEntity
     @Excel(name = "时间戳")
     private Long createTimestamp;
 
+    public static SurProjectAttendanceGroup createHuazhu(JSONObject j) {
+        SurProjectAttendanceGroup g=new SurProjectAttendanceGroup();
+        g.companyId=j.getLongValue("unitId",0);
+        g.companyName=j.getString("unitName");
+        g.companyTypeId=j.getString("unitType");
+        g.serverid=j.getString("id");
+        g.enterDate=j.getLong("enterTime");
+        g.exitDate=j.getLong("leaveTime");
+        return  g;
+    }
+
     public Long getCreateTimestamp() {
         return createTimestamp;
     }
@@ -124,22 +135,22 @@ public class SurProjectAttendanceGroup extends BaseEntity
         g.serverid=json.getString("id");
         g.bizLicense=json.getString("bizLicense");
         g.companyCode=json.getString("companyCode");
-        g.companyId=json.getLong("companyId");
+        g.companyId=json.getLongValue("companyId",0);
         g.companyName=json.getString("companyName");
         g.companyTypeId=json.getString("companyTypeId");
-        g.vendorId=json.getLong("vendorId");
+        g.vendorId=json.getLongValue("vendorId",0);
         g.name=json.getString("name");
         g.leaderName=json.getString("leaderName");
         g.leaderPhone=json.getString("leaderPhone");
-        g.teamId=json.getLong("teamId");
+        g.teamId=json.getLongValue("teamId",0);
         g.teamName=json.getString("teamName");
-        g.type=json.getLong("type");
+        g.type=json.getLongValue("type",0);
-        g.leaderId=json.getLong("leaderId");
+        g.leaderId=json.getLongValue("leaderId",0);
         g.deleted=json.get("deleted")==null?0:(json.getBoolean("deleted")?1:0);
-        g.platformGroupId=json.getLong("platformGroupId");
+        g.platformGroupId=json.getLongValue("platformGroupId",0);
-        g.platformTeamId=json.getLong("platformTeamId");
+        g.platformTeamId=json.getLongValue("platformTeamId",0);
-        g.enterDate=json.getLong("enterDate");
+        g.enterDate=json.getLongValue("enterDate",0);
-        g.exitDate=json.getLong("exitDate");
+        g.exitDate=json.getLongValue("exitDate",0);
         g.isDel=0l;
         return g;
 

yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.yanzhu.jh.project.domain.SurProjectAttendanceCfg;
 import com.yanzhu.jh.project.domain.SurProjectAttendanceData;
+import com.yanzhu.jh.project.domain.SurProjectAttendanceGroup;
 import com.yanzhu.jh.project.domain.SurProjectAttendanceUser;
 import com.yanzhu.jh.project.service.ISurProjectAttendanceCfgService;
 import com.yanzhu.jh.project.service.ISurProjectAttendanceDataService;
@@ -60,12 +61,12 @@ public class AttendanceHuazhuTask {
     }
     */
     //380649600000
-    public static void main(String[] args) {
+    public static void main2(String[] args) {
         //String s= DateUtil.format(DateUtil.date(1704167341751l),"yyyy-MM-dd HH:mm:ss");
         System.out.println(DateUtil.current());
 
     }
-    public static void main1(String[] args) {
+    public static void main(String[] args) {
         String path="/api/open/labour/findLabourWorkerByPage";
         Map<String,String> map=new HashMap<>();
         map.put("appId","8024283707153666851");
@@ -77,15 +78,17 @@ public class AttendanceHuazhuTask {
         SurProjectAttendanceCfg it=new SurProjectAttendanceCfg();
         it.setId(0l);;
         //new AttendanceHuazhuTask().doSyncWorker(jo,1,it);
-        long p=jo.getLongValue("page",1);
+        //long p=jo.getLongValue("page",1);
-        jo.put("page",1);
+        //jo.put("page",1);
-        System.out.println(p);
+        //System.out.println(p);
-        System.out.println(jo.toString());
+        //System.out.println(jo.toString());
-        new AttendanceHuazhuTask().doSyncAttendanceData(jo,1,it,null);
+        new AttendanceHuazhuTask().doSyncGroup(jo,1,it);
+        //new AttendanceHuazhuTask().doSyncWorker(jo,1,it);
     }
     private static RequestBody toFormBody(Map<String, Object> params ){
+        String json=JSON.toJSONString(params);
         return  RequestBody.create(
-                MediaType.parse("application/json"), JSON.toJSONString(params));
+                MediaType.parse("application/json"),json );
     }
     private static  Headers setHeaderParams(Map<String, String> headerParams) {
         Headers headers = null;
@@ -120,6 +123,47 @@ public class AttendanceHuazhuTask {
         syncAttendanceData(startTime);
     }
 
+    public void syncGroup(){
+        SurProjectAttendanceCfg where =new SurProjectAttendanceCfg();
+        where.setEnabled(1l);
+        where.setIsDel(0l);
+        where.setVendorsCode("huazhu");
+        List<SurProjectAttendanceCfg> list=attendanceCfgService.selectSurProjectAttendanceCfgList(where);
+        for(SurProjectAttendanceCfg it :list){
+            String param= it.getVendorsParameter();
+            if(Strings.isNotEmpty(param)){
+                try{
+                    JSONObject jo=JSON.parseObject(param);
+                    doSyncGroup(jo,1,it);
+                }catch (Exception ex){
+                    ex.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private void doSyncGroup(JSONObject jdata, long page, SurProjectAttendanceCfg it) {
+        String path="/api/open/labour/findUnitProjectByPage";
+        Request request=getRequest(path,jdata,page);
+        String data=AttendanceTask.getResult(request);
+        JSONObject jo= JSON.parseObject(data);
+        JSONObject joData= jo.getJSONObject("data");
+        JSONArray arr=joData.getJSONArray("records");
+        long pages=joData.getLong("pages");
+        if(arr!=null && arr.size()>0){
+            for(int i=0;i<arr.size();i++) {
+                JSONObject json = arr.getJSONObject(i);
+                SurProjectAttendanceGroup group=SurProjectAttendanceGroup.createHuazhu(json);
+                group.setCfgid(it.getId());
+                group.setAppId(jdata.getString("appId"));
+                attendanceGroupService.add(group);
+            }
+        }
+        if(page<pages){
+            doSyncGroup(jdata,page+1,it);
+        }
+    }
+
     private void syncAttendanceData(long startTime){
         SurProjectAttendanceCfg where =new SurProjectAttendanceCfg();
         where.setEnabled(1l);
@@ -173,7 +217,7 @@ public class AttendanceHuazhuTask {
         }
     }
     private   void doSyncAttendanceData(JSONObject jdata,long page,SurProjectAttendanceCfg it,Map<String,Object> ps){
-        String path="/api/open/labour/findCardRecordByPage";
+        String path="/api/open/labour/findUnitProjectByPage";
         Request request=getRequest(path,jdata,page,ps);
         String data=AttendanceTask.getResult(request);
         JSONObject jo= JSON.parseObject(data);

yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java

@@ -104,6 +104,7 @@ public class AttendanceTask {
             for (int i = 0; i < arr.size(); i++) {
                 JSONObject json=arr.getJSONObject(i);
                 SurProjectAttendanceGroup group=SurProjectAttendanceGroup.create(json);
+                group.setAppId(appId);
                 group.setCfgid(it.getId());
                 attendanceGroupService.add(group);
             }