修改短信发送模板

refined-manager/src/main/java/com/mortals/xhx/busiz/web/TestController.java

@@ -4,15 +4,11 @@ package com.mortals.xhx.busiz.web;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.HexUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.common.Rest;
-import com.mortals.framework.util.DateUtils;
-import com.mortals.framework.util.MD5Util;
 import com.mortals.framework.util.SecurityUtil;
-import com.mortals.xhx.module.face.service.FacePlanService;
+import com.mortals.xhx.module.hik.face.service.FacePlanService;
 import com.mortals.xhx.module.hik.door.model.req.door.DoorEventReq;
 import com.mortals.xhx.module.hik.door.model.rsp.door.DoorEventDataInfo;
 import com.mortals.xhx.module.hik.door.service.IHikDoorService;
@@ -25,16 +21,12 @@ import com.mortals.xhx.module.hik.person.model.rsp.org.OrgDataInfo;
 import com.mortals.xhx.module.hik.person.model.rsp.person.PersonDataInfo;
 import com.mortals.xhx.module.hik.person.service.IHikPersonService;
 import com.mortals.xhx.module.realtime.model.RealtimeDataflowStatEntity;
-import com.mortals.xhx.module.realtime.model.RealtimeDataflowStatQuery;
 import com.mortals.xhx.module.realtime.service.RealtimeDataflowStatService;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**

refined-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/SubEventStartedService.java

@@ -10,10 +10,10 @@ import com.mortals.framework.util.ThreadPool;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.module.device.service.DeviceService;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
-import com.mortals.xhx.module.face.model.FaceGroupQuery;
-import com.mortals.xhx.module.face.service.FaceGroupService;
-import com.mortals.xhx.module.face.service.FacePlanService;
+import com.mortals.xhx.module.hik.face.model.FaceGroupEntity;
+import com.mortals.xhx.module.hik.face.model.FaceGroupQuery;
+import com.mortals.xhx.module.hik.face.service.FaceGroupService;
+import com.mortals.xhx.module.hik.face.service.FacePlanService;
 import com.mortals.xhx.module.hik.event.model.req.sub.EventSubReq;
 import com.mortals.xhx.module.hik.event.model.rsp.EventInfo;
 import com.mortals.xhx.module.hik.event.service.IHikEventService;

refined-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/SyncWorkmanStartedService.java

@@ -7,10 +7,6 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.module.face.service.FaceGroupService;
-import com.mortals.xhx.module.face.service.FacePlanService;
-import com.mortals.xhx.module.hik.face.service.IHikFaceService;
-import com.mortals.xhx.module.hik.face.service.IHikPlanService;
 import com.mortals.xhx.module.hik.person.model.req.person.PersonReq;
 import com.mortals.xhx.module.hik.person.model.rsp.person.PersonDataInfo;
 import com.mortals.xhx.module.hik.person.service.IHikPersonService;
@@ -18,7 +14,6 @@ import com.mortals.xhx.module.person.model.PersonEntity;
 import com.mortals.xhx.module.person.service.PersonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
 import java.util.Date;

refined-manager/src/main/java/com/mortals/xhx/daemon/task/CreateAppointPersonToHikBlackPlanByDayTaskImpl.java

@@ -3,21 +3,9 @@ package com.mortals.xhx.daemon.task;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
-import com.mortals.framework.util.DateUtils;
-import com.mortals.xhx.base.system.upload.service.UploadService;
-import com.mortals.xhx.module.appointment.service.AppointmentConfigService;
-import com.mortals.xhx.module.appointment.service.AppointmentConfigTimesService;
-import com.mortals.xhx.module.appointment.service.AppointmentPersonService;
-import com.mortals.xhx.module.device.service.DeviceService;
-import com.mortals.xhx.module.face.service.FaceGroupPersonService;
-import com.mortals.xhx.module.face.service.FaceGroupService;
-import com.mortals.xhx.module.face.service.FacePlanService;
-import com.mortals.xhx.module.hik.face.service.IHikFaceService;
-import com.mortals.xhx.module.hik.face.service.IHikPlanService;
-import com.mortals.xhx.module.person.service.PersonService;
+import com.mortals.xhx.module.hik.face.service.FacePlanService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 /**
  * 创建每日预约人群，并添加的预约人脸组中

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointWaitAndFinTaskImpl.java

@@ -97,7 +97,7 @@ public class SyncAppointWaitAndFinTaskImpl implements ITaskExcuteService {
         List<FinPersonInfo> finPersonInfos = new ArrayList<>();
         cacheService.select(redisDb);//
         while (true) {
-            WaitPersonInfo waitPersonInfo = cacheService.lpop(RedisKey.KEY_WAITNUM_LIST_CACHE, WaitPersonInfo.class);
+            WaitPersonInfo waitPersonInfo = cacheService.blpop(RedisKey.KEY_WAITNUM_LIST_CACHE,10, WaitPersonInfo.class);
             if (ObjectUtils.isEmpty(waitPersonInfo)) {
                 break;
             } else {
@@ -105,7 +105,7 @@ public class SyncAppointWaitAndFinTaskImpl implements ITaskExcuteService {
             }
         }
         while (true) {
-            FinPersonInfo finPersonInfo = cacheService.lpop(RedisKey.KEY_FIN_LIST_CACHE, FinPersonInfo.class);
+            FinPersonInfo finPersonInfo = cacheService.blpop(RedisKey.KEY_FIN_LIST_CACHE,10, FinPersonInfo.class);
             if (ObjectUtils.isEmpty(finPersonInfo)) {
                 break;
             } else {

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointmentPersonTaskImpl.java

 package com.mortals.xhx.daemon.task;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
@@ -11,32 +10,19 @@ import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.busiz.rsp.register.AppointmentDataInfo;
 import com.mortals.xhx.busiz.rsp.register.AppointmentDataItem;
-import com.mortals.xhx.busiz.rsp.register.DataItem;
-import com.mortals.xhx.busiz.rsp.register.RegisterDataInfo;
-import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.appointment.model.AppointmentPersonEntity;
 import com.mortals.xhx.module.appointment.model.AppointmentPersonQuery;
 import com.mortals.xhx.module.appointment.service.AppointmentPersonService;
-import com.mortals.xhx.module.face.service.FacePlanService;
+import com.mortals.xhx.module.hik.face.service.FacePlanService;
 import com.mortals.xhx.module.person.model.PersonEntity;
-import com.mortals.xhx.module.person.model.PersonQuery;
 import com.mortals.xhx.module.person.service.PersonService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java

@@ -2,26 +2,18 @@ package com.mortals.xhx.daemon.task;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
-import com.mortals.xhx.base.system.user.model.UserEntity;
-import com.mortals.xhx.base.system.user.model.UserQuery;
-import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.GenderEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.pdu.RespData;
-import com.mortals.xhx.common.pdu.user.UserPdu;
-import com.mortals.xhx.feign.user.IUserFeign;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
-import com.mortals.xhx.module.face.model.FaceGroupQuery;
-import com.mortals.xhx.module.face.service.FaceGroupPersonService;
-import com.mortals.xhx.module.face.service.FaceGroupService;
+import com.mortals.xhx.module.hik.face.model.FaceGroupEntity;
+import com.mortals.xhx.module.hik.face.model.FaceGroupPersonEntity;
+import com.mortals.xhx.module.hik.face.model.FaceGroupQuery;
+import com.mortals.xhx.module.hik.face.service.FaceGroupPersonService;
+import com.mortals.xhx.module.hik.face.service.FaceGroupService;
 import com.mortals.xhx.module.hik.face.model.req.face.FaceInfo;
 import com.mortals.xhx.module.hik.face.model.req.face.FacePic;
 import com.mortals.xhx.module.hik.face.model.req.face.FaceReq;
@@ -31,10 +23,7 @@ import com.mortals.xhx.module.person.model.PersonEntity;
 import com.mortals.xhx.module.person.model.PersonQuery;
 import com.mortals.xhx.module.person.service.PersonService;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 

refined-manager/src/main/java/com/mortals/xhx/module/face/dao/FaceGroupDao.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/dao/FaceGroupDao.java

-package com.mortals.xhx.module.face.dao;
+package com.mortals.xhx.module.hik.face.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
-import java.util.List;
+import com.mortals.xhx.module.hik.face.model.FaceGroupEntity;
+
 /**
 * 人脸分组信息Dao
 * 人脸分组信息 DAO接口

refined-manager/src/main/java/com/mortals/xhx/module/face/dao/FaceGroupPersonDao.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/dao/FaceGroupPersonDao.java

-package com.mortals.xhx.module.face.dao;
+package com.mortals.xhx.module.hik.face.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
-import java.util.List;
+import com.mortals.xhx.module.hik.face.model.FaceGroupPersonEntity;
+
 /**
 * 分组人脸信息Dao
 * 分组人脸信息 DAO接口

refined-manager/src/main/java/com/mortals/xhx/module/face/dao/FacePlanDao.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/dao/FacePlanDao.java

-package com.mortals.xhx.module.face.dao;
+package com.mortals.xhx.module.hik.face.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
-import com.mortals.xhx.module.face.model.FacePlanEntity;
-import java.util.List;
+import com.mortals.xhx.module.hik.face.model.FacePlanEntity;
+
 /**
 * 人员识别计划信息Dao
 * 人员识别计划信息 DAO接口

refined-manager/src/main/java/com/mortals/xhx/module/face/dao/ibatis/FaceGroupDaoImpl.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/dao/ibatis/FaceGroupDaoImpl.java

-package com.mortals.xhx.module.face.dao.ibatis;
+package com.mortals.xhx.module.hik.face.dao.ibatis;
 
 
+import com.mortals.xhx.module.hik.face.model.FaceGroupEntity;
 import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.face.dao.FaceGroupDao;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
-import java.util.Date;
+import com.mortals.xhx.module.hik.face.dao.FaceGroupDao;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
+
 /**
 * 人脸分组信息DaoImpl DAO接口
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/dao/ibatis/FaceGroupPersonDaoImpl.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/dao/ibatis/FaceGroupPersonDaoImpl.java

-package com.mortals.xhx.module.face.dao.ibatis;
+package com.mortals.xhx.module.hik.face.dao.ibatis;
 
 
+import com.mortals.xhx.module.hik.face.model.FaceGroupPersonEntity;
 import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.face.dao.FaceGroupPersonDao;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
-import java.util.Date;
+import com.mortals.xhx.module.hik.face.dao.FaceGroupPersonDao;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
+
 /**
 * 分组人脸信息DaoImpl DAO接口
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/dao/ibatis/FacePlanDaoImpl.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/dao/ibatis/FacePlanDaoImpl.java

-package com.mortals.xhx.module.face.dao.ibatis;
+package com.mortals.xhx.module.hik.face.dao.ibatis;
 
 
+import com.mortals.xhx.module.hik.face.model.FacePlanEntity;
 import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.face.dao.FacePlanDao;
-import com.mortals.xhx.module.face.model.FacePlanEntity;
-import java.util.Date;
+import com.mortals.xhx.module.hik.face.dao.FacePlanDao;
 import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-import java.util.List;
+
 /**
 * 人员识别计划信息DaoImpl DAO接口
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/model/FaceGroupEntity.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/FaceGroupEntity.java

-package com.mortals.xhx.module.face.model;
+package com.mortals.xhx.module.hik.face.model;
 
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.face.model.vo.FaceGroupVo;
+import com.mortals.xhx.module.hik.face.model.vo.FaceGroupVo;
+
 /**
 * 人脸分组信息实体对象
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/model/FaceGroupPersonEntity.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/FaceGroupPersonEntity.java

-package com.mortals.xhx.module.face.model;
+package com.mortals.xhx.module.hik.face.model;
 
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.face.model.vo.FaceGroupPersonVo;
+import com.mortals.xhx.module.hik.face.model.vo.FaceGroupPersonVo;
+
 /**
 * 分组人脸信息实体对象
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/model/FaceGroupPersonQuery.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/FaceGroupPersonQuery.java

-package com.mortals.xhx.module.face.model;
+package com.mortals.xhx.module.hik.face.model;
 
 import java.util.List;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
+
 /**
 * 分组人脸信息查询对象
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/model/FaceGroupQuery.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/FaceGroupQuery.java

-package com.mortals.xhx.module.face.model;
+package com.mortals.xhx.module.hik.face.model;
 
 import java.util.List;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
+
 /**
 * 人脸分组信息查询对象
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/model/FacePlanEntity.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/FacePlanEntity.java

-package com.mortals.xhx.module.face.model;
+package com.mortals.xhx.module.hik.face.model;
 
 import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.face.model.vo.FacePlanVo;
+import com.mortals.xhx.module.hik.face.model.vo.FacePlanVo;
+
 /**
 * 人员识别计划信息实体对象
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/model/FacePlanQuery.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/FacePlanQuery.java

-package com.mortals.xhx.module.face.model;
+package com.mortals.xhx.module.hik.face.model;
 
-import java.util.Date;
 import java.util.List;
-import com.mortals.xhx.module.face.model.FacePlanEntity;
+
 /**
 * 人员识别计划信息查询对象
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/model/vo/FaceGroupPersonVo.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/vo/FaceGroupPersonVo.java

-package com.mortals.xhx.module.face.model.vo;
+package com.mortals.xhx.module.hik.face.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.Data;
 /**
 * 分组人脸信息视图对象

refined-manager/src/main/java/com/mortals/xhx/module/face/model/vo/FaceGroupVo.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/vo/FaceGroupVo.java

-package com.mortals.xhx.module.face.model.vo;
+package com.mortals.xhx.module.hik.face.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.Data;
 /**
 * 人脸分组信息视图对象

refined-manager/src/main/java/com/mortals/xhx/module/face/model/vo/FacePlanVo.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/vo/FacePlanVo.java

-package com.mortals.xhx.module.face.model.vo;
+package com.mortals.xhx.module.hik.face.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.face.model.FacePlanEntity;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.Data;
 /**
 * 人员识别计划信息视图对象

refined-manager/src/main/java/com/mortals/xhx/module/face/service/FaceGroupPersonService.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/FaceGroupPersonService.java

-package com.mortals.xhx.module.face.service;
+package com.mortals.xhx.module.hik.face.service;
 import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
+import com.mortals.xhx.module.hik.face.model.FaceGroupPersonEntity;
+
 /**
 * FaceGroupPersonService
 *

refined-manager/src/main/java/com/mortals/xhx/module/face/service/FaceGroupService.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/FaceGroupService.java

-package com.mortals.xhx.module.face.service;
+package com.mortals.xhx.module.hik.face.service;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
+import com.mortals.xhx.module.hik.face.model.FaceGroupEntity;
 import com.mortals.xhx.module.hik.face.model.req.group.FaceGroupReq;
 
 /**

refined-manager/src/main/java/com/mortals/xhx/module/face/service/FacePlanService.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/FacePlanService.java

-package com.mortals.xhx.module.face.service;
+package com.mortals.xhx.module.hik.face.service;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.face.model.FacePlanEntity;
+import com.mortals.xhx.module.hik.face.model.FacePlanEntity;
 import com.mortals.xhx.module.hik.face.model.rsp.plan.PlanRecognInfo;
 
 import java.util.List;

refined-manager/src/main/java/com/mortals/xhx/module/face/service/impl/FaceGroupPersonServiceImpl.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/impl/FaceGroupPersonServiceImpl.java

-package com.mortals.xhx.module.face.service.impl;
+package com.mortals.xhx.module.hik.face.service.impl;
+import com.mortals.xhx.module.hik.face.model.FaceGroupPersonEntity;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.xhx.module.face.dao.FaceGroupPersonDao;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
-import com.mortals.xhx.module.face.service.FaceGroupPersonService;
+import com.mortals.xhx.module.hik.face.dao.FaceGroupPersonDao;
+import com.mortals.xhx.module.hik.face.service.FaceGroupPersonService;
 /**
 * FaceGroupPersonService
 * 分组人脸信息 service实现

refined-manager/src/main/java/com/mortals/xhx/module/face/service/impl/FaceGroupServiceImpl.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/impl/FaceGroupServiceImpl.java

-package com.mortals.xhx.module.face.service.impl;
+package com.mortals.xhx.module.hik.face.service.impl;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.hik.face.model.FaceGroupEntity;
 import com.mortals.xhx.module.hik.face.model.req.group.FaceGroupReq;
 import com.mortals.xhx.module.hik.face.model.rsp.group.FaceGroupDataInfo;
 import com.mortals.xhx.module.hik.face.service.IHikFaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.xhx.module.face.dao.FaceGroupDao;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
-import com.mortals.xhx.module.face.service.FaceGroupService;
+import com.mortals.xhx.module.hik.face.dao.FaceGroupDao;
+import com.mortals.xhx.module.hik.face.service.FaceGroupService;
 
 import java.util.Date;
 

refined-manager/src/main/java/com/mortals/xhx/module/face/service/impl/FacePlanServiceImpl.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/impl/FacePlanServiceImpl.java

-package com.mortals.xhx.module.face.service.impl;
+package com.mortals.xhx.module.hik.face.service.impl;
 
 import cn.hutool.core.codec.Base64;
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
@@ -20,32 +18,27 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
 import com.mortals.xhx.module.face.model.*;
-import com.mortals.xhx.module.face.service.FaceGroupPersonService;
-import com.mortals.xhx.module.face.service.FaceGroupService;
+import com.mortals.xhx.module.hik.face.model.*;
+import com.mortals.xhx.module.hik.face.service.FaceGroupPersonService;
+import com.mortals.xhx.module.hik.face.service.FaceGroupService;
+import com.mortals.xhx.module.hik.face.dao.FacePlanDao;
 import com.mortals.xhx.module.hik.face.model.req.face.FaceInfo;
 import com.mortals.xhx.module.hik.face.model.req.face.FacePic;
 import com.mortals.xhx.module.hik.face.model.req.face.FaceReq;
-import com.mortals.xhx.module.hik.face.model.req.group.FaceGroupReq;
 import com.mortals.xhx.module.hik.face.model.req.plan.PlanRecognListReq;
 import com.mortals.xhx.module.hik.face.model.req.plan.PlanRecognReq;
-import com.mortals.xhx.module.hik.face.model.req.plan.TimeBlockListItem;
-import com.mortals.xhx.module.hik.face.model.req.plan.TimeRangeItem;
 import com.mortals.xhx.module.hik.face.model.req.resource.ResourceReq;
 import com.mortals.xhx.module.hik.face.model.rsp.face.FaceDataInfo;
 import com.mortals.xhx.module.hik.face.model.rsp.plan.PlanRecognInfo;
 import com.mortals.xhx.module.hik.face.model.rsp.resource.ResourceDataInfo;
-import com.mortals.xhx.module.hik.face.service.IHikFaceService;
-import com.mortals.xhx.module.hik.face.service.IHikPlanService;
+import com.mortals.xhx.module.hik.face.service.*;
 import com.mortals.xhx.module.person.model.PersonEntity;
 import com.mortals.xhx.module.person.service.PersonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
-import com.mortals.xhx.module.face.dao.FacePlanDao;
-import com.mortals.xhx.module.face.service.FacePlanService;
+import com.mortals.xhx.module.hik.face.service.FacePlanService;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;

refined-manager/src/main/java/com/mortals/xhx/module/face/web/FaceGroupController.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/web/FaceGroupController.java

-package com.mortals.xhx.module.face.web;
+package com.mortals.xhx.module.hik.face.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.hik.face.model.FaceGroupEntity;
+import com.mortals.xhx.module.hik.face.service.FaceGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.face.model.FaceGroupEntity;
-import com.mortals.xhx.module.face.service.FaceGroupService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
+
 /**
 *
 * 人脸分组信息
@@ -31,7 +19,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 */
 @RestController
 @RequestMapping("face/group")
