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

update code

dev_xds
haha 2024-01-31 22:44:45 +08:00
parent e0cea68644
commit 88326fad41
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/vue.config.js
View File

@ -41,8 +41,8 @@ module.exports = {
// }
// },
'/jhapi':{
target: `http://62.234.3.186/jhapi/`,
//target: `http://127.0.0.1:8090/jhapi/`,
//target: `http://62.234.3.186/jhapi/`,
target: `http://127.0.0.1:8090/jhapi/`,
changeOrigin: true,
pathRewrite: {
'^/jhapi':'/'

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAttendanceDataMapper.java
View File

@ -75,7 +75,7 @@ public interface SurProjectAttendanceDataMapper
*/
public int batchSurProjectAttendanceData(List<SurProjectAttendanceData> SurProjectAttendanceDataList);
public String getLastServerId(SurProjectAttendanceData where);
public Long getLastServerId(SurProjectAttendanceData where);
List<SurProjectAttendanceData> groupByComany(SurProjectAttendanceData where);

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

@ -140,7 +140,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
@Override
public String getLastServerId(SurProjectAttendanceData where) {
return surProjectAttendanceDataMapper.getLastServerId(where);
return ""+surProjectAttendanceDataMapper.getLastServerId(where);
}
@Override

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

@ -176,9 +176,9 @@ public class AttendanceTask {
}
}
}
private void doSyncAttendanceData(String appid,String secret,String projectld,String id,SurProjectAttendanceCfg it){
private void doSyncAttendanceData(String appid,String secret,String projectId,String id,SurProjectAttendanceCfg it){
Map<String, Object> params = new HashMap<>();
params.put("projectId", projectld);
params.put("projectId", projectId);
params.put("startId",""+id);
params.put("pageSize", "500");
params.put("appid",appid);
@ -210,17 +210,17 @@ public class AttendanceTask {
}
//System.out.println("-------->"+id+","+lastId);
if(arr.size()==500){
doSyncAttendanceData(appid,secret,projectld,lastId,it);
doSyncAttendanceData(appid,secret,projectId,lastId,it);
}
}
public static void main(String[] args){
System.out.println("-------1--------->AttendanceUserTask.syncWorker");
Map<String, Object> params = new HashMap<>();
params.put("projectId", "719148569880576");
params.put("projectId", "824959117494784");
//params.put("start", "2023-10-06 00:00:00");
//params.put("end", "2023-10-07 00:00:00");
//params.put("pageNo", "1");
params.put("startId", "6755780004");
params.put("startId", "0");
params.put("pageSize", "1000");
params.put("appid","8fba899a21c64be4aa25bf0f3314ad5c");
String sign = getSign(params,"426b3d8280620176d80a826eebef3579");
@ -241,9 +241,9 @@ public class AttendanceTask {
JSONArray jsonArray=jo.getJSONArray("data");
for(int i=0;i<jsonArray.size();i++){
JSONObject o=jsonArray.getJSONObject(i);
if(o.getLong("workerId")==7813018){
//if(o.getLong("workerId")==7813018){
System.out.println(o.toString());
}
//}
}
}

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
View File

@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<select id="getLastServerId" parameterType="SurProjectAttendanceData" resultType="Long">
SELECT IF(MAX(serverid),MAX(serverid),0) serverid FROM sur_project_attendance_data WHERE cfgid=#{cfgid}
SELECT IF(MAX(serverid+0),MAX(serverid+0),0) serverid FROM sur_project_attendance_data WHERE cfgid=#{cfgid}
</select>
<select id="groupByComanyOld" parameterType="SurProjectAttendanceData" resultMap="SurProjectAttendanceDataResult">
select companyTypeId,count(1) id from ( <include refid="selectSurProjectAttendanceDataVo"/> ) x2 where id in (