From 09de5753609582daa7bb5a79729584ee5aa38669 Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 14 Mar 2024 23:11:14 +0800 Subject: [PATCH 1/5] update code --- .../yanzhu/jh/project/task/AttendanceHuazhuTask.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java index cf16aa34..c94f39f1 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java @@ -42,6 +42,8 @@ public class AttendanceHuazhuTask { HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(host + path)) .newBuilder(); + long endTime=DateUtil.current(); + long startTime=endTime-3600*1000*24*90; Map headerParams=new HashMap<>(); headerParams.put("appId","8024283707153666851"); headerParams.put("appSecret","2070308b49399d94b401d98adeaa5b342aa81627"); @@ -51,7 +53,10 @@ public class AttendanceHuazhuTask { params.put("orgId","1666339529033805825"); params.put("tenantId","1666337067184893953"); params.put("size","200"); - params.put("current","174"); + params.put("current","1"); + params.put("startTime",startTime); + //params.put("endTime",startTime); + Request request = new Request.Builder() .url(urlBuilder.build()) .post(toFormBody(params)).headers(setHeaderParams(headerParams)) @@ -69,6 +74,7 @@ public class AttendanceHuazhuTask { public static void main3(String[] args) { String path="/api/open/labour/findLabourWorkerByPage"; Map map=new HashMap<>(); + map.put("appId","8024283707153666851"); map.put("secret","2070308b49399d94b401d98adeaa5b342aa81627"); map.put("projectId","1666339529033805825"); @@ -173,7 +179,7 @@ public class AttendanceHuazhuTask { Map map=new HashMap<>(); long endTime=DateUtil.current(); - map.put("endTime",endTime); + //map.put("endTime",endTime); map.put("startTime",startTime); for(SurProjectAttendanceCfg it :list){ String param= it.getVendorsParameter(); From 6ed84b9dadd31f29b9d1de83412dc33a329de840 Mon Sep 17 00:00:00 2001 From: haha Date: Fri, 15 Mar 2024 23:25:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8E=E5=B7=A5?= =?UTF-8?q?=E8=80=83=E5=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jh/project/task/AttendanceJgwTask.java | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java new file mode 100644 index 00000000..aad98020 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java @@ -0,0 +1,75 @@ +package com.yanzhu.jh.project.task; + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.common.utils.sign.Md5Utils; +import okhttp3.*; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +public class AttendanceJgwTask { + static String host="http://api.gongyoumishu.com:80/gomeetapi/"; + public static String getToken(String appid,String secret){ + String grantType="client_credential"; + String path="/webapi/credential"; + Map params = new HashMap<>(); + params.put("appId",appid); + params.put("secret",secret); + params.put("grantType",grantType); + Request request = new Request.Builder() + .url(host+path) + .post(toFormBody(params)) + .build(); + String data=AttendanceTask.getResult(request); + JSONObject jo= JSON.parseObject(data); + JSONObject joData= jo.getJSONObject("data"); + if(joData!=null){ + return joData.getString("token"); + + } + return null; + } + private static RequestBody toFormBody(Map params ){ + FormBody.Builder builder=new FormBody.Builder(); + for(String key :params.keySet()){ + builder.add(key,params.get(key).toString()); + } + return builder.build(); + } + public static void main(String[] args){ + String appid="6a6f24fe35b04ee0bcf31cfb46ed1051"; + String secret="c3h5enh4MjAyNHN1Yw=="; + String prjId="b67f1baa6dca4558a16bf90a4681b82e"; + String token= getToken(appid,secret); + if(token==null || token.length()==0){ + return; + } + System.out.println(token); + findAddWorkerByProject(appid,token,prjId); + } + public static void findAddWorkerByProject(String appId,String token,String projectId){ + String path="/webapi/project/findAddWorkerByProject"; + String timestamp=""+DateUtil.current(); + String startId="0"; + String url=host+path+"?"+"appId=" + appId + "&tokenSign=" + token +"×tamp" + timestamp; + System.out.println(url); + String tokenSign = Md5Utils.hash(url); + System.out.println(tokenSign); + Map params = new HashMap<>(); + params.put("appId",appId); + params.put("timestamp",timestamp); + params.put("tokenSign",tokenSign); + params.put("projectId",projectId); + params.put("startId",startId); + Request request = new Request.Builder() + .url(url) + .post(toFormBody(params)) + .build(); + String data=AttendanceTask.getResult(request); + System.out.println(data); + } + +} From 6afbc7d93760d880b2b508ea28f985fd540653de Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 16 Mar 2024 00:02:59 +0800 Subject: [PATCH 3/5] update code --- .../jh/project/task/AttendanceJgwTask.java | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java index aad98020..40c71ef6 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java @@ -12,6 +12,7 @@ import java.util.Objects; public class AttendanceJgwTask { static String host="http://api.gongyoumishu.com:80/gomeetapi/"; + //sign/photo/20240101/E24E76-C9A5CB-0000FF/1741751233297383424_8848.JPG public static String getToken(String appid,String secret){ String grantType="client_credential"; String path="/webapi/credential"; @@ -48,24 +49,49 @@ public class AttendanceJgwTask { return; } System.out.println(token); - findAddWorkerByProject(appid,token,prjId); + //findAddWorkerByProject(appid,token,prjId); + findAttendanceByProject(appid,token,prjId); } - public static void findAddWorkerByProject(String appId,String token,String projectId){ - String path="/webapi/project/findAddWorkerByProject"; - String timestamp=""+DateUtil.current(); + public static void findAttendanceByProject(String appId,String token,String projectId){ + String path="/webapi/project/findAttendanceByProject"; + String time = System.currentTimeMillis() + ""; String startId="0"; - String url=host+path+"?"+"appId=" + appId + "&tokenSign=" + token +"×tamp" + timestamp; + String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; System.out.println(url); String tokenSign = Md5Utils.hash(url); System.out.println(tokenSign); Map params = new HashMap<>(); params.put("appId",appId); - params.put("timestamp",timestamp); + params.put("timestamp",time); + params.put("tokenSign",tokenSign); + params.put("projectId",projectId); + params.put("startId",startId); + params.put("startId",startId); + params.put("startTime","2024-01-01"); + params.put("endTime","2024-01-20"); + Request request = new Request.Builder() + .url(host+path) + .post(toFormBody(params)) + .build(); + String data=AttendanceTask.getResult(request); + System.out.println(data); + } + public static void findAddWorkerByProject(String appId,String token,String projectId){ + String path="/webapi/project/findAddWorkerByProject"; + String time = System.currentTimeMillis() + ""; + String startId="0"; + String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"×tamp=" + time; + System.out.println(url); + String tokenSign = Md5Utils.hash(url); + System.out.println(tokenSign); + Map params = new HashMap<>(); + params.put("appId",appId); + params.put("timestamp",time); params.put("tokenSign",tokenSign); params.put("projectId",projectId); params.put("startId",startId); Request request = new Request.Builder() - .url(url) + .url(host+path) .post(toFormBody(params)) .build(); String data=AttendanceTask.getResult(request); From 9f80befa1aa1fde603283cfa39c14250c9511bbd Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 16 Mar 2024 14:39:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?update=20code=20=E5=8D=8E=E7=AD=91=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SurProjectAttendanceDataServiceImpl.java | 3 +++ .../jh/project/task/AttendanceHuazhuTask.java | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index c66b795a..3620a50c 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -125,6 +125,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc @Override public void add(SurProjectAttendanceData sdata) { + if(StringUtils.isEmpty(sdata.getWorkerId()) || StringUtils.isEmpty(sdata.getAttendanceTime())){ + return; + } SurProjectAttendanceData where=new SurProjectAttendanceData(); where.setVendorsCode(sdata.getVendorsCode()); where.setCfgid(sdata.getCfgid()); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java index c94f39f1..65288d57 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java @@ -43,7 +43,7 @@ public class AttendanceHuazhuTask { .newBuilder(); long endTime=DateUtil.current(); - long startTime=endTime-3600*1000*24*90; + long startTime=endTime-3600*1000*24*0; Map headerParams=new HashMap<>(); headerParams.put("appId","8024283707153666851"); headerParams.put("appSecret","2070308b49399d94b401d98adeaa5b342aa81627"); @@ -62,7 +62,17 @@ public class AttendanceHuazhuTask { .post(toFormBody(params)).headers(setHeaderParams(headerParams)) .build(); String data=AttendanceTask.getResult(request); - System.out.println(data); + 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 Date: Sat, 16 Mar 2024 15:29:07 +0800 Subject: [PATCH 5/5] update code --- .../SurProjectAttendanceDataMapper.java | 2 ++ .../ISurProjectAttendanceDataService.java | 2 ++ .../SurProjectAttendanceDataServiceImpl.java | 7 ++++- .../jh/project/task/AttendanceHuazhuTask.java | 15 ++++++++--- .../SurProjectAttendanceDataMapper.xml | 27 ++++++++++++++++++- 5 files changed, 47 insertions(+), 6 deletions(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java index eeaa3ad1..30f4e596 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java @@ -27,6 +27,8 @@ public interface SurProjectAttendanceDataMapper */ public List selectSurProjectAttendanceDataList(SurProjectAttendanceData surProjectAttendanceData); + + public List selectSurProjectAttendanceDataListEx(SurProjectAttendanceData surProjectAttendanceData); /** * 新增劳务实名制管理 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java index c7113514..ea081592 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAttendanceDataService.java @@ -28,6 +28,8 @@ public interface ISurProjectAttendanceDataService */ public List selectSurProjectAttendanceDataList(SurProjectAttendanceData surProjectAttendanceData); + public List selectSurProjectAttendanceDataListEx(SurProjectAttendanceData surProjectAttendanceData); + /** * 新增劳务实名制管理 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java index 3620a50c..0c3153e4 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java @@ -45,6 +45,11 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc return surProjectAttendanceDataMapper.selectSurProjectAttendanceDataList(surProjectAttendanceData); } + public List selectSurProjectAttendanceDataListEx(SurProjectAttendanceData surProjectAttendanceData) + { + return surProjectAttendanceDataMapper.selectSurProjectAttendanceDataListEx(surProjectAttendanceData); + } + /** * 新增劳务实名制管理 * @@ -132,7 +137,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc where.setVendorsCode(sdata.getVendorsCode()); where.setCfgid(sdata.getCfgid()); where.setServerid(sdata.getServerid()); - List list=selectSurProjectAttendanceDataList(where); + List list=selectSurProjectAttendanceDataListEx(where); if(list.size()==0){ insertSurProjectAttendanceData(sdata); }else{ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java index 65288d57..3e0fb852 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java @@ -42,8 +42,9 @@ public class AttendanceHuazhuTask { HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(host + path)) .newBuilder(); - long endTime=DateUtil.current(); - long startTime=endTime-3600*1000*24*0; + + long startTime=DateUtil.date(DateUtil.parse("2024-03-16")).getTime(); + long endTime=startTime+3600*1000*24*1; Map headerParams=new HashMap<>(); headerParams.put("appId","8024283707153666851"); headerParams.put("appSecret","2070308b49399d94b401d98adeaa5b342aa81627"); @@ -55,7 +56,7 @@ public class AttendanceHuazhuTask { params.put("size","200"); params.put("current","1"); params.put("startTime",startTime); - //params.put("endTime",startTime); + params.put("endTime",endTime); Request request = new Request.Builder() .url(urlBuilder.build()) @@ -125,12 +126,18 @@ public class AttendanceHuazhuTask { /** * 同步7天之内的数据 */ - public void syncLastWeekAttendanceData() { + public void syncLast90DayAttendanceData() { long endTime=DateUtil.current(); long startTime=endTime-3600*1000*24*90; syncAttendanceData(startTime); } + public void syncLastWeekAttendanceData() { + long endTime=DateUtil.current(); + long startTime=endTime-3600*1000*24*7; + syncAttendanceData(startTime); + } + /** * 同步当天数据 */ diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index e0158551..af37f108 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -45,9 +45,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sur_project_attendance_data + +