除湿系统

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

@@ -1,12 +1,31 @@
package com.ekexiu.project.bridge.envdata;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Select;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GroupSqlColumn;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.In;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
@@ -26,4 +45,72 @@ public interface EnvDataDao {
    @OrderBy("ORDER BY CREATE_TIME DESC")
    List<EnvData> query(Connection con, @GtEq @Alias("createTime")String bt,@LtEq @Alias("createTime") String et) throws SQLException;
    @Insert
    int insert(Connection con, EnvServer envServer) throws SQLException;
    @Insert
    int insert(Connection con, EnvTransducer envTransducer) throws SQLException;
    @UpdateWith
    @From(EnvServer.class)
    @SetSentence("active = '0'")
    @Where("active = '1")
    @IncludeFixSet("modifyTime")
    int logicDeleteServer(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    @From(EnvServer.class)
    @SetSentence("active = '0'")
    @Where("active = '1")
    @IncludeFixSet("modifyTime")
    int logicDeleteServerByBridge(Connection con, @Set String modifier,String bridgeId) throws SQLException;
    @UpdateWith
    @From(EnvTransducer.class)
    @SetSentence("active = '0'")
    @Where("active = '1")
    @IncludeFixSet("modifyTime")
    int logicDeleteTransducer(Connection con, @Set String modifier, String id) throws SQLException;
    @UpdateWith
    @From(EnvTransducer.class)
    @SetSentence("active = '0'")
    @Where("active = '1")
    @IncludeFixSet("modifyTime")
    int logicDeleteTranByServers(Connection con, @Set String modifier, @In String[] serverId) throws SQLException;
    @Update
    @Exclude("active")
    int update(Connection con, EnvServer envServer) throws SQLException;
    @Update
    @Exclude("active")
    int update(Connection con, EnvTransducer envTransducer) throws SQLException;
    @SelectList
    List<EnvServer> queryByBridge(Connection con,@Nullable Boolean active, String bridgeId) throws SQLException;
    @QueryList
    @From(EnvTransducer.class)
    @Select(EnvTransducer.class)
    List<EnvTranNew> queryByServer(Connection con,@Nullable Boolean active, @In String[] serverId) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY CODE")
    PageQueryResult<EnvServer> pageQuery(Connection con, @Nullable Boolean active, @Nullable @SqlColumn(handlerClass = StringHandler.class, value = {"BRIDGE_ID IN (SELECT ID FROM BRIDGE WHERE SHORT_NAME LIKE ?)"}) String key, @Nullable @Like String code, int pageSize, int pageNo) throws SQLException;
    @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;
    @SelectOne
    @Nullable
    EnvServer queryEnvServer(Connection con, String id) throws SQLException;
    @SelectOne
    @Nullable
    EnvTransducer queryEnvTransducer(Connection con, String id) throws SQLException;
}

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

@@ -1,14 +1,25 @@
package com.ekexiu.project.bridge.envdata;
import com.ekexiu.project.bridge.system.vo.SessionUser;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.LoginUser;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.jdbc.PreparedStatementConfig;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -68,4 +79,99 @@ public class EnvDataService {
    }
    @Path("/server")
    @Post
    public String insert(@JdbcConn(true)Connection con, @LoginUser SessionUser sessionUser, EnvServer envServer)throws SQLException {
        String id = StringUtil.buildUUID();
        envServer.setId(id);
        envServer.setActive(true);
        envServer.setCreator(sessionUser.getId());
        envServer.setModifier(sessionUser.getId());
        envDataDao.insert(con, envServer);
        return id;
    }
    @Path("/transducer")
    @Post
    public String insert(@JdbcConn(true)Connection con,@LoginUser SessionUser sessionUser,EnvTransducer envTransducer)throws SQLException {
        String id = StringUtil.buildUUID();
        envTransducer.setId(id);
        envTransducer.setActive(true);
        envTransducer.setCreator(sessionUser.getId());
        envTransducer.setModifier(sessionUser.getId());
        envDataDao.insert(con, envTransducer);
        return id;
    }
    @Path("/server/delete")
    @Get
    public void deleteServer(@JdbcConn(true)Connection con,@LoginUser SessionUser sessionUser,String id)throws SQLException {
        envDataDao.logicDeleteServer(con, sessionUser.getId(), id);
        String[] serverId = new String[1];
        serverId[0] = id;
        envDataDao.logicDeleteTranByServers(con, sessionUser.getId(), serverId);
    }
    @Path("/transducer/delete")
    @Get
    public void deleteTran(@JdbcConn(true)Connection con, @LoginUser SessionUser sessionUser,String id)throws SQLException {
        envDataDao.logicDeleteTransducer(con, sessionUser.getId(), id);
    }
    @Path("/server/pq")
    @Get
    public PageQueryResult<EnvServer> pageQuery(@JdbcConn Connection con, @Nullable Boolean active,@Nullable String key,@Nullable String code,int pageSize,int pageNo)throws SQLException {
        return envDataDao.pageQuery(con, active, key == null ? null : "%" + key + "%", code == null ? null : "%" + code + "%", pageSize, pageNo);
    }
    @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);
    }
    @Path("/server/qo")
    @Get
    public EnvServer queryServer(@JdbcConn Connection con,String id)throws SQLException {
        return envDataDao.queryEnvServer(con, id);
    }
    @Path("/transducer/qo")
    @Get
    public EnvTransducer queryTransducer(@JdbcConn Connection con,String id)throws SQLException {
        return envDataDao.queryEnvTransducer(con, id);
    }
    @Path("/all/byBridge")
    @Get
    @LoginUser
    public Map<String,Object> queryAll(@JdbcConn Connection con,@Nullable Boolean active,String bridgeId)throws SQLException {
        Map<String, Object> result = new HashMap<>();
        List<EnvServer> servers = envDataDao.queryByBridge(con, active, bridgeId);
        result.put("server", servers);
        if (servers.size() > 0) {
            String[] serverIds = new String[servers.size()];
            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) {
                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() {
                    @Override
                    public void config(PreparedStatement preparedStatement) throws SQLException {
                        preparedStatement.setInt(1,id);
                    }
                },0));
            }
            result.put("transducer", transducers);
        } else {
            result.put("transducer", servers);
        }
        return result;
    }
}

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

