diff --git a/pom.xml b/pom.xml
index e5ab319..7ef7464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,12 @@
kotlin-stdlib-jdk8
${kotlin.version}
+
+
+ org.jsoup
+ jsoup
+ 1.15.3
+
diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt
index a1caff0..1a7533f 100644
--- a/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt
@@ -16,6 +16,15 @@ import java.util.*
@SpringBootApplication
open class DakaApplication {
}
+
+val holidays: List = listOf(
+ "2023-04-05",
+ "2023-04-29", "2023-04-30", "2023-05-01", "2023-05-01", "2023-05-03",
+ "2023-06-22", "2023-06-23", "2023-06-24",
+ "2023-09-29", "2023-09-30", "2023-10-01", "2023-10-02", "2023-10-03", "2023-10-04", "2023-10-05", "2023-10-06")
+
+val workdays: List = listOf("2023-04-23", "2023-05-06", "2023-06-25", "2023-10-07", "2023-10-08")
+
private val logger = LoggerFactory.getLogger("APPLICATION-STARTER")
fun main(args: Array) {
SpringApplication.run(DakaApplication::class.java, *args)
diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt
index 7bd3da0..dc27c27 100644
--- a/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt
@@ -3,81 +3,47 @@ package com.pomelotea.hoperun.sign.api
import com.alibaba.fastjson.JSON
import com.alibaba.fastjson.JSONObject
import com.alibaba.fastjson.TypeReference
+import com.pomelotea.hoperun.sign.api.model.AttendancesDetail
+import com.pomelotea.hoperun.sign.api.model.AttendancesDetailResponse
+import com.pomelotea.hoperun.sign.common.*
import com.pomelotea.hoperun.sign.config.HoperunUserConfig
+import com.pomelotea.hoperun.sign.config.HoperunUserConfig.deviceMap
+import com.pomelotea.hoperun.sign.config.HoperunUserConfig.getUserConfig
+import com.pomelotea.hoperun.sign.config.HoperunUserConfig.userConfigMap
import com.pomelotea.hoperun.sign.config.UserConfig
+import com.pomelotea.hoperun.sign.scheduler.AutoDakaScheduler
import okhttp3.FormBody
import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.jsoup.Jsoup
+import org.springframework.web.bind.annotation.*
import java.text.SimpleDateFormat
-import java.time.Duration
-import java.time.LocalDate
import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
/**
*
* @version 0.0.1
* @author jimlee
* date 2022-07-15 11:01
+ * update: 2023/3/22
* hoperun打卡服务接口
**/
+
@RestController
@RequestMapping("/api/daka")
-class HoperunSignController(
- private val hoperunUserConfig: HoperunUserConfig
-) {
+class HoperunSignController {
- companion object {
-
- const val DAKA_URL = "http://pom.hoperun.com:8187/attm/attence/recordAttendance"
- const val MONTH_ATT_URL = "http://pom.hoperun.com:8187/attm/calendar/monthAtt"
- const val LOGIN_URL = "http://pom.hoperun.com:8187/attm/login/login"
-
- val client = OkHttpClient()
- .newBuilder()
- .connectTimeout(Duration.ofSeconds(10))
- .callTimeout(Duration.ofSeconds(10))
-// .addInterceptor(LogInterceptor())
- .build()
- val sessionMap: MutableMap = HashMap()
- val expireMap: MutableMap = HashMap()
-
-
- fun getNowDateyyyy_MM(): String {
- val localDate = LocalDate.now()
- return "${localDate.year}-${pad(localDate.monthValue)}"
- }
-
- fun getLastDateyyyy_MM(): String {
- val localDate = LocalDate.now().minusMonths(1)
- return "${localDate.year}-${pad(localDate.monthValue)}"
- }
-
- fun getNowDateyyyy_MM_dd(): String {
- val localDate = LocalDate.now()
- return "${localDate.year}-${pad(localDate.monthValue)}-${pad(localDate.dayOfMonth)}"
- }
-
- private fun pad(num: Int): String {
- return if (num < 10) "0$num" else "$num"
- }
+ init {
+ AutoDakaScheduler()
}
- @GetMapping("/username/{employeeNo}")
- fun getUsername(@PathVariable employeeNo: String): WebResult {
- val userConfig = getUserConfig(employeeNo)
- if (userConfig == null) {
- return WebResult.getFailed("登陆失败")
- }
+ @GetMapping("/username/{employeeNo}/{jsessionId}/{checked}")
+ fun getUsername(@PathVariable employeeNo: String, @PathVariable jsessionId: String, @PathVariable checked: Boolean): WebResult {
+ getJsessionIdAutoLogin(employeeNo, jsessionId)
+ val userConfig = getUserConfig(employeeNo) ?: return WebResult.getFailed("登陆失败")
+ userConfig.autoDaka = checked
+ userConfig.device = deviceMap[employeeNo]
return WebResult.getSuccess(
LoginResponse(
userConfig.username,
@@ -89,19 +55,26 @@ class HoperunSignController(
)
}
+ @GetMapping("/auto/{employeeNo}/{checked}")
+ fun autoDaka(@PathVariable employeeNo: String, @PathVariable checked: Boolean): WebResult {
+ val userConfig = getUserConfig(employeeNo) ?: return WebResult.getFailed("需要重新登录")
+ userConfig.autoDaka = checked
+ return WebResult.getSuccess(checked)
+ }
+
@GetMapping("/last/{employeeNo}")
fun getLast5DaysRecord(@PathVariable employeeNo: String): WebResult {
- val jsessionId = getJsessionIdAutoLogin(employeeNo) ?: return WebResult.getFailed("登陆失败")
+ val jsessionId = sessionMap.get(employeeNo) ?: return WebResult.getFailed("登陆失败")
return WebResult.getSuccess(monthAtt(employeeNo, jsessionId))
}
@PostMapping("/endTime")
fun endTime(@RequestBody request: DakaRequest): WebResult {
- val userConfig = hoperunUserConfig.userConfigMap.get(request.employeeNo)
+ val userConfig = userConfigMap.get(request.employeeNo)
if (userConfig?.device == null) {
return WebResult.getFailed("用户没有配置的deviceUA")
}
- val jsessionId = getJsessionIdAutoLogin(request.employeeNo)
+ val jsessionId = sessionMap.get(request.employeeNo)
if (jsessionId == null) {
return WebResult.getFailed("登陆失败")
}
@@ -126,14 +99,11 @@ class HoperunSignController(
@PostMapping("/beginTime")
fun beginTime(@RequestBody request: DakaRequest): WebResult {
- val userConfig = hoperunUserConfig.userConfigMap.get(request.employeeNo)
+ val userConfig = userConfigMap.get(request.employeeNo)
if (userConfig?.device == null) {
return WebResult.getFailed("用户没有配置的deviceUA")
}
- val jsessionId = getJsessionIdAutoLogin(request.employeeNo)
- if (jsessionId == null) {
- return WebResult.getFailed("登陆失败")
- }
+ val jsessionId = sessionMap.get(request.employeeNo)
val date = if (request.date == "今天") SimpleDateFormat("yyyy-MM-dd").format(Date()) else request.date
val dakaRequest = Request.Builder()
.url(DAKA_URL)
@@ -152,21 +122,13 @@ class HoperunSignController(
return WebResult.getSuccess(JSONObject.parseObject(result, DakaResponse::class.java))
}
- private fun getJsessionIdAutoLogin(employeeNo: String): String? {
- if (sessionMap.get(employeeNo) == null || expireMap.get(employeeNo) == null || expireMap.get(employeeNo)!! < System.currentTimeMillis()) {
- login(employeeNo)
+ private fun getJsessionIdAutoLogin(employeeNo: String, jsessionId: String): String? {
+ if (sessionMap.get(employeeNo) == null) {
+ login(employeeNo, jsessionId)
}
return sessionMap.get(employeeNo)
}
- private fun getUserConfig(employeeNo: String): UserConfig? {
- val userConfig = hoperunUserConfig.userConfigMap.get(employeeNo)
- if (userConfig?.username == null) {
- login(employeeNo)
- }
- return hoperunUserConfig.userConfigMap.get(employeeNo)
- }
-
/**
* 查询近两个月的
*/
@@ -201,150 +163,64 @@ class HoperunSignController(
object : TypeReference?>() {})
}
- private fun login(employeeNo: String) {
- val jsessionId: String?
- val loginRequest = Request.Builder()
- .url(LOGIN_URL)
- .post(
- FormBody.Builder()
- .add("login_id", padEmployeeNumber(employeeNo))
- .add("password", "123456")
- .build()
- )
- .build()
- val response = client.newCall(loginRequest).execute()
- jsessionId = response.request.url.pathSegments[2].substring(19)
- sessionMap.put(employeeNo, jsessionId)
- expireMap.put(employeeNo, System.currentTimeMillis() + 300000)
-
-
+ private fun login(employeeNo: String, jsessionId: String) {
// 读取员工姓名
- if (hoperunUserConfig.userConfigMap[employeeNo]?.username == null) {
- setUserConfig(employeeNo)
+ if (userConfigMap[employeeNo]?.username == null) {
+ setUserConfig(employeeNo, jsessionId)
+ sessionMap.put(employeeNo, jsessionId)
}
}
- private fun setUserConfig(employeeNo: String) {
- // 获取deviceua
- val loginRequest = Request.Builder()
- .url("http://pom.hoperun.com:8187/attp/login/login.do")
- .post(
- JSON.toJSONString(
- mapOf(
- "login_id" to padEmployeeNumber(employeeNo),
- "password" to "123456",
- "roleType" to "0"
- )
- ).toRequestBody("application/json;charset=utf-8".toMediaTypeOrNull())
- )
- .build()
- val response = client.newCall(loginRequest).execute()
- val jsessionId = response.headers("Set-Cookie")[0].substring(11, 43)
-
+ private fun setUserConfig(employeeNo: String, jsessionId: String) {
val attendancesDetailRequest = Request.Builder()
- .url("http://pom.hoperun.com:8187/attp/attendances/queryAttendancesDetail")
- .post(
- JSON.toJSONString(
- mapOf(
- "beginDate" to getLastDateyyyy_MM() + "-21",
- "endDate" to getNowDateyyyy_MM_dd(),
- "staffCode" to padEmployeeNumber(employeeNo)
- )
- ).toRequestBody("application/json;charset=utf-8".toMediaTypeOrNull())
- )
+ .url("http://pom.hoperun.com:8187/attm/calendar/monthAtt?staff_code=${padEmployeeNumber(employeeNo)}&yearmonth=${getNowDateyyyy_MM()}-01")
+ .get()
.addHeader("Cookie", "JSESSIONID=$jsessionId")
+ .addHeader("User-Agent", "Qing/0.9.113;iOS 16.3.1;Apple;iPhone13,2;deviceId:a8baf66f-fdeb-4f4d-b1e5-9fafcd5045b6;deviceName:iOS;clientId:10200;os:iOS 16.3.1;brand:Apple;model:iPhone13,2;lang:zh-CN;fontNum:0;fontScale:1.0;ver:10.7.14;Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148")
+ .addHeader("accept", "*/*")
+ .addHeader("Origin", "http://pom.hoperun.com:8187")
+ .addHeader("Referer", "http://pom.hoperun.com:8187/attm/attence/getInfo")
+ .addHeader("content-type", "application/x-www-form-urlencoded; charset=UTF-8")
.build()
- val attendancesDetailResponse = client.newCall(attendancesDetailRequest).execute()
- val bodyString = attendancesDetailResponse.body?.string()
- val dakaJsonArray = JSONObject.parseArray(bodyString)
- val dakaInfo = dakaJsonArray.getJSONObject(dakaJsonArray.size - 1)
- val dakaList = dakaInfo.getJSONArray("list")
- var lastDakaInfo = dakaList.getJSONObject(dakaList.size - 1)
- val userConfig: UserConfig = hoperunUserConfig.userConfigMap.get(employeeNo) ?: UserConfig()
+ val attendancesDetailResp = client.newCall(attendancesDetailRequest).execute()
+ val bodyString = attendancesDetailResp.body?.string()
+ val attendancesDetailResponse = JSONObject.parseObject(bodyString, AttendancesDetailResponse::class.java)
+ val dataList: List = JSONObject.parseObject(attendancesDetailResponse.data, object : TypeReference>() {})
+ val lastDakaInfo: AttendancesDetail = dataList
+ .filter { it.project_id != "-1" }
+ .findLast { it.yearmonth == "2023-03-21" }!!
+ val userConfig: UserConfig = userConfigMap.get(employeeNo) ?: UserConfig()
- if (lastDakaInfo.getString("begin_time") == null) {
- for (i in dakaList.size - 1 downTo 0) {
- lastDakaInfo = dakaList.getJSONObject(i)
- if (lastDakaInfo.getString("actual_area_end") != null) {
- break
- }
- }
- }
- val username: String = lastDakaInfo.getString("staff_name")
- userConfig.username = username
- if (userConfig.device == null) {
- if (lastDakaInfo.getString("actual_area_end") != null) {
- val area: String = lastDakaInfo.getString("actual_area_end")
- userConfig.device = area.substring(area.lastIndexOf("Qing") + 13)
- } else if (lastDakaInfo.getString("actual_area_begin") != null) {
- val area: String = lastDakaInfo.getString("actual_area_begin")
- userConfig.device = area.substring(area.lastIndexOf("Qing") + 13)
- } else {
- userConfig.device = null
- }
- }
if (userConfig.projectcode == null) {
- userConfig.projectcode = dakaInfo.getString("pro_id")
+ userConfig.projectcode = lastDakaInfo.projectcode
}
if (userConfig.projectname == null) {
- userConfig.projectname = dakaInfo.getString("pro_name")
+ userConfig.projectname = lastDakaInfo.projectname
}
if (userConfig.project_id == null) {
- userConfig.project_id = dakaInfo.getString("pro_id")
+ userConfig.project_id = lastDakaInfo.project_id
}
- hoperunUserConfig.addUserConfig(
+ // username 要从主页的html元素中获取
+ val indexRequest = Request.Builder()
+ .url("http://pom.hoperun.com:8187/attm/attence/getInfo")
+ .get()
+ .addHeader("Cookie", "JSESSIONID=$jsessionId")
+ .addHeader("User-Agent", "Qing/0.9.113;iOS 16.3.1;Apple;iPhone13,2;deviceId:a8baf66f-fdeb-4f4d-b1e5-9fafcd5045b6;deviceName:iOS;clientId:10200;os:iOS 16.3.1;brand:Apple;model:iPhone13,2;lang:zh-CN;fontNum:0;fontScale:1.0;ver:10.7.14;Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148")
+ .addHeader("accept", "*/*")
+ .addHeader("Origin", "http://pom.hoperun.com:8187")
+ .addHeader("Referer", "http://pom.hoperun.com:8187/attm/attence/getInfo")
+ .addHeader("content-type", "application/x-www-form-urlencoded; charset=UTF-8")
+ .build()
+ val indexResp = client.newCall(indexRequest).execute()
+ val indexHtml = indexResp.body?.string()
+ val doc = Jsoup.parse(indexHtml!!)
+ userConfig.username = doc.select("#attendance-detail-content > div.container.none-padding > div > div:nth-child(1) > div:nth-child(4)").text()
+ userConfig.employeeNo = employeeNo
+ HoperunUserConfig.addUserConfig(
employeeNo, userConfig
)
}
-
- private fun beginTimeHoperunDakaRequest(
- employeeNo: String,
- yearmonth: String,
- begin_time: String?
- ): HoperunDakaRequest {
- val ua = hoperunUserConfig.getUA(employeeNo)
- val userConfig: UserConfig = getUserConfig(employeeNo)!!
- val hoperunDakaRequest = HoperunDakaRequest(
- staff_code = padEmployeeNumber(employeeNo),
- yearmonth = yearmonth,
- userConfig.project_id!!,
- userConfig.projectname!!,
- userConfig.projectcode!!,
- actualArea = ua
- )
- hoperunDakaRequest.begin_time = begin_time
- return hoperunDakaRequest
- }
-
- private fun endTimeHoperunDakaRequest(
- employeeNo: String,
- yearmonth: String,
- end_time: String?
- ): HoperunDakaRequest {
- val ua = hoperunUserConfig.getUA(employeeNo)
- val userConfig: UserConfig = getUserConfig(employeeNo)!!
- val hoperunDakaRequest = HoperunDakaRequest(
- staff_code = padEmployeeNumber(employeeNo),
- yearmonth = yearmonth,
- userConfig.project_id!!,
- userConfig.projectname!!,
- userConfig.projectcode!!,
- actualArea = ua
- )
- hoperunDakaRequest.end_time = end_time
- return hoperunDakaRequest
- }
-
-
- fun padEmployeeNumber(employeeNumber: String): String {
- return when (employeeNumber.length) {
- 5 -> "0000" + employeeNumber
- 4 -> "00000" + employeeNumber
- else -> employeeNumber
- }
- }
-
}
diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/api/model/AttendancesDetailResponse.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/api/model/AttendancesDetailResponse.kt
new file mode 100644
index 0000000..ff2ec5f
--- /dev/null
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/api/model/AttendancesDetailResponse.kt
@@ -0,0 +1,30 @@
+package com.pomelotea.hoperun.sign.api.model
+
+/**
+ *
+ * @version 0.0.1
+ * @author jimlee
+ * date 2023-03-22 13:52
+ *
+ **/
+data class AttendancesDetailResponse(
+ val data: String,
+ val success: Boolean = false
+)
+
+data class AttendancesDetail(
+ val area_id: String? = null,
+ val area_id_begin: String? = null,
+ val area_id_end: String? = null,
+ val attState: String? = null,
+ val att_type: String? = null,
+ val begin_time: String? = null,
+ val dateType: String? = null,
+ val departmentcode: String? = null,
+ val end_time: String? = null,
+ val project_id: String? = null,
+ val projectcode: String? = null,
+ val projectname: String? = null,
+ val staff_code: String? = null,
+ val yearmonth: String? = null,
+)
\ No newline at end of file
diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/common/Common.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/common/Common.kt
new file mode 100644
index 0000000..18be421
--- /dev/null
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/common/Common.kt
@@ -0,0 +1,164 @@
+package com.pomelotea.hoperun.sign.common
+
+import com.alibaba.fastjson.JSON
+import com.alibaba.fastjson.JSONObject
+import com.pomelotea.hoperun.sign.api.DakaResponse
+import com.pomelotea.hoperun.sign.api.HoperunDakaRequest
+import com.pomelotea.hoperun.sign.config.HoperunUserConfig
+import com.pomelotea.hoperun.sign.config.HoperunUserConfig.getUserConfig
+import com.pomelotea.hoperun.sign.config.UserConfig
+import com.pomelotea.hoperun.sign.holidays
+import com.pomelotea.hoperun.sign.workdays
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.time.DayOfWeek
+import java.time.Duration
+import java.time.LocalDate
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+import java.util.*
+
+/**
+ *
+ * @version 0.0.1
+ * @author jimlee
+ * date 2023-03-22 15:45
+ *
+ **/
+
+
+const val DAKA_URL = "http://pom.hoperun.com:8187/attm/attence/recordAttendance"
+const val MONTH_ATT_URL = "http://pom.hoperun.com:8187/attm/calendar/monthAtt"
+val DEFAULT_ZONE = ZoneOffset.of("+8")
+
+val client = OkHttpClient()
+ .newBuilder()
+ .connectTimeout(Duration.ofSeconds(10))
+ .callTimeout(Duration.ofSeconds(10))
+// .addInterceptor(LogInterceptor())
+ .build()
+val sessionMap: MutableMap = HashMap()
+
+fun getNowDateyyyy_MM(): String {
+ val localDate = LocalDate.now()
+ return "${localDate.year}-${pad(localDate.monthValue)}"
+}
+
+fun getLastDateyyyy_MM(): String {
+ val localDate = LocalDate.now().minusMonths(1)
+ return "${localDate.year}-${pad(localDate.monthValue)}"
+}
+
+fun getNowDateyyyy_MM_dd(): String {
+ val localDate = LocalDate.now()
+ return "${localDate.year}-${pad(localDate.monthValue)}-${pad(localDate.dayOfMonth)}"
+}
+
+private fun pad(num: Int): String {
+ return if (num < 10) "0$num" else "$num"
+}
+fun isWeekend(dakaDate: String): Boolean {
+ val date = LocalDate.parse(dakaDate, DateTimeFormatter.ISO_LOCAL_DATE)
+ return date.dayOfWeek == DayOfWeek.SATURDAY || date.dayOfWeek == DayOfWeek.SUNDAY
+}
+
+fun isWeekday(dakaDate: String): Boolean {
+ val date = LocalDate.parse(dakaDate, DateTimeFormatter.ISO_LOCAL_DATE)
+ return date.dayOfWeek == DayOfWeek.MONDAY || date.dayOfWeek == DayOfWeek.TUESDAY
+ || date.dayOfWeek == DayOfWeek.WEDNESDAY || date.dayOfWeek == DayOfWeek.THURSDAY || date.dayOfWeek == DayOfWeek.FRIDAY
+}
+
+fun beginTime(employeeNo: String, date: String, time: String, jsessionId: String = sessionMap.get(employeeNo)!!): DakaResponse {
+ val dakaRequest = Request.Builder()
+ .url(DAKA_URL)
+ .post(
+ JSON.toJSONString(
+ beginTimeHoperunDakaRequest(
+ employeeNo,
+ date,
+ time
+ )
+ ).toRequestBody("application/json;charset=utf-8".toMediaTypeOrNull())
+ )
+ .addHeader("Cookie", "JSESSIONID=$jsessionId")
+ .build()
+ val result: String? = client.newCall(dakaRequest).execute().body?.string()
+ return JSONObject.parseObject(result, DakaResponse::class.java)
+}
+
+
+
+fun beginTimeHoperunDakaRequest(
+ employeeNo: String,
+ yearmonth: String,
+ begin_time: String?
+): HoperunDakaRequest {
+ val ua = HoperunUserConfig.getUA(employeeNo)
+ val userConfig: UserConfig = HoperunUserConfig.getUserConfig(employeeNo)!!
+ val hoperunDakaRequest = HoperunDakaRequest(
+ staff_code = padEmployeeNumber(employeeNo),
+ yearmonth = yearmonth,
+ userConfig.project_id!!,
+ userConfig.projectname!!,
+ userConfig.projectcode!!,
+ actualArea = ua
+ )
+ hoperunDakaRequest.begin_time = begin_time
+ return hoperunDakaRequest
+}
+
+fun endTime(employeeNo: String, date: String, time: String, jsessionId: String = sessionMap.get(employeeNo)!!): DakaResponse {
+ val dakaRequest = Request.Builder()
+ .url(DAKA_URL)
+ .post(
+ JSON.toJSONString(
+ endTimeHoperunDakaRequest(
+ employeeNo,
+ date,
+ time
+ )
+ ).toRequestBody("application/json;charset=utf-8".toMediaTypeOrNull())
+ )
+ .addHeader("Cookie", "JSESSIONID=$jsessionId")
+ .build()
+ val result: String? = client.newCall(dakaRequest).execute().body?.string()
+ return JSONObject.parseObject(result, DakaResponse::class.java)
+}
+
+fun padEmployeeNumber(employeeNumber: String): String {
+ return when (employeeNumber.length) {
+ 5 -> "0000" + employeeNumber
+ 4 -> "00000" + employeeNumber
+ else -> employeeNumber
+ }
+}
+fun endTimeHoperunDakaRequest(
+ employeeNo: String,
+ yearmonth: String,
+ end_time: String?
+): HoperunDakaRequest {
+ val ua = HoperunUserConfig.getUA(employeeNo)
+ val userConfig: UserConfig = getUserConfig(employeeNo)!!
+ val hoperunDakaRequest = HoperunDakaRequest(
+ staff_code = padEmployeeNumber(employeeNo),
+ yearmonth = yearmonth,
+ userConfig.project_id!!,
+ userConfig.projectname!!,
+ userConfig.projectcode!!,
+ actualArea = ua
+ )
+ hoperunDakaRequest.end_time = end_time
+ return hoperunDakaRequest
+}
+
+
+fun randowSecond(): String {
+ val second = Random().nextInt(59)
+ return if (second < 10) "0$second" else "$second"
+}
+
+fun isNeedDaka(dakaDate: String): Boolean {
+ return workdays.contains(dakaDate) || (isWeekday(dakaDate) && !holidays.contains(dakaDate))
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/config/HoperunUserConfig.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/config/HoperunUserConfig.kt
index 35b2aa8..2498c3c 100644
--- a/src/main/kotlin/com/pomelotea/hoperun/sign/config/HoperunUserConfig.kt
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/config/HoperunUserConfig.kt
@@ -1,10 +1,5 @@
package com.pomelotea.hoperun.sign.config
-import com.pomelotea.hoperun.sign.api.HoperunSignController.Companion.expireMap
-import com.pomelotea.hoperun.sign.api.HoperunSignController.Companion.sessionMap
-import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.context.annotation.Configuration
-
/**
*
* @version 0.0.1
@@ -12,21 +7,23 @@ import org.springframework.context.annotation.Configuration
* date 2022-07-18 09:56
* 用户配置
**/
-@Configuration
-@ConfigurationProperties("hoperun")
-open class HoperunUserConfig {
- val userConfigMap: MutableMap = HashMap()
- var address: String = "浙江省杭州市西湖区万塘路18号黄龙时代广场B座"
- var longitueHead: String = "120.131"
- var latitudeHead: String = "30.279"
- var longitueShort: String = "120.136679"
- var latitudeShort: String = "30.279766"
- var qingUa: String = "Qing/0.9.101"
+object HoperunUserConfig {
- init {
- expireMap.put("9119", System.currentTimeMillis() + 300000)
- addUserConfig("9119", UserConfig(username = "李建明", device = "iOS 16.2;Apple;iPhone13,2;deviceId:a8baf66f-fdeb-4f4d-b1e5-9fafcd5045b6(", projectcode = "U2103S000078", project_id = "U2103S000078", projectname = "JRKF-银河资产对接合作平台贷项目"))
- sessionMap.put("9119", "887B892ABF482A65AD9EFA4254250DFE")
+ val deviceMap = mapOf(
+ "16638" to "Android 12;Redmi;M2007J3SC;deviceId:OAIDe7fa6084205e9a22d8f6f71bc91893ff;deviceName:Android",
+ "9119" to "iOS 16.3.1;Apple;iPhone13,2;deviceId:a8baf66f-fdeb-4f4d-b1e5-9fafcd5045b6;deviceName:iOS;clientId:10200;os:iOS 16.3.1;brand:Apple;model:iPhone13,2;lang:zh-CN;fontNum:0;fontScale:1.0;ver:10.7.14;Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148"
+ )
+
+ val userConfigMap: MutableMap = HashMap()
+ var address: String = "浙江省杭州市西湖区转塘街道凌家桥路飞天园区"
+ var longitueHead: String = "120.085"
+ var latitudeHead: String = "30.138"
+ var longitueShort: String = "120.0845715522375"
+ var latitudeShort: String = "30.140219809955912"
+ var qingUa: String = "Qing/0.9.113"
+
+ fun getUserConfig(employeeNo: String): UserConfig? {
+ return userConfigMap.get(employeeNo)
}
fun getUA(emplotyeeNo: String): String {
@@ -36,7 +33,7 @@ open class HoperunUserConfig {
"$longitueShort," +
"$latitudeShort;" +
"$qingUa;" +
- (userConfigMap.get(emplotyeeNo)!!.device ?: "")
+ (deviceMap.get(emplotyeeNo) ?: "")
}
fun addUserConfig(emplotyeeNo: String, userConfig: UserConfig) {
@@ -60,8 +57,10 @@ open class HoperunUserConfig {
data class UserConfig(
var username: String? = null,
+ var employeeNo: String? = null,
var device: String? = null,
var project_id: String? = null,
var projectname: String? = null,
- var projectcode: String? = null
+ var projectcode: String? = null,
+ var autoDaka: Boolean = false
)
\ No newline at end of file
diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt
new file mode 100644
index 0000000..27fa584
--- /dev/null
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt
@@ -0,0 +1,122 @@
+package com.pomelotea.hoperun.sign.scheduler
+
+import com.pomelotea.hoperun.sign.common.*
+import com.pomelotea.hoperun.sign.config.HoperunUserConfig
+import com.pomelotea.hoperun.sign.config.UserConfig
+import java.io.BufferedWriter
+import java.io.File
+import java.io.OutputStreamWriter
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.*
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.TimeUnit
+
+/**
+ *
+ * @version 0.0.1
+ * @author jimlee
+ * date 2023-03-22 14:50
+ * 自动打卡定时任务
+ **/
+class AutoDakaScheduler {
+
+ val outFile = File("./daka.log")
+ val bw: BufferedWriter = BufferedWriter(OutputStreamWriter(outFile.outputStream()))
+
+ val timeThreadPool: ScheduledExecutorService = Executors.newScheduledThreadPool(1)
+ val schedulerThreadPool: ScheduledExecutorService = Executors.newScheduledThreadPool(10)
+
+ init {
+ timeThreadPool.scheduleAtFixedRate({addAutoDakaScheduled()}, 1, 60, TimeUnit.MINUTES)
+ }
+
+ companion object {
+ val dakaQueue: MutableList = LinkedList()
+ }
+
+ fun addAutoDakaScheduled(dakaDate: String = getNowDateyyyy_MM_dd()) {
+ // 调休的工作日
+ if (isNeedDaka(dakaDate)) {
+ bw.use {
+ HoperunUserConfig.userConfigMap.forEach { (k, v) ->
+ if (v.autoDaka) {
+ // 没有当日的打卡信息才插入
+ var daka = dakaQueue.find { it.dakaDate == dakaDate && it.employeeNo == v.employeeNo }
+ if (daka == null) {
+ daka = generateDakaInfo(v, dakaDate)
+ dakaQueue.add(daka)
+ }
+ bw.write("${v.username},${daka.toCsv()}")
+ bw.newLine()
+ }
+ }
+ }
+ }
+
+ dakaQueue.forEach {
+ val beginDate = LocalDateTime.parse(it.dakaDate + "T" + it.beginTime + ":" + randowSecond(), DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+ val endDate = LocalDateTime.parse(it.dakaDate + "T" + it.endTime + ":" + randowSecond(), DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+ val beginSeconds = beginDate.toEpochSecond(DEFAULT_ZONE)
+ val endSeconds = endDate.toEpochSecond(DEFAULT_ZONE)
+ if (beginSeconds > System.currentTimeMillis() / 1000) {
+ schedulerThreadPool.schedule({beginDaka(it)}, beginDate.toEpochSecond(DEFAULT_ZONE), TimeUnit.SECONDS)
+ }
+ if (endSeconds > System.currentTimeMillis() / 1000) {
+ schedulerThreadPool.schedule({endDaka(it)}, endDate.toEpochSecond(DEFAULT_ZONE), TimeUnit.SECONDS)
+ }
+// schedulerThreadPool.schedule({beginDaka(it)}, 5, TimeUnit.SECONDS)
+// schedulerThreadPool.schedule({ endDaka(it) }, 5, TimeUnit.SECONDS)
+ }
+
+ dakaQueue.removeIf { it.dakaDate.compareTo(dakaDate) == -1 }
+ }
+
+ private fun beginDaka(daka: Daka) {
+// println("begin:${daka.toCsv()}")
+ beginTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.beginTime)
+ }
+
+ private fun endDaka(daka: Daka) {
+// println("end:${daka.toCsv()}")
+ endTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.beginTime)
+ }
+
+ private fun generateDakaInfo(userConfig: UserConfig, dakaDate: String): Daka {
+ return Daka(
+ beginTime = "09:" + (10 + Random().nextInt(19)),
+ endTime = getRandomEndTime(),
+ employeeNo = userConfig.employeeNo!!,
+ dakaDate = dakaDate
+ )
+ }
+
+ private fun getRandomEndTime(): String {
+ val hourArray = intArrayOf(18, 19, 20, 21, 22, 23, 20, 21, 22, 19, 18, 20)
+ val randomHour = hourArray[Math.round(Math.random() * 9).toInt()]
+ val randomMinute = if (randomHour == 18) {
+ 30 + Random().nextInt(19)
+ } else {
+ val min = Random().nextInt(59)
+ if (min < 10) {
+ "0$min"
+ } else {
+ min
+ }
+ }
+ return "$randomHour:$randomMinute"
+ }
+
+}
+
+data class Daka(
+ val beginTime: String,
+ val endTime: String,
+ val employeeNo: String,
+ val dakaDate: String
+) {
+ fun toCsv(): String {
+ return "$employeeNo,$dakaDate,$beginTime,$endTime"
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index 37e5d36..353d123 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -18,7 +18,12 @@ spring:
name: 打卡平台
profiles:
active: dev
+ thymeleaf:
+ cache: false
+deviceMap:
+ "16638": "Android 12;Redmi;M2007J3SC;deviceId:OAIDe7fa6084205e9a22d8f6f71bc91893ff;deviceName:Android"
+ "9119": "Qing/0.9.113;iOS 16.3.1;Apple;iPhone13,2;deviceId:a8baf66f-fdeb-4f4d-b1e5-9fafcd5045b6;deviceName:iOS;clientId:10200;os:iOS 16.3.1;brand:Apple;model:iPhone13,2;lang:zh-CN;fontNum:0;fontScale:1.0;ver:10.7.14;Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148"
hoperun:
address: "浙江省杭州市西湖区转塘街道凌家桥路飞天园区120"
longitueHead: "120.085"
diff --git a/src/main/resources/static/index.0.html b/src/main/resources/static/index.0.html
index fed9a00..1af7b84 100644
--- a/src/main/resources/static/index.0.html
+++ b/src/main/resources/static/index.0.html
@@ -6,7 +6,7 @@
-
+