params = new HashMap<>();
+ while (parameters.hasMoreElements()) {
+ String parameter = parameters.nextElement();
+ String value = request.getParameter(parameter);
+ if (StringUtils.isNotBlank(value)) {
+ params.put(parameter, value);
+ }
+ }
+
+ return params;
+ }
+
+ public static String getDomain(){
+ HttpServletRequest request = getHttpServletRequest();
+ StringBuffer url = request.getRequestURL();
+ return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
+ }
+
+ public static String getOrigin(){
+ HttpServletRequest request = getHttpServletRequest();
+ return request.getHeader(HttpHeaders.ORIGIN);
+ }
+
+ public static String getLanguage() {
+ //默认语言
+ String defaultLanguage = "zh-CN";
+ //request
+ HttpServletRequest request = getHttpServletRequest();
+ if(request == null){
+ return defaultLanguage;
+ }
+
+ //请求语言
+ defaultLanguage = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
+
+ return defaultLanguage;
+ }
+}
\ No newline at end of file
diff --git a/face-common/src/main/java/com/dkha/common/util/IdCardUtil.java b/face-common/src/main/java/com/dkha/common/util/IdCardUtil.java
new file mode 100644
index 0000000..2471940
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/IdCardUtil.java
@@ -0,0 +1,427 @@
+package com.dkha.common.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ *
+ * 身份证合法性校验
+ *
+ *
+ *
+ * --15位身份证号码：第7、8位为出生年份(两位数)，第9、10位为出生月份，第11、12位代表出生日期，第15位代表性别，奇数为男，偶数为女。
+ * --18位身份证号码：第7、8、9、10位为出生年份(四位数)，第11、第12位为出生月份，第13、14位代表出生日期，第17位代表性别，奇数为男，偶数为女。
+ * 最后一位为校验位
+ *
+ *
+ * @author 313921
+ */
+public class IdCardUtil {
+
+ private static Logger logger = LoggerFactory.getLogger(IdCardUtil.class);
+
+ /**
+ *
+ * 省、直辖市代码表：
+ * 11 : 北京 12 : 天津 13 : 河北 14 : 山西 15 : 内蒙古
+ * 21 : 辽宁 22 : 吉林 23 : 黑龙江 31 : 上海 32 : 江苏
+ * 33 : 浙江 34 : 安徽 35 : 福建 36 : 江西 37 : 山东
+ * 41 : 河南 42 : 湖北 43 : 湖南 44 : 广东 45 : 广西 46 : 海南
+ * 50 : 重庆 51 : 四川 52 : 贵州 53 : 云南 54 : 西藏
+ * 61 : 陕西 62 : 甘肃 63 : 青海 64 : 宁夏 65 : 新疆
+ * 71 : 台湾
+ * 81 : 香港 82 : 澳门
+ * 91 : 国外
+ *
+ */
+ private static String[] cityCode = { "11", "12", "13", "14", "15", "21",
+ "22", "23", "31", "32", "33", "34", "35", "36", "37", "41", "42",
+ "43", "44", "45", "46", "50", "51", "52", "53", "54", "61", "62",
+ "63", "64", "65", "71", "81", "82", "91" };
+
+ /**
+ * 每位加权因子
+ */
+ private static int power[] = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5,
+ 8, 4, 2 };
+
+ /**
+ * 验证所有的身份证的合法性
+ *
+ * @param idcard
+ * 身份证
+ * @return 合法返回true，否则返回false
+ */
+ public static boolean isValidatedAllIdcard(String idcard) {
+ if (idcard == null || "".equals(idcard)) {
+ return false;
+ }
+ int s=15;
+ if (idcard.length() == s) {
+ return validate15IDCard(idcard);
+ }
+ int s1=18;
+ if(idcard.length()==s1) {
+ return validate18Idcard(idcard);
+ }
+ return false;
+
+ }
+
+ /**
+ *
+ * 判断18位身份证的合法性
+ *
+ * 根据〖中华人民共和国国家标准GB11643-1999〗中有关公民身份号码的规定，公民身份号码是特征组合码，由十七位数字本体码和一位数字校验码组成。
+ * 排列顺序从左至右依次为：六位数字地址码，八位数字出生日期码，三位数字顺序码和一位数字校验码。
+ *
+ * 顺序码: 表示在同一地址码所标识的区域范围内，对同年、同月、同 日出生的人编定的顺序号，顺序码的奇数分配给男性，偶数分配 给女性。
+ *
+ *
+ * 1.前1、2位数字表示：所在省份的代码； 2.第3、4位数字表示：所在城市的代码； 3.第5、6位数字表示：所在区县的代码；
+ * 4.第7~14位数字表示：出生年、月、日； 5.第15、16位数字表示：所在地的派出所的代码；
+ * 6.第17位数字表示性别：奇数表示男性，偶数表示女性；
+ * 7.第18位数字是校检码：也有的说是个人信息码，一般是随计算机的随机产生，用来检验身份证的正确性。校检码可以是0~9的数字，有时也用x表示。
+ *
+ *
+ * 第十八位数字(校验码)的计算方法为： 1.将前面的身份证号码17位数分别乘以不同的系数。从第一位到第十七位的系数分别为：7 9 10 5 8 4
+ * 2 1 6 3 7 9 10 5 8 4 2
+ *
+ *
+ * 2.将这17位数字和系数相乘的结果相加。
+ *
+ *
+ * 3.用加出来和除以11，看余数是多少
+ *
+ * 4.余数只可能有0 1 2 3 4 5 6 7 8 9 10这11个数字。其分别对应的最后一位身份证的号码为1 0 X 9 8 7 6 5 4 3
+ * 2。
+ *
+ * 5.通过上面得知如果余数是2，就会在身份证的第18位数字上出现罗马数字的Ⅹ。如果余数是10，身份证的最后一位号码就是2。
+ *
+ *
+ * @param idcard
+ * @return
+ */
+ public static boolean validate18Idcard(String idcard) {
+ if (idcard == null) {
+ return false;
+ }
+
+ // 非18位为假
+ int s=18;
+ if (idcard.length() != s) {
+ logger.error("身份证位数不正确!");
+ return false;
+ }
+ // 获取前17位
+ String idcard17 = idcard.substring(0, 17);
+
+ // 前17位全部为数字
+ if (!isDigital(idcard17)) {
+ return false;
+ }
+
+ String provinceid = idcard.substring(0, 2);
+ // 校验省份
+ if (!checkProvinceid(provinceid)) {
+ return false;
+ }
+
+ // 校验出生日期
+ String birthday = idcard.substring(6, 14);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+
+ try {
+ Date birthDate = sdf.parse(birthday);
+ String tmpDate = sdf.format(birthDate);
+ // 出生年月日不正确
+ if (!tmpDate.equals(birthday)) {
+ return false;
+ }
+
+ } catch (ParseException e1) {
+
+ return false;
+ }
+
+ // 获取第18位
+ String idcard18Code = idcard.substring(17, 18);
+
+ char c[] = idcard17.toCharArray();
+
+ int bit[] = converCharToInt(c);
+
+ int sum17 = 0;
+
+ sum17 = getPowerSum(bit);
+
+ // 将和值与11取模得到余数进行校验码判断
+ String checkCode = getCheckCodeBySum(sum17);
+ if (null == checkCode) {
+ return false;
+ }
+ // 将身份证的第18位与算出来的校码进行匹配，不相等就为假
+ if (!idcard18Code.equalsIgnoreCase(checkCode)) {
+ return false;
+ }
+ //System.out.println("正确");
+ return true;
+ }
+
+ /**
+ * 校验15位身份证
+ *
+ *
+ * 只校验省份和出生年月日
+ *
+ *
+ * @param idcard
+ * @return
+ */
+ public static boolean validate15IDCard(String idcard) {
+ if (idcard == null) {
+ return false;
+ }
+ // 非15位为假
+ int s=15;
+ if (idcard.length() != s) {
+ return false;
+ }
+
+ // 15全部为数字
+ if (!isDigital(idcard)) {
+ return false;
+ }
+
+ String provinceid = idcard.substring(0, 2);
+ // 校验省份
+ if (!checkProvinceid(provinceid)) {
+ return false;
+ }
+
+ String birthday = idcard.substring(6, 12);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
+
+ try {
+ Date birthDate = sdf.parse(birthday);
+ String tmpDate = sdf.format(birthDate);
+ // 身份证日期错误
+ if (!tmpDate.equals(birthday)) {
+ return false;
+ }
+
+ } catch (ParseException e1) {
+
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * 将15位的身份证转成18位身份证
+ *
+ * @param idcard
+ * @return
+ */
+ public static String convertIdcarBy15bit(String idcard) {
+ if (idcard == null) {
+ return null;
+ }
+
+ // 非15位身份证
+ int s=15;
+ if (idcard.length() != s) {
+ return null;
+ }
+
+ // 15全部为数字
+ if (!isDigital(idcard)) {
+ return null;
+ }
+
+ String provinceid = idcard.substring(0, 2);
+ // 校验省份
+ if (!checkProvinceid(provinceid)) {
+ return null;
+ }
+
+ String birthday = idcard.substring(6, 12);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
+
+ Date birthdate = null;
+ try {
+ birthdate = sdf.parse(birthday);
+ String tmpDate = sdf.format(birthdate);
+ // 身份证日期错误
+ if (!tmpDate.equals(birthday)) {
+ return null;
+ }
+
+ } catch (ParseException e1) {
+ return null;
+ }
+
+ Calendar cday = Calendar.getInstance();
+ cday.setTime(birthdate);
+ String year = String.valueOf(cday.get(Calendar.YEAR));
+
+ String idcard17 = idcard.substring(0, 6) + year + idcard.substring(8);
+
+ char c[] = idcard17.toCharArray();
+ String checkCode = "";
+
+ // 将字符数组转为整型数组
+ int bit[] = converCharToInt(c);
+
+ int sum17 = 0;
+ sum17 = getPowerSum(bit);
+
+ // 获取和值与11取模得到余数进行校验码
+ checkCode = getCheckCodeBySum(sum17);
+
+ // 获取不到校验位
+ if (null == checkCode) {
+ return null;
+ }
+ // 将前17位与第18位校验码拼接
+ idcard17 += checkCode;
+ return idcard17;
+ }
+
+ /**
+ * 校验省份
+ *
+ * @param provinceid
+ * @return 合法返回TRUE，否则返回FALSE
+ */
+ private static boolean checkProvinceid(String provinceid) {
+ for (String id : cityCode) {
+ if (id.equals(provinceid)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 数字验证
+ *
+ * @param str
+ * @return
+ */
+ private static boolean isDigital(String str) {
+ return str.matches("^[0-9]*$");
+ }
+
+ /**
+ * 将身份证的每位和对应位的加权因子相乘之后，再得到和值
+ *
+ * @param bit
+ * @return
+ */
+ private static int getPowerSum(int[] bit) {
+
+ int sum = 0;
+
+ if (power.length != bit.length) {
+ return sum;
+ }
+
+ for (int i = 0; i < bit.length; i++) {
+ for (int j = 0; j < power.length; j++) {
+ if (i == j) {
+ sum = sum + bit[i] * power[j];
+ }
+ }
+ }
+ return sum;
+ }
+
+ /**
+ * 将和值与11取模得到余数进行校验码判断
+ *
+ * @param sum17
+ * @return 校验位
+ */
+ private static String getCheckCodeBySum(int sum17) {
+ String checkCode = null;
+ switch (sum17 % 11) {
+ case 10:
+ checkCode = "2";
+ break;
+ case 9:
+ checkCode = "3";
+ break;
+ case 8:
+ checkCode = "4";
+ break;
+ case 7:
+ checkCode = "5";
+ break;
+ case 6:
+ checkCode = "6";
+ break;
+ case 5:
+ checkCode = "7";
+ break;
+ case 4:
+ checkCode = "8";
+ break;
+ case 3:
+ checkCode = "9";
+ break;
+ case 2:
+ checkCode = "x";
+ break;
+ case 1:
+ checkCode = "0";
+ break;
+ case 0:
+ checkCode = "1";
+ break;
+ default:
+ }
+ return checkCode;
+ }
+
+ /**
+ * 将字符数组转为整型数组
+ *
+ * @param c
+ * @return
+ * @throws NumberFormatException
+ */
+ private static int[] converCharToInt(char[] c) throws NumberFormatException {
+ int[] a = new int[c.length];
+ int k = 0;
+ for (char temp : c) {
+ a[k++] = Integer.parseInt(String.valueOf(temp));
+ }
+ return a;
+ }
+
+
+ /*public static void main(String[] args) throws Exception {
+ String idcard15 = "130321860311519";
+ String idcard18 = "210102198617083732";//
+ String idcard="610**************";
+ //自己身份证测试
+ System.out.println(isValidatedAllIdcard(idcard));
+ // 15位身份证
+ //System.out.println(isValidatedAllIdcard(idcard15));
+ // 18位身份证
+ //System.out.println(isValidatedAllIdcard(idcard18));
+ // 15位身份证转18位身份证
+ //System.out.println(convertIdcarBy15bit(idcard15));
+ }*/
+}
+
diff --git a/face-common/src/main/java/com/dkha/common/util/IntUUID.java b/face-common/src/main/java/com/dkha/common/util/IntUUID.java
new file mode 100644
index 0000000..a9c6801
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/IntUUID.java
@@ -0,0 +1,40 @@
+package com.dkha.common.util;
+
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @Description 生成32位int UUID
+ * 14位的当前系统时间(格式为：yyyyMMddHHmmss) + 当前电脑的IP地址的最后两位 + 当前线程的hashCode的前9位 + 7位的随机数
+ * @Author Spring
+ * @Since 2019/8/14 10:53
+ */
+
+public class IntUUID {
+
+ public static final AtomicInteger shortUUID = new AtomicInteger(0);
+
+ public static int getShortUUID(){
+ int current;
+ int next;
+ do {
+ current = shortUUID.get();
+ next = current >= 2147483647 ? 0 : current + 1;
+ } while(!shortUUID.compareAndSet(current, next));
+ return next;
+ }
+
+ /**
+ * 获取字符串类型UUID
+ * @return
+ */
+ public static synchronized String getStrUUID() {
+ return UUID.randomUUID().toString().replaceAll("-", "");
+ }
+
+ public static void main(String[] args) {
+ //System.out.println(IntUUID.getShortUUID());
+ String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+ System.out.println(uuid);
+ }
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/IpUtils.java b/face-common/src/main/java/com/dkha/common/util/IpUtils.java
new file mode 100644
index 0000000..3801fa7
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/IpUtils.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.dkha.common.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * IP地址
+ * @author Spring
+ */
+public class IpUtils {
+ private static Logger logger = LoggerFactory.getLogger(IpUtils.class);
+
+ /**
+ * 获取IP地址
+ *
+ * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
+ * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
+ */
+ public static String getIpAddr(HttpServletRequest request) {
+ String unknown = "unknown";
+ String ip = null;
+ try {
+ ip = request.getHeader("x-forwarded-for");
+ //nginx代理存在的情况下
+ if (UtilValidate.isNotEmpty(ip) && ip.contains(",")) {
+ ip = ip.split(",")[0];
+ }
+ if (StringUtils.isEmpty(ip) || unknown.equalsIgnoreCase(ip)) {
+ ip = request.getHeader("Proxy-Client-IP");
+ }
+ if (StringUtils.isEmpty(ip) || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
+ ip = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (StringUtils.isEmpty(ip) || unknown.equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (StringUtils.isEmpty(ip) || unknown.equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (StringUtils.isEmpty(ip) || unknown.equalsIgnoreCase(ip)) {
+ ip = request.getRemoteAddr();
+ }
+ } catch (Exception e) {
+ logger.error("IPUtils ERROR ", e);
+ }
+
+ return ip;
+ }
+
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/JsonUtil.java b/face-common/src/main/java/com/dkha/common/util/JsonUtil.java
new file mode 100644
index 0000000..3b555f4
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/JsonUtil.java
@@ -0,0 +1,226 @@
+package com.dkha.common.util;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.*;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author Spring
+ * @Since 2019/12/11 14:24
+ * @Description 基于jackson 对象序列化反序列化工具
+ */
+
+public class JsonUtil {
+
+ private static Logger logger = LoggerFactory.getLogger(JsonUtil.class);
+
+ private static ObjectMapper objectMapper = new ObjectMapper();
+
+ static {
+ //序列化的时候序列对象的所有属性
+ objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
+
+ // 如果是空对象的时候,不抛异常
+ objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+ //属性为null的转换--为空的值不参与反序列化
+ //objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ // 取消默认转换timestamps对象
+ objectMapper.configure(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS, false);
+ // 所有日期统一格式
+ objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+ // 忽略 在json字符串中存在, 但是在java对象中不存在对应属性的情况, 防止出错
+ objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+ }
+
+
+ public static String obj2String(T obj) {
+ if (obj == null) {
+ return null;
+ }
+ try {
+ return obj instanceof String ? (String)obj : objectMapper
+ .writeValueAsString
+ (obj);
+ } catch (Exception e) {
+ logger.error("Parse object to String error:" + e);
+ return null;
+ }
+ }
+
+ /**
+ * 返回一个格式化好的字符串, 用于调试
+ * @param obj
+ * @param
+ * @return
+ */
+ public static String obj2StringPretty(T obj) {
+ if (obj == null) {
+ return null;
+ }
+ try {
+ return obj instanceof String ? (String)obj : objectMapper.writerWithDefaultPrettyPrinter()
+ .writeValueAsString
+ (obj);
+ } catch (Exception e) {
+ logger.error("Parse object to String error:" + e);
+ return null;
+ }
+ }
+
+ /**
+ * 将字符串转成对象, 单个
+ * @param str
+ * @param clazz
+ * @param
+ * @return
+ */
+ public static T string2Obj(String str, Class clazz) {
+ if (UtilValidate.isEmpty(str) || clazz == null) {
+ return null;
+ }
+ try {
+ return clazz.equals(String.class) ? (T)str : objectMapper.readValue
+ (str, clazz);
+ } catch (IOException e) {
+ logger.error("Parse String to Object error :" + e);
+ return null;
+ }
+ }
+
+ /**
+ * 将字符串转换成对象, 集合
+ * List userEntityList1 = JsonUtil.string2Obj(str, new TypeReference>() {});
+ * @param str
+ * @param typeReference
+ * @param
+ * @return
+ */
+ public static T string2Obj(String str, TypeReference typeReference) {
+ if (UtilValidate.isEmpty(str) || typeReference == null) {
+ return null;
+ }
+ try {
+ return (T)(typeReference.getType().equals(String.class) ? (T)str :
+ objectMapper.readValue
+ (str, typeReference));
+ } catch (IOException e) {
+ logger.error("Parse String to typeReference Object error :" + e);
+ return null;
+ }
+ }
+ /**
+ * 将字符串转换成对象, 集合
+ * List sysUserEntityList2 = JsonUtil.string2Obj(str, List.class, SysUserEntity.class);
+ * @param str
+ * @param collectionClass
+ * @param
+ * @return
+ */
+ public static T string2Obj(String str, Class collectionClass, Class... elementClasses) {
+ JavaType javaType = objectMapper.getTypeFactory()
+ .constructParametricType(collectionClass, elementClasses);
+ try {
+ return objectMapper.readValue(str, javaType);
+ } catch (IOException e) {
+ logger.error("Parse String to Object2 error :" + e);
+ return null;
+ }
+ }
+
+ /**
+ * 测试代码
+ */
+ public static void main(String[] args) {
+ SysUserEntity userEntity = new SysUserEntity();
+ userEntity.setUsername("张三");
+ userEntity.setCreateTime(new Date());
+ System.out.println(JsonUtil.obj2String(userEntity));
+ List userEntityList = new ArrayList<>();
+ userEntityList.add(userEntity);
+ System.out.println(JsonUtil.obj2String(userEntityList));
+
+ String str = "[{\"username\":\"张三\",\"createTime\":\"2019-12-11 14:38:01\"}, {\"username\":\"李四\",\"createTime\":\"2019-10-11 14:38:01\"}]";
+ List userEntityList1 = JsonUtil.string2Obj(str, new TypeReference>() {
+ });
+ System.out.println(userEntityList1.toString());
+
+ List sysUserEntityList2 = JsonUtil.string2Obj(str, List.class, SysUserEntity.class);
+ System.out.println(sysUserEntityList2.toString());
+
+ SysUserEntity userEntity1 = JsonUtil.string2Obj("", SysUserEntity.class);
+ }
+
+ @Data
+ public static class SysUserEntity {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 用户名
+ */
+ private String username;
+ /**
+ * 密码
+ */
+ private String password;
+ /**
+ * 姓名
+ */
+ private String realName;
+ /**
+ * 头像
+ */
+ private String headUrl;
+ /**
+ * 性别 0：男 1：女 2：保密
+ */
+ private Integer gender;
+ /**
+ * 邮箱
+ */
+ private String email;
+ /**
+ * 手机号
+ */
+ private String mobile;
+ /**
+ * 部门ID
+ */
+ private Long deptId;
+ /**
+ * 超级管理员 0：否 1：是
+ */
+ private Integer superAdmin;
+ /**
+ * 状态 0：停用 1：正常
+ */
+ private Integer status;
+ /**
+ * 更新者
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updater;
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateDate;
+ /**
+ * 部门名称
+ */
+ @TableField(exist=false)
+ private String deptName;
+
+ private Date createTime;
+ }
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/NameUtil.java b/face-common/src/main/java/com/dkha/common/util/NameUtil.java
new file mode 100644
index 0000000..5835399
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/NameUtil.java
@@ -0,0 +1,98 @@
+package com.dkha.common.util;
+
+import com.dkha.common.exception.EmployeeException;
+
+/**
+ * @ClassName:
+ * @Description:(please write your description)
+ * @author: {开发人的姓名}
+ * @date:
+ * @Copyright: 成都电科惠安
+ */
+public class NameUtil {
+
+ public static String createAsterisk(int length) {
+ StringBuffer stringBuffer = new StringBuffer();
+ for (int i = 0; i < length; i++) {
+ stringBuffer.append("*");
+ }
+ return stringBuffer.toString();
+ }
+
+ public static String getNames(String name) {
+ if (UtilValidate.isEmpty(name)) {
+ throw new EmployeeException("不能输入空");
+ }
+ String[] show = name.split("·");
+ if (show.length == 2) {
+ name = show[0] + createAsterisk(show[1].length());
+ return name;
+ }
+
+ return name;
+ }
+
+ /**
+ * @param idCardNum 身份证号码
+ * @param front 需要显示前几位
+ * @param end 需要显示末几位
+ * @return
+ */
+ public static String idMask(String idCardNum, int front, int end) {
+ // 身份证不能为空
+ if (UtilValidate.isEmpty(idCardNum)) {
+ throw new EmployeeException("不能输入空");
+ }
+ // 需要截取的长度不能大于身份证号长度
+// if ((front + end) > idCardNum.length()) {
+// throw new EmployeeException("需要截取的长度不能大于身份证号长度");
+// }
+// // 需要截取的不能小于0
+//
+// if (front < 0 || end < 0) {
+// throw new EmployeeException("需要截取的不能小于0");
+// }
+ // 计算*的数量
+ int asteriskCount = idCardNum.length() - (front + end);
+ StringBuffer asteriskStr = new StringBuffer();
+// for (int i = 0; i < asteriskCount; i++) {
+ asteriskStr.append("********");
+// }
+ String regex = "(\\w{" + String.valueOf(front) + "})(\\w+)(\\w{" + String.valueOf(end) + "})";
+ return idCardNum.replaceAll(regex, "$1" + "********" + "$3");
+ }
+
+
+ /**
+ * 正则表达式判断是否是数字: 完美
+ * @param str
+ * @return
+ */
+ public static boolean isNumber(String str){
+ String reg = "^[0-9]+(.[0-9]+)?$";
+ return str.matches(reg);
+ }
+
+ /**
+ * ASCII码 ，不能判断小数点有几个 ：1.1.1 也会返回true
+ * @param str
+ * @return
+ */
+ public static boolean isNumeric(String str){
+ for(int i=str.length();--i>=0;){
+ int chr=str.charAt(i);
+ System.out.println(chr);
+ if(chr<48 || chr>57) {
+ if(chr != 46){
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+// public static void main(String[] args) {
+// String id ="513902199202293979E.5";
+// System.out.println(NameUtil.isNumber(id));
+// }
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/ShieldUtil.java b/face-common/src/main/java/com/dkha/common/util/ShieldUtil.java
new file mode 100644
index 0000000..f77fa0a
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/ShieldUtil.java
@@ -0,0 +1,56 @@
+package com.dkha.common.util;
+
+/**
+ * 身份证号，姓名屏蔽
+ */
+public class ShieldUtil {
+
+ /**
+ * 少数名字屏蔽·后
+ * @param name
+ * @return
+ */
+ public static String getShieldName(String name) {
+
+ if (name != null && name.contains("·")) {
+ String[] strings = name.split("·");
+ char[] c = strings[1].toCharArray();
+ for (int i = 0; i < strings[1].toCharArray().length; i++) {
+ c[i] = '*';
+ }
+
+ strings[1] = new String(c);
+ name = strings[0] + "·" + strings[1];
+ }
+ return name;
+
+ }
+
+ /**
+ * 身份证号屏蔽出生日期
+ * @param idCardNo
+ * @return
+ */
+ public static String getShieldIdCardNo(String idCardNo) {
+ if (idCardNo != null && idCardNo.trim().length() != 0) {
+ char[] c = idCardNo.toCharArray();
+ for (int i = 0; i < c.length; i++) {
+ switch (i) {
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ case 12:
+ case 13:
+ c[i] = '*';
+ break;
+ }
+ }
+ idCardNo = new String(c);
+ }
+ return idCardNo;
+ }
+
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/SpringBeanFactoryUtils.java b/face-common/src/main/java/com/dkha/common/util/SpringBeanFactoryUtils.java
new file mode 100644
index 0000000..f7036e8
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/SpringBeanFactoryUtils.java
@@ -0,0 +1,28 @@
+package com.dkha.common.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author Spring
+ * @Since 2019/9/21 9:48
+ * @Description 用于在Spring框架无法注入的情况下获取对应的Bean
+ */
+@Component
+public class SpringBeanFactoryUtils implements ApplicationContextAware {
+
+ private static ApplicationContext context = null;
+
+ public static T getBean(Class type) {
+ return context.getBean(type);
+ }
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ if (SpringBeanFactoryUtils.context == null) {
+ SpringBeanFactoryUtils.context = applicationContext;
+ }
+ }
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/SpringContextUtils.java b/face-common/src/main/java/com/dkha/common/util/SpringContextUtils.java
new file mode 100644
index 0000000..1efbbfb
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/SpringContextUtils.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.dkha.common.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * Spring Context 工具类
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Component
+public class SpringContextUtils implements ApplicationContextAware {
+ public static ApplicationContext applicationContext;
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext)
+ throws BeansException {
+ SpringContextUtils.applicationContext = applicationContext;
+ }
+
+ public static Object getBean(String name) {
+ return applicationContext.getBean(name);
+ }
+
+ public static T getBean(Class requiredType) {
+ return applicationContext.getBean(requiredType);
+ }
+
+ public static T getBean(String name, Class requiredType) {
+ return applicationContext.getBean(name, requiredType);
+ }
+
+ public static boolean containsBean(String name) {
+ return applicationContext.containsBean(name);
+ }
+
+ public static boolean isSingleton(String name) {
+ return applicationContext.isSingleton(name);
+ }
+
+ public static Class getType(String name) {
+ return applicationContext.getType(name);
+ }
+
+}
\ No newline at end of file
diff --git a/face-common/src/main/java/com/dkha/common/util/TimeUtil.java b/face-common/src/main/java/com/dkha/common/util/TimeUtil.java
new file mode 100644
index 0000000..1747843
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/TimeUtil.java
@@ -0,0 +1,101 @@
+package com.dkha.common.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @version V1.0
+ * @Description: TODO(please write your description)
+ * All rights 成都电科慧安
+ * @Title: TimeUtil
+ * @Package com.dkha.common.util
+ * @author: panhui
+ * @date: 2019/12/10 15:09
+ * @Copyright: 成都电科慧安
+ */
+public class TimeUtil {
+
+ /**
+ * 获取今天时间开始的时间
+ *
+ * @return
+ */
+ public static Long toDayStart() {
+ Date date=new Date();
+ date.setHours(0);
+ date.setMinutes(0);
+ date.setSeconds(0);
+ return date.getTime();
+ }
+ /**
+ * 获取今天时间结束的时间
+ *
+ * @return
+ */
+ public static Long toDayStop()
+ {
+ Date date=new Date();
+ date.setHours(23);
+ date.setMinutes(59);
+ date.setSeconds(59);
+ return date.getTime();
+ }
+
+ /**
+ * 获取传入时间的开始的时间
+ *
+ * @return
+ */
+ public static Long toDateByTimeStart(String time) {
+ Date date=exchangeDate(time);
+ date.setHours(0);
+ date.setMinutes(0);
+ date.setSeconds(0);
+ return date.getTime();
+ }
+ /**
+ * 获取传入时间结束的时间
+ *
+ * @return
+ */
+ public static Long toDateByTimeStop(String time)
+ {
+ Date date=exchangeDate(time);
+ date.setHours(23);
+ date.setMinutes(59);
+ date.setSeconds(59);
+ return date.getTime();
+ }
+
+ /**
+ * 将时间转换为时间戳
+ * @param time
+ * @return
+ */
+ public static Long exchangeTime(String time)
+ {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = null;
+ try {
+ date = simpleDateFormat.parse(time);
+ } catch (ParseException e) {
+ }
+ return date.getTime();
+ }
+ /**
+ * 将时间转换为时间戳
+ * @param time
+ * @return
+ */
+ public static Date exchangeDate(String time)
+ {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = null;
+ try {
+ date = simpleDateFormat.parse(time);
+ } catch (ParseException e) {
+ }
+ return date;
+ }
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/UUIDBits.java b/face-common/src/main/java/com/dkha/common/util/UUIDBits.java
new file mode 100644
index 0000000..241ed87
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/UUIDBits.java
@@ -0,0 +1,43 @@
+package com.dkha.common.util;
+
+import java.util.UUID;
+
+/**
+ * All rights 成都电科慧安
+ *
+ * @ClassName: UUIDBits
+ * @program: dkha-cloud
+ * @description:
+ * @author: maming
+ * @create: 2019/11/18 10:47
+ **/
+
+public class UUIDBits {
+
+ public static String[] chars = new String[] { "a", "b", "c", "d", "e", "f",
+ "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
+ "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5",
+ "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I",
+ "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
+ "W", "X", "Y", "Z" };
+
+ /**
+ * 生成6位UUID
+ * @return 6位UUID
+ */
+ public static String getUUIDBits(Integer num) {
+ StringBuffer shortBuffer = new StringBuffer();
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ for (int i = 0; i < num; i++) {
+ String str = uuid.substring(i * 4, i * 4 + 4);
+ int x = Integer.parseInt(str, 16);
+ shortBuffer.append(chars[x % 0x3E]);
+ }
+ return shortBuffer.toString();
+ }
+
+ public static void main(String[] args) {
+ System.out.println(getUUIDBits(6));
+ }
+}
+
diff --git a/face-common/src/main/java/com/dkha/common/util/UrlUtil.java b/face-common/src/main/java/com/dkha/common/util/UrlUtil.java
new file mode 100644
index 0000000..170cab0
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/UrlUtil.java
@@ -0,0 +1,109 @@
+package com.dkha.common.util;
+
+import com.dkha.common.enums.ErrEnum;
+import com.dkha.common.http.HttpUtil;
+import com.dkha.common.modules.vo.ReturnVO;
+import com.dkha.common.result.CommonResult;
+import com.google.gson.Gson;
+
+/**
+ * @version V1.0
+ * @Description: TODO(please write your description)
+ * All rights 成都电科慧安
+ * @Title: UrlUtil
+ * @Package com.dkha.task.util
+ * @author: panhui
+ * @date: 2020/1/10 10:46
+ * @Copyright: 成都电科慧安
+ */
+public class UrlUtil {
+ /**
+ * 调用预警的信息 faceserver
+ *
+ * @param object
+ * @return
+ */
+ public static String postData(String warningUrl, Object object, HttpUtil httpUtil, Gson gson) {
+ try {
+ CommonResult commonResult = (CommonResult) httpUtil.post(warningUrl, object, CommonResult.class);
+ if (commonResult.getCode().intValue() != 0 || UtilValidate.isEmpty(commonResult.getData())) {
+ return null;
+ }
+ return gson.toJson(commonResult.getData());
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /**
+ * 调用预警的信息 face-server
+ *
+ * @param warningUrl
+ * @return
+ */
+ public static String getData(String warningUrl, HttpUtil httpUtil, Gson gson) {
+// log.error("warningUrl={}",warningUrl);
+ try {
+
+ CommonResult commonResult = (CommonResult) httpUtil.get(warningUrl, CommonResult.class);
+ if (commonResult.getCode().intValue() != 0 || UtilValidate.isEmpty(commonResult.getData())) {
+ return null;
+ }
+ return gson.toJson(commonResult.getData());
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /**
+ * 调用 api
+ *
+ * @param object
+ * @return
+ */
+ public static String postApiData(String warningUrl, Object object, HttpUtil httpUtil, Gson gson) {
+ try {
+ ReturnVO returnVO = (ReturnVO) httpUtil.post(warningUrl, object, ReturnVO.class);
+ if (returnVO.getCode().intValue() != 200 || UtilValidate.isEmpty(returnVO.getData())) {
+ return null;
+ }
+ return gson.toJson(returnVO.getData());
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+
+ /**
+ * 调用 api
+ *
+ * @param warningUrl
+ * @return
+ */
+ public static String getApiData(String warningUrl, HttpUtil httpUtil, Gson gson) {
+// log.error("warningUrl={}",warningUrl);
+ try {
+
+ ReturnVO returnVO = (ReturnVO) httpUtil.get(warningUrl, ReturnVO.class);
+ if (returnVO.getCode().intValue() != 200 || UtilValidate.isEmpty(returnVO.getData())) {
+ return null;
+ }
+ return gson.toJson(returnVO.getData());
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public static String getData(String warningUrl, Object object, HttpUtil httpUtil, Gson gson)
+ {
+ CommonResult commonResult= (CommonResult) httpUtil.get(warningUrl,object,CommonResult.class);
+ //为授权
+ if (commonResult.getCode().intValue()==ErrEnum.UNAUTHORIZED.getCode()){
+ return gson.toJson(401);
+ }
+ if(commonResult.getCode().intValue()!=0 || UtilValidate.isEmpty(commonResult.getData())) {
+ return null;
+ }
+ return gson.toJson(commonResult.getData());
+ }
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/UtilValidate.java b/face-common/src/main/java/com/dkha/common/util/UtilValidate.java
new file mode 100644
index 0000000..69531f4
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/UtilValidate.java
@@ -0,0 +1,144 @@
+package com.dkha.common.util;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * @author Spring
+ * @date 2017/5/18-11:30
+ * @Description: 通用验证工具类
+ */
+public class UtilValidate {
+
+ /**
+ * 验证一个对象是否非空，支持String,Map,Collection等。
+ * @param o
+ * @return
+ */
+ public static boolean isEmpty(Object o){
+ return isBaseEmpty(o);
+ }
+
+ /**
+ * 验证String是否为空
+ * @param s
+ * @return
+ */
+ public static boolean isEmpty(String s) {
+ return ((s == null) || (s.length() == 0));
+ }
+
+ /**
+ * 验证数组是否为空
+ * @param arrays
+ * @return
+ */
+ public static boolean isEmpty(Object [] arrays) {
+ return ((arrays == null) || (arrays.length == 0));
+ }
+
+ /**
+ * 验证一个集合是否为空
+ * @param c
+ * @param
+ * @return
+ */
+ public static boolean isEmpty(Collection c) {
+ return ((c == null) || (c.size() == 0));
+ }
+
+ /**
+ * 验证Map集合是否为空
+ * @param m
+ * @param
+ * @param
+ * @return
+ */
+ public static boolean isEmpty(Map m) {
+ return ((m == null) || (m.size() == 0));
+ }
+
+ /**
+ * 验证charsequence是否为空
+ * @param c
+ * @return
+ */
+ public static boolean isEmpty(CharSequence c) {
+ return ((c == null) || (c.length() == 0));
+ }
+
+ /**
+ * 验证一个对象是否非空，支持String,Map,Collection等。
+ * @param o
+ * @return
+ */
+ public static boolean isNotEmpty(Object o) {
+ return !isBaseEmpty(o);
+ }
+
+ /**
+ * 验证String是否不为空
+ * @param s
+ * @return
+ */
+ public static boolean isNotEmpty(String s) {
+ return ((s != null) && (s.length() > 0));
+ }
+
+ /**
+ * 验证数组是否为空
+ * @param arrays
+ * @return
+ */
+ public static boolean isNotEmpty(Object [] arrays) {
+ return ((arrays != null) && (arrays.length > 0));
+ }
+
+ /**
+ * 验证Collection是否不为空
+ * @param c
+ * @param
+ * @return
+ */
+ public static boolean isNotEmpty(Collection c) {
+ return ((c != null) && (c.size() > 0));
+ }
+
+ /**
+ * 验证CharSequence是否不能为空
+ * @param c
+ * @return
+ */
+ public static boolean isNotEmpty(CharSequence c) {
+ return ((c != null) && (c.length() > 0));
+ }
+
+ /**
+ * 基类
+ * @param value
+ * @return
+ */
+ @SuppressWarnings("unchecked")
+ private static boolean isBaseEmpty(Object value) {
+ if (value == null) return true;
+ if (value instanceof String) return UtilValidate.isEmpty((String) value);
+ if (value instanceof Collection) return UtilValidate.isEmpty((Collection) value);
+ if (value instanceof Map) return UtilValidate.isEmpty((Map) value);
+ if (value instanceof CharSequence) return UtilValidate.isEmpty((CharSequence) value);
+ // These types would flood the log
+ // Number covers: BigDecimal, BigInteger, Byte, Double, Float, Integer, Long, Short
+ if (value instanceof Boolean) return false;
+ if (value instanceof Number) return false;
+ if (value instanceof Character) return false;
+ if (value instanceof java.sql.Timestamp) return false;
+ return false;
+ }
+
+ /**
+ * 系统测试方法
+ * @param args
+ */
+ public static void main(String[] args) {
+ System.out.println(UtilValidate.isEmpty(""));
+ }
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/excel/ExcelField.java b/face-common/src/main/java/com/dkha/common/util/excel/ExcelField.java
new file mode 100644
index 0000000..2918801
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/excel/ExcelField.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright © 2012-2016 JeeSite All rights reserved.
+ */
+package com.dkha.common.util.excel;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Excel注解定义
+ * @author ThinkGem
+ * @version 2013-03-10
+ */
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcelField {
+
+ /**
+ * 导出字段名（默认调用当前字段的“get”方法，如指定导出字段为对象，请填写“对象名.对象属性”，例：“area.name”、“office.name”）
+ */
+ String value() default "";
+
+ /**
+ * 导出字段标题（需要添加批注请用“**”分隔，标题**批注，仅对导出模板有效）
+ */
+ String title();
+
+ /**
+ * 字段类型（0：导出导入；1：仅导出；2：仅导入）
+ */
+ int type() default 0;
+
+ /**
+ * 导出字段对齐方式（0：自动；1：靠左；2：居中；3：靠右）
+ */
+ int align() default 0;
+
+ /**
+ * 导出字段字段排序（升序）
+ */
+ int sort() default 0;
+
+ /**
+ * 如果是字典类型，请设置字典的type值
+ */
+ String dictType() default "";
+
+ /**
+ * 反射类型
+ */
+ Class fieldType() default Class.class;
+
+ /**
+ * 字段归属组（根据分组导出导入）
+ */
+ int[] groups() default {};
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/excel/ImportExcel.java b/face-common/src/main/java/com/dkha/common/util/excel/ImportExcel.java
new file mode 100644
index 0000000..ed9cb24
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/excel/ImportExcel.java
@@ -0,0 +1,343 @@
+package com.dkha.common.util.excel;
+
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 导入Excel文件（支持“XLS”和“XLSX”格式）
+ * @author ThinkGem
+ * @version 2013-03-10
+ */
+public class ImportExcel {
+
+ private static Logger log = LoggerFactory.getLogger(ImportExcel.class);
+
+ /**
+ * 工作薄对象
+ */
+ private Workbook wb;
+
+ /**
+ * 工作表对象
+ */
+ private Sheet sheet;
+
+ /**
+ * 标题行号
+ */
+ private int headerNum;
+
+ /**
+ * 构造函数
+ * @param fileName 导入文件，读取第一个工作表
+ * @param headerNum 标题行号，数据行号=标题行号+1
+ * @throws InvalidFormatException
+ * @throws IOException
+ */
+ public ImportExcel(String fileName, int headerNum)
+ throws InvalidFormatException, IOException {
+ this(new File(fileName), headerNum);
+ }
+
+ /**
+ * 构造函数
+ * @param file 导入文件对象，读取第一个工作表
+ * @param headerNum 标题行号，数据行号=标题行号+1
+ * @throws InvalidFormatException
+ * @throws IOException
+ */
+ public ImportExcel(File file, int headerNum)
+ throws InvalidFormatException, IOException {
+ this(file, headerNum, 0);
+ }
+
+ /**
+ * 构造函数
+ * @param fileName 导入文件
+ * @param headerNum 标题行号，数据行号=标题行号+1
+ * @param sheetIndex 工作表编号
+ * @throws InvalidFormatException
+ * @throws IOException
+ */
+ public ImportExcel(String fileName, int headerNum, int sheetIndex)
+ throws InvalidFormatException, IOException {
+ this(new File(fileName), headerNum, sheetIndex);
+ }
+
+ /**
+ * 构造函数
+ * @param file 导入文件对象
+ * @param headerNum 标题行号，数据行号=标题行号+1
+ * @param sheetIndex 工作表编号
+ * @throws InvalidFormatException
+ * @throws IOException
+ */
+ public ImportExcel(File file, int headerNum, int sheetIndex)
+ throws InvalidFormatException, IOException {
+ this(file.getName(), new FileInputStream(file), headerNum, sheetIndex);
+ }
+
+ /**
+ * 构造函数
+ * @param multipartFile 导入文件对象
+ * @param headerNum 标题行号，数据行号=标题行号+1
+ * @param sheetIndex 工作表编号
+ * @throws InvalidFormatException
+ * @throws IOException
+ */
+ public ImportExcel(MultipartFile multipartFile, int headerNum, int sheetIndex)
+ throws InvalidFormatException, IOException {
+ this(multipartFile.getOriginalFilename(), multipartFile.getInputStream(), headerNum, sheetIndex);
+ }
+
+ /**
+ * @param fileName 导入文件对象
+ * @param is 文件流
+ * @param headerNum 标题行号，数据行号=标题行号+1
+ * @param sheetIndex 工作表编号
+ * @throws InvalidFormatException
+ * @throws IOException
+ */
+ public ImportExcel(String fileName, InputStream is, int headerNum, int sheetIndex)
+ throws InvalidFormatException, IOException {
+ if (StringUtils.isBlank(fileName)){
+ throw new RuntimeException("导入文档为空!");
+ }else if(fileName.toLowerCase().endsWith("xls")){
+ this.wb = new HSSFWorkbook(is);
+ }else if(fileName.toLowerCase().endsWith("xlsx")){
+ this.wb = new XSSFWorkbook(is);
+ }else{
+ throw new RuntimeException("文档格式不正确!");
+ }
+ if (this.wb.getNumberOfSheets() List getDataList(Class cls, int... groups) throws InstantiationException, IllegalAccessException{
+ List annotationList = Lists.newArrayList();
+ // Get annotation field
+ Field[] fs = cls.getDeclaredFields();
+ for (Field f : fs){
+ ExcelField ef = f.getAnnotation(ExcelField.class);
+ if (ef != null && (ef.type()==0 || ef.type()==2)){
+ if (groups!=null && groups.length>0){
+ boolean inGroup = false;
+ for (int g : groups){
+ if (inGroup){
+ break;
+ }
+ for (int efg : ef.groups()){
+ if (g == efg){
+ inGroup = true;
+ annotationList.add(new Object[]{ef, f});
+ break;
+ }
+ }
+ }
+ }else{
+ annotationList.add(new Object[]{ef, f});
+ }
+ }
+ }
+ // Get annotation method
+ Method[] ms = cls.getDeclaredMethods();
+ for (Method m : ms){
+ ExcelField ef = m.getAnnotation(ExcelField.class);
+ if (ef != null && (ef.type()==0 || ef.type()==2)){
+ if (groups!=null && groups.length>0){
+ boolean inGroup = false;
+ for (int g : groups){
+ if (inGroup){
+ break;
+ }
+ for (int efg : ef.groups()){
+ if (g == efg){
+ inGroup = true;
+ annotationList.add(new Object[]{ef, m});
+ break;
+ }
+ }
+ }
+ }else{
+ annotationList.add(new Object[]{ef, m});
+ }
+ }
+ }
+ // Field sorting
+ Collections.sort(annotationList, new Comparator() {
+ @Override
+ public int compare(Object[] o1, Object[] o2) {
+ return new Integer(((ExcelField)o1[0]).sort()).compareTo(
+ new Integer(((ExcelField)o2[0]).sort()));
+ };
+ });
+ log.debug("Import column count:"+annotationList.size());
+ // Get excel data
+ List dataList = Lists.newArrayList();
+ //错误数据
+ List error = Lists.newArrayList();
+ for (int i = this.getDataRowNum(); i < this.getLastDataRowNum(); i++) {
+ E e = (E)cls.newInstance();
+ int column = 0;
+ Row row = this.getRow(i);
+ StringBuilder sb = new StringBuilder();
+ for (Object[] os : annotationList){
+ Object val = this.getCellValue(row, column++);
+ if (val != null){
+ ExcelField ef = (ExcelField)os[0];
+ // Get param type and type cast
+ Class valType = Class.class;
+ if (os[1] instanceof Field){
+ valType = ((Field)os[1]).getType();
+ }else if (os[1] instanceof Method){
+ Method method = ((Method)os[1]);
+ if ("get".equals(method.getName().substring(0, 3))){
+ valType = method.getReturnType();
+ }else if("set".equals(method.getName().substring(0, 3))){
+ valType = ((Method)os[1]).getParameterTypes()[0];
+ }
+ }
+ log.info("Import value type===>导入数据信息: ["+i+","+column+"] " + valType);
+ try {
+ if (valType == String.class){
+ String s = String.valueOf(val.toString());
+ if(StringUtils.endsWith(s, ".0")){
+ val = StringUtils.substringBefore(s, ".0");
+ }else{
+ val = String.valueOf(val.toString());
+ }
+ }else if (valType == Integer.class){
+ val = Double.valueOf(val.toString()).intValue();
+ }else if (valType == Long.class){
+ val = Double.valueOf(val.toString()).longValue();
+ }else if (valType == Double.class){
+ val = Double.valueOf(val.toString());
+ }else if (valType == Float.class){
+ val = Float.valueOf(val.toString());
+ }else if (valType == Date.class){
+ val = DateUtil.getJavaDate((Double)val);
+ }else{
+ if (ef.fieldType() != Class.class){
+ val = ef.fieldType().getMethod("getValue", String.class).invoke(null, val.toString());
+ }else{
+ val = Class.forName(this.getClass().getName().replaceAll(this.getClass().getSimpleName(),
+ "fieldtype."+valType.getSimpleName()+"Type")).getMethod("getValue", String.class).invoke(null, val.toString());
+ }
+ }
+ } catch (Exception ex) {
+ log.info("Get cell value ["+i+","+column+"] error: " + ex.toString());
+ val=ex.getMessage();
+ val = null;
+// return error;
+ }
+ // set entity value
+ if (os[1] instanceof Field){
+ Reflections.invokeSetter(e, ((Field)os[1]).getName(), val);
+ }else if (os[1] instanceof Method){
+ String mthodName = ((Method)os[1]).getName();
+ if ("get".equals(mthodName.substring(0, 3))){
+ mthodName = "set"+StringUtils.substringAfter(mthodName, "get");
+ }
+ Reflections.invokeMethod(e, mthodName, new Class[] {valType}, new Object[] {val});
+ }
+ }
+ sb.append(val+", ");
+ }
+ dataList.add(e);
+ log.debug("Read success");
+ }
+ return dataList;
+ }
+
+
+}
diff --git a/face-common/src/main/java/com/dkha/common/util/excel/Reflections.java b/face-common/src/main/java/com/dkha/common/util/excel/Reflections.java
new file mode 100644
index 0000000..01ea016
--- /dev/null
+++ b/face-common/src/main/java/com/dkha/common/util/excel/Reflections.java
@@ -0,0 +1,299 @@
+/**
+ * Copyright (c) 2005-2012 springside.org.cn
+ */
+package com.dkha.common.util.excel;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+
+import java.lang.reflect.*;
+
+/**
+ * 反射工具类.
+ * 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ * @author calvin
+ * @version 2013-01-15
+ */
+@SuppressWarnings("rawtypes")
+public class Reflections {
+
+ private static final String SETTER_PREFIX = "set";
+
+ private static final String GETTER_PREFIX = "get";
+
+ private static final String CGLIB_CLASS_SEPARATOR = "$$";
+
+ private static Logger logger = LoggerFactory.getLogger(Reflections.class);
+
+ /**
+ * 调用Getter方法.
+ * 支持多级，如：对象名.对象名.方法
+ */
+ public static Object invokeGetter(Object obj, String propertyName) {
+ Object object = obj;
+ for (String name : StringUtils.split(propertyName, ".")){
+ String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+ object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+ }
+ return object;
+ }
+
+ /**
+ * 调用Setter方法, 仅匹配方法名。
+ * 支持多级，如：对象名.对象名.方法
+ */
+ public static void invokeSetter(Object obj, String propertyName, Object value) {
+ Object object = obj;
+ String[] names = StringUtils.split(propertyName, ".");
+ for (int i=0; i[] parameterTypes,
+ final Object[] args) {
+ Method method = getAccessibleMethod(obj, methodName, parameterTypes);
+ if (method == null) {
+ throw new IllegalArgumentException("Could not find method [" + methodName + "] on target [" + obj + "]");
+ }
+
+ try {
+ return method.invoke(obj, args);
+ } catch (Exception e) {
+ throw convertReflectionExceptionToUnchecked(e);
+ }
+ }
+
+ /**
+ * 直接调用对象方法, 无视private/protected修饰符，
+ * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
+ * 只匹配函数名，如果有多个同名函数调用第一个。
+ */
+ public static Object invokeMethodByName(final Object obj, final String methodName, final Object[] args) {
+ Method method = getAccessibleMethodByName(obj, methodName);
+ if (method == null) {
+ throw new IllegalArgumentException("Could not find method [" + methodName + "] on target [" + obj + "]");
+ }
+
+ try {
+ return method.invoke(obj, args);
+ } catch (Exception e) {
+ throw convertReflectionExceptionToUnchecked(e);
+ }
+ }
+
+ /**
+ * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
+ *
+ * 如向上转型到Object仍无法找到, 返回null.
+ */
+ public static Field getAccessibleField(final Object obj, final String fieldName) {
+ Validate.notNull(obj, "object can't be null");
+ Validate.notBlank(fieldName, "fieldName can't be blank");
+ for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) {
+ try {
+ Field field = superClass.getDeclaredField(fieldName);
+ makeAccessible(field);
+ return field;
+ } catch (NoSuchFieldException e) {//NOSONAR
+ // Field不在当前类定义,继续向上转型
+ continue;// new add
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+ * 如向上转型到Object仍无法找到, 返回null.
+ * 匹配函数名+参数类型。
+ *
+ * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+ */
+ public static Method getAccessibleMethod(final Object obj, final String methodName,
+ final Class... parameterTypes) {
+ Validate.notNull(obj, "object can't be null");
+ Validate.notBlank(methodName, "methodName can't be blank");
+
+ for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) {
+ try {
+ Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
+ makeAccessible(method);
+ return method;
+ } catch (NoSuchMethodException e) {
+ // Method不在当前类定义,继续向上转型
+ continue;// new add
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+ * 如向上转型到Object仍无法找到, 返回null.
+ * 只匹配函数名。
+ *
+ * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+ */
+ public static Method getAccessibleMethodByName(final Object obj, final String methodName) {
+ Validate.notNull(obj, "object can't be null");
+ Validate.notBlank(methodName, "methodName can't be blank");
+
+ for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) {
+ Method[] methods = searchType.getDeclaredMethods();
+ for (Method method : methods) {
+ if (method.getName().equals(methodName)) {
+ makeAccessible(method);
+ return method;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+ */
+ public static void makeAccessible(Method method) {
+ if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
+ && !method.isAccessible()) {
+ method.setAccessible(true);
+ }
+ }
+
+ /**
+ * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+ */
+ public static void makeAccessible(Field field) {
+ if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) || Modifier
+ .isFinal(field.getModifiers())) && !field.isAccessible()) {
+ field.setAccessible(true);
+ }
+ }
+
+ /**
+ * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
+ * 如无法找到, 返回Object.class.
+ * eg.
+ * public UserDao extends HibernateDao
+ *
+ * @param clazz The class to introspect
+ * @return the first generic declaration, or Object.class if cannot be determined
+ */
+ @SuppressWarnings("unchecked")
+ public static Class getClassGenricType(final Class clazz) {
+ return getClassGenricType(clazz, 0);
+ }
+
+ /**
+ * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
+ * 如无法找到, 返回Object.class.
+ *
+ * 如public UserDao extends HibernateDao
+ *
+ * @param clazz clazz The class to introspect
+ * @param index the Index of the generic ddeclaration,start from 0.
+ * @return the index generic declaration, or Object.class if cannot be determined
+ */
+ public static Class getClassGenricType(final Class clazz, final int index) {
+
+ Type genType = clazz.getGenericSuperclass();
+
+ if (!(genType instanceof ParameterizedType)) {
+ logger.warn(clazz.getSimpleName() + "'s superclass not ParameterizedType");
+ return Object.class;
+ }
+
+ Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
+
+ if (index >= params.length || index < 0) {
+ logger.warn("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
+ + params.length);
+ return Object.class;
+ }
+ if (!(params[index] instanceof Class)) {
+ logger.warn(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
+ return Object.class;
+ }
+
+ return (Class) params[index];
+ }
+
+ public static Class getUserClass(Object instance) {
+ Assert.notNull(instance, "Instance must not be null");
+ Class clazz = instance.getClass();
+ if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
+ Class superClass = clazz.getSuperclass();
+ if (superClass != null && !Object.class.equals(superClass)) {
+ return superClass;
+ }
+ }
+ return clazz;
+
+ }
+
+ /**
+ * 将反射时的checked exception转换为unchecked exception.
+ */
+ public static RuntimeException convertReflectionExceptionToUnchecked(Exception e) {
+ if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
+ || e instanceof NoSuchMethodException) {
+ return new IllegalArgumentException(e);
+ } else if (e instanceof InvocationTargetException) {
+ return new RuntimeException(((InvocationTargetException) e).getTargetException());
+ } else if (e instanceof RuntimeException) {
+ return (RuntimeException) e;
+ }
+ return new RuntimeException("Unexpected Checked Exception.", e);
+ }
+}
diff --git a/face-server/Dockerfile b/face-server/Dockerfile
new file mode 100644
index 0000000..187249d
--- /dev/null
+++ b/face-server/Dockerfile
@@ -0,0 +1,8 @@
+FROM centos7/jdk1.8
+#指定工作目录
+WORKDIR /usr/local
+RUN touch face.log
+ADD face-server-1.0-SNAPSHOT.jar face-server-1.0-SNAPSHOT.jar
+#指定暴露的端口号
+EXPOSE 8899
+ENTRYPOINT java -jar face-server-1.0-SNAPSHOT.jar > face.log 2>&1
\ No newline at end of file
diff --git a/face-server/pom.xml b/face-server/pom.xml
new file mode 100644
index 0000000..350248a
--- /dev/null
+++ b/face-server/pom.xml
@@ -0,0 +1,194 @@
+
+
+
+ face-application
+ com.dkha
+ 1.0-SNAPSHOT
+
+ 4.0.0
+
+ face-server
+
+
+
+ com.dkha
+ face-common
+ ${project.version}
+
+
+ org.apache.mina
+ mina-core
+ 2.1.3
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+
+ org.springframework
+ springloaded
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+ true
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ com.github.axet
+ kaptcha
+
+
+
+ io.springfox
+ springfox-swagger2
+
+
+ io.springfox
+ springfox-swagger-ui
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+
+
+ com.baomidou
+ mybatis-plus-generator
+
+
+
+
+ org.freemarker
+ freemarker
+
+
+ mysql
+ mysql-connector-java
+
+
+ org.projectlombok
+ lombok
+
+
+ com.alibaba
+ druid-spring-boot-starter
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+ redis.clients
+ jedis
+
+
+
+
+ io.minio
+ minio
+
+
+ com.alibaba
+ fastjson
+
+
+ io.netty
+ netty-all
+
+
+ org.apache.shiro
+ shiro-core
+
+
+ org.apache.shiro
+ shiro-spring
+
+
+ com.github.axet
+ kaptcha
+
+
+
+ cn.afterturn
+ easypoi-base
+
+
+ cn.afterturn
+ easypoi-web
+
+
+ cn.afterturn
+ easypoi-annotation
+
+
+ org.aspectj
+ aspectjrt
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ com.sun.mail
+ javax.mail
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.bytedeco
+ javacv
+ 1.4.3
+
+
+ org.bytedeco.javacpp-presets
+ opencv
+ 3.4.3-1.4.3
+ windows-x86_64
+
+
+
+
+ org.bytedeco.javacpp-presets
+ ffmpeg-platform
+ 4.0.2-1.4.3
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ com.dkha.server.FaceServerApplication
+
+
+
+
+
diff --git a/face-server/src/main/java/com/dkha/server/FaceServerApplication.java b/face-server/src/main/java/com/dkha/server/FaceServerApplication.java
new file mode 100644
index 0000000..12e40ca
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/FaceServerApplication.java
@@ -0,0 +1,50 @@
+package com.dkha.server;
+
+import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
+import com.dkha.server.common.handler.MyMetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+import java.net.InetSocketAddress;
+
+
+@SpringBootApplication(exclude = {
+ org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class},scanBasePackages = {"com.dkha.common", "com.dkha.server"})
+@MapperScan("com.dkha.server.mappers")
+@MapperScan("com.dkha.server.system.modules.log.dao")
+@MapperScan("com.dkha.server.system.modules.sys.dao")
+@EnableScheduling
+public class FaceServerApplication {
+ public static void main(String[] args) {
+ SpringApplication springApplication = new SpringApplication(FaceServerApplication.class);
+ ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
+ //解决WebSocket不能注入的问题
+ }
+
+ /**
+ * mybatis-plus自动注入插件
+ *
+ * @return
+ */
+ @Bean
+ public MyMetaObjectHandler createMyMetaObjectHandler() {
+ return new MyMetaObjectHandler();
+ }
+
+
+ /**
+ * mybatis-plus执行效率插件
+ * @return
+ */
+ //@Bean
+ // 设置 dev test 环境开启
+ //@Profile({"dev"})
+ public PerformanceInterceptor performanceInterceptor() {
+ return new PerformanceInterceptor();
+ }
+
+}
diff --git a/face-server/src/main/java/com/dkha/server/annotation/NoRepeatSubmitAnnotation.java b/face-server/src/main/java/com/dkha/server/annotation/NoRepeatSubmitAnnotation.java
new file mode 100644
index 0000000..9c3d386
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/annotation/NoRepeatSubmitAnnotation.java
@@ -0,0 +1,29 @@
+package com.dkha.server.annotation;
+
+import java.lang.annotation.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @version V1.0
+ * @Description: 对需要防止重复提交的页面添加该注解
+ * @Title: 防止重复提交
+ * @author: huangyugang
+ * @date: 2019/12/23 13:58
+ * @Copyright: 成都电科慧安
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface NoRepeatSubmitAnnotation {
+ /** key前缀 */
+ String prefix() default "";
+
+ /** 过期秒数,默认为5秒 */
+ int expire() default 5;
+
+ /** 超时时间单位，默认为秒 */
+ TimeUnit timeUnit() default TimeUnit.SECONDS;
+
+ /** Key的分隔符（默认 :） */
+ String delimiter() default ":";
+}
diff --git a/face-server/src/main/java/com/dkha/server/aspect/RepeatSubmitAspect.java b/face-server/src/main/java/com/dkha/server/aspect/RepeatSubmitAspect.java
new file mode 100644
index 0000000..54a366c
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/aspect/RepeatSubmitAspect.java
@@ -0,0 +1,93 @@
+package com.dkha.server.aspect;
+
+import com.dkha.common.exception.DkException;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.systemcode.SystemCode;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.annotation.NoRepeatSubmitAnnotation;
+import com.dkha.server.system.modules.security.user.SecurityUser;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.manager.util.SessionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * @version V1.0
+ * @Description: 防止重复提交的切面
+ * @Title:
+ * @author: huangyugang
+ * @date: 2019/12/23 14:01
+ * @Copyright: 成都电科慧安
+ */
+@Aspect
+@Component
+@Slf4j
+public class RepeatSubmitAspect {
+
+ /** lua */
+ private static final String RELEASE_LOCK_LUA_SCRIPT = "if redis.call('get', KEYS[1]) == ARGV[1] then return redis.call('del', KEYS[1]) else return 0 end";
+
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Pointcut("@annotation(com.dkha.server.annotation.NoRepeatSubmitAnnotation)")
+ public void pointCut(){}
+
+ @Around("pointCut()")
+ public Object around(ProceedingJoinPoint joinPoint) throws Throwable{
+ log.info("接口幂等性验证：");
+ // 可以根据业务获取用户唯一的个人信息，例如手机号码
+ if(UtilValidate.isEmpty(SecurityUser.getUserId()))
+ {
+ throw new DkException(SystemCode.TOKEN_ERROR);
+ }
+ String phone = SecurityUser.getUserId().toString();
+ MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ Method method = signature.getMethod();
+ NoRepeatSubmitAnnotation cacheLock = method.getAnnotation(NoRepeatSubmitAnnotation.class);
+ String prefix = cacheLock.prefix();
+ if (StringUtils.isBlank(prefix)){
+ throw new DkException("CacheLock prefix can't be null");
+ }
+ // 拼接 key
+ String delimiter = cacheLock.delimiter();
+ StringBuilder sb = new StringBuilder();
+ sb.append(prefix).append(delimiter).append(phone);
+ final String lockKey = sb.toString();
+ final String UUID = java.util.UUID.randomUUID().toString();
+ try {
+ // 获取锁
+ boolean success = redisTemplate.opsForValue().setIfAbsent(lockKey,UUID,cacheLock.expire(),cacheLock.timeUnit());
+ if (!success){
+
+ throw new DkException("请勿重复提交");
+ }
+ Object result= joinPoint.proceed();
+ return result;
+ }finally {
+ // 最后记得释放锁
+ DefaultRedisScript redisScript = new DefaultRedisScript<>(RELEASE_LOCK_LUA_SCRIPT,Long.class);
+ Long result = redisTemplate.execute(redisScript, Collections.singletonList(lockKey),UUID);
+ }
+
+ }
+
+}
diff --git a/face-server/src/main/java/com/dkha/server/aspect/portraitThread.java b/face-server/src/main/java/com/dkha/server/aspect/portraitThread.java
new file mode 100644
index 0000000..467e640
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/aspect/portraitThread.java
@@ -0,0 +1,41 @@
+package com.dkha.server.aspect;
+
+/**
+ * @version V1.0
+ * @Description: TODO(please write your description)
+ * All rights 成都电科慧安
+ * @Title: portraitThread
+ * @Package com.dkha.server.aspect
+ * @author: yangjun
+ * @date: 2019/12/27 16:48
+ * @Copyright: 成都电科慧安
+ */
+public class portraitThread implements Runnable{
+
+ /**
+ * 线程名称
+ */
+ private String threadName;
+
+ /**
+ * 构造函数
+ *
+ * @param threadName 线程名称
+ */
+ public portraitThread(String threadName) {
+ this.threadName = threadName;
+ }
+
+ @Override
+ public void run() {
+ for (int i = 0; i < 100; i++) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ System.out.println("--->>>"+"开始执行"+i);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/face-server/src/main/java/com/dkha/server/common/config/InitStartDateConfig.java b/face-server/src/main/java/com/dkha/server/common/config/InitStartDateConfig.java
new file mode 100644
index 0000000..b4f1714
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/common/config/InitStartDateConfig.java
@@ -0,0 +1,32 @@
+package com.dkha.server.common.config;
+
+import com.dkha.common.util.UtilValidate;
+import org.springframework.context.annotation.Bean;
+
+import java.util.Date;
+
+/**
+ * @version V1.0
+ * @Description: TODO(系统启动创建一个时间)
+ * All rights 成都电科慧安
+ * @Title: InitStartDateConfig
+ * @Package com.dkha.server.common.config
+ * @author: panhui
+ * @date: 2019/12/15 9:02
+ * @Copyright: 成都电科慧安
+ */
+public class InitStartDateConfig {
+
+ public static Date initDate;
+
+ static
+ {
+ if(UtilValidate.isEmpty(initDate))
+ {
+ initDate=new Date();
+ initDate.setHours(0);
+ initDate.setMinutes(0);
+ initDate.setSeconds(0);
+ }
+ }
+}
diff --git a/face-server/src/main/java/com/dkha/server/common/config/SwaggerConfig.java b/face-server/src/main/java/com/dkha/server/common/config/SwaggerConfig.java
new file mode 100644
index 0000000..bbc5b26
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/common/config/SwaggerConfig.java
@@ -0,0 +1,64 @@
+package com.dkha.server.common.config;
+
+import com.dkha.server.system.common.constant.Constant;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+/**
+ * Swagger配置
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+ @Value("${swagger.show}")
+ private boolean isShow;
+
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .enable(isShow)
+ .apiInfo(apiInfo())
+ .select()
+ //加了ApiOperation注解的类，生成接口文档
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ //包下的类，生成接口文档
+ //.apis(RequestHandlerSelectors.basePackage("io.renren.modules.job.controller"))
+ .paths(PathSelectors.any())
+ .build()
+ .directModelSubstitute(java.util.Date.class, String.class)
+ .securitySchemes(security());
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ .title("face server")
+ .description("faceServer api文档")
+ .version("V1.0")
+ .build();
+ }
+
+
+ private List security() {
+ return newArrayList(
+ new ApiKey(Constant.TOKEN_HEADER, Constant.TOKEN_HEADER, "header")
+ );
+ }
+
+}
\ No newline at end of file
diff --git a/face-server/src/main/java/com/dkha/server/common/exception/DkExceptionHandler.java b/face-server/src/main/java/com/dkha/server/common/exception/DkExceptionHandler.java
new file mode 100644
index 0000000..8c836df
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/common/exception/DkExceptionHandler.java
@@ -0,0 +1,69 @@
+package com.dkha.server.common.exception;
+
+import com.dkha.common.exception.DkAuthorityException;
+import com.dkha.common.exception.DkException;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.systemcode.SystemCode;
+import com.dkha.server.system.common.utils.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Author Spring
+ * @Since 2019/11/11 16:42
+ * @Description 全局异常处理类--用于非系统异常处理
+ * 系统异常全局异常处理类
+ */
+@RestControllerAdvice
+public class DkExceptionHandler extends CommonResult {
+
+ private static final Logger logger = LoggerFactory.getLogger(DkExceptionHandler.class);
+
+ /**
+ * Dk自定义异常全局处理
+ *
+ * @param ex
+ * @return
+ */
+ @ExceptionHandler(DkException.class)
+ public CommonResult handleDkException(DkException ex, HttpServletRequest request) {
+ logger.error(ex.getMessage(), ex);
+ return failResult(ex.getMsg());
+ }
+
+ /**
+ * 参数校验异常处理
+ *
+ * @param ex
+ * @return
+ */
+ @ExceptionHandler(MethodArgumentNotValidException.class)
+ public CommonResult handleDkException(MethodArgumentNotValidException ex) {
+ logger.error(ex.getMessage(), ex);
+ return failResult(ex.getBindingResult().getFieldError().getDefaultMessage());
+
+ }
+
+ /**
+ * 权限异常拦截--主要用于拦截token
+ *
+ * @param ex
+ * @return
+ */
+ @ExceptionHandler(DkAuthorityException.class)
+ public CommonResult handleAuthorityException(DkAuthorityException ex) {
+ logger.error(ex.getMessage(), ex);
+ return failResult(SystemCode.TOKEN_ERROR.des);
+ }
+
+ @ExceptionHandler(Exception.class)
+ public CommonResult handleException(Exception ex,HttpServletRequest request) {
+ logger.error(ex.getMessage(), ex);
+ return failResult(SystemCode.HANDLER_FAILED.des);
+ }
+}
diff --git a/face-server/src/main/java/com/dkha/server/common/handler/MyMetaObjectHandler.java b/face-server/src/main/java/com/dkha/server/common/handler/MyMetaObjectHandler.java
new file mode 100644
index 0000000..7880a1d
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/common/handler/MyMetaObjectHandler.java
@@ -0,0 +1,43 @@
+package com.dkha.server.common.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.dkha.common.enums.YNEnums;
+import com.dkha.server.system.modules.security.user.SecurityUser;
+import org.apache.ibatis.reflection.MetaObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
+
+/**
+ * 公共字段自动填充处理类
+ */
+public class MyMetaObjectHandler implements MetaObjectHandler {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MyMetaObjectHandler.class);
+
+
+ @Override
+ public void insertFill(MetaObject metaObject) {
+
+ /**
+ * Ps:此处不能用下划线表示数据库字段，要使用驼峰命名
+ */
+
+ Object isValidData = this.getFieldValByName(
+ "isValid", metaObject);
+ if (isValidData == null) {
+ this.setFieldValByName("isValid", YNEnums.YES.code, metaObject);
+ }
+ this.setFieldValByName("createTime", new Date(), metaObject);
+ this.setFieldValByName("createBy", String.valueOf(0L), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ this.setFieldValByName("updateBy", String.valueOf(0L), metaObject);
+ }
+
+ @Override
+ public void updateFill(MetaObject metaObject) {
+ this.setUpdateFieldValByName("updateTime", new Date(), metaObject);
+ this.setUpdateFieldValByName("updateBy", String.valueOf(0L), metaObject);
+ }
+}
+
diff --git a/face-server/src/main/java/com/dkha/server/controllers/CameraController.java b/face-server/src/main/java/com/dkha/server/controllers/CameraController.java
new file mode 100644
index 0000000..69d8f51
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/controllers/CameraController.java
@@ -0,0 +1,227 @@
+package com.dkha.server.controllers;
+
+import com.dkha.common.exception.DkException;
+import com.dkha.common.page.PageParam;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.util.ExcelUtils;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.annotation.NoRepeatSubmitAnnotation;
+import com.dkha.server.modules.entities.FaceCameraEntity;
+import com.dkha.server.modules.entities.faceCamera.FaceCameraExcel;
+import com.dkha.server.modules.entities.faceCamera.FaceCameraInfo;
+import com.dkha.server.modules.entities.faceCamera.InsertFaceCamera;
+import com.dkha.server.services.FaceCameraService;
+import com.dkha.server.system.modules.sys.entity.SysRegionEntity;
+import com.dkha.server.system.modules.sys.enums.RegionLevelEnum;
+import com.dkha.server.system.modules.sys.enums.RegionTopEnum;
+import com.dkha.server.system.modules.sys.service.SysRegionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static com.dkha.common.systemcode.SystemCode.EXCEL_ERROR_DATA;
+
+@RestController
+@RequestMapping(value = "/camera")
+@Api(tags = "摄像头管理")
+@Slf4j
+public class CameraController extends CommonResult {
+
+ @Resource
+ private SysRegionService sysRegionService;
+
+ @Resource
+ private FaceCameraService faceCameraServiceImpl;
+
+ @ApiOperation(value = "摄像头列表")
+ @PostMapping(value = "/getList")
+ @RequiresPermissions("camera:list")
+ public CommonResult getList(@ApiParam(required = true, name = "pageParam", value = "{\n" +
+ " \"note\": {\n" +
+ " \"cameraName\": \"摄像头名称\",\n" +
+ " \"cameraRegion\":\"摄像头区域\",\n" +
+ " \"cameratLocationtypeId\":\"位置类型\",\n" +
+
+ "\"status\":\"是否运行 Y启动 N未启动\"\n" +
+ " },\n" +
+ " \"pageNo\": 1,\n" +
+ " \"pageSize\": 10,\n" +
+ " \"sort\": {\n" +
+ " \n" +
+ " },\n" +
+ " \"sex\": \"desc\"\n" +
+ "}") @RequestBody PageParam pageParam) {
+
+ return successResult(faceCameraServiceImpl.getPage(pageParam));
+ }
+
+ @ApiOperation(value = "全部摄像头列表")
+ @GetMapping(value = "/getAllList")
+// @RequiresPermissions("camera:list")
+ public CommonResult getAllList(String cameraName) {
+ return successResult(faceCameraServiceImpl.getAll(cameraName));
+ }
+
+
+ @ApiOperation(value = "查看摄像头信息")
+ @GetMapping(value = "/findById/{idCamera}")
+ @RequiresPermissions("camera:info")
+ public CommonResult findById(@PathVariable("idCamera") long idCamera) {
+ return successResult(faceCameraServiceImpl.findById(idCamera));
+ }
+
+ @PostMapping(value = "/insert")
+ @ApiOperation(value = "新增摄像头")
+ @RequiresPermissions("camera:save")
+ @NoRepeatSubmitAnnotation(prefix = "camera/insert")
+ public CommonResult insert(@RequestBody @Valid InsertFaceCamera insertFaceCamera) {
+ try {
+ faceCameraServiceImpl.insertCamera(insertFaceCamera);
+ } catch (DkException e) {
+ return failResult(e.getMessage());
+ } catch (Exception e) {
+ log.error("添加摄像头异常===>", e.getMessage());
+ return failResult("操作失败");
+ }
+ return successResult("添加成功");
+ }
+
+
+// @ApiOperation(value = "获取摄像头卡口树状图")
+// @GetMapping(value = "/getBayonet")
+// public CommonResult getBayonet() {
+// return successResult(faceCameraServiceImpl.getBayonet(RegionTopEnum.FATHER.value()));
+// }
+
+ @ApiOperation(value = "获取摄像头卡口树状图")
+ @GetMapping(value = "/getBayonet")
+ public CommonResult getBayonet() {
+ List regionByLevel = sysRegionService.getRegionByLevel(RegionLevelEnum.ONE.value());
+ List>> lists = new ArrayList<>();
+ List> results = new ArrayList<>();
+ for (SysRegionEntity region:regionByLevel) {
+ List> bayonet = faceCameraServiceImpl.getBayonet(region.getPid());
+ results.add(bayonet.get(0));
+ }
+ return successResult(results);
+ }
+
+
+// @ApiOperation(value = "获取摄像头区域树状图")
+// @GetMapping(value = "/getRegion")
+// public CommonResult getRegion() {
+// return successResult(faceCameraServiceImpl.getRegion(RegionTopEnum.FATHER.value()));
+// }
+
+ @ApiOperation(value = "获取摄像头区域树状图")
+ @GetMapping(value = "/getRegion")
+ public CommonResult getRegion() {
+ List regionByLevel = sysRegionService.getRegionByLevel(RegionLevelEnum.ONE.value());
+ List> lists = new ArrayList<>();
+ for (SysRegionEntity region:regionByLevel) {
+ List> mapList = faceCameraServiceImpl.getRegion(region.getPid());
+ lists.add(mapList.get(0));
+ }
+ return successResult(lists);
+ }
+
+ @ApiOperation(value = "获取当前区域下的摄像头")
+ @GetMapping(value = "/getRegion/{regionId}")
+ public CommonResult getRegionCamera(@PathVariable("regionId") long regionId) {
+ return successResult(faceCameraServiceImpl.getCameraByRegionId(regionId));
+ }
+
+ @ApiOperation(value = "获取当前区域下尚未布控的摄像头")
+ @GetMapping(value = "/getRegion/unControl/{regionId}")
+ public CommonResult getRegionUnControlCamera(@PathVariable("regionId") long regionId) {
+ return successResult(faceCameraServiceImpl.getRegionUnControlCamera(regionId));
+ }
+
+ @ApiOperation(value = "获取当前区域下的所有摄像头")
+ @GetMapping(value = "/getRegion/all/{regionId}")
+ public CommonResult getAllRegionCamera(@PathVariable("regionId") long regionId) {
+ return successResult(faceCameraServiceImpl.getAllCameraByRegionId(regionId));
+ }
+
+ @ApiOperation(value = "删除摄像头")
+ @GetMapping(value = "/delete/{idCamera}")
+ @RequiresPermissions("camera:del")
+ public CommonResult delete(@PathVariable("idCamera") long idCamera) {
+ return successResult(faceCameraServiceImpl.delete(idCamera));
+ }
+
+ @ApiOperation(value = "更改摄像头状态")
+ @GetMapping(value = "/{idCamera}/{status}")
+ public CommonResult status(@PathVariable("idCamera") long idCamera, @PathVariable("status") boolean status) {
+ return successResult(faceCameraServiceImpl.status(idCamera, status));
+ }
+
+ @ApiOperation(value = "修改摄像头")
+ @PostMapping(value = "/update")
+ @RequiresPermissions("camera:update")
+ public CommonResult update(@RequestBody @Valid FaceCameraInfo faceCameraInfo) {
+ return successResult(faceCameraServiceImpl.update(faceCameraInfo));
+ }
+
+
+ @ApiOperation(value = "经纬度查询摄像头信息")
+ @GetMapping(value = "/findByCoordinate")
+ public CommonResult findByCoordinate(@ApiParam(name = "经度") @RequestParam(name = "cameraLatitude") String cameraLongitude,
+ @RequestParam(name = "cameraLatitude") String cameraLatitude) {
+ FaceCameraEntity faceCameraInfo = faceCameraServiceImpl.findByCoordinate(cameraLongitude, cameraLatitude);
+ if (UtilValidate.isNotEmpty(faceCameraInfo)) {
+ return successResult(faceCameraInfo);
+ }
+ return failResult("未能查询到该摄像头");
+ }
+
+ @GetMapping(value = "/downloadExcel")
+ @ApiOperation(value = "下载模板")
+ public void downloadIncomeExcel(HttpServletResponse servletResponse) throws Exception {
+ ExcelUtils.downloadTemplate(servletResponse, "摄像头导入模板");
+ }
+
+ @PostMapping(value = "/import")
+ @ApiOperation(value = "摄像头导入功能")
+ public CommonResult importDailyTimeStatisticsExcel(@RequestParam(name = "processFile", required = true) MultipartFile multipartFile,
+ HttpServletResponse response
+ ) {
+ List data = faceCameraServiceImpl.importExcel(multipartFile);
+ if (UtilValidate.isEmpty(data)) {
+ return successResult("上传成功");
+ }
+ return failResult(EXCEL_ERROR_DATA.code, "存在错误数据", data);
+ }
+// private CheckTtl checkTtl;
+// @GetMapping(value = "/test")
+// @ApiOperation(value = "下载模板")
+// public void test() {
+// Lock lock = new Lock(new ConsulClient(), "lock-key", checkTtl);
+// try {
+// if (lock.lock(true, 500L, null)) {
+// log.info("Thread {} start!", 1);
+// // 处理业务逻辑
+// log.info("Thread {} end!", 2);
+// }else {
+// log.info("Thread {} end!", 3);
+// }
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// } finally {
+// lock.unlock();
+// }
+// }
+
+
+}
diff --git a/face-server/src/main/java/com/dkha/server/controllers/CompareController.java b/face-server/src/main/java/com/dkha/server/controllers/CompareController.java
new file mode 100644
index 0000000..6fc85ae
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/controllers/CompareController.java
@@ -0,0 +1,62 @@
+package com.dkha.server.controllers;
+
+import com.dkha.common.exception.DkException;
+import com.dkha.common.modules.vo.facelib.CompareRequestVo;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.services.ICompareService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * @Author Spring
+ * @Since 2019/12/11 17:05
+ * @Description
+ */
+@RestController
+@RequestMapping(value = "/compare")
+@Api(tags = "比对相关")
+@Slf4j
+public class CompareController extends CommonResult {
+
+ @Autowired
+ private ICompareService compareService;
+
+ @PostMapping(value = "/grouping")
+ @ApiOperation(value = "分组比对")
+ @RequiresPermissions("face:group:comparison")
+ public CommonResult groupingCompare(
+ @ApiParam(required = true, name = "compareRequestVo", value = "")
+ @RequestBody CompareRequestVo compareRequestVo) {
+ return successResult(compareService.groupingCompare(compareRequestVo));
+ }
+
+ @PostMapping(value = "/oneToOne")
+ @ApiOperation(value = "一比一比对")
+ @RequiresPermissions("face:onetoone:comparison")
+ public CommonResult oneToOneCompare(
+ @ApiParam(required = true, name = "compareRequestVo", value = "")
+ @RequestBody CompareRequestVo compareRequestVo) {
+ return successResult(compareService.oneToOne(compareRequestVo));
+ }
+ @PostMapping(value = "/oneToOneImage")
+ @ApiOperation(value = "一比一比对上传 Image")
+ //@RequiresPermissions("employment:contract:upload")
+ public CommonResult oneToOneCompareImage1(
+ @ApiParam(required = true, name = "compareRequestVo", value = "")
+ @RequestBody CompareRequestVo compareRequestVo) {
+ if (UtilValidate.isEmpty(compareRequestVo.getUrlList())) {
+ throw new DkException("请选择需要比对的图片");
+ }
+ String fileName = compareRequestVo.getUrlList().get(0);
+ return successResult(compareService.setFaceCompare(fileName.substring(fileName.indexOf(",")+1)));
+ }
+}
diff --git a/face-server/src/main/java/com/dkha/server/controllers/ControlTaskController.java b/face-server/src/main/java/com/dkha/server/controllers/ControlTaskController.java
new file mode 100644
index 0000000..2e8d4b4
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/controllers/ControlTaskController.java
@@ -0,0 +1,263 @@
+package com.dkha.server.controllers;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dkha.common.enums.YNEnums;
+import com.dkha.common.exception.DkException;
+import com.dkha.common.modules.vo.control.TaskControlVO;
+import com.dkha.common.modules.vo.control.VideoControlVo;
+import com.dkha.common.modules.vo.facelib.CompareRequestVo;
+import com.dkha.common.modules.vo.facelib.FileImageVo;
+import com.dkha.common.page.PageParam;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.systemcode.SystemCode;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.annotation.NoRepeatSubmitAnnotation;
+import com.dkha.server.modules.entities.*;
+import com.dkha.server.services.*;
+import com.dkha.server.system.common.validator.ValidatorUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * @version V1.0
+ * @Description: 布控任务控制器
+ * @Title:
+ * @author: huangyugang
+ * @date: 2019-12-09 10：25
+ * @Copyright: 成都电科慧安
+ */
+@RestController
+@RequestMapping("/control")
+@Api(tags = "布控任务管理")
+@Slf4j
+public class ControlTaskController extends CommonResult {
+
+ @Autowired
+ IControlTaskService iControlTaskService;
+ @Autowired
+ IControlLibraryMidService iControlLibraryMidService;
+ @Autowired
+ IControlBayonetMidService iControlBayonetMidService;
+ @Autowired
+ private ICompareService compareService;
+
+ @ApiOperation(value = "获取布控任务列表")
+ @PostMapping(value = "/tasklist")
+ public CommonResult getTaskList(@ApiParam(required = true, name = "pageParam", value = "{\n" +
+ " \"note\": {\n" +
+ " \"taskName\": \"任务名称\",\n" +
+ " \"createBy\":\"创建人\",\n" +
+ " \"disposalType\":\" 处置类型-码值视频对比 -1 抓捕类1，监控类2，提示类0 默认选择0\",\n" +
+ " \"controlType\":\"布控类型-码值 长期布控 0，临时布控 1 默认选择0\",\n" +
+ " \"isValid\":\"运行中:0 停止运行-1 暂停运行 1\",\n" +
+ " },\n" +
+ " \"pageNo\": 1,\n" +
+ " \"pageSize\": 10,\n" +
+ "}") @RequestBody PageParam pageParam, BindingResult bindingResult) {
+ String disposetype= pageParam.getNote().get("disposalType");
+ Page controlTask=null;
+ if(!StringUtils.isEmpty(disposetype)){
+ controlTask = iControlTaskService.getList(pageParam,Integer.parseInt(disposetype));
+ }else
+ {
+ controlTask = iControlTaskService.getList(pageParam,0);
+ }
+ return successResult(controlTask);
+ }
+ @ApiOperation(value = "获取视频比对布控任务列表")
+ @PostMapping(value = "/tasklistvideo")
+ public CommonResult getTaskVideoList(@ApiParam(required = true, name = "pageParam", value = "{\n" +
+ " \"note\": {\n" +
+ " \"taskName\": \"任务名称\",\n" +
+ " \"createBy\":\"创建人\",\n" +
+ " },\n" +
+ " \"pageNo\": 1,\n" +
+ " \"pageSize\": 10,\n" +
+ "}") @RequestBody PageParam pageParam, BindingResult bindingResult) {
+
+
+ Page controlTask = iControlTaskService.getList(pageParam,-1);
+
+
+ return successResult(controlTask);
+ }
+
+ @PostMapping(value = "/inserttask")
+ @ApiOperation(value = "新增任务")
+ @NoRepeatSubmitAnnotation(prefix = "insertTask")
+ public CommonResult insertTask(@ApiParam(required = true, name = "controlTask") @RequestBody @Valid TaskControlVO taskvo , BindingResult bindingResult) {
+ this.validate(bindingResult);
+ if (UtilValidate.isEmpty(taskvo)) {
+ return failResult(SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.des, null);
+ }
+ return iControlTaskService.addControlTask(taskvo);
+ }
+
+
+ @PutMapping(value = "/updatetask")
+ @ApiOperation(value = "修改任务：修改名称，处置类别，备注")
+ public CommonResult updateTask(@ApiParam(required = true, name = "controlTask") @RequestBody TaskControlVO taskvo ) {
+ if (UtilValidate.isEmpty(taskvo)) {
+ return failResult(SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.des, null);
+ }
+ return iControlTaskService.updateControlTask(taskvo);
+ }
+
+
+ @DeleteMapping("/deletetask/{taskId}")
+ @ApiParam(required = true, name = "taskId", value = "")
+ @ApiOperation(value = "删除布控任务")
+ public CommonResult deleteTask(@PathVariable(value = "taskId") String taskId) {
+ if (UtilValidate.isEmpty(taskId)) {
+ return failResult("布控任务id不能为空!");
+ }
+ return iControlTaskService.deleteControlTask(taskId);
+ }
+
+ @GetMapping("/viewcontrol/{taskId}")
+ @ApiParam(required = true, name = "taskId", value = "")
+ @ApiOperation(value = "查看布控详细信息")
+ public CommonResult GetControlTaskByID(@PathVariable("taskId") String taskId){
+ if(UtilValidate.isEmpty(taskId))
+ {
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "任务id不能为空！");
+ }
+ ControlTask controlTask= iControlTaskService.getById(taskId);
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("id_control_task", taskId);
+ List listlibrarymid = iControlLibraryMidService.list(queryWrapper);
+ Listlistlib=new ArrayList<>();
+ if(listlibrarymid!=null&&listlibrarymid.size()>0) {
+ for (ControlLibraryMid clm : listlibrarymid) {
+ listlib.add(clm.getIdFactory().toString());
+ }
+ }
+ List faceCameras = iControlBayonetMidService.selectFaceCameraBytaskID(taskId);
+ controlTask.setListfacecamera(faceCameras);
+ controlTask.setLibIds(listlib);
+
+ return successResult(controlTask);
+
+ }
+
+ @GetMapping("/gettaskcamera/{taskno}")
+ @ApiParam(required = true, name = "taskId", value = "")
+ @ApiOperation(value = "根据任务获取摄像头列表")
+ public CommonResult GetCameraListByTaskID(@PathVariable("taskno") String taskno){
+ if(UtilValidate.isEmpty(taskno))
+ {
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "任务id不能为空！");
+ }
+ return iControlTaskService.getCameraListByTaskNO(taskno);
+ }
+
+ @DeleteMapping("/stopcontrol/{taskId}")
+ @ApiParam(required = true, name = "taskId", value = "")
+ @ApiOperation(value = "根据任务ID停止任务")
+ public CommonResult StopControlByTaskID(@PathVariable("taskId") String taskId){
+ if(UtilValidate.isEmpty(taskId))
+ {
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "任务id不能为空！");
+ }
+ return iControlTaskService.stopControlByTaskID(taskId);
+ }
+
+ @PostMapping("/suspendcontrol/{taskId}")
+ @ApiParam(required = true, name = "taskId", value = "")
+ @ApiOperation(value = "根据任务ID暂停任务")
+ public CommonResult SuspendByTaskID(@PathVariable("taskId") String taskId){
+ if(UtilValidate.isEmpty(taskId))
+ {
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "任务id不能为空！");
+ }
+ return iControlTaskService.suspendControlByTaskID(taskId);
+ }
+ @PostMapping("/resumecontrol/{taskId}")
+ @ApiParam(required = true, name = "taskId", value = "")
+ @ApiOperation(value = "根据任务ID恢复任务")
+ public CommonResult resumeByTaskID(@PathVariable("taskId") String taskId){
+ if(UtilValidate.isEmpty(taskId))
+ {
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "任务id不能为空！");
+ }
+ return iControlTaskService.resumeControlByTaskID(taskId);
+ }
+
+ @ApiOperation("上传人像附件布控")
+ @PostMapping("/addtaskfaceFile")
+ @NoRepeatSubmitAnnotation(prefix = "addtaskfaceFile")
+ public CommonResult addtaskfaceFile(@RequestParam("file") MultipartFile multipartFile) {
+ if(multipartFile.isEmpty()){
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "上传文件不能为空！");
+ }
+ return iControlTaskService.addtaskfaceFile(multipartFile);
+ }
+
+ @PostMapping(value = "/getImage")
+ @ApiOperation(value = "上传 Image")
+ public CommonResult oneToOneCompareImage1(
+ @ApiParam(required = true, name = "compareRequestVo", value = "")
+ @RequestBody CompareRequestVo compareRequestVo) {
+ if (UtilValidate.isEmpty(compareRequestVo.getUrlList())) {
+ throw new DkException("请选择需要比对的图片");
+ }
+ String fileName = compareRequestVo.getUrlList().get(0);
+ String s = compareService.setFaceCompare(fileName.substring(fileName.indexOf(",") + 1));
+ return successResult(iControlTaskService.addtaskfaceFiles(s));
+ }
+ @ApiOperation("上传人像附件布控Base64")
+ @PostMapping("/addtaskfaceFiles")
+ @NoRepeatSubmitAnnotation(prefix = "addtaskfaceFiles")
+ public CommonResult addtaskfaceFiles( @ApiParam(required = true, name = "FileImageVo", value = "")
+ @RequestBody FileImageVo fileImageVo) {
+ if(fileImageVo.getUrl().isEmpty()){
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "上传文件不能为空！");
+ }
+ return iControlTaskService.addtaskfaceFiles(fileImageVo.getUrl());
+ }
+ @ApiOperation("添加比对视频文件")
+ @PostMapping("/addcomparvideoFile")
+ @NoRepeatSubmitAnnotation(prefix = "addcomparvideoFile")
+ public CommonResult addvideofaceFile(@ApiParam(required = true, name = "file", value = "视频文件")@RequestParam("file") MultipartFile multipartFile) {
+ if(multipartFile.isEmpty()){
+ return new CommonResult( null,SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, "上传文件不能为空！");
+ }
+
+ return iControlTaskService.addcomplevideoFile(multipartFile);
+ }
+
+ @ApiOperation("新增视频对比")
+ @PostMapping("/insertcmpviedo")
+ @RequiresPermissions("face:video:comparison")
+ @NoRepeatSubmitAnnotation(prefix = "insertcmpviedo")
+ public CommonResult addVideCompare(@ApiParam(required = true, name = "controlVO", value = "") @RequestBody @Valid VideoControlVo controlVO , BindingResult bindingResult) {
+
+ this.validate(bindingResult);
+ if (UtilValidate.isEmpty(controlVO)) {
+ return failResult(SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.code, SystemCode.ILLEGAL_ARGUMENT_EXCEPTION.des, null);
+ }
+ return iControlTaskService.addcomplevideoTask(controlVO);
+
+
+ }
+
+
+
+}
diff --git a/face-server/src/main/java/com/dkha/server/controllers/FaceController.java b/face-server/src/main/java/com/dkha/server/controllers/FaceController.java
new file mode 100644
index 0000000..2a7ddaf
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/controllers/FaceController.java
@@ -0,0 +1,113 @@
+package com.dkha.server.controllers;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dkha.common.exception.DkException;
+import com.dkha.common.fileupload.MinioUtil;
+import com.dkha.common.page.PageParam;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.util.ExcelUtils;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.annotation.NoRepeatSubmitAnnotation;
+import com.dkha.server.modules.entities.FaceCameraEntity;
+import com.dkha.server.modules.entities.faceCamera.FaceCameraExcel;
+import com.dkha.server.modules.entities.faceCamera.FaceCameraInfo;
+import com.dkha.server.modules.entities.faceCamera.InsertFaceCamera;
+import com.dkha.server.services.FaceCameraService;
+import com.dkha.server.system.modules.sys.entity.SysRegionEntity;
+import com.dkha.server.system.modules.sys.enums.RegionLevelEnum;
+import com.dkha.server.system.modules.sys.service.SysRegionService;
+import com.dkha.server.util.RequestUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.*;
+
+import static com.dkha.common.systemcode.SystemCode.EXCEL_ERROR_DATA;
+
+
+@RestController
+@RequestMapping("faces")
+@Slf4j
+public class FaceController extends CommonResult {
+ @Resource
+ private MinioUtil minioUtil;
+
+ private Map faceRes = new HashMap<>();
+
+ private List list = new ArrayList<>();
+ public FaceController(){
+ FaceResEntity resEntity = new FaceResEntity();
+ resEntity.setName("jhx");
+ resEntity.setRphoto("http://192.168.60.52:9000/school/face/jhx.jpg");
+ faceRes.put("eYJST7eY2mbnjGZvywPfxg==",resEntity);
+ }
+
+ @RequestMapping("callback")
+ public String callback(HttpServletRequest request) throws IOException {
+ try {
+ String streamText = RequestUtil.getStreamText(request);
+ System.out.println(streamText);
+ JSONObject object = JSONObject.parseObject(streamText);
+ String str = object.get("photo").toString();
+ String xsd = object.get("confidence").toString();
+ byte[] _byte = new BASE64Decoder().decodeBuffer(str);
+ InputStream inputStream = new ByteArrayInputStream(_byte);
+
+ String object1 = "http://192.168.60.52:9000/test/"+minioUtil.uploadImage(inputStream,"").getString("path");
+ System.out.println(object1);
+ if( faceRes.get(object.getString("ImageID"))!=null){
+ FaceResEntity resEntity = faceRes.get(object.getString("ImageID"));
+ resEntity.setCphoto(object1);
+ resEntity.setXsd(xsd.substring(0,5));
+ list.add(resEntity);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "ok";
+ }
+
+ @GetMapping("list")
+ public List getList(){
+ return list;
+ }
+
+/* @GetMapping("one")
+ public List queryWrapper=new QueryWrapper<>();
+ FaceLibrary faceLibrary=new FaceLibrary();
+ faceLibrary.setIsValid("Y");
+// faceLibrary.setFactoryType("-1");
+ queryWrapper.setEntity(faceLibrary);
+ queryWrapper.ne("factory_type","-1");
+ libNumber=iFaceLibraryService.getBaseMapper().selectCount(queryWrapper);
+ }catch (Exception e){}
+
+ try
+ {
+ //人脸数量
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ Portrait portrait=new Portrait();
+ portrait.setIsValid("Y");
+ queryWrapper.setEntity(portrait);
+ faceNumber=iPortraitService.getBaseMapper().selectCount(queryWrapper);
+ }catch (Exception e){}
+
+ try
+ {
+ //布控任务数量
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ queryWrapper.ne("disposal_type","-1");
+ taskNumber=iControlTaskService.getBaseMapper().selectCount(queryWrapper);
+ }catch (Exception e){}
+
+ try {
+ //预警数量
+ ApiAlarmVO apiAlarmVO=new ApiAlarmVO();
+ PageVO pageVO=new PageVO();
+ pageVO.setPageSize(1);
+ pageVO.setPageNo(1);
+ apiAlarmVO.setPage(pageVO);
+ ApiVO warningVO = (ApiVO) httpUtil.post(link + ApiUrlEnum.ALARMS_POSTURL.getUrl(), apiAlarmVO, ApiVO.class);
+ if (!UtilValidate.isEmpty(warningVO)) {
+ if (!UtilValidate.isEmpty(warningVO) && !UtilValidate.isEmpty(warningVO.getData())) {
+ WarningBayonetReturnVO wvo = gson.fromJson(gson.toJson(warningVO.getData()), WarningBayonetReturnVO.class);
+ warnNumber=wvo.getPage().getTotal();
+ }
+ }
+
+ }catch (Exception e)
+ {
+ log.error("首页展示数据失败:{}",e.getMessage());
+ }
+ Map myMap=new HashMap<>();
+ myMap.put("libNumber",libNumber);
+ myMap.put("faceNumber",faceNumber);
+ myMap.put("taskNumber",taskNumber);
+ myMap.put("warnNumber",warnNumber);
+ myMap.put("daysOfOperation",daysOfOperation);
+ return successResult(myMap);
+ }
+}
diff --git a/face-server/src/main/java/com/dkha/server/controllers/ResourcesController.java b/face-server/src/main/java/com/dkha/server/controllers/ResourcesController.java
new file mode 100644
index 0000000..218e0a3
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/controllers/ResourcesController.java
@@ -0,0 +1,369 @@
+package com.dkha.server.controllers;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dkha.common.enums.YNEnums;
+import com.dkha.common.exception.DkException;
+import com.dkha.common.modules.vo.face.ApiSearchFaceRectVO;
+import com.dkha.common.modules.vo.facelib.FileImageVo;
+import com.dkha.common.modules.vo.position.PortraitListVo;
+import com.dkha.common.page.PageParam;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.systemcode.SystemCode;
+import com.dkha.common.util.IdCardUtil;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.annotation.NoRepeatSubmitAnnotation;
+import com.dkha.server.modules.entities.FaceLibrary;
+import com.dkha.server.modules.entities.Portrait;
+import com.dkha.server.services.IFaceLibraryService;
+import com.dkha.server.services.IPortraitService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @version V1.0
+ * @Description: TODO(please write your description)
+ * All rights 成都电科慧安
+ * @Title: ResourcesController
+ * @Package com.dkha.server.controllers
+ * @author: yangjun
+ * @date: 2019/12/9 15:49
+ * @Copyright: 成都电科慧安
+ */
+@RestController
+@RequestMapping("/Resources")
+@Api(tags="资源管理")
+public class ResourcesController extends CommonResult {
+ public static final Logger logger = LoggerFactory.getLogger(ResourcesController.class);
+ /**
+ * 库
+ */
+ @Autowired
+ private IFaceLibraryService iFaceLibraryService;
+ /**
+ * 人像
+ */
+ @Autowired
+ private IPortraitService iPortraitService;
+ @PostMapping("/faceLib")
+ @ApiParam(required = true, name = "faceLibrary", value = "")
+ @ApiOperation(value = "新增库")
+ @RequiresPermissions("portrait:lib:save")
+ @NoRepeatSubmitAnnotation(prefix = "Resources/faceLib")
+ public CommonResult addFaceLibrary(@ApiParam(required = true, name = "faceLibrary", value = "{\n" +
+ " \"factoryName\": \"库名称\",\n" +
+ " \"factoryType\": \"库类型\",\n" +
+ " \"remarks\": \"备注\"\n" +
+ "}")@RequestBody FaceLibrary faceLibrary){
+ if (UtilValidate.isEmpty(faceLibrary.getFactoryName())){
+ throw new DkException("库名称不能为空");
+ }
+ faceLibrary.setIsValid(YNEnums.YES.code);
+ faceLibrary.setCreateTime(new Date());
+ faceLibrary.setUpdateTime(new Date());
+ FaceLibrary faceLibrar = iFaceLibraryService.addLibrary(faceLibrary);
+ if(UtilValidate.isEmpty(faceLibrar))
+ {
+ return failResult("添加任性库失败失败");
+ }
+ return successResult(faceLibrar);
+ }
+ @PutMapping("/updateLibrary")
+ @ApiParam(required = true, name = "faceLibrary", value = "")
+ @ApiOperation(value = "修改库")
+ @RequiresPermissions("portrait:lib:update")
+ public CommonResult updateLibrary(@ApiParam(required = true, name = "faceLibrary", value = "{\n" +
+ " \"idFactory\": \"库id\",\n" +
+ " \"factoryName\": \"库名称\",\n" +
+ " \"factoryType\": \"库类型\",\n" +
+ " \"remarks\": \"备注\"\n" +
+ "}")@RequestBody FaceLibrary faceLibrary){
+ if (UtilValidate.isEmpty(faceLibrary.getIdFactory())){
+ throw new DkException("库ID不能为空");
+ }
+ FaceLibrary faceLibrar = iFaceLibraryService.updateLibrary(faceLibrary);
+ if(UtilValidate.isEmpty(faceLibrar))
+ {
+ return failResult("修改库失败");
+ }
+ return successResult(faceLibrar);
+ }
+ @DeleteMapping("/faceLib/{libraryId}")
+ @ApiParam(required = true, name = "faceLibrary", value = "")
+ @ApiOperation(value = "删除库")
+ @RequiresPermissions("portrait:lib:del")
+ public CommonResult deleteLibrary(@ApiParam(required = true, name = "libraryId", value = "")
+ @PathVariable(value = "libraryId") Long libraryId){
+ if (UtilValidate.isEmpty(libraryId)){
+ throw new DkException("库id不能为空");
+ }
+ FaceLibrary faceLibrar;
+ try {
+ faceLibrar= iFaceLibraryService.deleteLibrary(libraryId);
+ }catch (DkException e){
+ logger.error(e.getMessage(), e);
+ return failResult(Integer.valueOf(e.getCode()),e.getMsg(), null);
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return failResult(SystemCode.HANDLER_FAILED.des);
+ }
+ return successResult(faceLibrar);
+ }
+
+ /**
+ * 分页查询
+ * @return
+ */
+ @PostMapping("/libraryPage")
+ @ApiOperation(value = "人像库分页查询")
+ @RequiresPermissions("portrait:lib:info")
+ public CommonResult getLibraryPage(@ApiParam(required = true, name = "pageParam", value = "{\n" +
+ "\t\"pageNo\": \"当前页码\",\n" +
+ "\t\"pageSize\": \"每页显示数量 默认10\",\n" +
+ "\t\"note\": {\n" +
+ "\t\t\"factoryName\": \"库名称\"\n" +
+ "\t}\n" +
+ "}")@RequestBody PageParam pageParam){
+ Page page = iFaceLibraryService.queryLibrary(pageParam);
+ return successResult(page);
+ }
+ @ApiOperation("上传人像附件")
+ @PostMapping("/addFile/{libraryId}")
+ @RequiresPermissions("portrait:save")
+ //@NoRepeatSubmitAnnotation(prefix = "Resources/addFile")
+ public CommonResult addFile(@PathVariable("libraryId") String libraryId, @RequestParam("processFile") MultipartFile multipartFile) {
+ if(UtilValidate.isEmpty(libraryId) ){
+ throw new DkException("目标库不能为空");
+ }
+ if(UtilValidate.isEmpty(multipartFile)){
+ throw new DkException("请选择图片");
+ }
+ Portrait portrait;
+ try {
+ portrait = iPortraitService.addPortrait(libraryId, multipartFile);
+ }catch (DkException e){
+ logger.error(e.getMessage(), e);
+ return failResult(Integer.valueOf(e.getCode()),e.getMsg(), null);
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return failResult(SystemCode.HANDLER_FAILED.des);
+ }
+
+ return successResult(portrait);
+ }
+
+ @ApiOperation("布控图片上传人像附件")
+ @PostMapping("/addpngFile/{libraryId}")
+ @RequiresPermissions("portrait:save")
+ public CommonResult addpngFile(@PathVariable("libraryId") String libraryId, @RequestParam("processFile") MultipartFile multipartFile) {
+ if(UtilValidate.isEmpty(libraryId) ){
+ throw new DkException("目标库不能为空");
+ }
+ if(UtilValidate.isEmpty(multipartFile)){
+ throw new DkException("请选择图片");
+ }
+ Portrait portrait;
+ try {
+ portrait = iPortraitService.addPortraitPng(libraryId, multipartFile);
+ }catch (DkException e){
+ logger.error(e.getMessage(), e);
+ return failResult(Integer.valueOf(e.getCode()),e.getMsg(), null);
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return failResult(SystemCode.HANDLER_FAILED.des);
+ }
+
+ return successResult(portrait);
+ }
+
+ @ApiOperation("人像检测")
+ @PostMapping("/pictureDetection")
+ //@RequiresPermissions("employment:contract:upload")
+ public CommonResult pictureDetection(@RequestParam("processFile") MultipartFile multipartFile) {
+
+ if(UtilValidate.isEmpty(multipartFile)){
+ throw new DkException("请选择图片");
+ }
+ List apiSearchFaceRectVOS = new ArrayList<>();
+ try{
+ apiSearchFaceRectVOS = iPortraitService.pictureDetection(multipartFile);
+ }catch (DkException e){
+ logger.error(e.getMessage(), e);
+ return failResult(Integer.valueOf(e.getCode()),e.getMsg(), null);
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return failResult(SystemCode.HANDLER_FAILED.des);
+ }
+ return successResult(apiSearchFaceRectVOS);
+ }
+ @ApiOperation("批量上传人像Base64")
+ @PostMapping("/batch/{libraryId}")
+ //@RequiresPermissions("employment:contract:upload"
+ public CommonResult addbatch(@PathVariable("libraryId") String libraryId, @RequestBody FileImageVo fileImageVo) {
+ if(UtilValidate.isEmpty(libraryId) ){
+ throw new DkException("目标库不能为空");
+ }
+ List portraits = new ArrayList<>();
+ Portrait portrait = null;
+ /**base64上传到文件服务器的地址*/
+ if(UtilValidate.isEmpty(fileImageVo.getUrls())){
+ throw new DkException("请选择图片");
+ }else{
+ try {
+ if (fileImageVo.getUrls().size() > 0) {
+ for (String url :
+ fileImageVo.getUrls()) {
+ portrait = iPortraitService.addPortraitPngs(libraryId, url);
+ portraits.add(portrait);
+ }
+ }
+ } catch(Exception e){
+ logger.error("批量上传人像异常" + e.getMessage());
+ return failResult(e.getMessage());
+ }
+ }
+ return successResult(portraits);
+ }
+ @ApiOperation("批量上传人像")
+ @PostMapping("/addFiles/{libraryId}")
+ //@RequiresPermissions("employment:contract:upload"
+ public CommonResult addFiles(@PathVariable("libraryId") String libraryId, @RequestParam("processFile") MultipartFile[] multipartFile) {
+ if(UtilValidate.isEmpty(libraryId) ){
+ throw new DkException("目标库不能为空");
+ }
+ if(UtilValidate.isEmpty(multipartFile)){
+ throw new DkException("请选择图片");
+ }
+ List portraits;
+ try {
+ portraits = iPortraitService.addPortraits(libraryId, multipartFile);
+ } catch (Exception e) {
+ logger.error("批量上传人像异常"+e.getMessage());
+ return failResult(e.getMessage());
+ }
+ return successResult(portraits);
+ }
+
+ /**
+ * 人脸信息分页查询
+ * @return
+ */
+ @PostMapping("/queryPortrait")
+ @ApiOperation(value = "人像分页查询")
+ @RequiresPermissions("portrait:info")
+ public CommonResult getPortraitVO(@ApiParam(required = true, name = "pageParam", value = "{\n" +
+ "\t\"pageNo\": \"当前页码\",\n" +
+ "\t\"pageSize\": \"每页显示数量 默认10\",\n" +
+ "\t\"note\": {\n" +
+ "\t\"name\": \"姓名\",\n" +
+ "\t\"sex\": \"性别\",\n" +
+ "\t\"libraryId\": \"库id\"\n" +
+ "\t}\n" +
+ "}")@RequestBody PageParam pageParam){
+ //ReturnVO page = iPortraitService.queryPortrait(pageParam)
+ Page page = iPortraitService.queryPortrait(pageParam);
+ return successResult(page);
+ }
+
+ @PostMapping("/deletePortraits")
+ @ApiParam(required = true, name = "idPortrait", value = "")
+ @ApiOperation(value = "批量删除人像信息")
+ @RequiresPermissions("portrait:del")
+ public CommonResult deletePortraits(@ApiParam(required = true, name = "idPortrait", value = "")
+ @RequestBody PortraitListVo idPortrait){
+ if (UtilValidate.isEmpty(idPortrait)){
+ throw new DkException("人像id不能为空");
+ }
+ List longs = iPortraitService.deletePortraits(idPortrait.getIdPortrait());
+ if(UtilValidate.isEmpty(longs))
+ {
+ return failResult("删除人像失败");
+ }
+ return successResult(longs);
+ }
+
+ @DeleteMapping("/deletePortrait/{idPortrait}")
+ @ApiParam(required = true, name = "idPortrait", value = "")
+ @ApiOperation(value = "删除人像信息")
+ @RequiresPermissions("portrait:del")
+ public CommonResult deletePortrait(@ApiParam(required = true, name = "idPortrait", value = "")
+ @PathVariable(value = "idPortrait") Long idPortrait){
+ if (UtilValidate.isEmpty(idPortrait)){
+ throw new DkException("人像id不能为空");
+ }
+ Long aLong = iPortraitService.deletePortrait(idPortrait);
+ if(UtilValidate.isEmpty(aLong))
+ {
+ return failResult("删除人像失败");
+ }
+ return successResult(aLong);
+ }
+
+ @PutMapping("/updatePortrait")
+ @ApiParam(required = true, name = "portrait", value = "")
+ @ApiOperation(value = "修改人像信息")
+ @RequiresPermissions("portrait:update")
+ public CommonResult updatePortrait(@ApiParam(required = true, name = "portrait", value = "{\n" +
+ " \"idPortrait\": \"id\",\n" +
+ " \"idCard\": \"身份证\",\n" +
+ " \"name\": \"姓名\",\n" +
+ " \"sex\": \"性别\"\n" +
+ "}") @RequestBody Portrait portrait){
+ if (UtilValidate.isEmpty(portrait.getIdPortrait())){
+ throw new DkException("id不能为空");
+ }
+ if (UtilValidate.isNotEmpty(portrait.getIdCard())) {
+ if (!IdCardUtil.isValidatedAllIdcard(portrait.getIdCard())) {
+ throw new DkException(SystemCode.IDCARD_ERROR.code,"身份证号码输入不正确");
+ }
+ }
+ Portrait portrait1 = iPortraitService.updatePortrait(portrait);
+ if(UtilValidate.isEmpty(portrait1))
+ {
+ return failResult("修改人像失败");
+ }
+ return successResult(portrait1);
+ }
+ @GetMapping(value = "/exportProjectTemplate")
+ @ApiOperation(value = "导出项目管理excel模板", httpMethod = "GET")
+ public void exportTemplate(HttpServletResponse response) {
+
+ try {
+ ClassPathResource classPathResource = new ClassPathResource("项目信息导入模板.xlsx");
+ InputStream inputStream = classPathResource.getInputStream();
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ response.setHeader("Content-Disposition",
+ "attachment;filename=" + URLEncoder.encode("项目信息导入模板", "UTF-8") + ".xlsx");
+ OutputStream out = response.getOutputStream();
+ int length = 0;
+ byte[] bytes = new byte[1024];
+ while ((length = inputStream.read(bytes)) != -1) {
+ out.write(bytes, 0, length);
+ }
+ out.flush();
+ out.close();
+ inputStream.close();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/face-server/src/main/java/com/dkha/server/controllers/SearchController.java b/face-server/src/main/java/com/dkha/server/controllers/SearchController.java
new file mode 100644
index 0000000..7493953
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/controllers/SearchController.java
@@ -0,0 +1,70 @@
+package com.dkha.server.controllers;
+
+import com.dkha.common.modules.vo.search.SearchRequestVo;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.systemcode.SystemCode;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.services.IFaceLibraryService;
+import com.dkha.server.services.IFileService;
+import com.dkha.server.services.IPortraitService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * @Author Spring
+ * @Since 2019/12/9 15:32
+ * @Description 人脸检索controller
+ */
+@RestController
+@RequestMapping(value = "/search")
+@Api(tags = "检索")
+@Slf4j
+public class SearchController extends CommonResult {
+
+ @Autowired
+ private IFaceLibraryService faceLibraryService;
+ @Autowired
+ private IPortraitService portraitService;
+
+ @GetMapping(value = "/libraries")
+ @ApiOperation(value = "获取所有的库")
+ public CommonResult findFaceLibraries() {
+ return successResult(faceLibraryService.findFaceLibraries());
+ }
+
+
+ @PostMapping(value = "/search")
+ @ApiOperation(value = "检索功能")
+ public CommonResult search(
+ @ApiParam(required = true, name = "searchRequestVo", value = "{\n" +
+ "\t\"libIdList\": [\"要检索的人像库Id集合\"],\n" +
+ "\t\"faceImageRequestList\": [\"需要检索的图片上传后的url地址，注意，只能有一个url地址，此处参数做成集合形式，是为了兼容后续修改\"],\n" +
+ "\t\"faceApiResultMap\": {\n" +
+ "\t\t\"后台传输回来，请求的时候，请再次传输到后台\": 0.0\n" +
+ "\t},\n" +
+ "\n" +
+ "\t\"minScore\": \"搜索阀值\",\n" +
+ "\t\"pageParam\": {\n" +
+ "\t\t\"pageNo\": 1,\n" +
+ "\t\t\"pageSize\": 10,\n" +
+ "\t\t\"note\": {\n" +
+ "\t\t\t\"search\": \"姓名/身份证号码\",\n" +
+ "\t\t\t\"sex\": \"性别 0男 1女\"\n" +
+ "\t\t},\n" +
+ "\t\t\"sort\": {},\n" +
+ "\t\t\"sortString\": \"\"\n" +
+ "\t}\n" +
+ "}")
+ @RequestBody SearchRequestVo searchRequestVo) {
+ return successResult(portraitService.libSearchPage(searchRequestVo));
+ }
+}
diff --git a/face-server/src/main/java/com/dkha/server/controllers/TrackController.java b/face-server/src/main/java/com/dkha/server/controllers/TrackController.java
new file mode 100644
index 0000000..19bf7bc
--- /dev/null
+++ b/face-server/src/main/java/com/dkha/server/controllers/TrackController.java
@@ -0,0 +1,286 @@
+package com.dkha.server.controllers;
+
+import com.dkha.common.enums.ApiUrlEnum;
+import com.dkha.common.modules.vo.camera.BayOnetCameraVO;
+import com.dkha.common.modules.vo.camera.CameraInfoVO;
+import com.dkha.common.modules.vo.camera.PeopleComparableVO;
+import com.dkha.common.modules.vo.camera.PeopleVO;
+import com.dkha.common.modules.vo.face.ApiFaceSearchReturnVO;
+import com.dkha.common.modules.vo.face.ApiFaceSearchVO;
+import com.dkha.common.modules.vo.face.FaceTrackVO;
+import com.dkha.common.modules.vo.face.PageVO;
+import com.dkha.common.redis.RedisKeys;
+import com.dkha.common.redis.RedisUtils;
+import com.dkha.common.result.CommonResult;
+import com.dkha.common.systemcode.SystemCode;
+import com.dkha.common.util.DateUtils;
+import com.dkha.common.util.TimeUtil;
+import com.dkha.common.systemcode.SystemCode;
+import com.dkha.common.util.UtilValidate;
+import com.dkha.server.modules.entities.FaceCameraEntity;
+import com.dkha.server.modules.entities.FaceTrackEntity;
+import com.dkha.server.services.FaceCameraService;
+import com.dkha.server.services.FaceTrackService;
+import com.dkha.server.services.IControlBayonetMidService;
+import com.dkha.server.services.impl.TrackTaskImpl;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.sun.jndi.toolkit.url.UrlUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @version V1.0
+ * @Description: TODO(please write your description)
+ * All rights 成都电科慧安
+ * @Title: TrackController
+ * @Package com.dkha.server.controllers
+ * @author: panhui
+ * @date: 2020/1/13 18:02
+ * @Copyright: 成都电科慧安
+ */
+@RestController
+@RequestMapping(value = "/track")
+@Api(tags = "轨迹分析")
+@Slf4j
+public class TrackController extends CommonResult {
+
+
+ @Autowired
+ private Gson gson;
+
+ @Autowired
+ private FaceTrackService faceTrackService;
+ @Autowired
+ private FaceCameraService faceCameraService;
+
+ @GetMapping("/people/{idPortrait}")
+ @ApiOperation(value = "根据人脸id查询当前数据")
+ public CommonResult getPeopeTrack(@PathVariable("idPortrait") String idPortrait) {
+ //查询出唯一的数据
+ if (UtilValidate.isEmpty(idPortrait)) {
+ return failResult("参数不能为空");
+ }
+ List peopleVOS = new ArrayList<>();
+ String time = new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis());
+ List list = trackTask.getRedisPeopleInfo(time, idPortrait);
+ if (UtilValidate.isNotEmpty(list)) {
+ peopleVOS.addAll(list);
+ }
+ //把数据库中的json转换为实体类数据
+ FaceTrackEntity faceTrackEntity = faceTrackService.queryByIdPortrait(idPortrait);
+ if (UtilValidate.isNotEmpty(faceTrackEntity)) {
+ List peopleVOList = gson.fromJson(faceTrackEntity.getLinkedData(), new TypeToken>() {
+ }.getType());
+ peopleVOS.addAll(peopleVOList);
+ }
+ if (UtilValidate.isEmpty(peopleVOS)) {
+ return successResult(new ArrayList<>());
+ }
+// for (PeopleVO peopleVO : peopleVOS) {
+// peopleVO.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(peopleVO.getTimestamp()));
+// }
+ return successResult(peopleVOS);
+ }
+
+ @DeleteMapping("/people/{idPortrait}/{esId}")
+ @ApiOperation(value = "删除错误的信息")
+ public CommonResult deletePeopeTrack(@PathVariable("idPortrait") String idPortrait, @PathVariable("esId") String esId) {
+ //查询出唯一的数据
+ if (UtilValidate.isEmpty(idPortrait)) {
+ return failResult("参数不能为空");
+ }
+ //把数据库中的json转换为实体类数据
+ FaceTrackEntity faceTrackEntity = faceTrackService.queryByIdPortrait(idPortrait);
+ if (UtilValidate.isEmpty(faceTrackEntity)) {
+ return successResult(null);
+ }
+ List peopleVOS = gson.fromJson(faceTrackEntity.getLinkedData(), new TypeToken>() {
+ }.getType());
+ log.error("处理后{}", peopleVOS.size());
+ if (UtilValidate.isEmpty(peopleVOS)) {
+ return successResult(null);
+ }
+ Iterator iterator = peopleVOS.iterator();
+ while (iterator.hasNext()) {
+ if (iterator.next().getEsId().equals(esId)) {
+ iterator.remove();
+ }
+ }
+ if (peopleVOS.size() > 0) {
+ faceTrackEntity.setCharacterData(gson.toJson(peopleVOS.get(0)));
+ }
+ faceTrackEntity.setLinkedData(gson.toJson(peopleVOS));
+ faceTrackService.updateById(faceTrackEntity);
+ log.error("处理后{}", peopleVOS.size());
+ return successResult(SystemCode.DELETE_SUCCESS.des);
+ }
+
+
+ @Autowired
+ private TrackTaskImpl trackTask;
+
+// @GetMapping("/people/test")
+// @ApiOperation(value = "测试")
+// public CommonResult test(String starTime, String stopTime) {
+//
+// String time = "2020-01-14";
+//// trackTask.setBingDataCamerID(time);
+// Date date=new Date();
+//
+// date.setDate(date.getDate()-1);
+// System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
+//// String startTime = "2020-01-01", stopTime = "2020-02-02";
+//// for(int i=0;i<30+1;i++)
+//// {
+////
+//// }
+//// System.out.println(DateUtils.dayDiff(DateUtils.str2Date(starTime, new SimpleDateFormat("yyyy-MM-dd")), DateUtils.str2Date(stopTime, new SimpleDateFormat("yyyy-MM-dd"))));
+// return null;
+// }
+
+
+ @PostMapping("/people/track")
+ @ApiOperation(value = "获取轨迹信息")
+ public CommonResult getTrack(@RequestBody FaceTrackVO faceTrackVO) {
+
+ if (UtilValidate.isEmpty(faceTrackVO) || UtilValidate.isEmpty(faceTrackVO.getStartTime()) || UtilValidate.isEmpty(faceTrackVO.getEndTime()) || UtilValidate.isEmpty(faceTrackVO.getUrl()) || UtilValidate.isEmpty(faceTrackVO.getTrajectoryThreshold())) {
+ return failResult(SystemCode.ParaIsNull);
+ }
+ if (UtilValidate.isNotEmpty(faceTrackVO.getTrajectoryThreshold())) {
+ faceTrackVO.setTrajectoryThreshold(faceTrackVO.getTrajectoryThreshold() / 100);
+ }
+ /* {
+ "endTime": "2020-01-14",
+ "startTime": "2020-01-14",
+ "trajectoryThreshold": 80.0,
+ "url": "http://10.51.10.201:9001/middleware/20200114/camera/1578962105682-886.jpg"
+ }*/
+
+
+ //判断是否是否今天
+ //如果今天就直接读取redis
+ //如果不是今天就读取历史
+ //如果包含今天或者历史就需要把所有数据读取出来分析
+// String nowTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis());
+ String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis());
+ List peopleVOS = new ArrayList<>();
+ List libList = new ArrayList<>();
+ //表示包含今天需要从redis读取
+ //读取redis和数据库中所有需要比对的库id
+// if (faceTrackVO.getStartTime().equals(nowTime) && faceTrackVO.getEndTime().equals(nowTime)) {
+// //只读取redis所有的数据
+// libList = trackTask.getRedisLibId(nowTime);
+// } else {
+ //读取数据库和redis数据
+ if (faceTrackVO.getStartTime().equals(nowTime) || faceTrackVO.getEndTime().equals(nowTime)) {
+ libList = trackTask.getRedisLibId(nowTime);
+ }
+ List dbLibList = faceTrackService.findIdFatoryByTime(faceTrackVO);
+ if (UtilValidate.isNotEmpty(dbLibList)) {
+ libList.addAll(dbLibList);
+ }
+// }
+ //进行人脸库比对、
+ List compareIds = trackTask.faceCheck(faceTrackVO.getUrl(), libList, faceTrackVO.getTrajectoryThreshold());
+ if (UtilValidate.isEmpty(compareIds)) {
+ return successResult(peopleVOS);
+ }
+ //先获取redis里面的数据，因为当天的数据不会放在数据库中 209
+ //67
+ compareIds.forEach(e ->
+ {
+ List peopleVOList = trackTask.getRedisPeopleInfo(nowTime, e);
+ if (UtilValidate.isNotEmpty(peopleVOList)) {
+ peopleVOS.addAll(peopleVOList);
+ }
+ });
+
+ //根据id查询数据
+ List