海康下发修改
This commit is contained in:
parent
3b505cceb0
commit
4da1379f67
@ -1307,19 +1307,21 @@ public class HikvisionCall {
|
||||
* @param project
|
||||
*/
|
||||
public void saveWorkerFace(WorkerInfo workerInfo, Project project) throws Exception {
|
||||
ArrayList<String> workerFaceIds = getWorkerFaceIds(String.valueOf(workerInfo.getId()), project);
|
||||
if (CollUtil.isNotEmpty(workerFaceIds)) {
|
||||
String workerFaceId = workerFaceIds.get(0);
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/face/single/update";
|
||||
String host = "https://" + project.getArtemisConfigHost();
|
||||
JSONObject jo = new JSONObject();
|
||||
jo.put("faceId", workerFaceId);
|
||||
jo.put("faceData", Base64Util.convertFileToBase64(PathUtil.reviseSlash(basePath + "/" + workerInfo.getFieldAcquisitionUrl())));
|
||||
String rs = HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
sendNoticeAndSetStatusForWorker("更新人员照片到海康isc", rs, workerInfo, 2, 2, true);
|
||||
} else {
|
||||
addWorkerFace(workerInfo, project);
|
||||
if (StrUtil.isNotBlank(workerInfo.getFieldAcquisitionUrl())) {
|
||||
ArrayList<String> workerFaceIds = getWorkerFaceIds(String.valueOf(workerInfo.getId()), project);
|
||||
if (CollUtil.isNotEmpty(workerFaceIds)) {
|
||||
String workerFaceId = workerFaceIds.get(0);
|
||||
final String ARTEMIS_PATH = "/artemis";
|
||||
final String path = ARTEMIS_PATH + "/api/resource/v1/face/single/update";
|
||||
String host = "https://" + project.getArtemisConfigHost();
|
||||
JSONObject jo = new JSONObject();
|
||||
jo.put("faceId", workerFaceId);
|
||||
jo.put("faceData", Base64Util.convertFileToBase64(PathUtil.reviseSlash(basePath + "/" + workerInfo.getFieldAcquisitionUrl())));
|
||||
String rs = HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
|
||||
sendNoticeAndSetStatusForWorker("更新人员照片到海康isc", rs, workerInfo, 2, 2, true);
|
||||
} else {
|
||||
addWorkerFace(workerInfo, project);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1346,7 +1348,7 @@ public class HikvisionCall {
|
||||
}
|
||||
|
||||
public void deleteWorkerFace(String uniqueId, WorkerInfo workerInfo, Project project, boolean sendNotice) throws Exception {
|
||||
ArrayList<String> workerFaceIds = getWorkerFaceIds(uniqueId, project);
|
||||
List<String> workerFaceIds = getWorkerFaceIds(uniqueId, project);
|
||||
if (CollUtil.isNotEmpty(workerFaceIds)) {
|
||||
for (String workerFaceId : workerFaceIds) {
|
||||
JSONObject rsJo = HikvisionUtil.deleteWorkerFace(project, workerFaceId);
|
||||
|
||||
@ -59,6 +59,7 @@ import com.zhgd.xmgl.modules.worker.service.*;
|
||||
import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync;
|
||||
import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionSyncMapper;
|
||||
import com.zhgd.xmgl.modules.xz.service.impl.XzSupplierQualificationApplyServiceImpl;
|
||||
import com.zhgd.xmgl.security.entity.UserInfo;
|
||||
import com.zhgd.xmgl.security.util.SecurityUtils;
|
||||
import com.zhgd.xmgl.util.*;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@ -1684,6 +1685,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
|
||||
public Result uploadExcelWorkerInfo(MultipartFile excelFile, String projectSn) {
|
||||
Result<String> result = new Result<String>();
|
||||
StringBuilder existName = new StringBuilder("");
|
||||
ArrayList<String> errIdCards = new ArrayList<>();
|
||||
String rtMsg = "";
|
||||
String existMsg = "";
|
||||
String ufaceId = null;
|
||||
try {
|
||||
InputStream is = excelFile.getInputStream();
|
||||
@ -1805,40 +1809,56 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
|
||||
workerInfo.setPayRollBankNumber(importInfo.get("银行卡号"));
|
||||
workerInfo.setInserviceType(1);
|
||||
workerInfo.setUfaceDevId(ufaceId);
|
||||
WorkerInfo oldWorkerInfo = workerInfoMapper.selectWorkWorkerInfoWithIDCard(workerInfo.getIdCard(), workerInfo.getProjectSn());
|
||||
if (workerInfo.getSex()==null) {
|
||||
workerInfo.setSex(1);
|
||||
}
|
||||
if (oldWorkerInfo != null) {
|
||||
if (oldWorkerInfo.toExistString().equals(workerInfo.toExistString())) {
|
||||
existName.append(workerInfo.getWorkerName());
|
||||
existName.append("、");
|
||||
log.info("忽略批量导入已存在完全一样劳务人员：{}", oldWorkerInfo.getWorkerName());
|
||||
continue;
|
||||
boolean isVaild = IdCardUtils.strongVerifyIdNumber(workerInfo.getIdCard());
|
||||
if (isVaild) {
|
||||
WorkerInfo oldWorkerInfo = workerInfoMapper.selectWorkWorkerInfoWithIDCard(workerInfo.getIdCard(), workerInfo.getProjectSn());
|
||||
if (oldWorkerInfo != null) {
|
||||
if (oldWorkerInfo.toExistString().equals(workerInfo.toExistString())) {
|
||||
existName.append(workerInfo.getWorkerName());
|
||||
existName.append("、");
|
||||
log.info("忽略批量导入已存在完全一样劳务人员：{}", oldWorkerInfo.getWorkerName());
|
||||
continue;
|
||||
}
|
||||
workerInfo.setId(oldWorkerInfo.getId());
|
||||
workerInfoService.editWorkerForUploadExcel(workerInfo);
|
||||
} else {
|
||||
String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
|
||||
workerInfo.setPersonSn(uuid);
|
||||
workerInfo.setAddTime(new Date());
|
||||
workerInfo.setAttendanceNumber(workerInfo.getIdCard());
|
||||
workerInfoService.addWorkerForUploadExcel(workerInfo);
|
||||
}
|
||||
workerInfo.setId(oldWorkerInfo.getId());
|
||||
workerInfoService.editWorkerForUploadExcel(workerInfo);
|
||||
asyncJiLianDa.saveWorkerInfo(workerInfo);
|
||||
} else {
|
||||
String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
|
||||
workerInfo.setPersonSn(uuid);
|
||||
workerInfo.setAddTime(new Date());
|
||||
workerInfo.setAttendanceNumber(workerInfo.getIdCard());
|
||||
workerInfoService.addWorkerForUploadExcel(workerInfo);
|
||||
//错误身份证
|
||||
errIdCards.add(workerInfo.getWorkerName());
|
||||
}
|
||||
asyncJiLianDa.saveWorkerInfo(workerInfo);
|
||||
}
|
||||
if (!"".equals(existName.toString())) {
|
||||
existName.deleteCharAt(existName.lastIndexOf("、"));
|
||||
result.successMsg("劳务人员姓名为：" + existName + "的人员已存在对应信息（身份证等信息一致）");
|
||||
return result;
|
||||
existMsg = "劳务人员姓名为：" + existName + "的人员已存在对应信息（身份证等信息一致）";
|
||||
}
|
||||
result.successMsg(MessageUtil.get("optSucess"));
|
||||
String errIdCardMsg = "";
|
||||
if (CollUtil.isNotEmpty(errIdCards)) {
|
||||
if (StrUtil.isNotBlank(existMsg)) {
|
||||
errIdCardMsg += ",";
|
||||
}
|
||||
errIdCardMsg += "错误的身份证格式的人员：" + StrUtil.join(",", errIdCards);
|
||||
}
|
||||
rtMsg = StrUtil.format("导入成功。{}{}", existMsg, errIdCardMsg);
|
||||
result.successMsg(rtMsg);
|
||||
} catch (OpenAlertException e) {
|
||||
log.error("error：", e);
|
||||
result.error500(e.getMessage());
|
||||
rtMsg = e.getMessage();
|
||||
result.error500(rtMsg);
|
||||
} catch (Exception e) {
|
||||
log.error("error：", e);
|
||||
result.error500(MessageUtil.get("failErr"));
|
||||
rtMsg = MessageUtil.get("failErr");
|
||||
result.error500(rtMsg);
|
||||
}
|
||||
UserInfo user = SecurityUtils.getUser();
|
||||
if (user != null) {
|
||||
noticeService.addUserNotice(user.getUserId(), rtMsg, "批量导入提醒", "1");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -118,7 +118,7 @@ public class XzHikvisionSyncController {
|
||||
@ApiImplicitParam(name = "id", value = "星纵-海康同步数据ID", paramType = "query", required = true, dataType = "Integer")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<XzHikvisionSync> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
Result<XzHikvisionSync> result = new Result<XzHikvisionSync>();
|
||||
Result<XzHikvisionSync> result = new Result<>();
|
||||
XzHikvisionSync xzHikvisionSync = xzHikvisionSyncService.getById(id);
|
||||
if (xzHikvisionSync == null) {
|
||||
result.error500("未找到对应实体");
|
||||
|
||||
@ -4,10 +4,12 @@ import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* @program: wisdomSite
|
||||
@ -19,6 +21,46 @@ import java.util.*;
|
||||
@Slf4j
|
||||
public class IdCardUtils {
|
||||
|
||||
/**
|
||||
* 大陆地区地域编码最大值
|
||||
**/
|
||||
public static final int MAX_MAINLAND_AREACODE = 659004;
|
||||
/**
|
||||
* 大陆地区地域编码最小值
|
||||
**/
|
||||
public static final int MIN_MAINLAND_AREACODE = 110000;
|
||||
/**
|
||||
* 香港地域编码值
|
||||
**/
|
||||
public static final int HONGKONG_AREACODE = 810000; // 香港地域编码值
|
||||
/**
|
||||
* 台湾地域编码值
|
||||
**/
|
||||
public static final int TAIWAN_AREACODE = 710000;
|
||||
/**
|
||||
* 澳门地域编码值
|
||||
**/
|
||||
public static final int MACAO_AREACODE = 820000;
|
||||
/**
|
||||
* 数字正则
|
||||
**/
|
||||
public static final String regexNum = "^[0-9]*$";
|
||||
/**
|
||||
* 闰年生日正则
|
||||
**/
|
||||
public static final String regexBirthdayInLeapYear = "^((19[0-9]{2})|(200[0-9])|(201[0-5]))((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))$";
|
||||
/**
|
||||
* 平年生日正则
|
||||
**/
|
||||
public static final String regexBirthdayInCommonYear = "^((19[0-9]{2})|(200[0-9])|(201[0-5]))((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|1[0-9]|2[0-8]))$";
|
||||
private static final HashSet<String> BLACK_SET = new HashSet<String>() {
|
||||
|
||||
private static final long serialVersionUID = 48136604486603324L;
|
||||
|
||||
{
|
||||
add("111111111111111");
|
||||
}
|
||||
};
|
||||
private static String tokenurl = "https://iam.cn-east-3.myhuaweicloud.com/v3/auth/tokens";
|
||||
private static String username;
|
||||
private static String domainname;
|
||||
@ -30,37 +72,6 @@ public class IdCardUtils {
|
||||
*/
|
||||
private static Boolean enable;
|
||||
|
||||
@Value("${hw-ocr-enable:false}")
|
||||
public void setEnable(Boolean enable) {
|
||||
IdCardUtils.enable = enable;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-username}")
|
||||
public void setUsername(String hwusername) {
|
||||
username = hwusername;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-domainname}")
|
||||
public void setDomainname(String hwdomainname) {
|
||||
domainname = hwdomainname;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-password}")
|
||||
public void setPassword(String hwpassword) {
|
||||
password = hwpassword;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-projectid}")
|
||||
public void setProjectid(String hwprojectid) {
|
||||
projectid = hwprojectid;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-endpoint}")
|
||||
public void setEndpoint(String hwendpoint) {
|
||||
endpoint = hwendpoint;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 识别身份证信息
|
||||
*
|
||||
@ -184,7 +195,172 @@ public class IdCardUtils {
|
||||
return map;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(getBirthdayAgeSex(""));
|
||||
/**
|
||||
* <p>
|
||||
* 身份证格式强校验
|
||||
* </p>
|
||||
* <p>
|
||||
* 1、号码的结构 公民身份号码是特征组合码，由十七位数字本体码和一位校验码组成。排列顺序从左至右依次为：六位数字地址码，
|
||||
* 八位数字出生日期码，三位数字顺序码和一位数字校验码。
|
||||
* </p>
|
||||
* <p>
|
||||
* 2、地址码(前六位数）表示编码对象常住户口所在县(市、旗、区)的行政区划代码，按GB/T2260的规定执行。
|
||||
* </p>
|
||||
* <p>
|
||||
* 3、出生日期码（第七位至十四位）表示编码对象出生的年、月、日，按GB/T7408的规定执行，年、月、日代码之间不用分隔符。
|
||||
* </p>
|
||||
* <p>
|
||||
* 4、顺序码（第十五位至十七位）表示在同一地址码所标识的区域范围内，对同年、同月、同日出生的人编定的顺序号， 顺序码的奇数分配给男性，偶数分配给女性。
|
||||
* </p>
|
||||
* <p>
|
||||
* 5、校验码（第十八位数）
|
||||
* （1）十七位数字本体码加权求和公式 S = Sum(Ai * Wi), i = 0, ... , 16 ，先对前17位数字的权求和
|
||||
* Ai:表示第i位置上的身份证号码数字值 Wi:表示第i位置上的加权因子 Wi: 7 9 10 5 8 4 2 1 6 3 7 9 10 5 8 4
|
||||
* 2 （2）计算模 Y = mod(S, 11) （3）通过模得到对应的校验码 Y: 0 1 2 3 4 5 6 7 8 9 10 校验码: 1 0
|
||||
* X 9 8 7 6 5 4 3 2
|
||||
* </p>
|
||||
*/
|
||||
public static final boolean strongVerifyIdNumber(String idNumber) {
|
||||
if (StringUtils.isBlank(idNumber)) {
|
||||
return false;
|
||||
}
|
||||
idNumber = idNumber.trim();
|
||||
|
||||
if (BLACK_SET.contains(idNumber)) {
|
||||
return false;
|
||||
}
|
||||
if (!checkIdNumberRegex(idNumber)) {
|
||||
return false;
|
||||
}
|
||||
if (!checkIdNumberArea(idNumber.substring(0, 6))) {
|
||||
return false;
|
||||
}
|
||||
idNumber = convertFifteenToEighteen(idNumber);
|
||||
if (!checkBirthday(idNumber.substring(6, 14))) {
|
||||
return false;
|
||||
}
|
||||
if (!checkIdNumberVerifyCode(idNumber)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 身份证正则校验
|
||||
*/
|
||||
private static boolean checkIdNumberRegex(String idNumber) {
|
||||
return Pattern.matches("^([0-9]{17}[0-9Xx])|([0-9]{15})$", idNumber);
|
||||
}
|
||||
|
||||
/**
|
||||
* 身份证地区码检查
|
||||
*/
|
||||
private static boolean checkIdNumberArea(String idNumberArea) {
|
||||
int areaCode = Integer.parseInt(idNumberArea);
|
||||
if (areaCode == HONGKONG_AREACODE || areaCode == MACAO_AREACODE || areaCode == TAIWAN_AREACODE) {
|
||||
return true;
|
||||
}
|
||||
if (areaCode <= MAX_MAINLAND_AREACODE && areaCode >= MIN_MAINLAND_AREACODE) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将15位身份证转换为18位
|
||||
*/
|
||||
private static String convertFifteenToEighteen(String idNumber) {
|
||||
if (15 != idNumber.length()) {
|
||||
return idNumber;
|
||||
}
|
||||
idNumber = idNumber.substring(0, 6) + "19" + idNumber.substring(6, 15);
|
||||
idNumber = idNumber + getVerifyCode(idNumber);
|
||||
return idNumber;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据身份证前17位计算身份证校验码
|
||||
*/
|
||||
private static String getVerifyCode(String idNumber) {
|
||||
if (!Pattern.matches(regexNum, idNumber.substring(0, 17))) {
|
||||
return null;
|
||||
}
|
||||
String[] ValCodeArr = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"};
|
||||
String[] Wi = {"7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2"};
|
||||
|
||||
int sum = 0;
|
||||
for (int i = 0; i < 17; i++) {
|
||||
sum = sum + Integer.parseInt(String.valueOf(idNumber.charAt(i))) * Integer.parseInt(Wi[i]);
|
||||
}
|
||||
return ValCodeArr[sum % 11];
|
||||
}
|
||||
|
||||
/**
|
||||
* 身份证出生日期嘛检查
|
||||
*/
|
||||
private static boolean checkBirthday(String idNumberBirthdayStr) {
|
||||
Integer year = null;
|
||||
try {
|
||||
year = Integer.valueOf(idNumberBirthdayStr.substring(0, 4));
|
||||
} catch (Exception e) {
|
||||
}
|
||||
if (null == year) {
|
||||
return false;
|
||||
}
|
||||
if (isLeapYear(year)) {
|
||||
return Pattern.matches(regexBirthdayInLeapYear, idNumberBirthdayStr);
|
||||
} else {
|
||||
return Pattern.matches(regexBirthdayInCommonYear, idNumberBirthdayStr);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否为闰年
|
||||
*/
|
||||
private static boolean isLeapYear(int year) {
|
||||
return (year % 400 == 0) || (year % 100 != 0 && year % 4 == 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 身份证校验码检查
|
||||
*/
|
||||
private static boolean checkIdNumberVerifyCode(String idNumber) {
|
||||
return getVerifyCode(idNumber).equalsIgnoreCase(idNumber.substring(17));
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(strongVerifyIdNumber("121"));
|
||||
System.out.println(strongVerifyIdNumber("420101198101019701"));
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-enable:false}")
|
||||
public void setEnable(Boolean enable) {
|
||||
IdCardUtils.enable = enable;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-username}")
|
||||
public void setUsername(String hwusername) {
|
||||
username = hwusername;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-domainname}")
|
||||
public void setDomainname(String hwdomainname) {
|
||||
domainname = hwdomainname;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-password}")
|
||||
public void setPassword(String hwpassword) {
|
||||
password = hwpassword;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-projectid}")
|
||||
public void setProjectid(String hwprojectid) {
|
||||
projectid = hwprojectid;
|
||||
}
|
||||
|
||||
@Value("${hw-ocr-endpoint}")
|
||||
public void setEndpoint(String hwendpoint) {
|
||||
endpoint = hwendpoint;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user