修复 监控

CODE/foreign-service/src/main/java/com/community/huiju/controller/TpConfigurationController.java

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备配置表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@RestController
+@RequestMapping("/")
+public class TpConfigurationController extends BaseController {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/controller/TpEquipmentController.java

@@ -0,0 +1,48 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.service.ITpEquipmentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 设备表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "设备 API", description = "设备 API")
+public class TpEquipmentController extends BaseController {
+
+    @Autowired
+    private ITpEquipmentService iTpEquipmentService;
+
+
+    @ApiOperation(value = "获取监控列表数据 HLS",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+    })
+    @RequestMapping(value = "/equipment/monitoring/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getListHLS(@PathVariable("communityId") Integer communityId,
+                                   @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTpEquipmentService.getMonitoringByCommunityId(communityId, pageNo, pageSize);
+        return responseBean;
+    }
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/controller/TpEquipmentTreeController.java

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备树 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@RestController
+@RequestMapping("/")
+public class TpEquipmentTreeController extends BaseController {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/dao/TpConfigurationMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpConfiguration;
+
+/**
+ * <p>
+ * 设备配置表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+public interface TpConfigurationMapper extends BaseMapper<TpConfiguration> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -0,0 +1,37 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.community.huiju.model.TpEquipment;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 设备表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
+
+    /**
+     * 根据小区获取 监控列表 HLS
+     * @param communityId
+     * @return
+     */
+    @ResultType(TpEquipment.class)
+    @Select("select " +
+            "tm.*, " +
+            "(select `key` FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as monitoringAddress " +
+            "FROM " +
+            "tp_equipment tm " +
+            "where tm.community_id = #{communityId} and tm.equipment_type = 1")
+    IPage<TpEquipment> selectMonitoringByCommunityId(IPage<TpEquipment> page, @Param("communityId") Integer communityId);
+}

CODE/foreign-service/src/main/java/com/community/huiju/dao/TpEquipmentTreeMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpEquipmentTree;
+
+/**
+ * <p>
+ * 设备树 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+public interface TpEquipmentTreeMapper extends BaseMapper<TpEquipmentTree> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/model/TpConfiguration.java

@@ -0,0 +1,87 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备配置表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_configuration")
+public class TpConfiguration implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 配置key
+     */
+    private String key;
+
+    /**
+     * 配置项名称
+     */
+    private String configurationName;
+
+    /**
+     * 配置类型: 1字符串  2多列值
+     */
+    private Integer configurationType;
+
+    /**
+     * 配置值
+     */
+    private String configurationValue;
+
+    /**
+     * 创建时间
+     */
+    private Date createTiem;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 门禁点UUID
+     */
+    @TableField("doorUuid")
+    private String doorUuid;
+
+    /**
+     * 门禁设备UUID
+     */
+    @TableField("deviceUuid")
+    private String deviceUuid;
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/model/TpEquipment.java

@@ -0,0 +1,148 @@
+package com.community.huiju.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_equipment")
+public class TpEquipment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer equipmentId;
+
+    /**
+     * 设备url地址，对应 配置tp_configuration 表id
+     */
+    private Integer urlId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 安保人员电话，对应 配置tp_configuration 表id
+     */
+    private Integer securityGuardTelId;
+
+    /**
+     * 保安室电话，对应 配置tp_configuration 表id
+     */
+    private Integer securityRoomTelId;
+
+    /**
+     * 设备地址，对应 配置tp_configuration 表id
+     */
+    private Integer addressId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+    /**
+     * 设备UUID ，对应 配置tp_configuration 表id
+     */
+    private Integer uuidId;
+
+    /**
+     * 设备类型，1 监控 2 访客机 3 可是对讲 4 门禁设备(看字典表)
+     */
+    private String equipmentType;
+
+    /**
+     * 设备树id，对应 tp_equipment_tree 表id
+     */
+    private Integer equipmentTreeId;
+
+    /**
+     * appkey(第三方平台)
+     */
+    @JSONField(serialize = false)
+    private String appkey;
+
+    /**
+     * secret(第三方平台)
+     */
+    @JSONField(serialize = false)
+    private String secret;
+
+    /**
+     * op_user_uuid(第三方平台操作人员uuid)
+     */
+    @JSONField(serialize = false)
+    private String opUserUuid;
+
+    /**
+     * http_server第三方服务器请求地址
+     */
+    @JSONField(serialize = false)
+    private String httpServer;
+
+    /**
+     * unit_uuids组织中心
+     */
+    @JSONField(serialize = false)
+    private String unitUuids;
+
+    /**
+     * 监控URL
+     */
+    @TableField(exist = false)
+    private String monitoringUrl;
+
+    /**
+     * 保安人员电话
+     */
+    @TableField(exist = false)
+    private String securityGuardTel;
+
+    /**
+     * 安保室电话
+     */
+    @TableField(exist = false)
+    private String securityRoomTel;
+
+    /**
+     * 监控地址
+     */
+    @TableField(exist = false)
+    private String monitoringAddress;
+}

