diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
+
+
+
+ +
+ +
+
    +
    +
    +
    + +
    +
    资产信息
    +
    +
    + 所在分区： + 资产代码： + 资产名称： +
    +
    +
    + + +
    +
    当前值
    +
    +
    + + 时间： + + + 甲烷浓度：0（%） + + + + +
    +
    +
    + + +
    +
    远程指令
    +
    +
    + +
    +
    +
    +
    +
    +
    + + + + + + diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
    +
    +
    +
    + +
    + +
    +
      +
      +
      +
      + +
      +
      资产信息
      +
      +
      + 所在分区： + 资产代码： + 资产名称： +
      +
      +
      + + +
      +
      当前值
      +
      +
      + + 时间： + + + 甲烷浓度：0（%） + + + + +
      +
      +
      + + +
      +
      远程指令
      +
      +
      + +
      +
      +
      +
      +
      +
      + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
      +
      +
      +
      + +
      + +
      +
        +
        +
        +
        + +
        +
        资产信息
        +
        +
        + 所在分区： + 资产代码： + 资产名称： +
        +
        +
        + + +
        +
        当前值
        +
        +
        + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
        +
        +
        + + +
        +
        远程指令
        +
        +
        + +
        +
        +
        +
        +
        +
        + + + + + + diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
        +
        +
        +
        + +
        + +
        +
          +
          +
          +
          + +
          +
          资产信息
          +
          +
          + 所在分区： + 资产代码： + 资产名称： +
          +
          +
          + + +
          +
          当前值
          +
          +
          + + 时间： + + + 甲烷浓度：0（%） + + + + +
          +
          +
          + + +
          +
          远程指令
          +
          +
          + +
          +
          +
          +
          +
          +
          + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
          +
          +
          +
          + +
          + +
          +
            +
            +
            +
            + +
            +
            资产信息
            +
            +
            + 所在分区： + 资产代码： + 资产名称： +
            +
            +
            + + +
            +
            当前值
            +
            +
            + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
            +
            +
            + + +
            +
            远程指令
            +
            +
            + +
            +
            +
            +
            +
            +
            + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
            +
            +
            +
            + +
            + +
            +
              +
              +
              +
              + +
              +
              资产信息
              +
              +
              + 所在分区： + 资产代码： + 资产名称： +
              +
              +
              + + +
              +
              当前值
              +
              +
              + + 时间： + + + 硫化氢浓度：0（%） + + + + +
              +
              +
              + + +
              +
              远程指令
              +
              +
              + +
              +
              +
              +
              +
              +
              + + + + + + diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
              +
              +
              +
              + +
              + +
              +
                +
                +
                +
                + +
                +
                资产信息
                +
                +
                + 所在分区： + 资产代码： + 资产名称： +
                +
                +
                + + +
                +
                当前值
                +
                +
                + + 时间： + + + 甲烷浓度：0（%） + + + + +
                +
                +
                + + +
                +
                远程指令
                +
                +
                + +
                +
                +
                +
                +
                +
                + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                +
                +
                +
                + +
                + +
                +
                  +
                  +
                  +
                  + +
                  +
                  资产信息
                  +
                  +
                  + 所在分区： + 资产代码： + 资产名称： +
                  +
                  +
                  + + +
                  +
                  当前值
                  +
                  +
                  + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                  +
                  +
                  + + +
                  +
                  远程指令
                  +
                  +
                  + +
                  +
                  +
                  +
                  +
                  +
                  + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                  +
                  +
                  +
                  + +
                  + +
                  +
                    +
                    +
                    +
                    + +
                    +
                    资产信息
                    +
                    +
                    + 所在分区： + 资产代码： + 资产名称： +
                    +
                    +
                    + + +
                    +
                    当前值
                    +
                    +
                    + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                    +
                    +
                    + + +
                    +
                    远程指令
                    +
                    +
                    + +
                    +
                    +
                    +
                    +
                    +
                    + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                    +
                    +
                    +
                    + +
                    + +
                    +
                      +
                      +
                      +
                      + +
                      +
                      资产信息
                      +
                      +
                      + 所在分区： + 资产代码： + 资产名称： +
                      +
                      +
                      + + +
                      +
                      当前值
                      +
                      +
                      + + 时间： + + + 甲烷浓度：0（%） + + + + +
                      +
                      +
                      + + +
                      +
                      远程指令
                      +
                      +
                      + +
                      +
                      +
                      +
                      +
                      +
                      + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                      +
                      +
                      +
                      + +
                      + +
                      +
                        +
                        +
                        +
                        + +
                        +
                        资产信息
                        +
                        +
                        + 所在分区： + 资产代码： + 资产名称： +
                        +
                        +
                        + + +
                        +
                        当前值
                        +
                        +
                        + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                        +
                        +
                        + + +
                        +
                        远程指令
                        +
                        +
                        + +
                        +
                        +
                        +
                        +
                        +
                        + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                        +
                        +
                        +
                        + +
                        + +
                        +
                          +
                          +
                          +
                          + +
                          +
                          资产信息
                          +
                          +
                          + 所在分区： + 资产代码： + 资产名称： +
                          +
                          +
                          + + +
                          +
                          当前值
                          +
                          +
                          + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                          +
                          +
                          + + +
                          +
                          远程指令
                          +
                          +
                          + +
                          +
                          +
                          +
                          +
                          +
                          + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                          +
                          +
                          +
                          + +
                          + +
                          +
                            +
                            +
                            +
                            + +
                            +
                            资产信息
                            +
                            +
                            + 所在分区： + 资产代码： + 资产名称： +
                            +
                            +
                            + + +
                            +
                            当前值
                            +
                            +
                            + + 时间： + + + 氧气浓度：0（%） + + + + +
                            +
                            +
                            + + +
                            +
                            远程指令
                            +
                            +
                            + +
                            +
                            +
                            +
                            +
                            +
                            + + + + + + diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                            +
                            +
                            +
                            + +
                            + +
                            +
                              +
                              +
                              +
                              + +
                              +
                              资产信息
                              +
                              +
                              + 所在分区： + 资产代码： + 资产名称： +
                              +
                              +
                              + + +
                              +
                              当前值
                              +
                              +
                              + + 时间： + + + 甲烷浓度：0（%） + + + + +
                              +
                              +
                              + + +
                              +
                              远程指令
                              +
                              +
                              + +
                              +
                              +
                              +
                              +
                              +
                              + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                              +
                              +
                              +
                              + +
                              + +
                              +
                                +
                                +
                                +
                                + +
                                +
                                资产信息
                                +
                                +
                                + 所在分区： + 资产代码： + 资产名称： +
                                +
                                +
                                + + +
                                +
                                当前值
                                +
                                +
                                + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                +
                                +
                                + + +
                                +
                                远程指令
                                +
                                +
                                + +
                                +
                                +
                                +
                                +
                                +
                                + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                +
                                +
                                +
                                + +
                                + +
                                +
                                  +
                                  +
                                  +
                                  + +
                                  +
                                  资产信息
                                  +
                                  +
                                  + 所在分区： + 资产代码： + 资产名称： +
                                  +
                                  +
                                  + + +
                                  +
                                  当前值
                                  +
                                  +
                                  + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                  +
                                  +
                                  + + +
                                  +
                                  远程指令
                                  +
                                  +
                                  + +
                                  +
                                  +
                                  +
                                  +
                                  +
                                  + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                  +
                                  +
                                  +
                                  + +
                                  + +
                                  +
                                    +
                                    +
                                    +
                                    + +
                                    +
                                    资产信息
                                    +
                                    +
                                    + 所在分区： + 资产代码： + 资产名称： +
                                    +
                                    +
                                    + + +
                                    +
                                    当前值
                                    +
                                    +
                                    + + 时间： + + + 氧气浓度：0（%） + + + + +
                                    +
                                    +
                                    + + +
                                    +
                                    远程指令
                                    +
                                    +
                                    + +
                                    +
                                    +
                                    +
                                    +
                                    +
                                    + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                    +
                                    +
                                    +
                                    + +
                                    + +
                                    +
                                      +
                                      +
                                      +
                                      + +
                                      +
                                      资产信息
                                      +
                                      +
                                      + 所在分区： + 资产代码： + 资产名称： +
                                      +
                                      +
                                      + + +
                                      +
                                      当前值
                                      +
                                      +
                                      + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                      +
                                      +
                                      + + +
                                      +
                                      远程指令
                                      +
                                      +
                                      + +
                                      +
                                      +
                                      +
                                      +
                                      +
                                      + + + + + + diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                      +
                                      +
                                      +
                                      + +
                                      + +
                                      +
                                        +
                                        +
                                        +
                                        + +
                                        +
                                        资产信息
                                        +
                                        +
                                        + 所在分区： + 资产代码： + 资产名称： +
                                        +
                                        +
                                        + + +
                                        +
                                        当前值
                                        +
                                        +
                                        + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                        +
                                        +
                                        + + +
                                        +
                                        远程指令
                                        +
                                        +
                                        + +
                                        +
                                        +
                                        +
                                        +
                                        +
                                        + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                        +
                                        +
                                        +
                                        + +
                                        + +
                                        +
                                          +
                                          +
                                          +
                                          + +
                                          +
                                          资产信息
                                          +
                                          +
                                          + 所在分区： + 资产代码： + 资产名称： +
                                          +
                                          +
                                          + + +
                                          +
                                          当前值
                                          +
                                          +
                                          + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                          +
                                          +
                                          + + +
                                          +
                                          远程指令
                                          +
                                          +
                                          + +
                                          +
                                          +
                                          +
                                          +
                                          +
                                          + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                          +
                                          +
                                          +
                                          + +
                                          + +
                                          +
                                            +
                                            +
                                            +
                                            + +
                                            +
                                            资产信息
                                            +
                                            +
                                            + 所在分区： + 资产代码： + 资产名称： +
                                            +
                                            +
                                            + + +
                                            +
                                            当前值
                                            +
                                            +
                                            + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                            +
                                            +
                                            + + +
                                            +
                                            远程指令
                                            +
                                            +
                                            + +
                                            +
                                            +
                                            +
                                            +
                                            +
                                            + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                            +
                                            +
                                            +
                                            + +
                                            + +
                                            +
                                              +
                                              +
                                              +
                                              + +
                                              +
                                              资产信息
                                              +
                                              +
                                              + 所在分区： + 资产代码： + 资产名称： +
                                              +
                                              +
                                              + + +
                                              +
                                              当前值
                                              +
                                              +
                                              + + 时间： + + + 氧气浓度：0（%） + + + + +
                                              +
                                              +
                                              + + +
                                              +
                                              远程指令
                                              +
                                              +
                                              + +
                                              +
                                              +
                                              +
                                              +
                                              +
                                              + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                              +
                                              +
                                              +
                                              + +
                                              + +
                                              +
                                                +
                                                +
                                                +
                                                + +
                                                +
                                                资产信息
                                                +
                                                +
                                                + 所在分区： + 资产代码： + 资产名称： +
                                                +
                                                +
                                                + + +
                                                +
                                                当前值
                                                +
                                                +
                                                + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                +
                                                +
                                                + + +
                                                +
                                                远程指令
                                                +
                                                +
                                                + +
                                                +
                                                +
                                                +
                                                +
                                                +
                                                + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                +
                                                +
                                                +
                                                + +
                                                + +
                                                +
                                                  +
                                                  +
                                                  +
                                                  + +
                                                  +
                                                  资产信息
                                                  +
                                                  +
                                                  + 所在分区： + 资产代码： + 资产名称： +
                                                  +
                                                  +
                                                  + + +
                                                  +
                                                  当前值
                                                  +
                                                  +
                                                  + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                  +
                                                  +
                                                  + + +
                                                  +
                                                  远程指令
                                                  +
                                                  +
                                                  + +
                                                  +
                                                  +
                                                  +
                                                  +
                                                  +
                                                  + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                  +
                                                  +
                                                  +
                                                  + +
                                                  + +
                                                  +
                                                    +
                                                    +
                                                    +
                                                    + +
                                                    +
                                                    资产信息
                                                    +
                                                    +
                                                    + 所在分区： + 资产代码： + 资产名称： +
                                                    +
                                                    +
                                                    + + +
                                                    +
                                                    当前值
                                                    +
                                                    +
                                                    + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                    +
                                                    +
                                                    + + +
                                                    +
                                                    远程指令
                                                    +
                                                    +
                                                    + +
                                                    +
                                                    +
                                                    +
                                                    +
                                                    +
                                                    + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                    +
                                                    +
                                                    +
                                                    + +
                                                    + +
                                                    +
                                                      +
                                                      +
                                                      +
                                                      + +
                                                      +
                                                      资产信息
                                                      +
                                                      +
                                                      + 所在分区： + 资产代码： + 资产名称： +
                                                      +
                                                      +
                                                      + + +
                                                      +
                                                      当前值
                                                      +
                                                      +
                                                      + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                      +
                                                      +
                                                      + + +
                                                      +
                                                      远程指令
                                                      +
                                                      +
                                                      + +
                                                      +
                                                      +
                                                      +
                                                      +
                                                      +
                                                      + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                      +
                                                      +
                                                      +
                                                      + +
                                                      + +
                                                      +
                                                        +
                                                        +
                                                        +
                                                        + +
                                                        +
                                                        资产信息
                                                        +
                                                        +
                                                        + 所在分区： + 资产代码： + 资产名称： +
                                                        +
                                                        +
                                                        + + +
                                                        +
                                                        当前值
                                                        +
                                                        +
                                                        + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                        +
                                                        +
                                                        + + +
                                                        +
                                                        远程指令
                                                        +
                                                        +
                                                        + +
                                                        +
                                                        +
                                                        +
                                                        +
                                                        +
                                                        + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + +
                                                        + +
                                                        +
                                                          +
                                                          +
                                                          +
                                                          + +
                                                          +
                                                          资产信息
                                                          +
                                                          +
                                                          + 所在分区： + 资产代码： + 资产名称： +
                                                          +
                                                          +
                                                          + + +
                                                          +
                                                          当前值
                                                          +
                                                          +
                                                          + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                          +
                                                          +
                                                          + + +
                                                          +
                                                          远程指令
                                                          +
                                                          +
                                                          + +
                                                          +
                                                          +
                                                          +
                                                          +
                                                          +
                                                          + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                          +
                                                          +
                                                          +
                                                          + +
                                                          + +
                                                          +
                                                            +
                                                            +
                                                            +
                                                            + +
                                                            +
                                                            资产信息
                                                            +
                                                            +
                                                            + 所在分区： + 资产代码： + 资产名称： +
                                                            +
                                                            +
                                                            + + +
                                                            +
                                                            当前值
                                                            +
                                                            +
                                                            + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                            +
                                                            +
                                                            + + +
                                                            +
                                                            远程指令
                                                            +
                                                            +
                                                            + +
                                                            +
                                                            +
                                                            +
                                                            +
                                                            +
                                                            + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                            +
                                                            +
                                                            +
                                                            + +
                                                            + +
                                                            +
                                                              +
                                                              +
                                                              +
                                                              + +
                                                              +
                                                              资产信息
                                                              +
                                                              +
                                                              + 所在分区： + 资产代码： + 资产名称： +
                                                              +
                                                              +
                                                              + + +
                                                              +
                                                              当前值
                                                              +
                                                              +
                                                              + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                              +
                                                              +
                                                              + + +
                                                              +
                                                              远程指令
                                                              +
                                                              +
                                                              + +
                                                              +
                                                              +
                                                              +
                                                              +
                                                              +
                                                              + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                              +
                                                              +
                                                              +
                                                              + +
                                                              + +
                                                              +
                                                                +
                                                                +
                                                                +
                                                                + +
                                                                +
                                                                资产信息
                                                                +
                                                                +
                                                                + 所在分区： + 资产代码： + 资产名称： +
                                                                +
                                                                +
                                                                + + +
                                                                +
                                                                当前值
                                                                +
                                                                +
                                                                + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                +
                                                                +
                                                                + + +
                                                                +
                                                                远程指令
                                                                +
                                                                +
                                                                + +
                                                                +
                                                                +
                                                                +
                                                                +
                                                                +
                                                                + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                +
                                                                +
                                                                +
                                                                + +
                                                                + +
                                                                +
                                                                  +
                                                                  +
                                                                  +
                                                                  + +
                                                                  +
                                                                  资产信息
                                                                  +
                                                                  +
                                                                  + 所在分区： + 资产代码： + 资产名称： +
                                                                  +
                                                                  +
                                                                  + + +
                                                                  +
                                                                  当前值
                                                                  +
                                                                  +
                                                                  + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                  +
                                                                  +
                                                                  + + +
                                                                  +
                                                                  远程指令
                                                                  +
                                                                  +
                                                                  + +
                                                                  +
                                                                  +
                                                                  +
                                                                  +
                                                                  +
                                                                  + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                  +
                                                                  +
                                                                  +
                                                                  + +
                                                                  + +
                                                                  +
                                                                    +
                                                                    +
                                                                    +
                                                                    + +
                                                                    +
                                                                    资产信息
                                                                    +
                                                                    +
                                                                    + 所在分区： + 资产代码： + 资产名称： +
                                                                    +
                                                                    +
                                                                    + + +
                                                                    +
                                                                    当前值
                                                                    +
                                                                    +
                                                                    + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                    +
                                                                    +
                                                                    + + +
                                                                    +
                                                                    远程指令
                                                                    +
                                                                    +
                                                                    + +
                                                                    +
                                                                    +
                                                                    +
                                                                    +
                                                                    +
                                                                    + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                    +
                                                                    +
                                                                    +
                                                                    + +
                                                                    + +
                                                                    +
                                                                      +
                                                                      +
                                                                      +
                                                                      + +
                                                                      +
                                                                      资产信息
                                                                      +
                                                                      +
                                                                      + 所在分区： + 资产代码： + 资产名称： +
                                                                      +
                                                                      +
                                                                      + + +
                                                                      +
                                                                      当前值
                                                                      +
                                                                      +
                                                                      + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                      +
                                                                      +
                                                                      + + +
                                                                      +
                                                                      远程指令
                                                                      +
                                                                      +
                                                                      + +
                                                                      +
                                                                      +
                                                                      +
                                                                      +
                                                                      +
                                                                      + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                      +
                                                                      +
                                                                      +
                                                                      + +
                                                                      + +
                                                                      +
                                                                        +
                                                                        +
                                                                        +
                                                                        + +
                                                                        +
                                                                        资产信息
                                                                        +
                                                                        +
                                                                        + 所在分区： + 资产代码： + 资产名称： +
                                                                        +
                                                                        +
                                                                        + + +
                                                                        +
                                                                        当前值
                                                                        +
                                                                        +
                                                                        + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                        +
                                                                        +
                                                                        + + +
                                                                        +
                                                                        远程指令
                                                                        +
                                                                        +
                                                                        + +
                                                                        +
                                                                        +
                                                                        +
                                                                        +
                                                                        +
                                                                        + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                        +
                                                                        +
                                                                        +
                                                                        + +
                                                                        + +
                                                                        +
                                                                          +
                                                                          +
                                                                          +
                                                                          + +
                                                                          +
                                                                          资产信息
                                                                          +
                                                                          +
                                                                          + 所在分区： + 资产代码： + 资产名称： +
                                                                          +
                                                                          +
                                                                          + + +
                                                                          +
                                                                          当前值
                                                                          +
                                                                          +
                                                                          + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                          +
                                                                          +
                                                                          + + +
                                                                          +
                                                                          远程指令
                                                                          +
                                                                          +
                                                                          + +
                                                                          +
                                                                          +
                                                                          +
                                                                          +
                                                                          +
                                                                          + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                          +
                                                                          +
                                                                          +
                                                                          + +
                                                                          + +
                                                                          +
                                                                            +
                                                                            +
                                                                            +
                                                                            + +
                                                                            +
                                                                            资产信息
                                                                            +
                                                                            +
                                                                            + 所在分区： + 资产代码： + 资产名称： +
                                                                            +
                                                                            +
                                                                            + + +
                                                                            +
                                                                            当前值
                                                                            +
                                                                            +
                                                                            + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                            +
                                                                            +
                                                                            + + +
                                                                            +
                                                                            远程指令
                                                                            +
                                                                            +
                                                                            + +
                                                                            +
                                                                            +
                                                                            +
                                                                            +
                                                                            +
                                                                            + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                            +
                                                                            +
                                                                            +
                                                                            + +
                                                                            + +
                                                                            +
                                                                              +
                                                                              +
                                                                              +
                                                                              + +
                                                                              +
                                                                              资产信息
                                                                              +
                                                                              +
                                                                              + 所在分区： + 资产代码： + 资产名称： +
                                                                              +
                                                                              +
                                                                              + + +
                                                                              +
                                                                              当前值
                                                                              +
                                                                              +
                                                                              + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                              +
                                                                              +
                                                                              + + +
                                                                              +
                                                                              远程指令
                                                                              +
                                                                              +
                                                                              + +
                                                                              +
                                                                              +
                                                                              +
                                                                              +
                                                                              +
                                                                              + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                              +
                                                                              +
                                                                              +
                                                                              + +
                                                                              + +
                                                                              +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +
                                                                                +
                                                                                资产信息
                                                                                +
                                                                                +
                                                                                + 所在分区： + 资产代码： + 资产名称： +
                                                                                +
                                                                                +
                                                                                + + +
                                                                                +
                                                                                当前值
                                                                                +
                                                                                +
                                                                                + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                                +
                                                                                +
                                                                                + + +
                                                                                +
                                                                                远程指令
                                                                                +
                                                                                +
                                                                                + +
                                                                                +
                                                                                +
                                                                                +
                                                                                +
                                                                                +
                                                                                + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +
                                                                                + +
                                                                                +
                                                                                  +
                                                                                  +
                                                                                  +
                                                                                  + +
                                                                                  +
                                                                                  资产信息
                                                                                  +
                                                                                  +
                                                                                  + 所在分区： + 资产代码： + 资产名称： +
                                                                                  +
                                                                                  +
                                                                                  + + +
                                                                                  +
                                                                                  当前值
                                                                                  +
                                                                                  +
                                                                                  + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                                  +
                                                                                  +
                                                                                  + + +
                                                                                  +
                                                                                  远程指令
                                                                                  +
                                                                                  +
                                                                                  + +
                                                                                  +
                                                                                  +
                                                                                  +
                                                                                  +
                                                                                  +
                                                                                  + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                                  +
                                                                                  +
                                                                                  +
                                                                                  + +
                                                                                  + +
                                                                                  +
                                                                                    +
                                                                                    +
                                                                                    +
                                                                                    + +
                                                                                    +
                                                                                    资产信息
                                                                                    +
                                                                                    +
                                                                                    + 所在分区： + 资产代码： + 资产名称： +
                                                                                    +
                                                                                    +
                                                                                    + + +
                                                                                    +
                                                                                    当前值
                                                                                    +
                                                                                    +
                                                                                    + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                                    +
                                                                                    +
                                                                                    + + +
                                                                                    +
                                                                                    远程指令
                                                                                    +
                                                                                    +
                                                                                    + +
                                                                                    +
                                                                                    +
                                                                                    +
                                                                                    +
                                                                                    +
                                                                                    + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                                    +
                                                                                    +
                                                                                    +
                                                                                    + +
                                                                                    + +
                                                                                    +
                                                                                      +
                                                                                      +
                                                                                      +
                                                                                      + +
                                                                                      +
                                                                                      资产信息
                                                                                      +
                                                                                      +
                                                                                      + 所在分区： + 资产代码： + 资产名称： +
                                                                                      +
                                                                                      +
                                                                                      + + +
                                                                                      +
                                                                                      当前值
                                                                                      +
                                                                                      +
                                                                                      + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                                      +
                                                                                      +
                                                                                      + + +
                                                                                      +
                                                                                      远程指令
                                                                                      +
                                                                                      +
                                                                                      + +
                                                                                      +
                                                                                      +
                                                                                      +
                                                                                      +
                                                                                      +
                                                                                      + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                                      +
                                                                                      +
                                                                                      +
                                                                                      + +
                                                                                      + +
                                                                                      +
                                                                                        +
                                                                                        +
                                                                                        +
                                                                                        + +
                                                                                        +
                                                                                        资产信息
                                                                                        +
                                                                                        +
                                                                                        + 所在分区： + 资产代码： + 资产名称： +
                                                                                        +
                                                                                        +
                                                                                        + + +
                                                                                        +
                                                                                        当前值
                                                                                        +
                                                                                        +
                                                                                        + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                                        +
                                                                                        +
                                                                                        + + +
                                                                                        +
                                                                                        远程指令
                                                                                        +
                                                                                        +
                                                                                        + +
                                                                                        +
                                                                                        +
                                                                                        +
                                                                                        +
                                                                                        +
                                                                                        + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgTemphum.java b/src/com/szpg/db/data/PgTemphum.java index 21045b6..6d6951a 100644 --- a/src/com/szpg/db/data/PgTemphum.java +++ b/src/com/szpg/db/data/PgTemphum.java @@ -1,9 +1,13 @@ package com.szpg.db.data; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; public class PgTemphum implements Serializable { @@ -92,4 +96,17 @@ public String toString() { return "PgTemphum[hum=" + hum + ", temp=" + temp + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("wd", null != this.getTemp() ? this.getTemp() : ""); + json.put("sd", null != this.getHum() ? this.getHum() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                                        +
                                                                                        +
                                                                                        +
                                                                                        + +
                                                                                        + +
                                                                                        +
                                                                                          +
                                                                                          +
                                                                                          +
                                                                                          + +
                                                                                          +
                                                                                          资产信息
                                                                                          +
                                                                                          +
                                                                                          + 所在分区： + 资产代码： + 资产名称： +
                                                                                          +
                                                                                          +
                                                                                          + + +
                                                                                          +
                                                                                          当前值
                                                                                          +
                                                                                          +
                                                                                          + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                                          +
                                                                                          +
                                                                                          + + +
                                                                                          +
                                                                                          远程指令
                                                                                          +
                                                                                          +
                                                                                          + +
                                                                                          +
                                                                                          +
                                                                                          +
                                                                                          +
                                                                                          +
                                                                                          + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                                          +
                                                                                          +
                                                                                          +
                                                                                          + +
                                                                                          + +
                                                                                          +
                                                                                            +
                                                                                            +
                                                                                            +
                                                                                            + +
                                                                                            +
                                                                                            资产信息
                                                                                            +
                                                                                            +
                                                                                            + 所在分区： + 资产代码： + 资产名称： +
                                                                                            +
                                                                                            +
                                                                                            + + +
                                                                                            +
                                                                                            当前值
                                                                                            +
                                                                                            +
                                                                                            + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                                            +
                                                                                            +
                                                                                            + + +
                                                                                            +
                                                                                            远程指令
                                                                                            +
                                                                                            +
                                                                                            + +
                                                                                            +
                                                                                            +
                                                                                            +
                                                                                            +
                                                                                            +
                                                                                            + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                                            +
                                                                                            +
                                                                                            +
                                                                                            + +
                                                                                            + +
                                                                                            +
                                                                                              +
                                                                                              +
                                                                                              +
                                                                                              + +
                                                                                              +
                                                                                              资产信息
                                                                                              +
                                                                                              +
                                                                                              + 所在分区： + 资产代码： + 资产名称： +
                                                                                              +
                                                                                              +
                                                                                              + + +
                                                                                              +
                                                                                              当前值
                                                                                              +
                                                                                              +
                                                                                              + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                                              +
                                                                                              +
                                                                                              + + +
                                                                                              +
                                                                                              远程指令
                                                                                              +
                                                                                              +
                                                                                              + +
                                                                                              +
                                                                                              +
                                                                                              +
                                                                                              +
                                                                                              +
                                                                                              + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                                              +
                                                                                              +
                                                                                              +
                                                                                              + +
                                                                                              + +
                                                                                              +
                                                                                                +
                                                                                                +
                                                                                                +
                                                                                                + +
                                                                                                +
                                                                                                资产信息
                                                                                                +
                                                                                                +
                                                                                                + 所在分区： + 资产代码： + 资产名称： +
                                                                                                +
                                                                                                +
                                                                                                + + +
                                                                                                +
                                                                                                当前值
                                                                                                +
                                                                                                +
                                                                                                + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                                                +
                                                                                                +
                                                                                                + + +
                                                                                                +
                                                                                                远程指令
                                                                                                +
                                                                                                +
                                                                                                + +
                                                                                                +
                                                                                                +
                                                                                                +
                                                                                                +
                                                                                                +
                                                                                                + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                                                +
                                                                                                +
                                                                                                +
                                                                                                + +
                                                                                                + +
                                                                                                +
                                                                                                  +
                                                                                                  +
                                                                                                  +
                                                                                                  + +
                                                                                                  +
                                                                                                  资产信息
                                                                                                  +
                                                                                                  +
                                                                                                  + 所在分区： + 资产代码： + 资产名称： +
                                                                                                  +
                                                                                                  +
                                                                                                  + + +
                                                                                                  +
                                                                                                  当前值
                                                                                                  +
                                                                                                  +
                                                                                                  + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                                                  +
                                                                                                  +
                                                                                                  + + +
                                                                                                  +
                                                                                                  远程指令
                                                                                                  +
                                                                                                  +
                                                                                                  + +
                                                                                                  +
                                                                                                  +
                                                                                                  +
                                                                                                  +
                                                                                                  +
                                                                                                  + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgTemphum.java b/src/com/szpg/db/data/PgTemphum.java index 21045b6..6d6951a 100644 --- a/src/com/szpg/db/data/PgTemphum.java +++ b/src/com/szpg/db/data/PgTemphum.java @@ -1,9 +1,13 @@ package com.szpg.db.data; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; public class PgTemphum implements Serializable { @@ -92,4 +96,17 @@ public String toString() { return "PgTemphum[hum=" + hum + ", temp=" + temp + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("wd", null != this.getTemp() ? this.getTemp() : ""); + json.put("sd", null != this.getHum() ? this.getHum() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/rmi/RemoteCH4CommandAction.java b/src/com/szpg/rmi/RemoteCH4CommandAction.java index 740ef64..cf7a8c7 100644 --- a/src/com/szpg/rmi/RemoteCH4CommandAction.java +++ b/src/com/szpg/rmi/RemoteCH4CommandAction.java @@ -1,18 +1,13 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCh4; import com.szpg.plc.message.command.write.SetCH4ThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -135,8 +130,8 @@ String countWord = ""; if (client.getFlag().equals("11")) { // 一期PLC配置 - start = Configure.getProperty("acubl", client.getAcucode() + ".CH4.START"); - countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH4.WORDCOUNT"); + start = Configure.getProperty("acubl", client.getAcucode() + ".CH.START"); + countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH.WORDCOUNT"); } else if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 二期PLC配置 start = Configure.getProperty("acubl", client.getAcucode() + ".HSCH4.START"); @@ -287,6 +282,24 @@ return null; } } + + public String readCH4ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCh4Dao dao = new PgCh4DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCh4 ch4 = dao.findLatestPblzByDevice(deviceId); + if (null != ch4) { + jResult.put("data", ch4.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                                                  +
                                                                                                  +
                                                                                                  +
                                                                                                  + +
                                                                                                  + +
                                                                                                  +
                                                                                                    +
                                                                                                    +
                                                                                                    +
                                                                                                    + +
                                                                                                    +
                                                                                                    资产信息
                                                                                                    +
                                                                                                    +
                                                                                                    + 所在分区： + 资产代码： + 资产名称： +
                                                                                                    +
                                                                                                    +
                                                                                                    + + +
                                                                                                    +
                                                                                                    当前值
                                                                                                    +
                                                                                                    +
                                                                                                    + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                                                    +
                                                                                                    +
                                                                                                    + + +
                                                                                                    +
                                                                                                    远程指令
                                                                                                    +
                                                                                                    +
                                                                                                    + +
                                                                                                    +
                                                                                                    +
                                                                                                    +
                                                                                                    +
                                                                                                    +
                                                                                                    + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                                                    +
                                                                                                    +
                                                                                                    +
                                                                                                    + +
                                                                                                    + +
                                                                                                    +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +
                                                                                                      +
                                                                                                      资产信息
                                                                                                      +
                                                                                                      +
                                                                                                      + 所在分区： + 资产代码： + 资产名称： +
                                                                                                      +
                                                                                                      +
                                                                                                      + + +
                                                                                                      +
                                                                                                      当前值
                                                                                                      +
                                                                                                      +
                                                                                                      + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + + +
                                                                                                      +
                                                                                                      远程指令
                                                                                                      +
                                                                                                      +
                                                                                                      + +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +
                                                                                                      + +
                                                                                                      +
                                                                                                        +
                                                                                                        +
                                                                                                        +
                                                                                                        + +
                                                                                                        +
                                                                                                        资产信息
                                                                                                        +
                                                                                                        +
                                                                                                        + 所在分区： + 资产代码： + 资产名称： +
                                                                                                        +
                                                                                                        +
                                                                                                        + + +
                                                                                                        +
                                                                                                        当前值
                                                                                                        +
                                                                                                        +
                                                                                                        + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                                                        +
                                                                                                        +
                                                                                                        + + +
                                                                                                        +
                                                                                                        远程指令
                                                                                                        +
                                                                                                        +
                                                                                                        + +
                                                                                                        +
                                                                                                        +
                                                                                                        +
                                                                                                        +
                                                                                                        +
                                                                                                        + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                                                        +
                                                                                                        +
                                                                                                        +
                                                                                                        + +
                                                                                                        + +
                                                                                                        +
                                                                                                          +
                                                                                                          +
                                                                                                          +
                                                                                                          + +
                                                                                                          +
                                                                                                          资产信息
                                                                                                          +
                                                                                                          +
                                                                                                          + 所在分区： + 资产代码： + 资产名称： +
                                                                                                          +
                                                                                                          +
                                                                                                          + + +
                                                                                                          +
                                                                                                          当前值
                                                                                                          +
                                                                                                          +
                                                                                                          + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                                                          +
                                                                                                          +
                                                                                                          + + +
                                                                                                          +
                                                                                                          远程指令
                                                                                                          +
                                                                                                          +
                                                                                                          + +
                                                                                                          +
                                                                                                          +
                                                                                                          +
                                                                                                          +
                                                                                                          +
                                                                                                          + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                                                          +
                                                                                                          +
                                                                                                          +
                                                                                                          + +
                                                                                                          + +
                                                                                                          +
                                                                                                            +
                                                                                                            +
                                                                                                            +
                                                                                                            + +
                                                                                                            +
                                                                                                            资产信息
                                                                                                            +
                                                                                                            +
                                                                                                            + 所在分区： + 资产代码： + 资产名称： +
                                                                                                            +
                                                                                                            +
                                                                                                            + + +
                                                                                                            +
                                                                                                            当前值
                                                                                                            +
                                                                                                            +
                                                                                                            + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                                                            +
                                                                                                            +
                                                                                                            + + +
                                                                                                            +
                                                                                                            远程指令
                                                                                                            +
                                                                                                            +
                                                                                                            + +
                                                                                                            +
                                                                                                            +
                                                                                                            +
                                                                                                            +
                                                                                                            +
                                                                                                            + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgTemphum.java b/src/com/szpg/db/data/PgTemphum.java index 21045b6..6d6951a 100644 --- a/src/com/szpg/db/data/PgTemphum.java +++ b/src/com/szpg/db/data/PgTemphum.java @@ -1,9 +1,13 @@ package com.szpg.db.data; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; public class PgTemphum implements Serializable { @@ -92,4 +96,17 @@ public String toString() { return "PgTemphum[hum=" + hum + ", temp=" + temp + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("wd", null != this.getTemp() ? this.getTemp() : ""); + json.put("sd", null != this.getHum() ? this.getHum() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/rmi/RemoteCH4CommandAction.java b/src/com/szpg/rmi/RemoteCH4CommandAction.java index 740ef64..cf7a8c7 100644 --- a/src/com/szpg/rmi/RemoteCH4CommandAction.java +++ b/src/com/szpg/rmi/RemoteCH4CommandAction.java @@ -1,18 +1,13 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCh4; import com.szpg.plc.message.command.write.SetCH4ThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -135,8 +130,8 @@ String countWord = ""; if (client.getFlag().equals("11")) { // 一期PLC配置 - start = Configure.getProperty("acubl", client.getAcucode() + ".CH4.START"); - countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH4.WORDCOUNT"); + start = Configure.getProperty("acubl", client.getAcucode() + ".CH.START"); + countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH.WORDCOUNT"); } else if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 二期PLC配置 start = Configure.getProperty("acubl", client.getAcucode() + ".HSCH4.START"); @@ -287,6 +282,24 @@ return null; } } + + public String readCH4ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCh4Dao dao = new PgCh4DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCh4 ch4 = dao.findLatestPblzByDevice(deviceId); + if (null != ch4) { + jResult.put("data", ch4.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteCOCommandAction.java b/src/com/szpg/rmi/RemoteCOCommandAction.java index 42a1618..f58d2f1 100644 --- a/src/com/szpg/rmi/RemoteCOCommandAction.java +++ b/src/com/szpg/rmi/RemoteCOCommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCO; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -264,6 +259,24 @@ return null; } } + + public String readCOValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCODao dao = new PgCODaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCO co = dao.findLatestPblzByDevice(deviceId); + if (null != co) { + jResult.put("data", co.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                                                            +
                                                                                                            +
                                                                                                            +
                                                                                                            + +
                                                                                                            + +
                                                                                                            +
                                                                                                              +
                                                                                                              +
                                                                                                              +
                                                                                                              + +
                                                                                                              +
                                                                                                              资产信息
                                                                                                              +
                                                                                                              +
                                                                                                              + 所在分区： + 资产代码： + 资产名称： +
                                                                                                              +
                                                                                                              +
                                                                                                              + + +
                                                                                                              +
                                                                                                              当前值
                                                                                                              +
                                                                                                              +
                                                                                                              + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                                                              +
                                                                                                              +
                                                                                                              + + +
                                                                                                              +
                                                                                                              远程指令
                                                                                                              +
                                                                                                              +
                                                                                                              + +
                                                                                                              +
                                                                                                              +
                                                                                                              +
                                                                                                              +
                                                                                                              +
                                                                                                              + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                                                              +
                                                                                                              +
                                                                                                              +
                                                                                                              + +
                                                                                                              + +
                                                                                                              +
                                                                                                                +
                                                                                                                +
                                                                                                                +
                                                                                                                + +
                                                                                                                +
                                                                                                                资产信息
                                                                                                                +
                                                                                                                +
                                                                                                                + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                +
                                                                                                                +
                                                                                                                + + +
                                                                                                                +
                                                                                                                当前值
                                                                                                                +
                                                                                                                +
                                                                                                                + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                                                                +
                                                                                                                +
                                                                                                                + + +
                                                                                                                +
                                                                                                                远程指令
                                                                                                                +
                                                                                                                +
                                                                                                                + +
                                                                                                                +
                                                                                                                +
                                                                                                                +
                                                                                                                +
                                                                                                                +
                                                                                                                + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                                                                +
                                                                                                                +
                                                                                                                +
                                                                                                                + +
                                                                                                                + +
                                                                                                                +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + +
                                                                                                                  +
                                                                                                                  资产信息
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + + +
                                                                                                                  +
                                                                                                                  当前值
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + + +
                                                                                                                  +
                                                                                                                  远程指令
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  +
                                                                                                                  + +
                                                                                                                  + +
                                                                                                                  +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + +
                                                                                                                    +
                                                                                                                    资产信息
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + + +
                                                                                                                    +
                                                                                                                    当前值
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + + +
                                                                                                                    +
                                                                                                                    远程指令
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    +
                                                                                                                    + +
                                                                                                                    + +
                                                                                                                    +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + +
                                                                                                                      +
                                                                                                                      资产信息
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + + +
                                                                                                                      +
                                                                                                                      当前值
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + + +
                                                                                                                      +
                                                                                                                      远程指令
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgTemphum.java b/src/com/szpg/db/data/PgTemphum.java index 21045b6..6d6951a 100644 --- a/src/com/szpg/db/data/PgTemphum.java +++ b/src/com/szpg/db/data/PgTemphum.java @@ -1,9 +1,13 @@ package com.szpg.db.data; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; public class PgTemphum implements Serializable { @@ -92,4 +96,17 @@ public String toString() { return "PgTemphum[hum=" + hum + ", temp=" + temp + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("wd", null != this.getTemp() ? this.getTemp() : ""); + json.put("sd", null != this.getHum() ? this.getHum() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/rmi/RemoteCH4CommandAction.java b/src/com/szpg/rmi/RemoteCH4CommandAction.java index 740ef64..cf7a8c7 100644 --- a/src/com/szpg/rmi/RemoteCH4CommandAction.java +++ b/src/com/szpg/rmi/RemoteCH4CommandAction.java @@ -1,18 +1,13 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCh4; import com.szpg.plc.message.command.write.SetCH4ThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -135,8 +130,8 @@ String countWord = ""; if (client.getFlag().equals("11")) { // 一期PLC配置 - start = Configure.getProperty("acubl", client.getAcucode() + ".CH4.START"); - countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH4.WORDCOUNT"); + start = Configure.getProperty("acubl", client.getAcucode() + ".CH.START"); + countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH.WORDCOUNT"); } else if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 二期PLC配置 start = Configure.getProperty("acubl", client.getAcucode() + ".HSCH4.START"); @@ -287,6 +282,24 @@ return null; } } + + public String readCH4ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCh4Dao dao = new PgCh4DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCh4 ch4 = dao.findLatestPblzByDevice(deviceId); + if (null != ch4) { + jResult.put("data", ch4.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteCOCommandAction.java b/src/com/szpg/rmi/RemoteCOCommandAction.java index 42a1618..f58d2f1 100644 --- a/src/com/szpg/rmi/RemoteCOCommandAction.java +++ b/src/com/szpg/rmi/RemoteCOCommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCO; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -264,6 +259,24 @@ return null; } } + + public String readCOValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCODao dao = new PgCODaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCO co = dao.findLatestPblzByDevice(deviceId); + if (null != co) { + jResult.put("data", co.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteHSCommandAction.java b/src/com/szpg/rmi/RemoteHSCommandAction.java index de12ce3..d2e2af3 100644 --- a/src/com/szpg/rmi/RemoteHSCommandAction.java +++ b/src/com/szpg/rmi/RemoteHSCommandAction.java @@ -1,18 +1,14 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgO2; +import com.szpg.db.data.PgSH; import com.szpg.plc.message.command.write.SetHSThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -287,7 +283,24 @@ return null; } } - + + public String readHSValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgHSDao dao = new PgHSDaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgSH hs = dao.findLatestPblzByDevice(deviceId); + if (null != hs) { + jResult.put("data", hs.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** * 给前端返回 diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      +
                                                                                                                      + +
                                                                                                                      + +
                                                                                                                      +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + +
                                                                                                                        +
                                                                                                                        资产信息
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + + +
                                                                                                                        +
                                                                                                                        当前值
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + + +
                                                                                                                        +
                                                                                                                        远程指令
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        +
                                                                                                                        + +
                                                                                                                        + +
                                                                                                                        +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + +
                                                                                                                          +
                                                                                                                          资产信息
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + + +
                                                                                                                          +
                                                                                                                          当前值
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + + +
                                                                                                                          +
                                                                                                                          远程指令
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          +
                                                                                                                          + +
                                                                                                                          + +
                                                                                                                          +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + +
                                                                                                                            +
                                                                                                                            资产信息
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + + +
                                                                                                                            +
                                                                                                                            当前值
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + + +
                                                                                                                            +
                                                                                                                            远程指令
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            +
                                                                                                                            + +
                                                                                                                            + +
                                                                                                                            +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + +
                                                                                                                              +
                                                                                                                              资产信息
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + + +
                                                                                                                              +
                                                                                                                              当前值
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + + +
                                                                                                                              +
                                                                                                                              远程指令
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              +
                                                                                                                              + +
                                                                                                                              + +
                                                                                                                              +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + +
                                                                                                                                +
                                                                                                                                资产信息
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + + +
                                                                                                                                +
                                                                                                                                当前值
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + + +
                                                                                                                                +
                                                                                                                                远程指令
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgTemphum.java b/src/com/szpg/db/data/PgTemphum.java index 21045b6..6d6951a 100644 --- a/src/com/szpg/db/data/PgTemphum.java +++ b/src/com/szpg/db/data/PgTemphum.java @@ -1,9 +1,13 @@ package com.szpg.db.data; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; public class PgTemphum implements Serializable { @@ -92,4 +96,17 @@ public String toString() { return "PgTemphum[hum=" + hum + ", temp=" + temp + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("wd", null != this.getTemp() ? this.getTemp() : ""); + json.put("sd", null != this.getHum() ? this.getHum() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/rmi/RemoteCH4CommandAction.java b/src/com/szpg/rmi/RemoteCH4CommandAction.java index 740ef64..cf7a8c7 100644 --- a/src/com/szpg/rmi/RemoteCH4CommandAction.java +++ b/src/com/szpg/rmi/RemoteCH4CommandAction.java @@ -1,18 +1,13 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCh4; import com.szpg.plc.message.command.write.SetCH4ThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -135,8 +130,8 @@ String countWord = ""; if (client.getFlag().equals("11")) { // 一期PLC配置 - start = Configure.getProperty("acubl", client.getAcucode() + ".CH4.START"); - countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH4.WORDCOUNT"); + start = Configure.getProperty("acubl", client.getAcucode() + ".CH.START"); + countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH.WORDCOUNT"); } else if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 二期PLC配置 start = Configure.getProperty("acubl", client.getAcucode() + ".HSCH4.START"); @@ -287,6 +282,24 @@ return null; } } + + public String readCH4ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCh4Dao dao = new PgCh4DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCh4 ch4 = dao.findLatestPblzByDevice(deviceId); + if (null != ch4) { + jResult.put("data", ch4.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteCOCommandAction.java b/src/com/szpg/rmi/RemoteCOCommandAction.java index 42a1618..f58d2f1 100644 --- a/src/com/szpg/rmi/RemoteCOCommandAction.java +++ b/src/com/szpg/rmi/RemoteCOCommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCO; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -264,6 +259,24 @@ return null; } } + + public String readCOValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCODao dao = new PgCODaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCO co = dao.findLatestPblzByDevice(deviceId); + if (null != co) { + jResult.put("data", co.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteHSCommandAction.java b/src/com/szpg/rmi/RemoteHSCommandAction.java index de12ce3..d2e2af3 100644 --- a/src/com/szpg/rmi/RemoteHSCommandAction.java +++ b/src/com/szpg/rmi/RemoteHSCommandAction.java @@ -1,18 +1,14 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgO2; +import com.szpg.db.data.PgSH; import com.szpg.plc.message.command.write.SetHSThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -287,7 +283,24 @@ return null; } } - + + public String readHSValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgHSDao dao = new PgHSDaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgSH hs = dao.findLatestPblzByDevice(deviceId); + if (null != hs) { + jResult.put("data", hs.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** * 给前端返回 diff --git a/src/com/szpg/rmi/RemoteO2CommandAction.java b/src/com/szpg/rmi/RemoteO2CommandAction.java index 7793359..8fa0c0d 100644 --- a/src/com/szpg/rmi/RemoteO2CommandAction.java +++ b/src/com/szpg/rmi/RemoteO2CommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgO2; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -285,7 +280,25 @@ return null; } } - + + public String readO2ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgO2Dao dao = new PgO2DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgO2 o2 = dao.findLatestPblzByDevice(deviceId); + if (null != o2) { + jResult.put("data", o2.toJson()); + } + } + + returnToFront(jResult); + return null; + } + /** * 给前端返回 diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                +
                                                                                                                                + +
                                                                                                                                + +
                                                                                                                                +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + +
                                                                                                                                  +
                                                                                                                                  资产信息
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + + +
                                                                                                                                  +
                                                                                                                                  当前值
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + + +
                                                                                                                                  +
                                                                                                                                  远程指令
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  +
                                                                                                                                  + +
                                                                                                                                  + +
                                                                                                                                  +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + +
                                                                                                                                    +
                                                                                                                                    资产信息
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + + +
                                                                                                                                    +
                                                                                                                                    当前值
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + + +
                                                                                                                                    +
                                                                                                                                    远程指令
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    +
                                                                                                                                    + +
                                                                                                                                    + +
                                                                                                                                    +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + +
                                                                                                                                      +
                                                                                                                                      资产信息
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + + +
                                                                                                                                      +
                                                                                                                                      当前值
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + + +
                                                                                                                                      +
                                                                                                                                      远程指令
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      +
                                                                                                                                      + +
                                                                                                                                      + +
                                                                                                                                      +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + +
                                                                                                                                        +
                                                                                                                                        资产信息
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + + +
                                                                                                                                        +
                                                                                                                                        当前值
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + + +
                                                                                                                                        +
                                                                                                                                        远程指令
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        +
                                                                                                                                        + +
                                                                                                                                        + +
                                                                                                                                        +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + +
                                                                                                                                          +
                                                                                                                                          资产信息
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + + +
                                                                                                                                          +
                                                                                                                                          当前值
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + + +
                                                                                                                                          +
                                                                                                                                          远程指令
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgTemphum.java b/src/com/szpg/db/data/PgTemphum.java index 21045b6..6d6951a 100644 --- a/src/com/szpg/db/data/PgTemphum.java +++ b/src/com/szpg/db/data/PgTemphum.java @@ -1,9 +1,13 @@ package com.szpg.db.data; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; public class PgTemphum implements Serializable { @@ -92,4 +96,17 @@ public String toString() { return "PgTemphum[hum=" + hum + ", temp=" + temp + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("wd", null != this.getTemp() ? this.getTemp() : ""); + json.put("sd", null != this.getHum() ? this.getHum() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/rmi/RemoteCH4CommandAction.java b/src/com/szpg/rmi/RemoteCH4CommandAction.java index 740ef64..cf7a8c7 100644 --- a/src/com/szpg/rmi/RemoteCH4CommandAction.java +++ b/src/com/szpg/rmi/RemoteCH4CommandAction.java @@ -1,18 +1,13 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCh4; import com.szpg.plc.message.command.write.SetCH4ThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -135,8 +130,8 @@ String countWord = ""; if (client.getFlag().equals("11")) { // 一期PLC配置 - start = Configure.getProperty("acubl", client.getAcucode() + ".CH4.START"); - countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH4.WORDCOUNT"); + start = Configure.getProperty("acubl", client.getAcucode() + ".CH.START"); + countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH.WORDCOUNT"); } else if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 二期PLC配置 start = Configure.getProperty("acubl", client.getAcucode() + ".HSCH4.START"); @@ -287,6 +282,24 @@ return null; } } + + public String readCH4ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCh4Dao dao = new PgCh4DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCh4 ch4 = dao.findLatestPblzByDevice(deviceId); + if (null != ch4) { + jResult.put("data", ch4.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteCOCommandAction.java b/src/com/szpg/rmi/RemoteCOCommandAction.java index 42a1618..f58d2f1 100644 --- a/src/com/szpg/rmi/RemoteCOCommandAction.java +++ b/src/com/szpg/rmi/RemoteCOCommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCO; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -264,6 +259,24 @@ return null; } } + + public String readCOValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCODao dao = new PgCODaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCO co = dao.findLatestPblzByDevice(deviceId); + if (null != co) { + jResult.put("data", co.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteHSCommandAction.java b/src/com/szpg/rmi/RemoteHSCommandAction.java index de12ce3..d2e2af3 100644 --- a/src/com/szpg/rmi/RemoteHSCommandAction.java +++ b/src/com/szpg/rmi/RemoteHSCommandAction.java @@ -1,18 +1,14 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgO2; +import com.szpg.db.data.PgSH; import com.szpg.plc.message.command.write.SetHSThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -287,7 +283,24 @@ return null; } } - + + public String readHSValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgHSDao dao = new PgHSDaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgSH hs = dao.findLatestPblzByDevice(deviceId); + if (null != hs) { + jResult.put("data", hs.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** * 给前端返回 diff --git a/src/com/szpg/rmi/RemoteO2CommandAction.java b/src/com/szpg/rmi/RemoteO2CommandAction.java index 7793359..8fa0c0d 100644 --- a/src/com/szpg/rmi/RemoteO2CommandAction.java +++ b/src/com/szpg/rmi/RemoteO2CommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgO2; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -285,7 +280,25 @@ return null; } } - + + public String readO2ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgO2Dao dao = new PgO2DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgO2 o2 = dao.findLatestPblzByDevice(deviceId); + if (null != o2) { + jResult.put("data", o2.toJson()); + } + } + + returnToFront(jResult); + return null; + } + /** * 给前端返回 diff --git a/src/com/szpg/rmi/RemoteWSCommandAction.java b/src/com/szpg/rmi/RemoteWSCommandAction.java index af8c683..86eef30 100644 --- a/src/com/szpg/rmi/RemoteWSCommandAction.java +++ b/src/com/szpg/rmi/RemoteWSCommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgTemphum; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgAlarmRule; import com.szpg.db.data.PgHjsbbl; @@ -426,6 +421,25 @@ return null; } } + + + public String readWSValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgWsDao wsDao = new PgWsDaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgTemphum ws = wsDao.findLatestWsdzByDevice(deviceId); + if (null != ws) { + jResult.put("data", ws.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/WebRoot/device/ch4.jsp b/WebRoot/device/ch4.jsp new file mode 100644 index 0000000..1bad4dc --- /dev/null +++ b/WebRoot/device/ch4.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 甲烷数据 + + + + + +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          +
                                                                                                                                          + +
                                                                                                                                          + +
                                                                                                                                          +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + +
                                                                                                                                            +
                                                                                                                                            资产信息
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + + +
                                                                                                                                            +
                                                                                                                                            当前值
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + + 时间： + + + 甲烷浓度：0（%） + + + + +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + + +
                                                                                                                                            +
                                                                                                                                            远程指令
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + + + + + + diff --git a/WebRoot/device/co.jsp b/WebRoot/device/co.jsp new file mode 100644 index 0000000..ab133c9 --- /dev/null +++ b/WebRoot/device/co.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 一氧化碳数据 + + + + + +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            +
                                                                                                                                            + +
                                                                                                                                            + +
                                                                                                                                            +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + +
                                                                                                                                              +
                                                                                                                                              资产信息
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + + +
                                                                                                                                              +
                                                                                                                                              当前值
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + + 时间： + + + 一氧化碳浓度：0（%） + + + + +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + + +
                                                                                                                                              +
                                                                                                                                              远程指令
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + + + + + + diff --git a/WebRoot/device/hs.jsp b/WebRoot/device/hs.jsp new file mode 100644 index 0000000..2678744 --- /dev/null +++ b/WebRoot/device/hs.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 硫化氢数据 + + + + + +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              +
                                                                                                                                              + +
                                                                                                                                              + +
                                                                                                                                              +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + +
                                                                                                                                                +
                                                                                                                                                资产信息
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + + +
                                                                                                                                                +
                                                                                                                                                当前值
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + + 时间： + + + 硫化氢浓度：0（%） + + + + +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + + +
                                                                                                                                                +
                                                                                                                                                远程指令
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + + + + + + diff --git a/WebRoot/device/light.jsp b/WebRoot/device/light.jsp index b139b3b..634d934 100644 --- a/WebRoot/device/light.jsp +++ b/WebRoot/device/light.jsp @@ -106,7 +106,7 @@ function initDeviceList(acu) { $.ajax({ url: "api/getPgDevice.action", - data: {params: "devType=应急荧光灯&partition=" + acu}, + data: {params: "devType=普通荧光灯&partition=" + acu}, dataType: "json", type: "POST", success: function(response) { diff --git a/WebRoot/device/o2.jsp b/WebRoot/device/o2.jsp new file mode 100644 index 0000000..c0b31b5 --- /dev/null +++ b/WebRoot/device/o2.jsp @@ -0,0 +1,181 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 氧气数据 + + + + + +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                +
                                                                                                                                                + +
                                                                                                                                                + +
                                                                                                                                                +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + +
                                                                                                                                                  +
                                                                                                                                                  资产信息
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + + +
                                                                                                                                                  +
                                                                                                                                                  当前值
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + + 时间： + + + 氧气浓度：0（%） + + + + +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + + +
                                                                                                                                                  +
                                                                                                                                                  远程指令
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + + + + + + diff --git a/WebRoot/device/temp.jsp b/WebRoot/device/temp.jsp new file mode 100644 index 0000000..2f5153b --- /dev/null +++ b/WebRoot/device/temp.jsp @@ -0,0 +1,183 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + 温湿度数据 + + + + + +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  +
                                                                                                                                                  + +
                                                                                                                                                  + +
                                                                                                                                                  +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    + +
                                                                                                                                                    +
                                                                                                                                                    资产信息
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    + 所在分区： + 资产代码： + 资产名称： +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    + + +
                                                                                                                                                    +
                                                                                                                                                    当前值
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    + + 时间： + + + 温湿度：0（℃）/0（%） + + + + +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    + + +
                                                                                                                                                    +
                                                                                                                                                    远程指令
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    + +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    +
                                                                                                                                                    + + + + + + diff --git a/src/com/szpg/db/data/PgCO.java b/src/com/szpg/db/data/PgCO.java index 6ba96f5..411046f 100644 --- a/src/com/szpg/db/data/PgCO.java +++ b/src/com/szpg/db/data/PgCO.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 一氧化碳浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCO[co=" + co + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("co", null != this.getCo() ? this.getCo() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgCh4.java b/src/com/szpg/db/data/PgCh4.java index a13f5b6..d62d84e 100644 --- a/src/com/szpg/db/data/PgCh4.java +++ b/src/com/szpg/db/data/PgCh4.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 甲烷浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgCh4[ch4=" + ch4 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("ch4", null != this.getCh4() ? this.getCh4() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgO2.java b/src/com/szpg/db/data/PgO2.java index 22a0279..ed58eb3 100644 --- a/src/com/szpg/db/data/PgO2.java +++ b/src/com/szpg/db/data/PgO2.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 氧气浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgO2[o2=" + o2 + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("o2", null != this.getO2() ? this.getO2() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgSH.java b/src/com/szpg/db/data/PgSH.java index 06d5262..3695e01 100644 --- a/src/com/szpg/db/data/PgSH.java +++ b/src/com/szpg/db/data/PgSH.java @@ -3,6 +3,8 @@ import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; /** * 硫化氢浓度值监测数据表 @@ -88,4 +90,16 @@ public String toString() { return "PgSH[sh=" + sh + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("hs", null != this.getSh() ? this.getSh() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/db/data/PgTemphum.java b/src/com/szpg/db/data/PgTemphum.java index 21045b6..6d6951a 100644 --- a/src/com/szpg/db/data/PgTemphum.java +++ b/src/com/szpg/db/data/PgTemphum.java @@ -1,9 +1,13 @@ package com.szpg.db.data; import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Date; import com.szpg.util.TimeFormat; +import z.json.JSONException; +import z.json.JSONObject; public class PgTemphum implements Serializable { @@ -92,4 +96,17 @@ public String toString() { return "PgTemphum[hum=" + hum + ", temp=" + temp + ", logtime=" + TimeFormat.formatTimestamp(logtime) + "]"; } + + public JSONObject toJson() { + JSONObject json = new JSONObject(); + try { + json.put("time", this.getTmStr()); + json.put("wd", null != this.getTemp() ? this.getTemp() : ""); + json.put("sd", null != this.getHum() ? this.getHum() : ""); + } catch (JSONException e) { + e.printStackTrace(); + } + + return json; + } } diff --git a/src/com/szpg/rmi/RemoteCH4CommandAction.java b/src/com/szpg/rmi/RemoteCH4CommandAction.java index 740ef64..cf7a8c7 100644 --- a/src/com/szpg/rmi/RemoteCH4CommandAction.java +++ b/src/com/szpg/rmi/RemoteCH4CommandAction.java @@ -1,18 +1,13 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCh4; import com.szpg.plc.message.command.write.SetCH4ThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -135,8 +130,8 @@ String countWord = ""; if (client.getFlag().equals("11")) { // 一期PLC配置 - start = Configure.getProperty("acubl", client.getAcucode() + ".CH4.START"); - countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH4.WORDCOUNT"); + start = Configure.getProperty("acubl", client.getAcucode() + ".CH.START"); + countWord = Configure.getProperty("acubl", client.getAcucode() + ".CH.WORDCOUNT"); } else if (client.getFlag().equals("23") || client.getFlag().equals("24")) { // 二期PLC配置 start = Configure.getProperty("acubl", client.getAcucode() + ".HSCH4.START"); @@ -287,6 +282,24 @@ return null; } } + + public String readCH4ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCh4Dao dao = new PgCh4DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCh4 ch4 = dao.findLatestPblzByDevice(deviceId); + if (null != ch4) { + jResult.put("data", ch4.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteCOCommandAction.java b/src/com/szpg/rmi/RemoteCOCommandAction.java index 42a1618..f58d2f1 100644 --- a/src/com/szpg/rmi/RemoteCOCommandAction.java +++ b/src/com/szpg/rmi/RemoteCOCommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgCO; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -264,6 +259,24 @@ return null; } } + + public String readCOValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgCODao dao = new PgCODaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgCO co = dao.findLatestPblzByDevice(deviceId); + if (null != co) { + jResult.put("data", co.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/com/szpg/rmi/RemoteHSCommandAction.java b/src/com/szpg/rmi/RemoteHSCommandAction.java index de12ce3..d2e2af3 100644 --- a/src/com/szpg/rmi/RemoteHSCommandAction.java +++ b/src/com/szpg/rmi/RemoteHSCommandAction.java @@ -1,18 +1,14 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgO2; +import com.szpg.db.data.PgSH; import com.szpg.plc.message.command.write.SetHSThresholdWordCommand; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -287,7 +283,24 @@ return null; } } - + + public String readHSValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgHSDao dao = new PgHSDaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgSH hs = dao.findLatestPblzByDevice(deviceId); + if (null != hs) { + jResult.put("data", hs.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** * 给前端返回 diff --git a/src/com/szpg/rmi/RemoteO2CommandAction.java b/src/com/szpg/rmi/RemoteO2CommandAction.java index 7793359..8fa0c0d 100644 --- a/src/com/szpg/rmi/RemoteO2CommandAction.java +++ b/src/com/szpg/rmi/RemoteO2CommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgO2; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgHjsbbl; import com.szpg.plc.message.AppMessageConstants; @@ -285,7 +280,25 @@ return null; } } - + + public String readO2ValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgO2Dao dao = new PgO2DaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgO2 o2 = dao.findLatestPblzByDevice(deviceId); + if (null != o2) { + jResult.put("data", o2.toJson()); + } + } + + returnToFront(jResult); + return null; + } + /** * 给前端返回 diff --git a/src/com/szpg/rmi/RemoteWSCommandAction.java b/src/com/szpg/rmi/RemoteWSCommandAction.java index af8c683..86eef30 100644 --- a/src/com/szpg/rmi/RemoteWSCommandAction.java +++ b/src/com/szpg/rmi/RemoteWSCommandAction.java @@ -1,17 +1,12 @@ package com.szpg.rmi; +import com.szpg.db.dao.*; +import com.szpg.db.dao.impl.*; +import com.szpg.db.data.PgTemphum; import org.apache.log4j.Logger; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionSupport; -import com.szpg.db.dao.PgAcuDao; -import com.szpg.db.dao.PgAlarmRuleDao; -import com.szpg.db.dao.PgDeviceDao; -import com.szpg.db.dao.PgHjsbblDao; -import com.szpg.db.dao.impl.PgAcuDaoImpl; -import com.szpg.db.dao.impl.PgAlarmRuleDaoImpl; -import com.szpg.db.dao.impl.PgDeviceDaoImpl; -import com.szpg.db.dao.impl.PgHjsbblDaoImpl; import com.szpg.db.data.PgAcu; import com.szpg.db.data.PgAlarmRule; import com.szpg.db.data.PgHjsbbl; @@ -426,6 +421,25 @@ return null; } } + + + public String readWSValueFromDB() throws Exception { + // 返回结果 + JSONObject jResult = new JSONObject(); + + PgDeviceDao deviceDao = new PgDeviceDaoImpl(); + PgWsDao wsDao = new PgWsDaoImpl(); + int deviceId = deviceDao.findDeviceIdByCode(zcbh); + if (deviceId > 0) { + PgTemphum ws = wsDao.findLatestWsdzByDevice(deviceId); + if (null != ws) { + jResult.put("data", ws.toJson()); + } + } + + returnToFront(jResult); + return null; + } /** diff --git a/src/struts.xml b/src/struts.xml index b7d9189..a4e734d 100644 --- a/src/struts.xml +++ b/src/struts.xml @@ -7,22 +7,27 @@ + + + + +