fix

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

@@ -40,6 +40,20 @@ public class TestCont {
 
     //-----------------------------------------------------------------------------------------
 
+    @ApiOperation("设备监测页面获取")
+    @RequestMapping(value = "/monitoring/get", method = RequestMethod.POST)
+    public Response get(@RequestBody Monitoring data) {
+        return Response.ok(testService.get(data));
+    }
+
+    @ApiOperation("设备监测页面保存")
+    @RequestMapping(value = "/monitoring/save", method = RequestMethod.POST)
+    public Response save(@RequestBody Monitoring data) {
+        return Response.ok(testService.save(data));
+    }
+
+    //-----------------------------------------------------------------------------------------
+
     @ApiOperation("视频监控分页查询")
     @RequestMapping(value = "/camera/{currPage}/{pageSize}", method = RequestMethod.POST)
     public Response list(@RequestBody Camera camera, @PathVariable int currPage, @PathVariable int pageSize) {

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

@@ -0,0 +1,17 @@
+package com.bosshand.virgo.api.test.dao;
+
+import com.bosshand.virgo.api.test.model.Monitoring;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface MonitoringDao {
+
+    List<Monitoring> get(Monitoring data);
+
+    void save(Monitoring data);
+
+    List<Monitoring> getProjectId(long projectId);
+
+}

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

@@ -0,0 +1,279 @@
+package com.bosshand.virgo.api.test.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 模拟设备监测
+ */
+public class Monitoring {
+
+    private long id;
+    private long organizationId;
+    private long projectId;
+    private long projectItemId;
+    private long projectItemTargetId;
+    private long projectItemTargetRoomId;
+
+    /**
+     * 系统类型  1、电气系统 2、暖通系统 3、给排水系统 4、安防系统 5、电梯系统 6、环境系统
+     */
+    private int type;
+
+    /**
+     * 设备id
+     */
+    private long deviceId;
+
+    /**
+     * 设备类型
+     */
+    private long deviceType;
+
+    private String startDate;
+    private String endDate;
+
+    /**
+     * 记录时间
+     */
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private String date;
+
+    /**
+     * 控制温度
+     */
+    private String controlTemperature;
+
+    /**
+     * 供水温度
+     */
+    private String supplyWaterTemperature;
+
+    /**
+     * 回水温度
+     */
+    private String backWaterTemperature;
+
+    /**
+     * 非烟温度
+     */
+    private String nonSmokingTemperature;
+
+    /**
+     * 介质压力
+     */
+    private String mediumPressure;
+
+    /**
+     * 介质温度
+     */
+    private String mediumTemperature;
+
+    /**
+     * 瞬时流量
+     */
+    private String instantaneousFlowRate;
+
+    /**
+     * 机组负荷
+     */
+    private String unitLoad;
+
+    /**
+     * 故障
+     */
+    private String fault;
+
+    /**
+     * 设定温度
+     */
+    private String setTemperature;
+
+    /**
+     * 设启停状态 0、关闭 1、开始 2、故障
+     */
+    private int state;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(long organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    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 int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public long getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(long deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getControlTemperature() {
+        return controlTemperature;
+    }
+
+    public void setControlTemperature(String controlTemperature) {
+        this.controlTemperature = controlTemperature;
+    }
+
+    public String getSupplyWaterTemperature() {
+        return supplyWaterTemperature;
+    }
+
+    public void setSupplyWaterTemperature(String supplyWaterTemperature) {
+        this.supplyWaterTemperature = supplyWaterTemperature;
+    }
+
+    public String getBackWaterTemperature() {
+        return backWaterTemperature;
+    }
+
+    public void setBackWaterTemperature(String backWaterTemperature) {
+        this.backWaterTemperature = backWaterTemperature;
+    }
+
+    public String getNonSmokingTemperature() {
+        return nonSmokingTemperature;
+    }
+
+    public void setNonSmokingTemperature(String nonSmokingTemperature) {
+        this.nonSmokingTemperature = nonSmokingTemperature;
+    }
+
+    public String getMediumPressure() {
+        return mediumPressure;
+    }
+
+    public void setMediumPressure(String mediumPressure) {
+        this.mediumPressure = mediumPressure;
+    }
+
+    public String getMediumTemperature() {
+        return mediumTemperature;
+    }
+
+    public void setMediumTemperature(String mediumTemperature) {
+        this.mediumTemperature = mediumTemperature;
+    }
+
+    public String getInstantaneousFlowRate() {
+        return instantaneousFlowRate;
+    }
+
+    public void setInstantaneousFlowRate(String instantaneousFlowRate) {
+        this.instantaneousFlowRate = instantaneousFlowRate;
+    }
+
+    public String getUnitLoad() {
+        return unitLoad;
+    }
+
+    public void setUnitLoad(String unitLoad) {
+        this.unitLoad = unitLoad;
+    }
+
+    public String getFault() {
+        return fault;
+    }
+
+    public void setFault(String fault) {
+        this.fault = fault;
+    }
+
+    public String getSetTemperature() {
+        return setTemperature;
+    }
+
+    public void setSetTemperature(String setTemperature) {
+        this.setTemperature = setTemperature;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+}

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

@@ -34,6 +34,9 @@ public class TestService {
     @Autowired
     CallAlarmDao callAlarmdao;
 
+    @Autowired
+    MonitoringDao monitoringdao;
+
     @Autowired
     RegionDao regiondao;
 
@@ -221,8 +224,8 @@ public class TestService {
         String today= DateTimeUtils.getTodayChar8();
         for(CallAlarm c : list){
             if(c.getAlarmLevel()==1){generalAlarm+=1;}
-            if(c.getAlarmLevel()==2){emergencyAlarm+=1;}
-            if(c.getAlarmLevel()==3){magnitudeAlarm+=1;}
+            if(c.getAlarmLevel()==2){magnitudeAlarm+=1;}
+            if(c.getAlarmLevel()==3){emergencyAlarm+=1;}
             if(c.getDate().contains(today)){
                 todayTotalAlarm +=1;
                 if(c.getAlarmLevel()==1){todayGeneralAlarm+=1;}
@@ -248,6 +251,19 @@ public class TestService {
         return map;
     }
 
+    //==============================================设备监测====================================================
+
+    public List<Monitoring> get(Monitoring data) {
+        return monitoringdao.get(data);
+    }
+
+    public Monitoring save(Monitoring data) {
+        monitoringdao.save(data);
+        return data;
+    }
+
+    //=========================================================================================================
+
     public List<Region> get(Region data) {
         return regiondao.get(data);
     }

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

@@ -0,0 +1,87 @@
+<!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.MonitoringDao">
+
+    <resultMap type="com.bosshand.virgo.api.test.model.Monitoring" id="result" >
+        <id column="id" property="id"/>
+        <result column="organizationId" property="organizationId"/>
+        <result column="projectId" property="projectId"/>
+        <result column="projectItemId" property="projectItemId"/>
+        <result column="projectItemTargetId" property="projectItemTargetId"/>
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
+        <result column="deviceId" property="deviceId"/>
+        <result column="deviceType" property="deviceType"/>
+        <result column="date" property="date"/>
+        <result column="type" property="type"/>
+        <result column="controlTemperature" property="controlTemperature"/>
+        <result column="supplyWaterTemperature" property="supplyWaterTemperature"/>
+        <result column="backWaterTemperature" property="backWaterTemperature"/>
+        <result column="nonSmokingTemperature" property="nonSmokingTemperature"/>
+        <result column="mediumPressure" property="mediumPressure"/>
+        <result column="mediumTemperature" property="mediumTemperature"/>
+        <result column="instantaneousFlowRate" property="instantaneousFlowRate"/>
+        <result column="unitLoad" property="unitLoad"/>
+        <result column="fault" property="fault"/>
+        <result column="setTemperature" property="setTemperature"/>
+        <result column="state" property="state"/>
+    </resultMap>
+
+    <select id="getProjectId" resultMap="result">
+        SELECT * FROM analog_monitoring where projectId = #{projectId}
+    </select>
+
+    <select id="get" resultMap="result">
+        SELECT * FROM analog_monitoring
+        <where>
+            <if test="startDate != null">
+                and date <![CDATA[ >= ]]> #{startDate}
+            </if>
+            <if test="endDate != null">
+                and date <![CDATA[ <= ]]> #{endDate}
+            </if>
+            <if test="organizationId != 0">
+                and organizationId = #{organizationId}
+            </if>
+            <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="deviceId != 0">
+                and deviceId = #{deviceId}
+            </if>
+            <if test="deviceType != 0">
+                and deviceType = #{deviceType}
+            </if>
+            <if test="type != 0">
+                and type = #{type}
+            </if>
+            <if test="state != 0">
+                and state = #{state}
+            </if>
+        </where>
+        order by date desc
+    </select>
+
+
+
+    <insert id="save" parameterType="com.bosshand.virgo.api.test.model.Monitoring" useGeneratedKeys="true"
+            keyProperty="id">
+        INSERT into analog_monitoring(projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, organizationId,
+                                      deviceId,deviceType,date,type,controlTemperature,supplyWaterTemperature,backWaterTemperature,
+                                      nonSmokingTemperature,mediumPressure,mediumTemperature,instantaneousFlowRate,unitLoad,fault,setTemperature,state)
+        values (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{organizationId},
+                #{deviceId},#{deviceType},now(),#{type},#{controlTemperature},#{supplyWaterTemperature},#{backWaterTemperature},
+                #{nonSmokingTemperature},#{mediumPressure},#{mediumTemperature},#{instantaneousFlowRate},#{unitLoad},#{fault},#{setTemperature},#{state})
+    </insert>
+
+</mapper>