fix

virgo.api/src/main/java/com/bosshand/virgo/api/test/controller/TestCont.java

@@ -111,13 +111,13 @@ public class TestCont {
 
     //--------------------------------------------------------------------------------------------
 
-    @ApiOperation("周界报警获取")
+    @ApiOperation("报警获取")
     @RequestMapping(value = "/giveAlarm/get", method = RequestMethod.POST)
     public Response get(@RequestBody GiveAlarm data) {
         return Response.ok(testService.get(data));
     }
 
-    @ApiOperation("周界报警保存")
+    @ApiOperation("报警保存")
     @RequestMapping(value = "/giveAlarm/save", method = RequestMethod.POST)
     public Response save(@RequestBody GiveAlarm data) {
         return Response.ok(testService.save(data));
@@ -125,6 +125,20 @@ public class TestCont {
 
     //---------------------------------------------------------------------------------------------
 
+    @ApiOperation("设备统计获取")
+    @RequestMapping(value = "/deviceCount/get", method = RequestMethod.POST)
+    public Response get(@RequestBody DeviceCount data) {
+        return Response.ok(testService.get(data));
+    }
+
+    @ApiOperation("设备统计保存")
+    @RequestMapping(value = "/deviceCount/save", method = RequestMethod.POST)
+    public Response save(@RequestBody DeviceCount data) {
+        return Response.ok(testService.save(data));
+    }
+
+    //-----------------------------------------------------------------------------------------------
+
     @ApiOperation("车辆通行记录获取")
     @RequestMapping(value = "/vehicle/get", method = RequestMethod.POST)
     public Response get(@RequestBody Vehicle data) {

virgo.api/src/main/java/com/bosshand/virgo/api/test/dao/DeviceCountDao.java

@@ -0,0 +1,15 @@
+package com.bosshand.virgo.api.test.dao;
+
+import com.bosshand.virgo.api.test.model.DeviceCount;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceCountDao {
+
+    List<DeviceCount> get(DeviceCount deviceCount);
+
+    int save(DeviceCount deviceCount);
+
+}

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/AccessControl.java

@@ -10,16 +10,33 @@ public class AccessControl {
     private long id;
     private long projectId;
     private long projectItemId;
+    private long projectItemTargetId;
+    private long projectItemTargetRoomId;
     private long organizationId;
     private String organizationName;
     private long userId;
     private String userName;
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private String date;
+    /**
+     * 1、进 2、出
+     */
     private int type;
+    /**
+     * 是否访客 0、职工 1、访客
+     */
     private int isT;
+    /**
+     * 闸机id
+     */
     private long gateId;
+    /**
+     * 闸机名称
+     */
     private String gateName;
+    /**
+     * 闸机头像
+     */
     private String gateAvatar;
 
     public long getId() {
@@ -46,6 +63,22 @@ public class AccessControl {
         this.projectItemId = projectItemId;
     }
 
+    public long getProjectItemTargetId() {
+        return projectItemTargetId;
+    }
+
+    public void setProjectItemTargetId(long projectItemTargetId) {
+        this.projectItemTargetId = projectItemTargetId;
+    }
+
+    public long getProjectItemTargetRoomId() {
+        return projectItemTargetRoomId;
+    }
+
+    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
+        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    }
+
     public long getOrganizationId() {
         return organizationId;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/DeviceCount.java

@@ -0,0 +1,135 @@
+package com.bosshand.virgo.api.test.model;
+
+/**
+ * 设备统计
+ */
+public class DeviceCount {
+
+    private long id;
+    private long projectId;
+    private long projectItemId;
+    private long projectItemTargetId;
+    private long projectItemTargetRoomId;
+    private long organizationId;
+    /**
+     * 类型
+     */
+    private int type;
+    /**
+     * 设备总数
+     */
+    private int totalNumber;
+    /**
+     * 在线
+     */
+    private int online;
+    /**
+     * 离线
+     */
+    private int offline;
+    /**
+     * 预留字段1
+     */
+    private String column1;
+
+    /**
+     * 预留字段2
+     */
+    private String column2;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+
+    public long getProjectItemId() {
+        return projectItemId;
+    }
+
+    public void setProjectItemId(long projectItemId) {
+        this.projectItemId = projectItemId;
+    }
+
+    public long getProjectItemTargetId() {
+        return projectItemTargetId;
+    }
+
+    public void setProjectItemTargetId(long projectItemTargetId) {
+        this.projectItemTargetId = projectItemTargetId;
+    }
+
+    public long getProjectItemTargetRoomId() {
+        return projectItemTargetRoomId;
+    }
+
+    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
+        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    }
+
+    public long getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(long organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getTotalNumber() {
+        return totalNumber;
+    }
+
+    public void setTotalNumber(int totalNumber) {
+        this.totalNumber = totalNumber;
+    }
+
+    public int getOnline() {
+        return online;
+    }
+
+    public void setOnline(int online) {
+        this.online = online;
+    }
+
+    public int getOffline() {
+        return offline;
+    }
+
+    public void setOffline(int offline) {
+        this.offline = offline;
+    }
+
+    public String getColumn1() {
+        return column1;
+    }
+
+    public void setColumn1(String column1) {
+        this.column1 = column1;
+    }
+
+    public String getColumn2() {
+        return column2;
+    }
+
+    public void setColumn2(String column2) {
+        this.column2 = column2;
+    }
+}

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/GiveAlarm.java

@@ -18,8 +18,17 @@ public class GiveAlarm {
     private String deviceName;
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private String date;
+    /**
+     * 报警信息
+     */
     private String info;
+    /**
+     * 类型
+     */
     private int type;
+    /**
+     * 状态
+     */
     private int state;
 
     public long getId() {

virgo.api/src/main/java/com/bosshand/virgo/api/test/service/TestService.java

@@ -67,6 +67,9 @@ public class TestService {
     @Autowired
     EmergencyDao emergencyDao;
 
+    @Autowired
+    DeviceCountDao deviceCountDao;
+
     private static Logger logger = LoggerFactory.getLogger(TestService.class);
 
     public List<AccessControl> get(AccessControl data) {
@@ -143,6 +146,15 @@ public class TestService {
         return data;
     }
 
+    public List<DeviceCount> get(DeviceCount data) {
+        return deviceCountDao.get(data);
+    }
+
+    public DeviceCount save(DeviceCount data) {
+        deviceCountDao.save(data);
+        return data;
+    }
+
     public List<Vehicle> get(Vehicle data) {
         return vehicledao.get(data);
     }

virgo.api/src/main/resources/mapper/AccessControlMapper.xml

@@ -8,6 +8,8 @@
         <id column="id" property="id"/>
         <result column="projectId" property="projectId"/>
         <result column="projectItemId" property="projectItemId"/>
+        <result column="projectItemTargetId" property="projectItemTargetId"/>
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
         <result column="organizationId" property="organizationId"/>
         <result column="organizationName" property="organizationName"/>
         <result column="userId" property="userId"/>
@@ -33,6 +35,12 @@
             <if test="projectItemId != 0">
                 and projectItemId = #{projectItemId}
             </if>
+            <if test="projectItemTargetId != 0">
+                and projectItemTargetId = #{projectItemTargetId}
+            </if>
+            <if test="projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+            </if>
             <if test="organizationId != 0">
                 and organizationId = #{organizationId}
             </if>
@@ -68,8 +76,8 @@
     </select>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.test.model.AccessControl" useGeneratedKeys="true" keyProperty="id">
-        INSERT into test_a(projectId, projectItemId, organizationId, organizationName, userId, userName, date, type, isT, gateId, gateName, gateAvatar)
-        values (#{projectId}, #{projectItemId}, #{organizationId}, #{organizationName}, #{userId}, #{userName}, now(), #{type}, #{isT}, #{gateId}, #{gateName}, #{gateAvatar})
+        INSERT into test_a(projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, organizationId, organizationName, userId, userName, date, type, isT, gateId, gateName, gateAvatar)
+        values (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{organizationId}, #{organizationName}, #{userId}, #{userName}, now(), #{type}, #{isT}, #{gateId}, #{gateName}, #{gateAvatar})
     </insert>
 
 </mapper>

virgo.api/src/main/resources/mapper/DeviceCountMapper.xml

@@ -0,0 +1,51 @@
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bosshand.virgo.api.test.dao.DeviceCountDao">
+
+    <resultMap type="com.bosshand.virgo.api.test.model.DeviceCount" id="result" >
+        <id column="id" property="id"/>
+        <result column="projectId" property="projectId"/>
+        <result column="projectItemId" property="projectItemId"/>
+        <result column="projectItemTargetId" property="projectItemTargetId"/>
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
+        <result column="organizationId" property="organizationId"/>
+        <result column="type" property="type"/>
+        <result column="totalNumber" property="totalNumber"/>
+        <result column="online" property="online"/>
+        <result column="offline" property="offline"/>
+        <result column="column1" property="column1"/>
+        <result column="column2" property="column2"/>
+    </resultMap>
+
+    <select id="get" resultMap="result">
+        SELECT * FROM test_p
+        <where>
+            <if test="projectId != 0">
+                and projectId = #{projectId}
+            </if>
+            <if test="projectItemId != 0">
+                and projectItemId = #{projectItemId}
+            </if>
+            <if test="projectItemTargetId != 0">
+                and projectItemTargetId = #{projectItemTargetId}
+            </if>
+            <if test="projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+            </if>
+            <if test="organizationId != 0">
+                and organizationId = #{organizationId}
+            </if>
+            <if test="type != 0">
+                and type = #{type}
+            </if>
+        </where>
+    </select>
+
+    <insert id="save" parameterType="com.bosshand.virgo.api.test.model.DeviceCount" useGeneratedKeys="true" keyProperty="id">
+        INSERT into test_p(projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, organizationId, type, totalNumber, online, offline, column1, column2)
+        values (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{organizationId}, #{type}, #{totalNumber}, #{online}, #{offline}, #{column1}, #{column2})
+    </insert>
+
+</mapper>