除湿系统

src/main/java/com/ekexiu/project/bridge/envdata/EnvDataDao.java

@@ -93,7 +93,7 @@ public interface EnvDataDao {
    @QueryList
    @From(EnvTransducer.class)
    @Select(EnvTransducer.class)
    List<EnvTranNew> queryByServer(Connection con,@Nullable Boolean active, @In String[] serverId) throws SQLException;
    List<EnvTranLastValue> queryByServer(Connection con, @Nullable Boolean active, @In String[] serverId) throws SQLException;
    @PageSelect
@@ -102,7 +102,7 @@ public interface EnvDataDao {
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<EnvTransducer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ENV_SERVER_ID IN (SELECT ID FROM ENV_SERVER WHERE CODE LIKE ?)"}) String serverCode, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class,value = {"ENV_SERVER_ID IN (SELECT ID FROM ENV_SERVER WHERE BRIDGE_ID IN {SELECT ID FROM BRIDGE WHERE SHORT_NAME LIKE ?})"}) String bridgeName,@Nullable String system, @Nullable Integer deviceId, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<EnvTransducer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"ENV_SERVER_ID IN (SELECT ID FROM ENV_SERVER WHERE CODE LIKE ?)"}) String serverCode, @Nullable @GroupSqlColumn(handlerClass = StringHandler.class,value = {"ENV_SERVER_ID IN (SELECT ID FROM ENV_SERVER WHERE BRIDGE_ID IN {SELECT ID FROM BRIDGE WHERE SHORT_NAME LIKE ?})"}) String bridgeName,@Nullable String system, @Nullable Integer code, int pageSize, int pageNo) throws SQLException;
    @SelectOne
    @Nullable

src/main/java/com/ekexiu/project/bridge/envdata/EnvDataService.java

@@ -126,8 +126,8 @@ public class EnvDataService {
    @Path("/transducer/pq")
    @Get
    public PageQueryResult<EnvTransducer> pageQuery(@JdbcConn Connection con,@Nullable Boolean active,@Nullable String serverCode,@Nullable String bridgeName,@Nullable String system,@Nullable Integer deviceId,int pageSize,int pageNo)throws SQLException {
        return envDataDao.pageQuery(con, active, serverCode == null ? null : "%" + serverCode + "%", bridgeName == null ? null : "%" + bridgeName + "%", system, deviceId, pageSize, pageNo);
    public PageQueryResult<EnvTransducer> pageQuery(@JdbcConn Connection con,@Nullable Boolean active,@Nullable String serverCode,@Nullable String bridgeName,@Nullable String system,@Nullable Integer code,int pageSize,int pageNo)throws SQLException {
        return envDataDao.pageQuery(con, active, serverCode == null ? null : "%" + serverCode + "%", bridgeName == null ? null : "%" + bridgeName + "%", system, code, pageSize, pageNo);
    }
    @Path("/server/qo")
@@ -154,10 +154,10 @@ public class EnvDataService {
            for (int i = 0; i < servers.size(); ++i) {
                serverIds[i] = servers.get(i).getId();
            }
            List<EnvTranNew> transducers = envDataDao.queryByServer(con, active, serverIds);
            for (EnvTranNew transducer : transducers) {
            List<EnvTranLastValue> transducers = envDataDao.queryByServer(con, active, serverIds);
            for (EnvTranLastValue transducer : transducers) {
                final int id = transducer.getSeq();
                transducer.setValue(JdbcUtil.queryDouble(con, "select * from env_data WHERE item_id = ? ORDER BY create_time desc limit 1", new PreparedStatementConfig() {
                transducer.setLastValue(JdbcUtil.queryDouble(con, "select * from env_data WHERE item_id = ? ORDER BY create_time desc limit 1", new PreparedStatementConfig() {
                    @Override
                    public void config(PreparedStatement preparedStatement) throws SQLException {
                        preparedStatement.setInt(1,id);

src/main/java/com/ekexiu/project/bridge/envdata/EnvTranLastValue.java

@@ -0,0 +1,16 @@
package com.ekexiu.project.bridge.envdata;
/**
 * Created by TT on 2019/3/19.
 */
public class EnvTranLastValue extends EnvTransducer {
    private Double lastValue;
    public Double getLastValue() {
        return lastValue;
    }
    public void setLastValue(Double lastValue) {
        this.lastValue = lastValue;
    }
}

src/main/java/com/ekexiu/project/bridge/envdata/EnvTranNew.java

@@ -1,16 +0,0 @@
package com.ekexiu.project.bridge.envdata;
/**
 * Created by TT on 2019/3/19.
 */
public class EnvTranNew extends EnvTransducer {
    private Double value;
    public Double getValue() {
        return value;
    }
    public void setValue(Double value) {
        this.value = value;
    }
}

src/main/java/com/ekexiu/project/bridge/envdata/EnvTransducer.java

@@ -17,7 +17,7 @@ public class EnvTransducer implements BaseTable {
    private String serverId;
    private String system;
    private int organize;
    private int deviceId;
    private int code;
    private int seq;
    private String name;
    private String position;
@@ -69,12 +69,12 @@ public class EnvTransducer implements BaseTable {
    @Column(descp = "传感器编号", value = DE.int_de)
    public int getDeviceId() {
        return deviceId;
    public int getCode() {
        return code;
    }
    public void setDeviceId(int deviceId) {
        this.deviceId = deviceId;
    public void setCode(int code) {
        this.code = code;
    }
    @Column(descp = "内部编号", value = DE.int_de)

src/main/java/com/ekexiu/project/bridge/servlet/AlarmDataServlet.java

@@ -219,7 +219,7 @@ public class AlarmDataServlet extends HttpServlet {
								//String to = u.getEmail();
								//try {
								//	if (to != null && to.length() > 0) {
								//		mailService.sendSimpleMail(to,  u.getName() + "您好：" + entry.getValue(), null, "桥梁临控报警");
								//		mailService.sendSimpleMail(to,  u.getName() + "您好：" + entry.getLastValue(), null, "桥梁临控报警");
								//	}
								//} catch (Throwable thr) {
								//}

src/main/resources/database.sql

@@ -3779,7 +3779,7 @@ CREATE TABLE ENV_TRANSDUCER (
        SERVER_ID TEXT NOT NULL,
        SYSTEM TEXT NOT NULL,
        ORGANIZE INTEGER NOT NULL,
        DEVICE_ID INTEGER NOT NULL,
        CODE INTEGER NOT NULL,
        SEQ INTEGER NOT NULL,
        NAME TEXT NOT NULL,
        POSITION TEXT NOT NULL,
@@ -3797,7 +3797,7 @@ COMMENT ON COLUMN ENV_TRANSDUCER.ID IS 'id';
COMMENT ON COLUMN ENV_TRANSDUCER.SERVER_ID IS '所属服务器ID';
COMMENT ON COLUMN ENV_TRANSDUCER.SYSTEM IS '所属系统';
COMMENT ON COLUMN ENV_TRANSDUCER.ORGANIZE IS '所属组';
COMMENT ON COLUMN ENV_TRANSDUCER.DEVICE_ID IS '传感器编号';
COMMENT ON COLUMN ENV_TRANSDUCER.CODE IS '传感器编号';
COMMENT ON COLUMN ENV_TRANSDUCER.SEQ IS '内部编号';
COMMENT ON COLUMN ENV_TRANSDUCER.NAME IS '名称';
COMMENT ON COLUMN ENV_TRANSDUCER.POSITION IS '所属方位';