@@ -0,0 +1,122 @@
package com.ekexiu.project.bridge.envdata;
import com.ekexiu.project.bridge.base.po.BaseTable;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2019/3/18.
 */
@PrimaryKey("id")
@Table(descp = "除湿系统采集服务器")
public class EnvServer implements BaseTable {
    private String id;
    private String code;
    private String seq;
    private String bridgeId;
    private String ipAddress;
    private String remark;
    private boolean active;
    private String createTime;
    private String modifyTime;
    private String creator;
    private String modifier;
    @Column(descp = "id", value = DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(descp = "采集服务器编号", value = DE.text_de)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(descp = "内部编号", value = DE.text_de)
    public String getSeq() {
        return seq;
    }
    public void setSeq(String seq) {
        this.seq = seq;
    }
    @Column(descp = "采集服务器所属桥梁Id", value = DE.text_de)
    public String getBridgeId() {
        return bridgeId;
    }
    public void setBridgeId(String bridgeId) {
        this.bridgeId = bridgeId;
    }
    @Column(descp = "采集服务器ip", value = DE.text_de)
    public String getIpAddress() {
        return ipAddress;
    }
    public void setIpAddress(String ipAddress) {
        this.ipAddress = ipAddress;
    }
    @Column(descp = "备注", value = DE.Text_de)
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(descp = "是否可用", value = DE.boolean_de)
    public boolean isActive() {
        return active;
    }
    public void setActive(boolean active) {
        this.active = active;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    public String getModifyTime() {
        return modifyTime;
    }
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
}

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

@@ -0,0 +1,16 @@
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

@@ -0,0 +1,174 @@
package com.ekexiu.project.bridge.envdata;
import com.ekexiu.project.bridge.base.po.BaseTable;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2019/3/18.
 */
@PrimaryKey("id")
@Table(descp = "传感器")
public class EnvTransducer implements BaseTable {
    private String id;
    private String serverId;
    private String system;
    private int organize;
    private int deviceId;
    private int seq;
    private String name;
    private String position;
    private String cableType;
    private String unit;
    private String remark;
    private boolean active;
    private String createTime;
    private String modifyTime;
    private String creator;
    private String modifier;
    @Column(descp = "id", value = DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(descp = "所属服务器ID", value = DE.text_de)
    public String getServerId() {
        return serverId;
    }
    public void setServerId(String serverId) {
        this.serverId = serverId;
    }
    @Column(descp = "所属系统", value = DE.text_de)
    public String getSystem() {
        return system;
    }
    public void setSystem(String system) {
        this.system = system;
    }
    @Column(descp = "所属组", value = DE.int_de)
    public int getOrganize() {
        return organize;
    }
    public void setOrganize(int organize) {
        this.organize = organize;
    }
    @Column(descp = "传感器编号", value = DE.int_de)
    public int getDeviceId() {
        return deviceId;
    }
    public void setDeviceId(int deviceId) {
        this.deviceId = deviceId;
    }
    @Column(descp = "内部编号", value = DE.int_de)
    public int getSeq() {
        return seq;
    }
    public void setSeq(int seq) {
        this.seq = seq;
    }
    @Column(descp = "名称", value = DE.text_de)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(descp = "所属方位", value = DE.text_de)
    public String getPosition() {
        return position;
    }
    public void setPosition(String position) {
        this.position = position;
    }
    @Column(descp = "所属主缆", value = DE.text_de)
    public String getCableType() {
        return cableType;
    }
    public void setCableType(String cableType) {
        this.cableType = cableType;
    }
    @Column(descp = "数据单位", value = DE.text_de)
    public String getUnit() {
        return unit;
    }
    public void setUnit(String unit) {
        this.unit = unit;
    }
    @Column(descp = "备注", value = DE.Text_de)
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(descp = "是否可用", value = DE.boolean_de)
    public boolean isActive() {
        return active;
    }
    public void setActive(boolean active) {
        this.active = active;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    public String getModifyTime() {
        return modifyTime;
    }
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
}

src/main/java/com/ekexiu/project/bridge/resource/service/BridgeService.java

@@ -1,5 +1,7 @@
package com.ekexiu.project.bridge.resource.service;
import com.ekexiu.project.bridge.envdata.EnvDataDao;
import com.ekexiu.project.bridge.envdata.EnvServer;
import com.ekexiu.project.bridge.resource.dao.BridgeDao;
import com.ekexiu.project.bridge.resource.dao.BridgeServerDao;
import com.ekexiu.project.bridge.resource.dao.CollectDeviceDao;
@@ -52,6 +54,8 @@ public class BridgeService {
    private CollectDeviceDao collectDeviceDao;
    @Autowrie
    private TransducerDao transducerDao;
    @Autowrie
    private EnvDataDao envDataDao;
    public BridgeDao getBridgeDao() {
        return bridgeDao;
@@ -85,6 +89,14 @@ public class BridgeService {
        this.transducerDao = transducerDao;
    }
    public EnvDataDao getEnvDataDao() {
        return envDataDao;
    }
    public void setEnvDataDao(EnvDataDao envDataDao) {
        this.envDataDao = envDataDao;
    }
    public File getImgPath() {
        return imgPath;
    }
@@ -208,6 +220,16 @@ public class BridgeService {
                this.transducerDao.logicDeleteByDevices(con, sessionUser.getId(), deviceId);
            }
        }
        this.envDataDao.logicDeleteServerByBridge(con, sessionUser.getId(), id);
        List<EnvServer> envServers = this.envDataDao.queryByBridge(con,null, id);
        if (envServers.size() > 0) {
            String[] envServerIds = new String[envServers.size()];
            for (int i = 0; i < envServers.size(); i++) {
                envServerIds[i] = envServers.get(i).getId();
            }
            this.envDataDao.logicDeleteTranByServers(con, sessionUser.getId(), envServerIds);
        }
    }
    @Post

src/main/resources/database.sql

@@ -3742,4 +3742,70 @@ CREATE TABLE "public"."env_id_dict" (
        "caption" text COLLATE "default" NOT NULL,
        "unit" text COLLATE "default" NOT NULL,
        CONSTRAINT "env_id_dict_pk" UNIQUE ("item_id")
)
);
----除湿系统
CREATE TABLE ENV_SERVER (
        ID CHAR(32) NOT NULL,
        CODE TEXT NOT NULL,
        SEQ TEXT NOT NULL,
        BRIDGE_ID TEXT NOT NULL,
        IP_ADDRESS TEXT NOT NULL,
        REMARK TEXT,
        ACTIVE CHAR(1) NOT NULL,
        CREATE_TIME CHAR(14) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL,
        CREATOR CHAR(32) NOT NULL,
        MODIFIER CHAR(32) NOT NULL);
ALTER TABLE ENV_SERVER ADD PRIMARY KEY (ID);
COMMENT ON TABLE ENV_SERVER IS '除湿系统采集服务器';
COMMENT ON COLUMN ENV_SERVER.ID IS 'id';
COMMENT ON COLUMN ENV_SERVER.CODE IS '采集服务器编号';
COMMENT ON COLUMN ENV_SERVER.SEQ IS '内部编号';
COMMENT ON COLUMN ENV_SERVER.BRIDGE_ID IS '采集服务器所属桥梁Id';
COMMENT ON COLUMN ENV_SERVER.IP_ADDRESS IS '采集服务器ip';
COMMENT ON COLUMN ENV_SERVER.REMARK IS '备注';
COMMENT ON COLUMN ENV_SERVER.ACTIVE IS '是否可用';
COMMENT ON COLUMN ENV_SERVER.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN ENV_SERVER.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
COMMENT ON COLUMN ENV_SERVER.CREATOR IS '创建人ID';
COMMENT ON COLUMN ENV_SERVER.MODIFIER IS '最后修改人ID';
CREATE TABLE ENV_TRANSDUCER (
        ID CHAR(32) NOT NULL,
        SERVER_ID TEXT NOT NULL,
        SYSTEM TEXT NOT NULL,
        ORGANIZE INTEGER NOT NULL,
        DEVICE_ID INTEGER NOT NULL,
        SEQ INTEGER NOT NULL,
        NAME TEXT NOT NULL,
        POSITION TEXT NOT NULL,
        CABLE_TYPE TEXT NOT NULL,
        UNIT TEXT NOT NULL,
        REMARK TEXT,
        ACTIVE CHAR(1) NOT NULL,
        CREATE_TIME CHAR(14) NOT NULL,
        MODIFY_TIME CHAR(14) NOT NULL,
        CREATOR CHAR(32) NOT NULL,
        MODIFIER CHAR(32) NOT NULL);
ALTER TABLE ENV_TRANSDUCER ADD PRIMARY KEY (ID);
COMMENT ON TABLE ENV_TRANSDUCER IS '传感器';
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.SEQ IS '内部编号';
COMMENT ON COLUMN ENV_TRANSDUCER.NAME IS '名称';
COMMENT ON COLUMN ENV_TRANSDUCER.POSITION IS '所属方位';
COMMENT ON COLUMN ENV_TRANSDUCER.CABLE_TYPE IS '所属主缆';
COMMENT ON COLUMN ENV_TRANSDUCER.UNIT IS '数据单位';
COMMENT ON COLUMN ENV_TRANSDUCER.REMARK IS '备注';
COMMENT ON COLUMN ENV_TRANSDUCER.ACTIVE IS '是否可用';
COMMENT ON COLUMN ENV_TRANSDUCER.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）不可修改';
COMMENT ON COLUMN ENV_TRANSDUCER.MODIFY_TIME IS '最后修改时间（YYYYMMDDHH24MISS）,初始值:20000101010101';
COMMENT ON COLUMN ENV_TRANSDUCER.CREATOR IS '创建人ID';
COMMENT ON COLUMN ENV_TRANSDUCER.MODIFIER IS '最后修改人ID';