From 7231fbeaae38c7a5ac53e0899b55a637565e03ac Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 05 Jul 2021 23:25:56 +0800
Subject: [PATCH] 考勤打卡接口修改，新增考勤实时位置比对接口
---
src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml | 2
src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java | 21 --
src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java | 397 ++-----------------------------------------------
src/main/java/org/springblade/modules/system/controller/UserController.java | 39 ++++
src/main/java/org/springblade/modules/attendance/entity/Attendance.java | 2
5 files changed, 59 insertions(+), 402 deletions(-)
diff --git a/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java b/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
index b029c80..ddf33de 100644
--- a/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
+++ b/src/main/java/org/springblade/modules/animalheat/controller/AnimalHeatController.java
@@ -3,10 +3,8 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.pinecone.utils.EncryptionUtils;
import lombok.AllArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.jfree.chart.ChartFactory;
@@ -18,7 +16,6 @@
import org.springblade.common.entity.AnimalHeatExcel;
import org.springblade.common.entity.ReportReturnData;
import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.http.util.HttpUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -56,25 +53,7 @@
private final AnimalHeatService animalHeatService;
- static BASE64Encoder encoder = new BASE64Encoder();
- @PostMapping("/upload")
- public String upload(MultipartFile file){
- try {
- String encode = encoder.encode(file.getBytes());
- String sm4Key = "bf679652628841dc8f35f84989abf350"; // 系统分配的密钥
- JSONObject source = new JSONObject();
- source.put("nameText","钟日健");
- source.put("numberText","360728199205280059");
- source.put("idPhoto",encode);
- // 加密数据,请先引入外部jar到工程中
- String encryptString = EncryptionUtils.encryptSM4(sm4Key,source.toString());
- System.out.println("encryptString = " + encryptString);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return "encryptString";
- }
/**
* 获取体温数据统计
diff --git a/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java b/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java
index 25f3b4c..cbe75bb 100644
--- a/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java
+++ b/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java
@@ -101,381 +101,24 @@
return R.data(AttendanceWrapper.build().pageVO(pages));
}
-
/**
- * 新增
+ * 保安位置比对
*/
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入attendance")
- public R save(@Valid @RequestBody Attendance attendance) {
- return R.status(attendanceService.save(attendance));
+ @GetMapping("/positionThan")
+ public R positionThan(@Valid Attendance attendance,HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ Enclosure enclosure = new Enclosure();
+ enclosure.setAnumber(attendance.getNumber());
+ //查询当前处警人员的电子围栏信息
+ Boolean onArea = iEnclosureService.isOnArea(attendance.getJd(),attendance.getWd(),enclosure);
+ if (onArea){
+ return R.data(true);
+ }
+ return R.data(false);
}
-// /**
-// * 新增
-// */
-// @PostMapping("/AppSave")
-// @ApiOperationSupport(order = 4)
-// @ApiOperation(value = "新增", notes = "传入attendance")
-// public R AppSave(@Valid Attendance attendance) {
-// System.out.println("attendance = " + attendance);
-// Enclosure enclosure = new Enclosure();
-// enclosure.setAnumber(attendance.getNumber());
-// //查询当前处警人员的电子围栏信息
-// Boolean onArea = iEnclosureService.isOnArea(attendance.getJd(),attendance.getWd(),enclosure);
-// //判断是否在所在区域打卡，返回数据
-// if (onArea){
-// //查询当前考勤人员的部门信息
-// //获取打卡时间标准
-// R<List<DictBiz>> attendanceType = iDictBizService.getList("attendanceStandard");
-// List<DictBiz> dictBizList = attendanceType.getData();
-// //定义打卡时间标准，上午，下午
-// StringBuilder forenoon = new StringBuilder();
-// StringBuilder afternoon = new StringBuilder();
-// String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-// for (DictBiz dictBiz:dictBizList) {
-// if (dictBiz.getDictValue().contains("上午")){
-// forenoon=forenoon.append(dictBiz.getDictKey());
-// }
-// if (dictBiz.getDictValue().contains("下午")){
-// afternoon=afternoon.append(dictBiz.getDictKey());
-// }
-// }
-// //上午打卡时间标准
-// String forenoonWorkTime = format+" "+forenoon.toString().split("-")[0]+":00";
-// String forenoonOfDutyTime = format+" "+forenoon.toString().split("-")[1]+":00";
-// //下午打卡时间标准
-// String afternoonWorkTime = format+" "+afternoon.toString().split("-")[0]+":00";
-// String afternoonOfDutyTime = format+" "+afternoon.toString().split("-")[1]+":00";
-// //查询当前人员当天打卡信息
-// List<Attendance> attendanceList = attendanceService.selAttendanceListNow(attendance.getNumber());
-// //判断打卡时间
-// try {
-// long time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(attendance.getClocktime()).getTime();
-// //当天第一次打卡
-// if(attendanceList.size()==0){
-// //当天还没有打卡，即为当天第一个打卡
-//
-// //判断打卡时间是上午还是下午
-// if (time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)>0){
-// //下午
-// //正常上班
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()<=0){
-// //正常上班
-// attendance.setClocktype("0");
-// attendance.setAttendancetype("0");
-// }
-// //迟到
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()>0
-// && time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()<0
-// ){
-// //迟到上班
-// attendance.setClocktype("0");
-// attendance.setAttendancetype("1");
-// }
-//
-// //正常下班
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()>0
-// &&
-// time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)<=0
-// ){
-// //正常下班
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("0");
-// }
-//
-// //加班
-// if (time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)>0){
-// //下午下班
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("0");
-// }
-// return R.status(attendanceService.save(attendance));
-// }else {
-// //上午
-// //正常上班
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonWorkTime).getTime()<=0){
-// //正常上午上班
-// attendance.setClocktype("0");
-// attendance.setAttendancetype("0");
-// }
-// //迟到
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonWorkTime).getTime()>0
-// &&
-// time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()<=0
-// ){
-// //迟到上班
-// attendance.setClocktype("0");
-// attendance.setAttendancetype("1");
-// }
-//
-//
-// //正常下班
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()>0
-// &&
-// time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)<=0
-// ){
-// //正常下班
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("0");
-// }
-// return R.status(attendanceService.save(attendance));
-// }
-// //打卡时间和上午上班时间
-// }
-// //已经打过一次卡，当天第二次打卡
-// if(attendanceList.size()==1){
-// //判断第一次打卡的时间范围，上午还是下午
-// long time1 = 0;
-// try {
-// time1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(attendanceList.get(0).getClocktime()).getTime();
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// //上午下班时间的半个小时后
-// if (time1-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)>0) {
-// //下午
-// //更新上班信息
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime() <= 0) {
-// //更新上班时间
-// //正常上班
-// attendance.setAttendancetype("0");
-// attendance.setId(attendanceList.get(0).getId());
-// //更新考勤消息
-// return R.status(attendanceService.updateById(attendance));
-// }
-//
-// //早退
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime() > 0
-// && time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime() < 0
-// ) {
-// //早退
-// attendance.setAttendancetype("2");
-// attendance.setClocktype("1");
-// //新增考勤消息
-// return R.status(attendanceService.save(attendance));
-// }
-//
-// //正常下班
-// if (time - (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000) <= 0
-// && time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime() >= 0
-// ) {
-// //新增下班
-// attendance.setAttendancetype("0");
-// attendance.setClocktype("1");
-// //新增考勤消息
-// return R.status(attendanceService.save(attendance));
-// }
-//
-// //其他时间修改
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000>0){
-// //加班
-//// attendance.setAttendancetype("加班");
-// attendance.setId(attendanceList.get(0).getId());
-// //更新考勤消息
-// return R.status(attendanceService.updateById(attendance));
-// }
-//
-//
-// }else {
-// //上午
-// //更新
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonWorkTime).getTime() <= 0) {
-// //更新上班时间
-// //正常上班
-// attendance.setAttendancetype("0");
-// attendance.setId(attendanceList.get(0).getId());
-// //更新考勤消息
-// return R.status(attendanceService.updateById(attendance));
-// }
-// //上午早退
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonWorkTime).getTime() > 0
-// && time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime() < 0
-// ) {
-// //早退
-// attendance.setAttendancetype("2");
-// attendance.setClocktype("1");
-// //新增考勤消息
-// return R.status(attendanceService.save(attendance));
-// }
-// //下午早退
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime() > 0
-// && time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime() < 0
-// ) {
-// //早退
-// attendance.setAttendancetype("2");
-// attendance.setClocktype("1");
-// //新增考勤消息
-// return R.status(attendanceService.save(attendance));
-// }
-//
-// //上午正常下班
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()>=0
-// && time - (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)<=0
-// ){
-// //下班
-// attendance.setAttendancetype("0");
-// attendance.setClocktype("1");
-// //新增考勤信息
-// return R.status(attendanceService.save(attendance));
-// }
-// //下午正常下班
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()>=0
-// && time - (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)<=0
-// ){
-// //下班
-// attendance.setAttendancetype("0");
-// attendance.setClocktype("1");
-// //新增考勤信息
-// return R.status(attendanceService.save(attendance));
-// }
-//
-// //正常上班
-// if (time - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()<=0
-// && time - (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)>0
-// ){
-// //上班
-// attendance.setAttendancetype("0");
-// attendance.setClocktype("0");
-// //新增考勤信息
-// return R.status(attendanceService.save(attendance));
-// }
-// }
-// }
-// //第三次打卡
-// if (attendanceList.size()==2){
-// //第三次记录打卡如果时间范围在上午的在早退时间及下班后的半小时范围内,则更新上一次打卡记录
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonWorkTime).getTime()>0
-// && time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)<0
-// ){
-// Attendance attendance1 = attendanceList.get(1);
-// attendance1.setClocktime(attendance.getClocktime());
-// //更新打卡信息
-// return R.status(attendanceService.updateById(attendance1));
-// }
-// //第三次打卡记录时间返回在上午下班半小时后到下午上班
-// if(time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()<=0
-// && time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)>=0){
-// //新增正常打卡信息
-// attendance.setClocktype("0");
-// attendance.setAttendancetype("0");
-// return R.status(attendanceService.save(attendance));
-// }
-// //第三次打卡记录时间返回在下午上班到下午下班之前
-// if(time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()>0
-// && time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()<0){
-// //判断第二次是否已经打卡上班
-// if (attendanceList.get(1).getClocktype().equals("0")){
-// //修改打卡信息
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("2");
-// return R.status(attendanceService.save(attendance));
-// }else {
-// //新增上班迟到打卡信息
-// attendance.setClocktype("0");
-// attendance.setAttendancetype("1");
-// return R.status(attendanceService.save(attendance));
-// }
-// }
-// //下午正常下班时间节点
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()>0
-// && time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)<=0){
-// //新增下班正常打卡信息
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("0");
-// return R.status(attendanceService.save(attendance));
-// }
-// //其他时间修改
-// if (time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)>0){
-// //修改打卡信息
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("2");
-// return R.status(attendanceService.save(attendance));
-// }
-// }
-// //第四次打卡
-// if (attendanceList.size()==3){
-// //第四次打卡记录时间返回在上午下班半小时后到下午上班
-// if(time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()<=0
-// && time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()+30*60*1000)>=0){
-// Attendance attendance2 = attendanceList.get(2);
-// attendance2.setClocktime(attendance.getClocktime());
-// //更新正常打卡信息
-// return R.status(attendanceService.updateById(attendance2));
-// }
-// //第四次打卡记录时间返回在下午上班到下午下班之前
-// if(time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()>0
-// && time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()<0){
-// //判断第二次是否是早退或者迟到
-// //迟到
-// if (attendanceList.get(2).getAttendancetype().equals("1")){
-// //新增下班早退打卡信息
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("2");
-// return R.status(attendanceService.save(attendance));
-// }else {
-// //早退
-// //更新上班早退打卡信息,只更新打卡时间，不更新考勤状态
-// Attendance attendance2 = attendanceList.get(2);
-// attendance2.setClocktime(attendance.getClocktime());
-// return R.status(attendanceService.updateById(attendance2));
-// }
-// }
-// //下午正常下班时间节点
-// if (time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()>0
-// && time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)<=0){
-// //如果上一次为早退，则只更新信息
-// if (attendanceList.get(2).getAttendancetype().equals("2")) {
-// //修改打卡信息
-// Attendance attendance2 = attendanceList.get(2);
-// attendance2.setClocktime(attendance.getClocktime());
-// return R.status(attendanceService.updateById(attendance2));
-// }else {
-// //新增正常下班打卡信息
-// attendance.setClocktype("1");
-// attendance.setAttendancetype("0");
-// return R.status(attendanceService.save(attendance));
-// }
-// }
-// //其他时间
-// if (time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)>0){
-// //修改打卡信息
-// Attendance attendance2 = attendanceList.get(2);
-// attendance2.setClocktime(attendance.getClocktime());
-// return R.status(attendanceService.updateById(attendance2));
-// }
-// }
-// //第五次打卡
-// if (attendanceList.size()==4){
-// //只有在下午下班后可以有新增加班考勤数据，其他情况则是更新第四次的记录
-// //第五次打卡记录时间返回在下午上班到下午下班后的30分钟之前
-//// if(time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonWorkTime).getTime()>0
-//// && time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()<0){
-//// //早退
-//// //更新上班早退打卡信息,只更新打卡时间，不更新考勤状态
-//// Attendance attendance3 = attendanceList.get(3);
-//// attendance3.setClocktime(attendance.getClocktime());
-//// return R.status(attendanceService.updateById(attendance3));
-//// }
-// Attendance attendance3 = attendanceList.get(3);
-// attendance3.setClocktime(attendance.getClocktime());
-// return R.status(attendanceService.updateById(attendance3));
-// //下午正常下班30分钟后时间节点
-//// if (time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()+30*60*1000)>0){
-//// //如果上一次为早退，则只更新信息
-//// //新增正常下班打卡信息
-//// attendance.setClocktype("1");
-//// attendance.setAttendancetype("0");
-//// return R.status(attendanceService.save(attendance));
-//// }
-// }
-// } catch (ParseException e) {
-// e.printStackTrace();
-// }
-// }
-// return R.status(false);
-// }
/**
* 新增
@@ -487,7 +130,6 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
- System.out.println("attendance = " + attendance);
Enclosure enclosure = new Enclosure();
enclosure.setAnumber(attendance.getNumber());
//查询当前处警人员的电子围栏信息
@@ -499,8 +141,7 @@
//获取当前日期是礼拜几
attendance.setWeek(new SimpleDateFormat("EEEE").format(new Date()));
//获取打卡时间标准
- R<List<DictBiz>> attendanceType = (R<List<DictBiz>>) iDictBizService.getList("attendanceStandard");
- List<DictBiz> dictBizList = attendanceType.getData();
+ List<DictBiz> dictBizList = iDictBizService.getList("attendanceStandard");
//定义打卡时间标准，上午，下午
StringBuilder forenoon = new StringBuilder();
StringBuilder afternoon = new StringBuilder();
@@ -519,11 +160,9 @@
//下午打卡时间标准
String afternoonWorkTime = format + " " + afternoon.toString().split("-")[0] + ":00";
String afternoonOfDutyTime = format + " " + afternoon.toString().split("-")[1] + ":00";
- //查询当前人员当天打卡信息
- List<Attendance> attendanceList = attendanceService.selAttendanceListNow(attendance.getNumber());
//判断打卡时间
try {
- long time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(attendance.getClocktime()).getTime();
+ long time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(attendance.getClockTime()).getTime();
//判断上午上班之前半小时前打卡为无效打卡
if (time-(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonWorkTime).getTime()-30*60*1000)<0){
@@ -545,7 +184,7 @@
&& time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(forenoonOfDutyTime).getTime()<0) {
//查询当前时间之前当前考勤人员的最新的一条考勤数据
Attendance attendanceNow = attendanceService.selAttendanceNewNow(attendance.getNumber());
- if (null!=attendanceNow.getAttendancetype()){
+ if (null!=attendanceNow){
if (attendanceNow.getAttendancetype().equals("0") || attendanceNow.getClocktype().equals("1")) {
//下班早退
attendance.setClocktype("1");
@@ -596,7 +235,7 @@
&& time-new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(afternoonOfDutyTime).getTime()<0){
//查询当前时间之前当前考勤人员的最新的一条考勤数据
Attendance attendanceNow = attendanceService.selAttendanceNewNow(attendance.getNumber());
- if (null!=attendanceNow.getAttendancetype()){
+ if (null!=attendanceNow){
if (attendanceNow.getAttendancetype().equals("0") && attendanceNow.getClocktype().equals("0")) {
//下班早退
attendance.setClocktype("1");
diff --git a/src/main/java/org/springblade/modules/attendance/entity/Attendance.java b/src/main/java/org/springblade/modules/attendance/entity/Attendance.java
index 7f724f6..f782734 100644
--- a/src/main/java/org/springblade/modules/attendance/entity/Attendance.java
+++ b/src/main/java/org/springblade/modules/attendance/entity/Attendance.java
@@ -63,7 +63,7 @@
*/
@ApiModelProperty(value = "打卡时间")
@TableField("clockTime")
- private String clocktime;
+ private String clockTime;
/**
* 经度
*/
diff --git a/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml b/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
index fe61ad3..ba494cc 100644
--- a/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
+++ b/src/main/java/org/springblade/modules/attendance/mapper/AttendanceMapper.xml
@@ -9,7 +9,7 @@
<result column="number" property="number"/>
<result column="department" property="department"/>
<result column="weather" property="weather"/>
- <result column="clockTime" property="clocktime"/>
+ <result column="clockTime" property="clockTime"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
<result column="clockType" property="clocktype"/>
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 55d7982..296d19d 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -17,9 +17,11 @@
package org.springblade.modules.system.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.pinecone.utils.EncryptionUtils;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -27,6 +29,7 @@
import lombok.AllArgsConstructor;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.http.util.HttpUtil;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -49,10 +52,13 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
+import sun.misc.BASE64Encoder;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,6 +77,36 @@
public class UserController {
private final IUserService userService;
+
+ static BASE64Encoder encoder = new BASE64Encoder();
+
+ private final String sm4Key = "bf679652628841dc8f35f84989abf350";
+
+ private final String clientCode = "909BCF57904BDBD3E053AF0A020A3760";
+
+ private final String url = "http://eid.gongqing.gov.cn/uias-test/fca/verifyFace";
+
+ @PostMapping("/faceCompare")
+ public R upload(String name,String idCardNo,MultipartFile file){
+ Map<String, Object> resultData = new HashMap<>();
+ try {
+ String encode = encoder.encode(file.getBytes());
+ JSONObject source = new JSONObject();
+ source.put("nameText",name);
+ source.put("numberText",idCardNo);
+ source.put("idPhoto",encode);
+ // 加密数据,请先引入外部jar到工程中
+ String encryptString = EncryptionUtils.encryptSM4(sm4Key,source.toString());
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("clientCode",clientCode);
+ map.put("encryptString",encryptString);
+ String result= HttpUtil.postJson(url, new JSONObject(map).toJSONString());
+ resultData = (Map<String, Object>)JSONObject.parse(result);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return R.data(resultData);
+ }
/**
* 查询单条
@@ -379,4 +415,7 @@
public R selectUser() {
return R.data(userService.selectUser());
}
+
+
+
}
--
Gitblit v1.9.3