diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 24a18a25..23b9bf80 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -5,7 +5,8 @@ "author": "若依", "license": "MIT", "scripts": { - "dev": "SET NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve", + "dev": "vue-cli-service serve", + "dev20": "SET NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue b/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue index 5a70669e..4fa6ded0 100644 --- a/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue +++ b/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue @@ -21,7 +21,7 @@ - + @@ -87,7 +87,7 @@ export default { subDeptId: '', appId: '', secret: '', - vendorsCode:'yanzhu', + vendorsCode:'gld', appProjectId: '', appTenantId:'', enabled: 0 @@ -221,7 +221,7 @@ export default { subDeptId: '', appId: '', secret: '', - vendorsCode:'yanzhu', + vendorsCode:'gld', appProjectId: '', appTenantId:'', enabled: 0 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 fe042a8d..3eae42d9 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 @@ -16,10 +16,7 @@ import org.apache.logging.log4j.util.Strings; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; @Component("attendanceHuazhuTask") public class AttendanceHuazhuTask { @@ -63,11 +60,12 @@ public class AttendanceHuazhuTask { } */ //380649600000 - public static void main4(String[] args) { - String s= DateUtil.format(DateUtil.date(1704167341751l),"yyyy-MM-dd HH:mm:ss"); - System.out.println(s); - } public static void main(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) { String path="/api/open/labour/findLabourWorkerByPage"; Map map=new HashMap<>(); map.put("appId","8024283707153666851"); @@ -83,9 +81,9 @@ public class AttendanceHuazhuTask { jo.put("page",1); System.out.println(p); System.out.println(jo.toString()); - new AttendanceHuazhuTask().doSyncAttendanceData(jo,1,it); + new AttendanceHuazhuTask().doSyncAttendanceData(jo,1,it,null); } - private static RequestBody toFormBody(Map params ){ + private static RequestBody toFormBody(Map params ){ return RequestBody.create( MediaType.parse("application/json"), JSON.toJSONString(params)); } @@ -105,7 +103,52 @@ public class AttendanceHuazhuTask { return headers; } + /** + * 同步7天之内的数据 + */ + public void syncLastWeekAttendanceData() { + long endTime=DateUtil.current(); + long startTime=endTime-3600*1000*24*7; + syncAttendanceData(startTime); + } + + /** + * 同步当天数据 + */ public void syncAttendanceData(){ + long startTime=DateUtil.date(DateUtil.parse(DateUtil.format(new Date(),"yyyy-MM-dd"))).getTime(); + syncAttendanceData(startTime); + } + + private void syncAttendanceData(long startTime){ + SurProjectAttendanceCfg where =new SurProjectAttendanceCfg(); + where.setEnabled(1l); + where.setIsDel(0l); + where.setVendorsCode("huazhu"); + List list=attendanceCfgService.selectSurProjectAttendanceCfgList(where); + Map map=new HashMap<>(); + long endTime=DateUtil.current(); + + map.put("endTime",endTime); + map.put("startTime",startTime); + for(SurProjectAttendanceCfg it :list){ + String param= it.getVendorsParameter(); + if(Strings.isNotEmpty(param)){ + try{ + JSONObject jo=JSON.parseObject(param); + doSyncAttendanceData(jo,1,it,map); + + }catch (Exception ex){ + ex.printStackTrace(); + } + } + } + } + + /** + * 同步所有数据 + */ + public void syncAllAttendanceData(){ SurProjectAttendanceCfg where =new SurProjectAttendanceCfg(); where.setEnabled(1l); where.setIsDel(0l); @@ -118,9 +161,9 @@ public class AttendanceHuazhuTask { JSONObject jo=JSON.parseObject(param); Long page=attendanceDataService.getHuazhuPage(it.getId()); if(null==page){ - doSyncAttendanceData(jo,1,it); + doSyncAttendanceData(jo,1,it,null); }else{ - doSyncAttendanceData(jo,page,it); + doSyncAttendanceData(jo,page,it,null); } }catch (Exception ex){ @@ -129,9 +172,9 @@ public class AttendanceHuazhuTask { } } } - private void doSyncAttendanceData(JSONObject jdata,long page,SurProjectAttendanceCfg it){ + private void doSyncAttendanceData(JSONObject jdata,long page,SurProjectAttendanceCfg it,Map ps){ String path="/api/open/labour/findCardRecordByPage"; - Request request=getRequest(path,jdata,page); + Request request=getRequest(path,jdata,page,ps); String data=AttendanceTask.getResult(request); JSONObject jo= JSON.parseObject(data); JSONObject joData= jo.getJSONObject("data"); @@ -143,14 +186,19 @@ public class AttendanceHuazhuTask { SurProjectAttendanceData sdata = SurProjectAttendanceData.createFromHuazhu(json); sdata.setVendorId(page); //VendorId保存华筑的页 sdata.setCfgid(it.getId()); + sdata.setAppId(jdata.getString("appId")); sdata.setVendorsCode(it.getVendorsCode()); attendanceDataService.add(sdata); } } if(page ps){ String appId=jo.getString("appId"); String secret=jo.getString("secret"); String projectId=jo.getString("projectId"); @@ -185,12 +235,16 @@ public class AttendanceHuazhuTask { headerParams.put("appSecret",secret); headerParams.put("Content-Type","application/json"); - Map params = new HashMap<>(); + Map params = new HashMap<>(); params.put("orgId",projectId); params.put("tenantId",tenantId); - params.put("size","500"); - params.put("current",""+page); - + params.put("size",500); + params.put("current",page); + if(ps!=null){ + for(String k :ps.keySet()){ + params.put(k,ps.get(k)); + } + } Request request = new Request.Builder() .url(urlBuilder.build()) @@ -212,6 +266,7 @@ public class AttendanceHuazhuTask { SurProjectAttendanceUser user=SurProjectAttendanceUser.createFromHuazhu(json); user.setVendorsCode(it.getVendorsCode()); user.setCfgid(it.getId()); + user.setAppId(jdata.getString("appId")); attendanceUserService.add(user); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java index b47a5feb..3509015f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java @@ -138,6 +138,7 @@ public class AttendanceTask { SurProjectAttendanceUser user=SurProjectAttendanceUser.create(json); user.setVendorsCode(it.getVendorsCode()); user.setCfgid(it.getId()); + user.setAppId(appid); attendanceUserService.add(user); } } @@ -201,11 +202,12 @@ public class AttendanceTask { SurProjectAttendanceData sdata=SurProjectAttendanceData.create(json); lastId=sdata.getServerid(); sdata.setCfgid(it.getId()); + sdata.setAppId(appid); sdata.setVendorsCode(it.getVendorsCode()); attendanceDataService.add(sdata); } } - System.out.println("-------->"+id+","+lastId); + //System.out.println("-------->"+id+","+lastId); if(arr.size()==500){ doSyncAttendanceData(appid,secret,projectld,lastId,it); }