diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java
index cfa1c6f..083b161 100644
--- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java
+++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.dcsoft.common.core.constant.Constants;
@@ -149,6 +150,7 @@ public class SysPeopleController extends BaseController
@PostMapping
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody SysPeople sysPeople) {
+ log.info("新增人员管理:{}", JSON.toJSONString(sysPeople));
SysPeople people = sysPeopleService.selectSysPeopleByGh(sysPeople.getGh());
if (people != null) {
return error("该工号已存在");
@@ -198,6 +200,7 @@ public class SysPeopleController extends BaseController
@Log(title = "人员管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysPeople sysPeople) {
+ log.info("修改人员管理:{}", JSON.toJSONString(sysPeople));
SysPeople people = sysPeopleService.selectSysPeopleByGh(sysPeople.getGh());
if (people != null && !people.getId().equals(sysPeople.getId())) {
return error("该工号已存在");
@@ -212,9 +215,12 @@ public class SysPeopleController extends BaseController
SysPeople peopleById = sysPeopleService.selectSysPeopleById(sysPeople.getId());
- if (StringUtils.isNotEmpty(sysPeople.getAvatar())) {
+ if (StringUtils.isBlank(peopleById.getFaceGuid())) {
+ sysPeople.setFaceGuid(IdUtils.simpleUUID());
+ } else {
sysPeople.setFaceGuid(peopleById.getFaceGuid());
}
+
sysPeople.setGuid(peopleById.getGuid());
//下发设备
@@ -242,10 +248,12 @@ public class SysPeopleController extends BaseController
@Log(title = "手机端人员管理", businessType = BusinessType.UPDATE)
@PutMapping("/update")
public AjaxResult update(@RequestBody SysPeople sysPeople) {
-
+ log.info("手机端修改人员管理:{}", JSON.toJSONString(sysPeople));
SysPeople peopleById = sysPeopleService.selectSysPeopleById(sysPeople.getId());
- if (StringUtils.isNotEmpty(sysPeople.getAvatar())) {
+ if (StringUtils.isBlank(peopleById.getFaceGuid())) {
+ sysPeople.setFaceGuid(IdUtils.simpleUUID());
+ } else {
sysPeople.setFaceGuid(peopleById.getFaceGuid());
}
sysPeople.setGuid(peopleById.getGuid());
diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEqDownRecord.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEqDownRecord.java
index 427f2c2..34c1e92 100644
--- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEqDownRecord.java
+++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEqDownRecord.java
@@ -40,6 +40,11 @@ public class SysEqDownRecord {
*/
private Integer downResult;
+ /**
+ * 人脸图片下发结果:0-成功,1-失败
+ */
+ private Integer faceDownResult;
+
/**
* 下发回执
*/
diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeopleEqDown.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeopleEqDown.java
index 2997195..a3104a2 100644
--- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeopleEqDown.java
+++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeopleEqDown.java
@@ -61,4 +61,7 @@ public class SysPeopleEqDown {
/** 下机结果 0:成功 1:失败 */
private Integer downResult;
+
+ /** 人脸图片下机结果 0:成功 1:失败 */
+ private Integer faceDownResult;
}
diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java
index 535a658..265a6d8 100644
--- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java
+++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java
@@ -746,6 +746,9 @@ public class SysSdkServiceImpl implements ISysSdkService {
String dataImg = this.imageCreateUrl(people.getGuid(), people.getFaceGuid(), people.getAvatar(), e.getIp(), e.getPassword());
if (!verifyResult(dataImg, sysEqDownRecord)) {
i++;
+ sysEqDownRecord.setFaceDownResult(1);
+ } else {
+ sysEqDownRecord.setFaceDownResult(0);
}
}
}
@@ -790,7 +793,10 @@ public class SysSdkServiceImpl implements ISysSdkService {
if (StringUtils.isNotEmpty(sysPeopleEqDown.getFaceGuid())) {
String dataImg = this.imageCreateUrl(sysPeopleEqDown.getGuid(), sysPeopleEqDown.getFaceGuid(), sysPeopleEqDown.getAvatar(), sysPeopleEqDown.getIp(), sysPeopleEqDown.getPassword());
if (!verifyResult(dataImg, sysEqDownRecord)) {
+ sysEqDownRecord.setFaceDownResult(1);
return sysEqDownRecord;
+ } else {
+ sysEqDownRecord.setFaceDownResult(0);
}
}
diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEqDownRecordMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEqDownRecordMapper.xml
index 65251d1..2ea7310 100644
--- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEqDownRecordMapper.xml
+++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEqDownRecordMapper.xml
@@ -18,6 +18,7 @@
+
@@ -28,6 +29,7 @@
people_id,
down_time,
down_result,
+ face_down_result,
msg,
oper_type,
create_by,
@@ -41,6 +43,7 @@
#{i.peopleId},
#{i.downTime},
#{i.downResult},
+ #{i.faceDownResult},
#{i.msg},
#{i.operType},
#{i.createBy},
@@ -53,6 +56,7 @@
people_id = values(people_id),
down_time = values(down_time),
down_result = values(down_result),
+ face_down_result = values(face_down_result),
msg = values(msg),
oper_type = values(oper_type),
create_by = values(create_by),
@@ -75,6 +79,7 @@
r.people_id,
r.down_time,
r.down_result,
+ r.face_down_result,
r.msg,
r.oper_type,
r.create_by,
@@ -117,7 +122,8 @@
r.people_id peopleId,
r.equipment_id equipmentId,
r.rule_id ruleId,
- r.down_result downResult
+ r.down_result downResult,
+ r.face_down_result faceDownResult
from sys_equipment_down_record r
left join sys_equipment e on r.equipment_id = e.id
left join sys_people p on r.people_id = p.id