Commit 333fc3dd authored by co_dengxiongwen's avatar co_dengxiongwen

接口调整

parent 83875ee2
package com.devplatform.admin.modules.eq.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="风速仪信息对象",description="风速仪信息对象")
@TableName("fsy_info")
public class FsyInfo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 风速 */
@ApiModelProperty(value="风速",name="windSpeed")
private java.lang.String windSpeed;
/** 是否报警(1否,2是) */
@ApiModelProperty(value="是否报警(1否,2是)",name="wsIsAlarm")
private Integer wsIsAlarm;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建人 */
@ApiModelProperty(value="创建人",name="createUserId")
private java.lang.String createUserId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
/** 备用项1 */
@ApiModelProperty(value="备用项1",name="byx1")
private java.lang.String byx1;
/** 备用项2 */
@ApiModelProperty(value="备用项2",name="byx2")
private java.lang.String byx2;
/** 备用项3 */
@ApiModelProperty(value="备用项3",name="byx3")
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="风压仪信息对象",description="风压仪信息对象")
@TableName("fyy_info")
public class FyyInfo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 风压 */
@ApiModelProperty(value="风压",name="windPressure")
private java.lang.String windPressure;
/** 是否报警(1否,2是) */
@ApiModelProperty(value="是否报警(1否,2是)",name="wpIsAlarm")
private Integer wpIsAlarm;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建人 */
@ApiModelProperty(value="创建人",name="createUserId")
private java.lang.String createUserId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
/** 备用项1 */
@ApiModelProperty(value="备用项1",name="byx1")
private java.lang.String byx1;
/** 备用项2 */
@ApiModelProperty(value="备用项2",name="byx2")
private java.lang.String byx2;
/** 备用项3 */
@ApiModelProperty(value="备用项3",name="byx3")
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
@ApiModel(value="4合1环境探测器信息对象",description="4合1环境探测器信息对象")
@TableName("hjtcq_info")
public class HjtcqInfo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 温度 */
@ApiModelProperty(value="温度",name="temperature")
private java.lang.String temperature;
/** 温度是否报警(1否,2是) */
@ApiModelProperty(value="温度是否报警(1否,2是)",name="tpIsAlarm")
private Integer tpIsAlarm;
/** 湿度 */
@ApiModelProperty(value="湿度",name="humidity")
private java.lang.String humidity;
/** 湿度是否报警(1否,2是) */
@ApiModelProperty(value="湿度是否报警(1否,2是)",name="hmIsAlarm")
private Integer hmIsAlarm;
/** CO */
@ApiModelProperty(value="CO",name="carbonMonoxide")
private java.lang.String carbonMonoxide;
/** CO是否报警(1否,2是) */
@ApiModelProperty(value="CO是否报警(1否,2是)",name="cmIsAlarm")
private Integer cmIsAlarm;
/** CO2 */
@ApiModelProperty(value="CO2",name="carbonDioxide")
private java.lang.String carbonDioxide;
/** CO2是否报警(1否,2是) */
@ApiModelProperty(value="CO2是否报警(1否,2是)",name="cdIsAlarm")
private Integer cdIsAlarm;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建人 */
@ApiModelProperty(value="创建人",name="createUserId")
private java.lang.String createUserId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
/** 备用项1 */
@ApiModelProperty(value="备用项1",name="byx1")
private java.lang.String byx1;
/** 备用项2 */
@ApiModelProperty(value="备用项2",name="byx2")
private java.lang.String byx2;
/** 备用项3 */
@ApiModelProperty(value="备用项3",name="byx3")
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="流量计信息对象",description="流量计信息对象")
@TableName("llj_info")
public class LljInfo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 水流流量 */
@ApiModelProperty(value="水流流量",name="flowRate")
private java.lang.String flowRate;
/** 是否报警(1否,2是) */
@ApiModelProperty(value="是否报警(1否,2是)",name="frIsAlarm")
private Integer frIsAlarm;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建人 */
@ApiModelProperty(value="创建人",name="createUserId")
private java.lang.String createUserId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
/** 备用项1 */
@ApiModelProperty(value="备用项1",name="byx1")
private java.lang.String byx1;
/** 备用项2 */
@ApiModelProperty(value="备用项2",name="byx2")
private java.lang.String byx2;
/** 备用项3 */
@ApiModelProperty(value="备用项3",name="byx3")
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="人流量统计信息对象",description="人流量统计信息对象")
@TableName("rlltj_info")
public class RlltjInfo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 人流量 */
@ApiModelProperty(value="人流量",name="pedestrianVolume")
private java.lang.String pedestrianVolume;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建人 */
@ApiModelProperty(value="创建人",name="createUserId")
private java.lang.String createUserId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
/** 备用项1 */
@ApiModelProperty(value="备用项1",name="byx1")
private java.lang.String byx1;
/** 备用项2 */
@ApiModelProperty(value="备用项2",name="byx2")
private java.lang.String byx2;
/** 备用项3 */
@ApiModelProperty(value="备用项3",name="byx3")
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="人流量统计信息-时对象",description="人流量统计信息-时对象")
@TableName("rlltj_info_hour")
public class RlltjInfoHour implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 人流量 */
@ApiModelProperty(value="人流量",name="pedestrianVolume")
private java.lang.String pedestrianVolume;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
}
package com.devplatform.admin.modules.eq.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="无线压力计信息对象",description="无线压力计信息对象")
@TableName("wxylj_info")
public class WxyljInfo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 水流压力 */
@ApiModelProperty(value="水流压力",name="waterPressure")
private java.lang.String waterPressure;
/** 是否报警(1否,2是) */
@ApiModelProperty(value="是否报警(1否,2是)",name="isAlarm")
private Integer isAlarm;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建人 */
@ApiModelProperty(value="创建人",name="createUserId")
private java.lang.String createUserId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
/** 备用项1 */
@ApiModelProperty(value="备用项1",name="byx1")
private java.lang.String byx1;
/** 备用项2 */
@ApiModelProperty(value="备用项2",name="byx2")
private java.lang.String byx2;
/** 备用项3 */
@ApiModelProperty(value="备用项3",name="byx3")
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@ApiModel(value="无线液位仪信息对象",description="无线液位仪信息对象")
@TableName("wxywy_info")
public class WxywyInfo implements Serializable {
private static final long serialVersionUID = 1L;
/** 主键id */
@ApiModelProperty(value="主键ID",name="id")
@TableId
private java.lang.String id;
/** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId;
/** 水位高度 */
@ApiModelProperty(value="水位高度",name="gaugeHeight")
private java.lang.String gaugeHeight;
/** 是否报警(1否,2是) */
@ApiModelProperty(value="是否报警(1否,2是)",name="ghIsAlarm")
private Integer ghIsAlarm;
/** 站点表id */
@ApiModelProperty(value="站点表id",name="stationId")
private java.lang.String stationId;
/** 创建人 */
@ApiModelProperty(value="创建人",name="createUserId")
private java.lang.String createUserId;
/** 创建时间 */
@ApiModelProperty(value="创建时间",name="createTime")
private java.util.Date createTime;
/** 备用项1 */
@ApiModelProperty(value="备用项1",name="byx1")
private java.lang.String byx1;
/** 备用项2 */
@ApiModelProperty(value="备用项2",name="byx2")
private java.lang.String byx2;
/** 备用项3 */
@ApiModelProperty(value="备用项3",name="byx3")
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.FsyInfoModel;
import com.devplatform.admin.modules.eq.bean.FsyInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* FsyInfo Mapper
* 用于风速仪信息的数据库操作
* @author Administrator
*
*/
@Mapper
public interface FsyInfoDao extends MyBaseMapper<FsyInfo> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(FsyInfoModel model);
/**
* 查询风速仪信息分页数据
* @param model
* @return
*/
List<FsyInfo> queryPageList(FsyInfoModel model);
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.FyyInfoModel;
import com.devplatform.admin.modules.eq.bean.FyyInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* FyyInfo Mapper
* 用于风压仪信息的数据库操作
* @author Administrator
*
*/
@Mapper
public interface FyyInfoDao extends MyBaseMapper<FyyInfo> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(FyyInfoModel model);
/**
* 查询风压仪信息分页数据
* @param model
* @return
*/
List<FyyInfo> queryPageList(FyyInfoModel model);
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.HjtcqInfoModel;
import com.devplatform.admin.modules.eq.bean.HjtcqInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* HjtcqInfo Mapper
* 用于4合1环境探测器信息的数据库操作
* @author Administrator
*
*/
@Mapper
public interface HjtcqInfoDao extends MyBaseMapper<HjtcqInfo> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(HjtcqInfoModel model);
/**
* 查询4合1环境探测器信息分页数据
* @param model
* @return
*/
List<HjtcqInfo> queryPageList(HjtcqInfoModel model);
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.LljInfoModel;
import com.devplatform.admin.modules.eq.bean.LljInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* LljInfo Mapper
* 用于流量计信息的数据库操作
* @author Administrator
*
*/
@Mapper
public interface LljInfoDao extends MyBaseMapper<LljInfo> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(LljInfoModel model);
/**
* 查询流量计信息分页数据
* @param model
* @return
*/
List<LljInfo> queryPageList(LljInfoModel model);
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.RlltjInfoModel;
import com.devplatform.admin.modules.eq.bean.RlltjInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* RlltjInfo Mapper
* 用于人流量统计信息的数据库操作
* @author Administrator
*
*/
@Mapper
public interface RlltjInfoDao extends MyBaseMapper<RlltjInfo> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(RlltjInfoModel model);
/**
* 查询人流量统计信息分页数据
* @param model
* @return
*/
List<RlltjInfo> queryPageList(RlltjInfoModel model);
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.RlltjInfoHourModel;
import com.devplatform.admin.modules.eq.bean.RlltjInfoHour;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* RlltjInfoHour Mapper
* 用于人流量统计信息-时的数据库操作
* @author Administrator
*
*/
@Mapper
public interface RlltjInfoHourDao extends MyBaseMapper<RlltjInfoHour> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(RlltjInfoHourModel model);
/**
* 查询人流量统计信息-时分页数据
* @param model
* @return
*/
List<RlltjInfoHour> queryPageList(RlltjInfoHourModel model);
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.WxyljInfoModel;
import com.devplatform.admin.modules.eq.bean.WxyljInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* WxyljInfo Mapper
* 用于无线压力计信息的数据库操作
* @author Administrator
*
*/
@Mapper
public interface WxyljInfoDao extends MyBaseMapper<WxyljInfo> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(WxyljInfoModel model);
/**
* 查询无线压力计信息分页数据
* @param model
* @return
*/
List<WxyljInfo> queryPageList(WxyljInfoModel model);
}
package com.devplatform.admin.modules.eq.dao;
import org.apache.ibatis.annotations.Mapper;
import com.devplatform.admin.modules.eq.model.WxywyInfoModel;
import com.devplatform.admin.modules.eq.bean.WxywyInfo;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
/**
* WxywyInfo Mapper
* 用于无线液位仪信息的数据库操作
* @author Administrator
*
*/
@Mapper
public interface WxywyInfoDao extends MyBaseMapper<WxywyInfo> {
/**
* 查询分页数量
* @param model
* @return
*/
Integer queryPageByCount(WxywyInfoModel model);
/**
* 查询无线液位仪信息分页数据
* @param model
* @return
*/
List<WxywyInfo> queryPageList(WxywyInfoModel model);
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 风速仪信息的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class FsyInfoModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 风速 */
private java.lang.String windSpeed;
/** 是否报警(1否,2是) */
private Integer wsIsAlarm;
/** 站点表id */
private java.lang.String stationId;
/** 创建人 */
private java.lang.String createUserId;
/** 创建时间 */
private java.util.Date createTime;
/** 备用项1 */
private java.lang.String byx1;
/** 备用项2 */
private java.lang.String byx2;
/** 备用项3 */
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 风压仪信息的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class FyyInfoModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 风压 */
private java.lang.String windPressure;
/** 是否报警(1否,2是) */
private Integer wpIsAlarm;
/** 站点表id */
private java.lang.String stationId;
/** 创建人 */
private java.lang.String createUserId;
/** 创建时间 */
private java.util.Date createTime;
/** 备用项1 */
private java.lang.String byx1;
/** 备用项2 */
private java.lang.String byx2;
/** 备用项3 */
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 4合1环境探测器信息的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class HjtcqInfoModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 温度 */
private java.lang.String temperature;
/** 温度是否报警(1否,2是) */
private Integer tpIsAlarm;
/** 湿度 */
private java.lang.String humidity;
/** 湿度是否报警(1否,2是) */
private Integer hmIsAlarm;
/** CO */
private java.lang.String carbonMonoxide;
/** CO是否报警(1否,2是) */
private Integer cmIsAlarm;
/** CO2 */
private java.lang.String carbonDioxide;
/** CO2是否报警(1否,2是) */
private Integer cdIsAlarm;
/** 站点表id */
private java.lang.String stationId;
/** 创建人 */
private java.lang.String createUserId;
/** 创建时间 */
private java.util.Date createTime;
/** 备用项1 */
private java.lang.String byx1;
/** 备用项2 */
private java.lang.String byx2;
/** 备用项3 */
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 流量计信息的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class LljInfoModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 水流流量 */
private java.lang.String flowRate;
/** 是否报警(1否,2是) */
private Integer frIsAlarm;
/** 站点表id */
private java.lang.String stationId;
/** 创建人 */
private java.lang.String createUserId;
/** 创建时间 */
private java.util.Date createTime;
/** 备用项1 */
private java.lang.String byx1;
/** 备用项2 */
private java.lang.String byx2;
/** 备用项3 */
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 人流量统计信息-时的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class RlltjInfoHourModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 人流量 */
private java.lang.String pedestrianVolume;
/** 站点表id */
private java.lang.String stationId;
/** 创建时间 */
private java.util.Date createTime;
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 人流量统计信息的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class RlltjInfoModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 人流量 */
private java.lang.String pedestrianVolume;
/** 站点表id */
private java.lang.String stationId;
/** 创建人 */
private java.lang.String createUserId;
/** 创建时间 */
private java.util.Date createTime;
/** 备用项1 */
private java.lang.String byx1;
/** 备用项2 */
private java.lang.String byx2;
/** 备用项3 */
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 无线压力计信息的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class WxyljInfoModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 水流压力 */
private java.lang.String waterPressure;
/** 是否报警(1否,2是) */
private Integer isAlarm;
/** 站点表id */
private java.lang.String stationId;
/** 创建人 */
private java.lang.String createUserId;
/** 创建时间 */
private java.util.Date createTime;
/** 备用项1 */
private java.lang.String byx1;
/** 备用项2 */
private java.lang.String byx2;
/** 备用项3 */
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.model;
import com.devplatform.admin.common.model.BaseModel;
import lombok.Data;
/**
* 无线液位仪信息的Model
* <br>
* @author 代码生成器产生
*/
@Data
public class WxywyInfoModel extends BaseModel {
/** 主键id */
private java.lang.String id;
/** 资源点id */
private java.lang.String resourceId;
/** 水位高度 */
private java.lang.String gaugeHeight;
/** 是否报警(1否,2是) */
private Integer ghIsAlarm;
/** 站点表id */
private java.lang.String stationId;
/** 创建人 */
private java.lang.String createUserId;
/** 创建时间 */
private java.util.Date createTime;
/** 备用项1 */
private java.lang.String byx1;
/** 备用项2 */
private java.lang.String byx2;
/** 备用项3 */
private java.lang.String byx3;
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.FsyInfo;
import com.devplatform.admin.modules.eq.model.FsyInfoModel;
import java.util.List;
/**
* 风速仪信息的service接口
* <br>
* <b>功能:</b>FsyInfoService<br>
* @author 代码生成器产生
*/
public interface FsyInfoService extends MyBaseService<FsyInfo> {
/**
* 查询风速仪信息分页数据
* @param model
* @return
*/
List<FsyInfo> queryPageList(FsyInfoModel model);
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.FyyInfo;
import com.devplatform.admin.modules.eq.model.FyyInfoModel;
import java.util.List;
/**
* 风压仪信息的service接口
* <br>
* <b>功能:</b>FyyInfoService<br>
* @author 代码生成器产生
*/
public interface FyyInfoService extends MyBaseService<FyyInfo> {
/**
* 查询风压仪信息分页数据
* @param model
* @return
*/
List<FyyInfo> queryPageList(FyyInfoModel model);
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.HjtcqInfo;
import com.devplatform.admin.modules.eq.model.HjtcqInfoModel;
import java.util.List;
/**
* 4合1环境探测器信息的service接口
* <br>
* <b>功能:</b>HjtcqInfoService<br>
* @author 代码生成器产生
*/
public interface HjtcqInfoService extends MyBaseService<HjtcqInfo> {
/**
* 查询4合1环境探测器信息分页数据
* @param model
* @return
*/
List<HjtcqInfo> queryPageList(HjtcqInfoModel model);
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.LljInfo;
import com.devplatform.admin.modules.eq.model.LljInfoModel;
import java.util.List;
/**
* 流量计信息的service接口
* <br>
* <b>功能:</b>LljInfoService<br>
* @author 代码生成器产生
*/
public interface LljInfoService extends MyBaseService<LljInfo> {
/**
* 查询流量计信息分页数据
* @param model
* @return
*/
List<LljInfo> queryPageList(LljInfoModel model);
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.RlltjInfoHour;
import com.devplatform.admin.modules.eq.model.RlltjInfoHourModel;
import java.util.List;
/**
* 人流量统计信息-时的service接口
* <br>
* <b>功能:</b>RlltjInfoHourService<br>
* @author 代码生成器产生
*/
public interface RlltjInfoHourService extends MyBaseService<RlltjInfoHour> {
/**
* 查询人流量统计信息-时分页数据
* @param model
* @return
*/
List<RlltjInfoHour> queryPageList(RlltjInfoHourModel model);
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.RlltjInfo;
import com.devplatform.admin.modules.eq.model.RlltjInfoModel;
import java.util.List;
/**
* 人流量统计信息的service接口
* <br>
* <b>功能:</b>RlltjInfoService<br>
* @author 代码生成器产生
*/
public interface RlltjInfoService extends MyBaseService<RlltjInfo> {
/**
* 查询人流量统计信息分页数据
* @param model
* @return
*/
List<RlltjInfo> queryPageList(RlltjInfoModel model);
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.WxyljInfo;
import com.devplatform.admin.modules.eq.model.WxyljInfoModel;
import java.util.List;
/**
* 无线压力计信息的service接口
* <br>
* <b>功能:</b>WxyljInfoService<br>
* @author 代码生成器产生
*/
public interface WxyljInfoService extends MyBaseService<WxyljInfo> {
/**
* 查询无线压力计信息分页数据
* @param model
* @return
*/
List<WxyljInfo> queryPageList(WxyljInfoModel model);
}
package com.devplatform.admin.modules.eq.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.admin.modules.eq.bean.WxywyInfo;
import com.devplatform.admin.modules.eq.model.WxywyInfoModel;
import java.util.List;
/**
* 无线液位仪信息的service接口
* <br>
* <b>功能:</b>WxywyInfoService<br>
* @author 代码生成器产生
*/
public interface WxywyInfoService extends MyBaseService<WxywyInfo> {
/**
* 查询无线液位仪信息分页数据
* @param model
* @return
*/
List<WxywyInfo> queryPageList(WxywyInfoModel model);
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.FsyInfo;
import com.devplatform.admin.modules.eq.dao.FsyInfoDao;
import com.devplatform.admin.modules.eq.model.FsyInfoModel;
import com.devplatform.admin.modules.eq.service.FsyInfoService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 风速仪信息的service接口实现类
* <br>
* <b>功能:</b>FsyInfoServiceImpl<br>
* @author 代码生成器产生
*/
@Service("fsyInfoService")
public class FsyInfoServiceImpl extends MyBaseServiceImpl<FsyInfoDao, FsyInfo> implements FsyInfoService {
@Override
public List<FsyInfo> queryPageList(FsyInfoModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.FyyInfo;
import com.devplatform.admin.modules.eq.dao.FyyInfoDao;
import com.devplatform.admin.modules.eq.model.FyyInfoModel;
import com.devplatform.admin.modules.eq.service.FyyInfoService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 风压仪信息的service接口实现类
* <br>
* <b>功能:</b>FyyInfoServiceImpl<br>
* @author 代码生成器产生
*/
@Service("fyyInfoService")
public class FyyInfoServiceImpl extends MyBaseServiceImpl<FyyInfoDao, FyyInfo> implements FyyInfoService {
@Override
public List<FyyInfo> queryPageList(FyyInfoModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.HjtcqInfo;
import com.devplatform.admin.modules.eq.dao.HjtcqInfoDao;
import com.devplatform.admin.modules.eq.model.HjtcqInfoModel;
import com.devplatform.admin.modules.eq.service.HjtcqInfoService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 4合1环境探测器信息的service接口实现类
* <br>
* <b>功能:</b>HjtcqInfoServiceImpl<br>
* @author 代码生成器产生
*/
@Service("hjtcqInfoService")
public class HjtcqInfoServiceImpl extends MyBaseServiceImpl<HjtcqInfoDao, HjtcqInfo> implements HjtcqInfoService {
@Override
public List<HjtcqInfo> queryPageList(HjtcqInfoModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.LljInfo;
import com.devplatform.admin.modules.eq.dao.LljInfoDao;
import com.devplatform.admin.modules.eq.model.LljInfoModel;
import com.devplatform.admin.modules.eq.service.LljInfoService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 流量计信息的service接口实现类
* <br>
* <b>功能:</b>LljInfoServiceImpl<br>
* @author 代码生成器产生
*/
@Service("lljInfoService")
public class LljInfoServiceImpl extends MyBaseServiceImpl<LljInfoDao, LljInfo> implements LljInfoService {
@Override
public List<LljInfo> queryPageList(LljInfoModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.RlltjInfoHour;
import com.devplatform.admin.modules.eq.dao.RlltjInfoHourDao;
import com.devplatform.admin.modules.eq.model.RlltjInfoHourModel;
import com.devplatform.admin.modules.eq.service.RlltjInfoHourService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 人流量统计信息-时的service接口实现类
* <br>
* <b>功能:</b>RlltjInfoHourServiceImpl<br>
* @author 代码生成器产生
*/
@Service("rlltjInfoHourService")
public class RlltjInfoHourServiceImpl extends MyBaseServiceImpl<RlltjInfoHourDao, RlltjInfoHour> implements RlltjInfoHourService {
@Override
public List<RlltjInfoHour> queryPageList(RlltjInfoHourModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.RlltjInfo;
import com.devplatform.admin.modules.eq.dao.RlltjInfoDao;
import com.devplatform.admin.modules.eq.model.RlltjInfoModel;
import com.devplatform.admin.modules.eq.service.RlltjInfoService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 人流量统计信息的service接口实现类
* <br>
* <b>功能:</b>RlltjInfoServiceImpl<br>
* @author 代码生成器产生
*/
@Service("rlltjInfoService")
public class RlltjInfoServiceImpl extends MyBaseServiceImpl<RlltjInfoDao, RlltjInfo> implements RlltjInfoService {
@Override
public List<RlltjInfo> queryPageList(RlltjInfoModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.WxyljInfo;
import com.devplatform.admin.modules.eq.dao.WxyljInfoDao;
import com.devplatform.admin.modules.eq.model.WxyljInfoModel;
import com.devplatform.admin.modules.eq.service.WxyljInfoService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 无线压力计信息的service接口实现类
* <br>
* <b>功能:</b>WxyljInfoServiceImpl<br>
* @author 代码生成器产生
*/
@Service("wxyljInfoService")
public class WxyljInfoServiceImpl extends MyBaseServiceImpl<WxyljInfoDao, WxyljInfo> implements WxyljInfoService {
@Override
public List<WxyljInfo> queryPageList(WxyljInfoModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
package com.devplatform.admin.modules.eq.service.impl;
import com.devplatform.admin.modules.eq.bean.WxywyInfo;
import com.devplatform.admin.modules.eq.dao.WxywyInfoDao;
import com.devplatform.admin.modules.eq.model.WxywyInfoModel;
import com.devplatform.admin.modules.eq.service.WxywyInfoService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 无线液位仪信息的service接口实现类
* <br>
* <b>功能:</b>WxywyInfoServiceImpl<br>
* @author 代码生成器产生
*/
@Service("wxywyInfoService")
public class WxywyInfoServiceImpl extends MyBaseServiceImpl<WxywyInfoDao, WxywyInfo> implements WxywyInfoService {
@Override
public List<WxywyInfo> queryPageList(WxywyInfoModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageList(model);
}
}
......@@ -435,7 +435,7 @@ public class LiResourceController extends AbstractController {
List<LiStationMap> mapList = liStationMapService.getTreeList(mapModel);
// 查询子系统字典项
List<SysDictionary> dicList = sysDictionaryService.queryByPid(Constants.SUB_SYSTEM_ID, model.getStationId());
List<SysDictionary> dicList = sysDictionaryService.queryByPid(Constants.RESOURCE_TYPE, null);
// 查询所有资源点
List<LiResource> resourceList = liResourceService.getTreeList(model);
......@@ -470,7 +470,7 @@ public class LiResourceController extends AbstractController {
Iterator<LiResource> iterator = resourceList.iterator();
while (iterator.hasNext()) {
LiResource resource = iterator.next();
if (dic.getValue().equals(resource.getSubCode()) && liStationMap.getId().equals(resource.getTierId())) {
if (dic.getId().equals(resource.getType()) && liStationMap.getId().equals(resource.getTierId())) {
Map<String, Object> mapResource = JSONObject.parseObject(JSONObject.toJSONString(resource), Map.class);
mapResource.put("cameraIds", resource.getCameraIds());
mapResource.put("cameraNames", resource.getCameraNames());
......@@ -520,7 +520,7 @@ public class LiResourceController extends AbstractController {
// 查询子系统字典项
List<SysDictionary> dicList = new ArrayList<>();
dicList = sysDictionaryService.queryByPid(Constants.SUB_SYSTEM_ID, model.getStationId());
dicList = sysDictionaryService.queryByPid(Constants.RESOURCE_TYPE, null);
// 查询该站点下所有资源点
List<LiResource> resourceList = liResourceService.getTreeList(model);
......@@ -547,7 +547,7 @@ public class LiResourceController extends AbstractController {
Iterator<LiResource> iterator = resourceList.iterator();
while (iterator.hasNext()) {
LiResource resource = iterator.next();
if (dic.getValue().equals(resource.getSubCode()) && liStationMap.getId().equals(resource.getTierId())) {
if (dic.getId().equals(resource.getType()) && liStationMap.getId().equals(resource.getTierId())) {
Map<String, Object> mapResource = JSONObject.parseObject(JSONObject.toJSONString(resource), Map.class);
mapResource.put("cameraIds", resource.getCameraIds());
mapResource.put("cameraNames", resource.getCameraNames());
......
#######################mysql c3p0 DataSource################################
gpt.url=jdbc:mysql://10.20.72.31:3306/zhxf
gpt.url=jdbc:mysql://47.94.207.62:3306/zhxf
#gpt.username=root
#gpt.password=superAdmin&321
gpt.minPoolSize=10
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.FsyInfoDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.FsyInfo">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="wind_speed" property="windSpeed"/>
<result column="ws_is_alarm" property="wsIsAlarm"/>
<result column="station_id" property="stationId"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- fsy_info table all fields -->
<sql id="Base_Column_List">
id,resource_id,wind_speed,ws_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="windSpeed!=null and windSpeed!=''">and t.wind_speed = #{windSpeed}</if>
<if test="wsIsAlarm!=null ">and t.ws_is_alarm = #{wsIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from fsy_info t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from fsy_info t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.FyyInfoDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.FyyInfo">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="wind_pressure" property="windPressure"/>
<result column="wp_is_alarm" property="wpIsAlarm"/>
<result column="station_id" property="stationId"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- fyy_info table all fields -->
<sql id="Base_Column_List">
id,resource_id,wind_pressure,wp_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="windPressure!=null and windPressure!=''">and t.wind_pressure = #{windPressure}</if>
<if test="wpIsAlarm!=null ">and t.wp_is_alarm = #{wpIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from fyy_info t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from fyy_info t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.HjtcqInfoDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.HjtcqInfo">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="temperature" property="temperature"/>
<result column="tp_is_alarm" property="tpIsAlarm"/>
<result column="humidity" property="humidity"/>
<result column="hm_is_alarm" property="hmIsAlarm"/>
<result column="carbon_monoxide" property="carbonMonoxide"/>
<result column="cm_is_alarm" property="cmIsAlarm"/>
<result column="carbon_dioxide" property="carbonDioxide"/>
<result column="cd_is_alarm" property="cdIsAlarm"/>
<result column="station_id" property="stationId"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- hjtcq_info table all fields -->
<sql id="Base_Column_List">
id,resource_id,temperature,tp_is_alarm,humidity,hm_is_alarm,carbon_monoxide,cm_is_alarm,carbon_dioxide,cd_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="temperature!=null and temperature!=''">and t.temperature = #{temperature}</if>
<if test="tpIsAlarm!=null ">and t.tp_is_alarm = #{tpIsAlarm}</if>
<if test="humidity!=null and humidity!=''">and t.humidity = #{humidity}</if>
<if test="hmIsAlarm!=null ">and t.hm_is_alarm = #{hmIsAlarm}</if>
<if test="carbonMonoxide!=null and carbonMonoxide!=''">and t.carbon_monoxide = #{carbonMonoxide}</if>
<if test="cmIsAlarm!=null ">and t.cm_is_alarm = #{cmIsAlarm}</if>
<if test="carbonDioxide!=null and carbonDioxide!=''">and t.carbon_dioxide = #{carbonDioxide}</if>
<if test="cdIsAlarm!=null ">and t.cd_is_alarm = #{cdIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from hjtcq_info t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from hjtcq_info t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.LljInfoDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.LljInfo">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="flow_rate" property="flowRate"/>
<result column="fr_is_alarm" property="frIsAlarm"/>
<result column="station_id" property="stationId"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- llj_info table all fields -->
<sql id="Base_Column_List">
id,resource_id,flow_rate,fr_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="flowRate!=null and flowRate!=''">and t.flow_rate = #{flowRate}</if>
<if test="frIsAlarm!=null ">and t.fr_is_alarm = #{frIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from llj_info t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from llj_info t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.RlltjInfoHourDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.RlltjInfoHour">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="pedestrian_volume" property="pedestrianVolume"/>
<result column="station_id" property="stationId"/>
<result column="create_time" property="createTime"/>
</resultMap>
<!-- rlltj_info_hour table all fields -->
<sql id="Base_Column_List">
id,resource_id,pedestrian_volume,station_id,create_time
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="pedestrianVolume!=null and pedestrianVolume!=''">and t.pedestrian_volume = #{pedestrianVolume}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from rlltj_info_hour t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from rlltj_info_hour t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.RlltjInfoDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.RlltjInfo">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="pedestrian_volume" property="pedestrianVolume"/>
<result column="station_id" property="stationId"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- rlltj_info table all fields -->
<sql id="Base_Column_List">
id,resource_id,pedestrian_volume,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="pedestrianVolume!=null and pedestrianVolume!=''">and t.pedestrian_volume = #{pedestrianVolume}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from rlltj_info t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from rlltj_info t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.WxyljInfoDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.WxyljInfo">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="water_pressure" property="waterPressure"/>
<result column="is_alarm" property="isAlarm"/>
<result column="station_id" property="stationId"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- wxylj_info table all fields -->
<sql id="Base_Column_List">
id,resource_id,water_pressure,is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="waterPressure!=null and waterPressure!=''">and t.water_pressure = #{waterPressure}</if>
<if test="isAlarm!=null ">and t.is_alarm = #{isAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from wxylj_info t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from wxylj_info t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.devplatform.admin.modules.eq.dao.WxywyInfoDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.WxywyInfo">
<result column="id" property="id"/>
<result column="resource_id" property="resourceId"/>
<result column="gauge_height" property="gaugeHeight"/>
<result column="gh_is_alarm" property="ghIsAlarm"/>
<result column="station_id" property="stationId"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- wxywy_info table all fields -->
<sql id="Base_Column_List">
id,resource_id,gauge_height,gh_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="gaugeHeight!=null and gaugeHeight!=''">and t.gauge_height = #{gaugeHeight}</if>
<if test="ghIsAlarm!=null ">and t.gh_is_alarm = #{ghIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and t.create_time = #{createTime}</if>
<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
</sql>
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from wxywy_info t
<include refid="Example_Where_Clause"/>
</select>
<select id="queryPageList" parameterType="Object" resultMap="BaseResultMap">
select t.* from wxywy_info t
<include refid="Example_Where_Clause"/>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
</mapper>
package com.devplatform.equipment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.devplatform.equipment.common.utils.Constants;
import com.devplatform.equipment.common.utils.SpringContextUtil;
import com.devplatform.equipment.common.utils.TestClient;
import com.devplatform.equipment.modules.ewarning.service.EwarningService;
import com.devplatform.equipment.modules.listation.bean.LiStation;
import com.devplatform.equipment.modules.listation.service.LiStationService;
import com.devplatform.equipment.modules.sys.bean.SysSystem;
import com.devplatform.equipment.modules.sys.service.SysSystemService;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......@@ -19,10 +11,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* springboot启动类
*
......@@ -41,46 +29,4 @@ public class EquipmentApplication {
public static void main(String[] args) {
SpringApplication.run(EquipmentApplication.class, args);
}
private static void handleMqInit() {
LiStationService liStationService =
(LiStationService) SpringContextUtil.getBean(LiStationService.class);
SysSystemService sysSystemService =
(SysSystemService) SpringContextUtil.getBean(SysSystemService.class);
EwarningService ewarningService =
(EwarningService) SpringContextUtil.getBean(EwarningService.class);
SysSystem sysSystem = sysSystemService.getOne(new LambdaQueryWrapper<>());
// 站点
List<LiStation> lists = null;
if (Constants.STRING_1.equals(sysSystem.getType())) {
lists =
liStationService.list(
new LambdaQueryWrapper<LiStation>()
.eq(LiStation::getDeleted, 0)
.eq(LiStation::getId, sysSystem.getCode())
.orderByAsc(LiStation::getOrderNum));
} else if (Constants.STRING_2.equals(sysSystem.getType())) {
//线路
lists =
liStationService.list(
new LambdaQueryWrapper<LiStation>()
.eq(LiStation::getDeleted, 0)
.eq(LiStation::getLineId, sysSystem.getCode())
.orderByAsc(LiStation::getOrderNum));
} else {
//路网
lists =
liStationService.list(
new LambdaQueryWrapper<LiStation>()
.eq(LiStation::getDeleted, 0)
.orderByAsc(LiStation::getLineId, LiStation::getOrderNum));
}
if (lists != null && lists.size() > 0) {
for (int i = 0; i < lists.size(); i++) {
System.out.println("初始化MQ消费端");
ewarningService.initMq(lists.get(i).getId());
}
}
}
}
......@@ -26,38 +26,19 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import lombok.SneakyThrows;
import org.apache.commons.lang.StringUtils;
import org.quartz.CronScheduleBuilder;
import org.quartz.JobBuilder;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobKey;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SchedulerFactory;
import org.quartz.Trigger;
import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey;
import org.quartz.*;
import org.quartz.impl.StdSchedulerFactory;
import org.quartz.impl.matchers.GroupMatcher;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.*;
/**
* @author Administrator
......@@ -162,7 +143,7 @@ public class EpPatrolPlanController extends AbstractController {
EpPatrolPlan bean = new EpPatrolPlan();
BeanUtils.copyProperties(model, bean);
LiStation station = liStationService.getById(bean.getStationId());
bean.setLineStationName(station.getLineName() + station.getStationName());
bean.setLineStationName(station.getStationName());
bean.setCreateUserId(getUserId());
bean.setCreateTime(new Date());
bean.setSysSign(getUser().getSysSystem().getCode());
......@@ -212,7 +193,7 @@ public class EpPatrolPlanController extends AbstractController {
EpPatrolPlan bean = new EpPatrolPlan();
BeanUtils.copyProperties(model, bean);
LiStation station = liStationService.getById(bean.getStationId());
bean.setLineStationName(station.getLineName() + station.getStationName());
bean.setLineStationName(station.getStationName());
bean.setUpdateUserId(getUserId());
bean.setUpdateTime(new Date());
bean.setSysSign(getUser().getSysSystem().getCode());
......
......@@ -26,26 +26,18 @@ import com.devplatform.equipment.modules.sys.service.SysSystemService;
import com.devplatform.equipment.modules.sysdictionary.service.SysDictionaryService;
import com.devplatform.equipment.modules.syspreset.bean.SysPreset;
import com.devplatform.equipment.modules.syspreset.service.SysPresetService;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;
/**
* 报警信息表的service接口实现类 <br>
* <b>功能:</b>EWarningServiceImpl<br>
......@@ -447,7 +439,6 @@ public class EwarningServiceImpl extends MyBaseServiceImpl<EwarningDao, Ewarning
alarmsService.saveAttachment(imageUuid,pathStr + imageUuid,snapUuid,pathStr + snapUuid,bean.getId(),sysSign,stationId);
}
bean.setLineId(liResource.getLineId());
return bean;
}
......
......@@ -9,16 +9,12 @@ import com.devplatform.common.util.StringUtil;
import com.devplatform.equipment.common.annotation.SysLogMethod;
import com.devplatform.equipment.common.utils.AbstractController;
import com.devplatform.equipment.common.utils.Constants;
import com.devplatform.equipment.modules.liline.bean.LiLine;
import com.devplatform.equipment.modules.liline.model.LiLineModel;
import com.devplatform.equipment.modules.liline.service.LiLineService;
import com.devplatform.equipment.modules.liresource.bean.LiResource;
import com.devplatform.equipment.modules.liresource.model.LiResourceModel;
import com.devplatform.equipment.modules.liresource.service.LiResourceService;
import com.devplatform.equipment.modules.liresourcecamera.bean.LiResourceCamera;
import com.devplatform.equipment.modules.liresourcecamera.service.LiResourceCameraService;
import com.devplatform.equipment.modules.listation.bean.LiStation;
import com.devplatform.equipment.modules.listation.model.LiStationModel;
import com.devplatform.equipment.modules.listation.service.LiStationService;
import com.devplatform.equipment.modules.listationmap.bean.LiStationMap;
import com.devplatform.equipment.modules.listationmap.model.LiStationMapModel;
......@@ -29,22 +25,11 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.*;
/**
* @author Administrator
......@@ -55,7 +40,6 @@ import org.springframework.web.bind.annotation.RestController;
public class LiResourceController extends AbstractController {
@Autowired private LiResourceService liResourceService;
@Autowired private LiLineService liLineService;
@Autowired private LiStationService liStationService;
@Autowired private LiStationMapService liStationMapService;
@Autowired private SysDictionaryService sysDictionaryService;
......@@ -208,8 +192,6 @@ public class LiResourceController extends AbstractController {
LiResource bean = liResourceService.getBeanById(id);
Map<String, Object> resourceDetailsMap =
JSONObject.parseObject(JSONObject.toJSONString(bean), Map.class);
// 线路站点
resourceDetailsMap.put("lineStation", bean.getLineName() + "-" + bean.getStationName());
// 告警等级
resourceDetailsMap.put("alarmLevel", "无");
if (!Constants.STRING_01.equals(bean.getSubCode())) {
......@@ -244,75 +226,6 @@ public class LiResourceController extends AbstractController {
return R.ok();
}
/**
* 获取线路-站点-资源点树
*
* @param model 承接对象
* @return
*/
@ApiOperation(value = "获取线路-站点-资源点树", notes = "获取线路-站点-资源点树")
@ApiImplicitParam(name = "model", value = "参数", required = true, dataType = "LiResourceModel")
@PostMapping("/getTreeList")
public R getTreeList(@RequestBody LiResourceModel model) {
// 默认只查询一个站点
List<Map<String, Object>> tree = new ArrayList<>();
if (StringUtil.checkNotNull(model.getStationId())) {
tree = getStationTreeList(model);
} else {
tree = getAllTreeList(model);
}
return R.ok().put("tree", tree);
}
private List<Map<String, Object>> getAllTreeList(LiResourceModel model) {
List<Map<String, Object>> tree = new ArrayList<>();
Map<String, Object> root = new HashMap<>(5);
root.put("name", "资源点列表");
root.put("id", "0");
root.put("level", 1);
LiLineModel lineModel = new LiLineModel();
List<LiLine> lineList = liLineService.getTreeList(lineModel);
LiStationModel stationModel = new LiStationModel();
List<LiStation> stationList = liStationService.getTreeList(stationModel);
List<Map<String, Object>> childrenRoot = new ArrayList<>();
if (lineList != null && lineList.size() > 0) {
lineList.forEach(
(liLine) -> {
Map<String, Object> map =
JSONObject.parseObject(JSONObject.toJSONString(liLine), Map.class);
map.put("level", 2);
List<Map<String, Object>> childrenLine = new ArrayList<>();
stationList.forEach(
(liStation) -> {
if (liLine.getId().equals(liStation.getLineId())) {
Map<String, Object> mapStation =
JSONObject.parseObject(JSONObject.toJSONString(liStation), Map.class);
mapStation.put("name", liStation.getStationName());
mapStation.put("level", 3);
childrenLine.add(mapStation);
}
});
map.put("children", childrenLine);
childrenRoot.add(map);
});
}
root.put("children", childrenRoot);
tree.add(root);
return tree;
}
private List<Map<String, Object>> getStationTreeList(LiResourceModel model) {
List<Map<String, Object>> tree = new ArrayList<>();
LiStation station = liStationService.getById(model.getStationId());
Map<String, Object> root = JSONObject.parseObject(JSONObject.toJSONString(station), Map.class);
root.put("name", station.getStationName());
root.put("key", UUID.randomUUID());
root.put("level", 3);
tree.add(root);
return tree;
}
/**
* 根据站点id查询站点地图
*
......@@ -339,7 +252,7 @@ public class LiResourceController extends AbstractController {
List<Map<String, Object>> childrenStationMap = new ArrayList<>();
dicList.forEach(
(dic) -> {
Map<String, Object> mapDic = getStringObjectMapDic(liStationMap, dic,null);
Map<String, Object> mapDic = getStringObjectMapDic(liStationMap, dic);
List<Map<String, Object>> childrenDic = new ArrayList<>();
resourceList.forEach(
(resource) -> {
......@@ -487,10 +400,9 @@ public class LiResourceController extends AbstractController {
Map<String, Object> mapStationMap = JSONObject.parseObject(JSONObject.toJSONString(liStationMap), Map.class);
mapStationMap.put("key", UUID.randomUUID());
mapStationMap.put("level", 4);
mapStationMap.put("lineId",station.getLineId());
List<Map<String, Object>> childrenStationMap = new ArrayList<>();
for (SysDictionary dic : dicList) {
Map<String, Object> mapDic = getStringObjectMapDic(liStationMap, dic,station.getLineId());
Map<String, Object> mapDic = getStringObjectMapDic(liStationMap, dic);
List<Map<String, Object>> childrenDic = new ArrayList<>();
// 不是防区,放入资源点就行
getChildrenDicResource(resourceList, liStationMap, dic, childrenDic);
......@@ -548,13 +460,12 @@ public class LiResourceController extends AbstractController {
* @param dic
* @return
*/
private Map<String, Object> getStringObjectMapDic(LiStationMap liStationMap, SysDictionary dic,String lineId) {
private Map<String, Object> getStringObjectMapDic(LiStationMap liStationMap, SysDictionary dic) {
Map<String, Object> mapDic = JSONObject.parseObject(JSONObject.toJSONString(dic), Map.class);
// 两个id拼接保证id的唯一性
mapDic.put("id", liStationMap.getId() + dic.getId());
mapDic.put("code", dic.getValue());
mapDic.put("stationId", liStationMap.getStationId());
mapDic.put("lineId", lineId);
mapDic.put("tierId", liStationMap.getId());
mapDic.put("key", UUID.randomUUID());
mapDic.put("level", 5);
......
......@@ -16,18 +16,15 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Administrator
......@@ -142,7 +139,7 @@ public class OrVideoMonitorController extends AbstractController {
LiResource liResource = liResourceService.getBeanById(bean.getResourceId());
if (liResource != null) {
bean.setResourceName(liResource.getName());
bean.setLineStationName(liResource.getLineName() + "-" + liResource.getStationName());
bean.setLineStationName(liResource.getStationName());
// 资源点类型名称
bean.setType(liResource.getTypeName());
}
......
......@@ -15,14 +15,15 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author Administrator
*/
......@@ -57,7 +58,7 @@ public class VideoTaskController extends AbstractController {
// 返回一个线路站点名
return R.ok()
.put("list", list)
.put("lineStation", liStation.getLineName() + "-" + liStation.getStationName());
.put("lineStation", liStation.getStationName());
}
/**
* 添加
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment