添加海康回调实现类

doc/api.md

@@ -3291,6 +3291,69 @@ msg|String|消息|-
 	"msg":"成功"
 }
 
+
+
+```
+## 第三方调用
+
+### 查询注册人员列表
+
+**请求URL:** device/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询注册人员列表
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+
+**请求样例:**
+```
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称| 参数类型    |描述
+:---|:--------|:------
+code| Integer |结果码（-1.失败，1.成功）
+msg| String  |消息
+data| object  |数据对象
+ per_page| Integer |每页条数
+ total| Integer |总条数
+ last_page| Integer |总页数
+ current_page| Integer |当前页
+ data| array   |结果集列表|数组
+  id| String  |外部系统id
+  name| String  |用户名称
+  idCard| String  |身份证号码
+  gender| Integer |性别(0.男,1.女)
+  phone| String  |手机号码
+  birthday| Date    |出生日期（yyyy-MM-dd）
+  address| String  |家庭住址
+  picUri| String  |照片路径(路径与数据二选一)
+  picData| String  |照片数据（base64）
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+
+
 ```
 ## 字典附录
 ### isBooking

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

@@ -7,12 +7,21 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.util.DateUtils;
 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;
+import com.mortals.xhx.module.hik.event.model.rsp.EventInfo;
+import com.mortals.xhx.module.hik.event.service.IHikEventService;
+import com.mortals.xhx.module.hik.person.model.req.org.OrgListReq;
+import com.mortals.xhx.module.hik.person.model.req.person.PersonReq;
+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 lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 设备
@@ -24,13 +33,46 @@ import java.util.Date;
 @Slf4j
 @RequestMapping("/test")
 public class TestController {
+
+    @Autowired
+    private IHikPersonService hikPersonService;
+    @Autowired
+    private IHikDoorService hikDoorService;
+    @Autowired
+    private IHikEventService hikEventService;
+
     
     @GetMapping("webservice")
     public String webservice() {
         log.info("测试");
-
         return "ok";
     }
+    @PostMapping("getPersonList")
+    public String getPersonList(@RequestBody PersonReq personReq) {
+        Rest<PersonDataInfo> personList = hikPersonService.getPersonList(personReq);
+        return JSON.toJSONString(personList);
+    }
+
+    @PostMapping("getOrgList")
+    public String getOrgList(@RequestBody OrgListReq orgListReq) {
+        Rest<OrgDataInfo> orgList = hikPersonService.getOrgList(orgListReq);
+        return JSON.toJSONString(orgList);
+    }
+
+    @PostMapping("getDoorEvents")
+    public String getDoorEvents(@RequestBody DoorEventReq doorEventReq) {
+        Rest<DoorEventDataInfo> doorEvents = hikDoorService.getDoorEvents(doorEventReq);
+        return JSON.toJSONString(doorEvents);
+    }
+
+    @PostMapping("getEvents")
+    public String getEvents() {
+        Rest<List<EventInfo>> events = hikEventService.getEvents();
+        return JSON.toJSONString(events);
+    }
+
+
+
 
     public static void main(String[] args) {
 

refined-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

@@ -81,6 +81,11 @@ public final class Constant {
 	 */
 	public final static String PARAM_SERVER_HTTP_URL = "server_http_url";
 
+	/**
+	 * 订阅的事件列表 多个逗号分割
+	 */
+	public final static String PARAM_EVENTTYPES = "event_types";
+
 	/**
 	 * rabbmit exchange分隔符
 	 */
@@ -112,6 +117,6 @@ public final class Constant {
 	 */
 	public static final String PATH_SITETREE = "site/siteTree";
 
-	public static final String DISTRIBUTE_PATH = "distribute_path";
+	public static final String DISTRIBUTE_PATH = "eventTypes";
 
 }

refined-manager/src/main/java/com/mortals/xhx/common/utils/ArtemisPostTest.java

@@ -78,9 +78,9 @@ public class ArtemisPostTest {
 		config.setAppKey("25128371");  // 秘钥appkey
 		config.setAppSecret("2m9RcPJOKq5j2QPQM4v5");// 秘钥appSecret
 		final String getCamsApi = ARTEMIS_PATH + "/api/resource/v1/person/personList";
-		Map<String, String> paramMap = new HashMap<String, String>();// post请求Form表单参数
-		paramMap.put("pageNo", "1");
-		paramMap.put("pageSize", "10");
+		Map<String, Integer> paramMap = new HashMap<>();// post请求Form表单参数
+		paramMap.put("pageNo", 1);
+		paramMap.put("pageSize", 10);
 		String body = JSON.toJSON(paramMap).toString();
 		Map<String, String> path = new HashMap<String, String>(2) {
 			{

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

+package com.mortals.xhx.daemon.applicationservice;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.ap.GlobalSysInfo;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.framework.util.ThreadPool;
+import com.mortals.xhx.common.key.Constant;
+import com.mortals.xhx.module.hik.event.model.req.EventSubReq;
+import com.mortals.xhx.module.hik.event.model.rsp.EventInfo;
+import com.mortals.xhx.module.hik.event.service.IHikEventService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+@Component
+@Slf4j
+public class SubEventStartedService implements IApplicationStartedService {
+
+    @Value("${hik.callback:''}")
+    private String callback;
+
+    @Autowired
+    private IHikEventService hikEventService;
+
+    @Override
+    public void start() {
+        log.info("开始服务..[事件订阅服务]");
+        ThreadPool.getInstance().init(20);
+        String eventtypes = GlobalSysInfo.getParamValue(Constant.PARAM_EVENTTYPES, "1644175361");
+        List<Integer> eventTypes = StrUtil.split(eventtypes, ",".charAt(0), -1, false, Integer::parseInt);
+
+        EventSubReq eventSubReq = new EventSubReq();
+        eventSubReq.setEventTypes(eventTypes);
+        eventSubReq.setEventDest(callback);
+        Rest<String> rest = hikEventService.subEvent(eventSubReq);
+        log.info("sub events resp==>{}", JSON.toJSONString(rest));
+
+        Rest<List<EventInfo>> events = hikEventService.getEvents();
+        log.info("get events resp==>{}", JSON.toJSONString(events));
+
+    }
+
+    @Override
+    public void stop() {
+        log.info("停止服务..");
+        ThreadPool.getInstance().close();
+    }
+
+    @Override
+    public int getOrder() {
+        return 10;
+    }
+
+
+}

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

+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.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.hik.camera.service.IHikCameraService;
+import com.mortals.xhx.module.hik.face.model.req.plan.PlanRecognBlackListReq;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 同步监控视频点
+ */
+@Slf4j
+@Service("SyncSiteDeviceTask")
+public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private DeviceService deviceService;
+    @Autowired
+    private IHikCameraService hikCameraService;
+
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("开始同步设备列表！");
+        syncDevice();
+        log.info("结束同步设备列表！");
+
+    }
+
+    private void syncDevice() {
+
+        PlanRecognBlackListReq planRecognBlackListReq = new PlanRecognBlackListReq();
+       // planRecognBlackListReq.set
+
+        //hikCameraService.findPlanRecognBlackList()
+
+       /* SitePdu sitePdu = new SitePdu();
+        sitePdu.setId(1L);
+        Rest<List<SitePdu>> siteRest = siteFeign.getFlatSitesBySiteId(sitePdu);
+        if (siteRest.getCode() == YesNoEnum.YES.getValue()) {
+            log.info("站点总数量：{}", siteRest.getData().size());
+            siteRest.getData().forEach(site -> {
+                log.info("站点名称:{}",site.getSiteName());
+                DevicePdu devicePdu = new DevicePdu();
+                devicePdu.setProductCode("ybj");
+                devicePdu.setSize(-1);
+                Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu);
+                log.info("deviceRest：{}",JSON.toJSONString(deviceRest));
+                if (YesNoEnum.YES.getValue() == deviceRest.getCode()) {
+                    List<DevicePdu> devicePduList = deviceRest.getData().getData();
+                    log.info("样表机总数量：{}", devicePduList.size());
+                    if (!ObjectUtils.isEmpty(devicePduList)) {
+                        List<DeviceEntity> newDeviceList = devicePduList.stream().map(newDevice -> {
+                            DeviceEntity deviceEntity = new DeviceEntity();
+                            deviceEntity.initAttrValue();
+                            BeanUtils.copyProperties(newDevice, deviceEntity, BeanUtil.getNullPropertyNames(newDevice));
+                            return deviceEntity;
+                        }).collect(Collectors.toList());
+
+                        List<DeviceEntity> oldDeviceList = deviceService.find(new DeviceQuery().siteId(site.getId()));
+                        Map<String, DeviceEntity> oldDeviceMap = oldDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
+                        Map<String, DeviceEntity> newDeviceMap = newDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
+
+                        List<DeviceEntity> updateDeviceLsit = newDeviceList.stream().map(item -> {
+                            if (oldDeviceMap.containsKey(item.getDeviceCode())) {
+                                item.setId(oldDeviceMap.get(item.getDeviceCode()).getId());
+                                item.setDeviceId(item.getId());
+                                item.setProductCode(oldDeviceMap.get(item.getDeviceCode()).getProductCode());
+                                item.setProductName(oldDeviceMap.get(item.getDeviceCode()).getProductName());
+                                item.setUpdateTime(new Date());
+                                return item;
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+                        List<DeviceEntity> saveDeviceList = newDeviceList.stream().map(item -> {
+                            if (!oldDeviceMap.containsKey(item.getDeviceCode())) {
+                                item.setDeviceId(item.getId());
+                                item.setCreateUserId(1L);
+                                item.setCreateUserName("系统管理员");
+                                item.setCreateTime(new Date());
+                                return item;
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+                        //做差集
+                        List<Long> delDeviceList = oldDeviceList.stream().map(item -> {
+                            if (!newDeviceMap.containsKey(item.getDeviceCode())) {
+                                return item.getId();
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+                        if (!ObjectUtils.isEmpty(updateDeviceLsit)) {
+                            log.info("设备更新，size:{}", updateDeviceLsit.size());
+                            deviceService.update(updateDeviceLsit);
+                        }
+
+                        if (!ObjectUtils.isEmpty(saveDeviceList)) {
+                            log.info("设备新增，size:{}", saveDeviceList.size());
+                            deviceService.save(saveDeviceList);
+                        }
+
+                        if (!ObjectUtils.isEmpty(delDeviceList)) {
+                            log.info("设备删除，size:{}", delDeviceList.size());
+                            deviceService.remove(delDeviceList,null);
+                        }
+                    }
+                } else {
+                    log.info("设备列表查询异常，{}", JSON.toJSONString(deviceRest));
+                }
+            });
+        } else {
+            log.info("站点列表查询异常，{}", JSON.toJSONString(siteRest));
+        }*/
+    }
+
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+}

refined-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public abstract class AbstractHikService {
 
-    @Value("${hik.host:''")
+    @Value("${hik.host:''}")
     protected String host;
 
     @Value("${hik.appKey:''}")
@@ -18,7 +18,7 @@ public abstract class AbstractHikService {
     protected String appSecret;
 
 
-    @Value("${hik.protocol:'http://'}")
+    @Value("${hik.protocol:http://}")
     protected String protocol;
 
     public String ARTEMIS_PATH = "/artemis";

refined-manager/src/main/java/com/mortals/xhx/module/hik/camera/service/IHikCameraService.java

@@ -20,6 +20,6 @@ public interface IHikCameraService {
      * @param cameraListReq
      * @return
      */
-    Rest<List<CameraDataInfo>> findPlanRecognBlackList(CameraListReq cameraListReq);
+    Rest<List<CameraDataInfo>> findCameraList(CameraListReq cameraListReq);
 
 }

refined-manager/src/main/java/com/mortals/xhx/module/hik/camera/service/impl/HikCameraServiceImpl.java

@@ -27,18 +27,19 @@ public class HikCameraServiceImpl extends AbstractHikService implements IHikCame
 
 
     @Override
-    public Rest<List<CameraDataInfo>> findPlanRecognBlackList(CameraListReq cameraListReq) {
+    public Rest<List<CameraDataInfo>> findCameraList(CameraListReq cameraListReq) {
         ArtemisConfig config = getArtemisConfig();
-        String getCamsApi = ARTEMIS_PATH + "/api/frs/v1/plan/recognition/black";
+        String getCamsApi = ARTEMIS_PATH + "/api/resource/v1/cameras";
         path.put(protocol, getCamsApi);
         try {
+            log.info("camera list req=>{}", JSON.toJSONString(cameraListReq));
             String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, JSON.toJSONString(cameraListReq), null, null, "application/json");
+            log.info("camera list resp=>{}", respJson);
             Rest<List<CameraDataInfo>> rest = JSON.parseObject(respJson, new TypeReference<Rest<List<CameraDataInfo>>>() {
             });
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("camera list error resp=>", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {

refined-manager/src/main/java/com/mortals/xhx/module/hik/door/model/req/door/DoorEventReq.java

@@ -24,7 +24,6 @@ public class DoorEventReq extends BaseReq implements Serializable {
 
 
     private String doorName;
-    private String receiveStartTime;
     private String sort;
     /**
      * 事件类型，参考[附录D2.1 门禁事件]
@@ -33,8 +32,9 @@ public class DoorEventReq extends BaseReq implements Serializable {
     private List<Integer> eventTypes;
     private List<String> readerDevIndexCodes;
     private String personName;
+    private String doorRegionIndexCode;
     @JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXXX")
-    private Date doorRegionIndexCode;
+    private Date receiveStartTime;
     @JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXXX")
     private Date receiveEndTime;
     @JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXXX")

refined-manager/src/main/java/com/mortals/xhx/module/hik/door/service/impl/HikDoorServiceImpl.java

@@ -33,13 +33,14 @@ public class HikDoorServiceImpl extends AbstractHikService implements IHikDoorSe
         Map<String, String> path = new HashMap<>(2);
         path.put(protocol, getCamsApi);
         try {
+            log.info("door events req=>{}", JSON.toJSONString(doorEventReq));
             String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, JSON.toJSONString(doorEventReq), null, null, "application/json");
+            log.info("door events error resp=>{}", respJson);
             Rest<DoorEventDataInfo> rest = JSON.parseObject(respJson, new TypeReference<Rest<DoorEventDataInfo>>() {
             });
             if(rest.getCode()==0){
                 return Rest.ok(rest.getData());
             }else{
-                log.info("door events error resp=>", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java

@@ -32,13 +32,14 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
         String getCamsApi = ARTEMIS_PATH + "/api/eventService/v1/eventSubscriptionByEventTypes";
         path.put(protocol, getCamsApi);
         try {
+            log.info("event sub req=>{}", JSON.toJSONString(eventSubReq));
             String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, JSON.toJSONString(eventSubReq), null, null, "application/json");
+            log.info("event sub resp=>{}", respJson);
             Rest<String> rest = JSON.parseObject(respJson, new TypeReference<Rest<String>>() {
             });
             if (rest.getCode() == 0) {
                 return Rest.ok();
             } else {
-                log.info("event sub error resp=>", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {
@@ -53,7 +54,7 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
         String getCamsApi = ARTEMIS_PATH + "/api/eventService/v1/eventSubscriptionView";
         path.put(protocol, getCamsApi);
         try {
-            String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, "", null, null, "application/json");
+            String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, "{}", null, null, "application/json");
             Rest<List<EventInfo>> rest = JSON.parseObject(respJson, new TypeReference<Rest<List<EventInfo>>>() {
             });
             if (rest.getCode() == 0) {

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

@@ -83,7 +83,7 @@ public class HikFaceServiceImpl extends AbstractHikService implements IHikFaceSe
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("face single error resp=>", respJson);
+                log.info("face single error resp=>{}", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {
@@ -94,7 +94,23 @@ public class HikFaceServiceImpl extends AbstractHikService implements IHikFaceSe
 
     @Override
     public Rest<Boolean> faceSingleDel(FaceReq faceReq) {
-        return null;
+        ArtemisConfig config = getArtemisConfig();
+        String getCamsApi = ARTEMIS_PATH + "/api/resource/v1/face/single/delete";
+        path.put(protocol, getCamsApi);
+        try {
+            String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, JSON.toJSONString(faceReq), null, null, "application/json");
+            Rest<Boolean> rest = JSON.parseObject(respJson, new TypeReference<Rest<Boolean>>() {
+            });
+            if (rest.getCode() == 0) {
+                return Rest.ok(rest.getData());
+            } else {
+                log.info("face single error resp=>{}", respJson);
+                return Rest.fail(rest.getMsg());
+            }
+        } catch (Exception e) {
+            log.error("face add error异常", e);
+            return Rest.fail(e.getMessage());
+        }
     }
 
     @Override
@@ -109,7 +125,7 @@ public class HikFaceServiceImpl extends AbstractHikService implements IHikFaceSe
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("face group list error resp=>", respJson);
+                log.info("face group list error resp=>{}", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {
@@ -131,7 +147,7 @@ public class HikFaceServiceImpl extends AbstractHikService implements IHikFaceSe
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("face single error resp=>", respJson);
+                log.info("face single error resp=>{}", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {
@@ -152,7 +168,7 @@ public class HikFaceServiceImpl extends AbstractHikService implements IHikFaceSe
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("face single error resp=>", respJson);
+                log.info("face single error resp=>{}", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {
@@ -178,7 +194,7 @@ public class HikFaceServiceImpl extends AbstractHikService implements IHikFaceSe
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("face res list error resp=>", respJson);
+                log.info("face res list error resp=>{}", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {

refined-manager/src/main/java/com/mortals/xhx/module/hik/person/model/req/person/PersonReq.java

@@ -12,11 +12,11 @@ public class PersonReq extends BaseReq implements Serializable {
     /**
      * 当前页
      */
-    private String pageNo;
+    private Integer pageNo;
 
     /**
      * 每页大小
      */
-    private String pageSize;
+    private Integer pageSize;
 
 }

refined-manager/src/main/java/com/mortals/xhx/module/hik/person/service/IHikPersonService.java

-package com.mortals.xhx.module.hik.person.model.service;
+package com.mortals.xhx.module.hik.person.service;
 
 
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.module.hik.person.model.req.org.OrgListReq;
 import com.mortals.xhx.module.hik.person.model.req.person.PersonReq;
+import com.mortals.xhx.module.hik.person.model.rsp.org.OrgDataInfo;
 import com.mortals.xhx.module.hik.person.model.rsp.person.PersonDataInfo;
 
 /**
@@ -38,7 +39,7 @@ public interface IHikPersonService {
      * @param orgListReq
      * @return
      */
-    Rest<PersonDataInfo> getOrgList(OrgListReq orgListReq);
+    Rest<OrgDataInfo> getOrgList(OrgListReq orgListReq);
 
     /**
      * 透传原始数据

refined-manager/src/main/java/com/mortals/xhx/module/hik/person/service/impl/HikPersonServiceImpl.java

@@ -8,8 +8,9 @@ import com.mortals.framework.common.Rest;
 import com.mortals.xhx.module.hik.AbstractHikService;
 import com.mortals.xhx.module.hik.person.model.req.org.OrgListReq;
 import com.mortals.xhx.module.hik.person.model.req.person.PersonReq;
+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.model.service.IHikPersonService;
+import com.mortals.xhx.module.hik.person.service.IHikPersonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +40,7 @@ public class HikPersonServiceImpl extends AbstractHikService implements IHikPers
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("person error resp=>", respJson);
+                log.info("person error resp=>{}", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {
@@ -63,19 +64,19 @@ public class HikPersonServiceImpl extends AbstractHikService implements IHikPers
     }
 
     @Override
-    public Rest<PersonDataInfo> getOrgList(OrgListReq orgListReq) {
+    public Rest<OrgDataInfo> getOrgList(OrgListReq orgListReq) {
         ArtemisConfig config = getArtemisConfig();
         String getCamsApi = ARTEMIS_PATH + "/api/resource/v1/org/orgList";
         Map<String, String> path = new HashMap<>(2);
         path.put(protocol, getCamsApi);
         try {
             String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, JSON.toJSONString(orgListReq), null, null, "application/json");
-            Rest<PersonDataInfo> rest = JSON.parseObject(respJson, new TypeReference<Rest<PersonDataInfo>>() {
+            Rest<OrgDataInfo> rest = JSON.parseObject(respJson, new TypeReference<Rest<OrgDataInfo>>() {
             });
             if (rest.getCode() == 0) {
                 return Rest.ok(rest.getData());
             } else {
-                log.info("org list error resp=>", respJson);
+                log.info("org list error resp=>{}", respJson);
                 return Rest.fail(rest.getMsg());
             }
         } catch (Exception e) {

refined-manager/src/main/java/com/mortals/xhx/module/person/model/req/RegisterPersonReq.java

+package com.mortals.xhx.module.person.model.req;
+/**
+ * 注册人员请求
+ * @author:
+ * @date: 2023/4/14 11:16
+ */
+public class RegisterPersonReq {
+
+    private Integer page;
+
+    private Integer size;
+
+}

refined-manager/src/main/java/com/mortals/xhx/module/person/model/rsp/RegisterPersonInfo.java

+package com.mortals.xhx.module.person.model.rsp;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 注册人员响应类
+ * @author:
+ * @date: 2023/4/14 11:18
+ */
+public class RegisterPersonInfo {
+
+    /**
+     * 用户名称
+     */
+    private String name;
+    /**
+     * 身份证号码
+     */
+    private String idCard;
+    /**
+     * 性别(0.男,1.女)
+     */
+    private Integer gender;
+    /**
+     * 手机号码
+     */
+    private String phone;
+    /**
+     * 出生日期（yyyy-MM-dd）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date birthday;
+    /**
+     * 家庭住址
+     */
+    private String address;
+
+    /**
+     * 照片地址（可选）
+     */
+    private String picUri;
+
+    /**
+     * 照片base64数据
+     */
+    private String picData;
+
+
+}

refined-manager/src/main/java/com/mortals/xhx/module/person/service/PersonService.java

@@ -12,4 +12,7 @@ import com.mortals.xhx.module.person.model.PersonEntity;
 */
 public interface PersonService extends ICRUDCacheService<PersonEntity,Long>{
 
+
+
+
 }
\ No newline at end of file

refined-manager/src/test/java/com/mortals/httpclient/TestController.http

+
+###人员列表
+POST {{baseUrl}}/test/getPersonList
+Content-Type: application/json
+
+{
+    "pageNo":1,
+    "pageSize":10
+}
+
+
+###组织列表
+POST {{baseUrl}}/test/getOrgList
+Content-Type: application/json
+
+{
+  "pageNo":1,
+  "pageSize":10
+}
+
+###门禁事件列表
+POST {{baseUrl}}/test/getDoorEvents
+Content-Type: application/json
+
+{
+  "pageNo": 1,
+  "pageSize": 10,
+  "startTime": "2023-04-10 12:00:00",
+  "endTime": "2023-04-12 12:00:00",
+  "receiveStartTime": "2023-04-10 12:00:00",
+  "receiveEndTime": "2023-04-12 12:00:00"
+}
+
+
+###查询订阅事件列表
+POST {{baseUrl}}/test/getEvents
+Content-Type: application/json
+
+{
+}
+
+
+###查询摄像头列表
+POST {{baseUrl}}/test/getEvents
+Content-Type: application/json
+
+{
+}
+

refined-manager/src/test/java/com/mortals/httpclient/http-client.env.json

 {
   "local": {
-    "baseUrl": "http://127.0.0.1:17400/refined",
-    "baseLogin": "http://127.0.0.1:18222/m"
+    "baseUrl": "http://127.0.0.1:21080/refined"
   },
   "test": {
-    "baseUrl": "http://192.168.0.98:11091/m",
+    "baseUrl": "http://192.168.0.98:11080/refined",
     "baseLogin": "http://192.168.0.98:11078/base"
   },
   "portal": {

refined-manager/src/test/java/com/mortals/httpclient/system.http

@@ -27,15 +27,4 @@ Content-Type: application/json
 
 
 
-###短信设置编辑
-GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
-Accept: application/json
-
-
-###短信设置删除
-GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
-Accept: application/json
-
-
-