sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2024-04-15 22:40:00 +08:00
parent b60ad07a83 9cca67e0c0
commit 7033395690
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceData.java
View File

@ -279,9 +279,9 @@ public class SurProjectAttendanceData extends BaseEntity
d.serverid=j.getString("id"); d.serverid=j.getString("id");
d.workerId=j.getString("workerId"); d.workerId=j.getString("workerId");
if("2".equals(j.getString("machineType"))){ if("2".equals(j.getString("machineType"))){
d.setRemark("L");
}else{
d.setRemark("E"); d.setRemark("E");
}else{
d.setRemark("L");
} }
d.attendanceTime = j.getString("checkinTime"); d.attendanceTime = j.getString("checkinTime");

3
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
View File

@ -272,6 +272,9 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
} }
} }
//upData.setAttendanceOutTime(sdata.getAttendanceTime()); //upData.setAttendanceOutTime(sdata.getAttendanceTime());
if("jgw".equals(upData.getVendorsCode())){
upData.setRemark(sdata.getRemark());
}
updateSurProjectAttendanceData(upData); updateSurProjectAttendanceData(upData);
} }
} }

21
yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceJgwTask.java
View File

@ -138,8 +138,8 @@ public class AttendanceJgwTask {
String appid="6a6f24fe35b04ee0bcf31cfb46ed1051"; String appid="6a6f24fe35b04ee0bcf31cfb46ed1051";
String secret="c3h5enh4MjAyNHN1Yw=="; String secret="c3h5enh4MjAyNHN1Yw==";
//String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";// //String prjId="db955e11ef774e63968a47c3dc2acc15";//"b67f1baa6dca4558a16bf90a4681b82e";//
String prjId="209aa0c01d8248b6a56a0921d1b88c83";//泾河新城荟锦坊二期 String prjId="fa0a3e017ead4d4aa31eeb0ab6e4eda9";//泾河新城荟锦坊二期
String phone="18992013714"; String phone="17697358473";
String token= getToken(appid,secret); String token= getToken(appid,secret);
if(token==null || token.length()==0){ if(token==null || token.length()==0){
return; return;
@ -149,12 +149,12 @@ public class AttendanceJgwTask {
String subcontractorId=new AttendanceJgwTask().getSubcontractor(appid,token,phone); String subcontractorId=new AttendanceJgwTask().getSubcontractor(appid,token,phone);
String leaderTeamId="9a7cda9fd629495b8acc615a54c00625"; String leaderTeamId="9a7cda9fd629495b8acc615a54c00625";
System.out.println(subcontractorId); System.out.println(subcontractorId);
findWorkerByLeader(appid,token,leaderTeamId); //findWorkerByLeader(appid,token,leaderTeamId);
//findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0); //findDirectlyUnderTeam(appid,token,prjId,subcontractorId,0);
//queryProject(appid,token,phone,0);; //queryProject(appid,token,phone,0);;
//findAddWorkerByProject(appid,token,prjId,0); //findAddWorkerByProject(appid,token,prjId,0);
//findUpdateWorkerByProject(appid,token,prjId,0); //findUpdateWorkerByProject(appid,token,prjId,0);
//findAttendanceByProject(appid,token,prjId); findAttendanceByProject(appid,token,prjId,"0");
//findTeamByProjectId(appid,token,prjId); //findTeamByProjectId(appid,token,prjId);
//findProContractorByProjectId(appid,token,prjId); //findProContractorByProjectId(appid,token,prjId);
//getJobTypeData(appid,token,"0"); //getJobTypeData(appid,token,"0");
@ -293,10 +293,10 @@ public class AttendanceJgwTask {
} }
return map; return map;
} }
public static void findAttendanceByProject(String appId,String token,String projectId){ public static void findAttendanceByProject(String appId,String token,String projectId,String startId){
String path="/webapi/project/findAttendanceByProject"; String path="/webapi/project/findAttendanceByProject";
String time = System.currentTimeMillis() + ""; String time = System.currentTimeMillis() + "";
String startId="0"; //String startId="0";
String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time; String url=host+path+"?appId=" + appId + "&tokenSign=" + token +"&timestamp=" + time;
System.out.println(url); System.out.println(url);
String tokenSign = Md5Utils.hash(url); String tokenSign = Md5Utils.hash(url);
@ -326,8 +326,12 @@ public class AttendanceJgwTask {
System.out.println(json.getString("machineType")); System.out.println(json.getString("machineType"));
String photoUrl=getPhoto(appId,token,photo); String photoUrl=getPhoto(appId,token,photo);
SurProjectAttendanceData sdata = SurProjectAttendanceData.createFromJgw(json); SurProjectAttendanceData sdata = SurProjectAttendanceData.createFromJgw(json);
sdata.setScanPhoto(photoUrl); if(sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")){
System.out.println("--->"+sdata.getRemark());
}
//sdata.setScanPhoto(photoUrl);
} }
findAttendanceByProject(appId,token,projectId,endId);
} }
} }
@ -1080,6 +1084,9 @@ public class AttendanceJgwTask {
sdata.setScanPhoto(photoUrl); sdata.setScanPhoto(photoUrl);
sdata.setCfgid(it.getId()); sdata.setCfgid(it.getId());
sdata.setAppId(appId); sdata.setAppId(appId);
if(sdata.getWorkerId().equals("63e0e09858624979b97291977afe352b")){
System.out.println("--->"+sdata.getRemark());
}
sdata.setVendorsCode(it.getVendorsCode()); sdata.setVendorsCode(it.getVendorsCode());
attendanceDataService.add(sdata); attendanceDataService.add(sdata);
} }