From 88326fad41fac3981cfeeaac4ec56d84fdddef65 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 31 Jan 2024 22:44:45 +0800
Subject: [PATCH] update code

---
 ruoyi-ui/vue.config.js                             |  4 ++--
 .../mapper/SurProjectAttendanceDataMapper.java     |  2 +-
 .../impl/SurProjectAttendanceDataServiceImpl.java  |  2 +-
 .../com/yanzhu/jh/project/task/AttendanceTask.java | 14 +++++++-------
 .../project/SurProjectAttendanceDataMapper.xml     |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 945f0299..b6e02c50 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -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':'/'
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 5600fb06..f3a48619 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
@@ -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);
 
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 eb1ef963..17eaf2e1 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
@@ -140,7 +140,7 @@ public class SurProjectAttendanceDataServiceImpl implements ISurProjectAttendanc
 
     @Override
     public String getLastServerId(SurProjectAttendanceData where) {
-        return surProjectAttendanceDataMapper.getLastServerId(where);
+        return ""+surProjectAttendanceDataMapper.getLastServerId(where);
     }
 
     @Override
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 61716ef5..34842ab7 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
@@ -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());
-            }
+            //}
         }
     }
 
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
index 298250c1..65c03a6e 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
@@ -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 (