-public class FaceGroupController extends BaseCRUDJsonBodyMappingController<FaceGroupService,FaceGroupEntity,Long> {
+public class FaceGroupController extends BaseCRUDJsonBodyMappingController<FaceGroupService, FaceGroupEntity,Long> {
 
     @Autowired
     private ParamService paramService;

refined-manager/src/main/java/com/mortals/xhx/module/face/web/FaceGroupPersonController.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/web/FaceGroupPersonController.java

-package com.mortals.xhx.module.face.web;
+package com.mortals.xhx.module.hik.face.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.hik.face.model.FaceGroupPersonEntity;
+import com.mortals.xhx.module.hik.face.service.FaceGroupPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.face.model.FaceGroupPersonEntity;
-import com.mortals.xhx.module.face.service.FaceGroupPersonService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
+
 /**
 *
 * 分组人脸信息
@@ -31,7 +19,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 */
 @RestController
 @RequestMapping("face/group/person")
-public class FaceGroupPersonController extends BaseCRUDJsonBodyMappingController<FaceGroupPersonService,FaceGroupPersonEntity,Long> {
+public class FaceGroupPersonController extends BaseCRUDJsonBodyMappingController<FaceGroupPersonService, FaceGroupPersonEntity,Long> {
 
     @Autowired
     private ParamService paramService;

refined-manager/src/main/java/com/mortals/xhx/module/face/web/FacePlanController.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/face/web/FacePlanController.java

-package com.mortals.xhx.module.face.web;
+package com.mortals.xhx.module.hik.face.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.hik.face.model.FacePlanEntity;
+import com.mortals.xhx.module.hik.face.service.FacePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.face.model.FacePlanEntity;
-import com.mortals.xhx.module.face.service.FacePlanService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
+
 import java.util.Map;
-import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import static com.mortals.framework.ap.SysConstains.*;
+
 /**
 *
 * 人员识别计划信息
@@ -31,7 +19,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 */
 @RestController
 @RequestMapping("face/plan")
-public class FacePlanController extends BaseCRUDJsonBodyMappingController<FacePlanService,FacePlanEntity,Long> {
+public class FacePlanController extends BaseCRUDJsonBodyMappingController<FacePlanService, FacePlanEntity,Long> {
 
     @Autowired
     private ParamService paramService;

refined-manager/src/main/resources/sqlmap/module/face/FaceGroupMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "mybatis-3-mapper.dtd">
-<mapper namespace="com.mortals.xhx.module.face.dao.ibatis.FaceGroupDaoImpl">
+<mapper namespace="com.mortals.xhx.module.hik.face.dao.ibatis.FaceGroupDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="FaceGroupEntity" id="FaceGroupEntity-Map">

refined-manager/src/main/resources/sqlmap/module/face/FaceGroupPersonMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "mybatis-3-mapper.dtd">
-<mapper namespace="com.mortals.xhx.module.face.dao.ibatis.FaceGroupPersonDaoImpl">
+<mapper namespace="com.mortals.xhx.module.hik.face.dao.ibatis.FaceGroupPersonDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="FaceGroupPersonEntity" id="FaceGroupPersonEntity-Map">

refined-manager/src/main/resources/sqlmap/module/face/FacePlanMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "mybatis-3-mapper.dtd">
-<mapper namespace="com.mortals.xhx.module.face.dao.ibatis.FacePlanDaoImpl">
+<mapper namespace="com.mortals.xhx.module.hik.face.dao.ibatis.FacePlanDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="FacePlanEntity" id="FacePlanEntity-Map">