CODE/foreign-service/src/main/java/com/community/huiju/model/TpEquipmentTree.java

@@ -0,0 +1,94 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备树
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_equipment_tree")
+public class TpEquipmentTree implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 名称
+     */
+    private String equipmentName;
+
+    /**
+     * 父节点id
+     */
+    private Integer pid;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+    /**
+     * appkey(第三方平台)
+     */
+    private String appkey;
+
+    /**
+     * secret(第三方平台)
+     */
+    private String secret;
+
+    /**
+     * 第三方平台操作人员uuid
+     */
+    private String opUserUuid;
+
+    /**
+     * 第三方平台请求地址
+     */
+    private String httpServer;
+
+    /**
+     * 组织中心(简称区域编号)
+     */
+    private String unitUuids;
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/ITpConfigurationService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpConfiguration;
+
+/**
+ * <p>
+ * 设备配置表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+public interface ITpConfigurationService extends IService<TpConfiguration> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/ITpEquipmentService.java

@@ -0,0 +1,26 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.model.TpEquipment;
+
+/**
+ * <p>
+ * 设备表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+public interface ITpEquipmentService extends IService<TpEquipment> {
+
+    /**
+     * 获取监控列表
+     * @param communityId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getMonitoringByCommunityId(Integer communityId, Integer pageNum, Integer pageSize);
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/ITpEquipmentTreeService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpEquipmentTree;
+
+/**
+ * <p>
+ * 设备树 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+public interface ITpEquipmentTreeService extends IService<TpEquipmentTree> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TpConfigurationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.model.TpConfiguration;
+import com.community.huiju.dao.TpConfigurationMapper;
+import com.community.huiju.service.ITpConfigurationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备配置表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@Service
+public class TpConfigurationServiceImpl extends ServiceImpl<TpConfigurationMapper, TpConfiguration> implements ITpConfigurationService {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TpEquipmentServiceImpl.java

@@ -0,0 +1,47 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.model.TpEquipment;
+import com.community.huiju.dao.TpEquipmentMapper;
+import com.community.huiju.service.ITpEquipmentService;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 设备表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@Service
+public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEquipment> implements ITpEquipmentService {
+
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
+    @Override
+    public ResponseBean getMonitoringByCommunityId(Integer communityId, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TpEquipment> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        IPage<TpEquipment> equipmentIPage = tpEquipmentMapper.selectMonitoringByCommunityId(page,communityId);
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("pageNum", equipmentIPage.getCurrent());
+        map.put("pageSize", equipmentIPage.getSize());
+        map.put("total", equipmentIPage.getTotal());
+        map.put("list", equipmentIPage.getRecords());
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+}

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TpEquipmentTreeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.model.TpEquipmentTree;
+import com.community.huiju.dao.TpEquipmentTreeMapper;
+import com.community.huiju.service.ITpEquipmentTreeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备树 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-16
+ */
+@Service
+public class TpEquipmentTreeServiceImpl extends ServiceImpl<TpEquipmentTreeMapper, TpEquipmentTree> implements ITpEquipmentTreeService {
+
+}

CODE/foreign-service/src/main/resources/mapper/TpConfigurationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpConfigurationMapper">
+
+</mapper>

CODE/foreign-service/src/main/resources/mapper/TpEquipmentMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpEquipmentMapper">
+
+</mapper>

CODE/foreign-service/src/main/resources/mapper/TpEquipmentTreeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpEquipmentTreeMapper">
+
+</mapper>

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -45,9 +45,9 @@ public interface TpEquipmentMapper {
     @Select("select " +
             "tm.*, " +
             "(select `key` FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
-            "(select `key` FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
-            "(select `key` FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
-            "(select `key` FROM tp_configuration WHERE id = tm.address_id) as monitoringAddress " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as monitoringAddress " +
             "FROM " +
             "tp_equipment tm " +
             "where tm.community_id = #{communityId} and tm.equipment_type = 1")