Skip to content

Z
zhxf_java
Commit 855769e1 authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

接口调整

parent d171aed5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 4845 deletions
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/bean/LiLine.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.admin.modules.liresource.bean;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.List;
/**
* @author Administrator
*/
@ApiModel(value = "线路管理表对象", description = "线路管理表对象")
@TableName("li_line")
public class LiLine implements Serializable {
/** */
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键ID", name = "id")
@TableId
/** 主键id*/
private java.lang.String id;
@ApiModelProperty(value = "线路名称", name = "name")
/** 线路名称*/
private java.lang.String name;
@ApiModelProperty(value = "线路编码", name = "code")
/** 线路编码*/
private java.lang.String code;
@ApiModelProperty(value = "线路类型(备用)", name = "type")
/** 线路类型(备用)*/
private Integer type;
@ApiModelProperty(value = "线路描述(备用)", name = "remark")
/** 线路描述(备用)*/
private java.lang.String remark;
@ApiModelProperty(value = "排序值(备用)", name = "orderNum")
/** 排序值(备用)*/
private Integer orderNum;
@ApiModelProperty(value = "状态(1正常，0不可用)", name = "status")
/** 状态(1正常，0不可用)*/
private Integer status;
@ApiModelProperty(value = "系统标识", name = "sysSign")
/** 系统标识*/
private java.lang.String sysSign;
@ApiModelProperty(value = "是否已删除（0未删除，1已删除）", name = "deleted")
/** 是否已删除（0未删除，1已删除）*/
private Integer deleted;
@ApiModelProperty(value = "创建人", name = "createUserId")
/** 创建人*/
private java.lang.String createUserId;
@ApiModelProperty(value = "创建时间", name = "createTime")
/** 创建时间*/
private java.util.Date createTime;
@ApiModelProperty(value = "修改人", name = "updateUserId")
/** 修改人*/
private java.lang.String updateUserId;
@ApiModelProperty(value = "修改时间", name = "updateTime")
/** 修改时间*/
private java.util.Date updateTime;
@ApiModelProperty(value = "备用项1", name = "byx1")
/** 备用项1*/
private java.lang.String byx1;
@ApiModelProperty(value = "备用项2", name = "byx2")
/** 备用项2*/
private java.lang.String byx2;
@ApiModelProperty(value = "备用项3", name = "byx3")
/** 备用项3*/
private java.lang.String byx3;
@TableField(exist = false)
private List<LiStation> liStationList;
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 线路名称的getter方法 */
public java.lang.String getName() {
return name;
}
/** 线路名称的setter方法 */
public void setName(java.lang.String name) {
this.name = name;
}
/** 线路编码的getter方法 */
public java.lang.String getCode() {
return code;
}
/** 线路编码的setter方法 */
public void setCode(java.lang.String code) {
this.code = code;
}
/** 线路类型(备用)的getter方法 */
public Integer getType() {
return type;
}
/** 线路类型(备用)的setter方法 */
public void setType(Integer type) {
this.type = type;
}
/** 线路描述(备用)的getter方法 */
public java.lang.String getRemark() {
return remark;
}
/** 线路描述(备用)的setter方法 */
public void setRemark(java.lang.String remark) {
this.remark = remark;
}
/** 排序值(备用)的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值(备用)的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public java.lang.String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(java.lang.String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public java.lang.String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(java.lang.String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public java.lang.String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(java.lang.String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public java.lang.String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(java.lang.String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public java.lang.String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(java.lang.String byx3) {
this.byx3 = byx3;
}
public List<LiStation> getLiStationList() {
return liStationList;
}
public void setLiStationList(List<LiStation> liStationList) {
this.liStationList = liStationList;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/bean/LiResourceCamera.java
View file @ 855769e1
......@@ -5,11 +5,14 @@ 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;
/**
* @author Administrator
*/
@Data
@ApiModel(value = "资源点与摄像头关联表对象", description = "资源点与摄像头关联表对象")
@TableName("li_resource_camera")
public class LiResourceCamera implements Serializable {
......@@ -85,44 +88,4 @@ public class LiResourceCamera implements Serializable {
this.byx3 = byx3;
}
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 资源点id的getter方法 */
public java.lang.String getResourceId() {
return resourceId;
}
/** 资源点id的setter方法 */
public void setResourceId(java.lang.String resourceId) {
this.resourceId = resourceId;
}
/** 摄像头id的getter方法 */
public java.lang.String getCameraId() {
return cameraId;
}
/** 摄像头id的setter方法 */
public void setCameraId(java.lang.String cameraId) {
this.cameraId = cameraId;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
public String getCameraName() {
return cameraName;
}
public void setCameraName(String cameraName) {
this.cameraName = cameraName;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/bean/LiResourceIcon.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.admin.modules.liresource.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
/**
* @author Administrator
*/
@ApiModel(value = "资源点图标表对象", description = "资源点图标表对象")
@TableName("li_resource_icon")
public class LiResourceIcon implements Serializable {
/** */
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键ID", name = "id")
@TableId
/** 主键*/
private java.lang.String id;
@ApiModelProperty(value = "图标类型(1默认)", name = "type")
/** 图标类型(1默认)*/
private Integer type;
@ApiModelProperty(value = "图标类型名称", name = "typeName")
/** 图标类型名称*/
private String typeName;
@ApiModelProperty(value = "图标尺寸(1小，2中，3大)", name = "size")
/** 图标尺寸(1小，2中，3大)*/
private Integer size;
@ApiModelProperty(value = "图标路径", name = "path")
/** 图标路径*/
private java.lang.String path;
@ApiModelProperty(value = "名称", name = "name")
/** 名称*/
private java.lang.String name;
@ApiModelProperty(value = "排序值", name = "orderNum")
/** 排序值*/
private Integer orderNum;
@ApiModelProperty(value = "是否删除(0未删除,1已删除)", name = "deleted")
/** 是否删除(0未删除,1已删除)*/
private Integer deleted;
@ApiModelProperty("系统标识")
private String sysSign;
@ApiModelProperty(value = "站点id", name = "stationId")
/** 站点id*/
private String stationId;
public String getSysSign() {
return sysSign;
}
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public Integer getOrderNum() {
return orderNum;
}
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 主键的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 图标类型(1默认)的getter方法 */
public Integer getType() {
return type;
}
/** 图标类型(1默认)的setter方法 */
public void setType(Integer type) {
this.type = type;
}
/** 图标尺寸(1小，2中，3大)的getter方法 */
public Integer getSize() {
return size;
}
/** 图标尺寸(1小，2中，3大)的setter方法 */
public void setSize(Integer size) {
this.size = size;
}
/** 图标路径的getter方法 */
public java.lang.String getPath() {
return path;
}
/** 图标路径的setter方法 */
public void setPath(java.lang.String path) {
this.path = path;
}
/** 名称的getter方法 */
public java.lang.String getName() {
return name;
}
/** 名称的setter方法 */
public void setName(java.lang.String name) {
this.name = name;
}
/** 是否删除(0未删除,1已删除)的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否删除(0未删除,1已删除)的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/bean/LiStation.java
View file @ 855769e1
......@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.devplatform.admin.modules.eqequipment.bean.EqAlarm;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Administrator
*/
@Data
@ApiModel(value = "线路站点管理表对象", description = "线路站点管理表对象")
@TableName("li_station")
public class LiStation implements Serializable {
......@@ -23,14 +26,6 @@ public class LiStation implements Serializable {
/** 主键id*/
private java.lang.String id;
@ApiModelProperty(value = "线路表id", name = "lineId")
/** 线路表id*/
private java.lang.String lineId;
@ApiModelProperty(value = "线路名称", name = "lineName")
/** 线路名称*/
private java.lang.String lineName;
@ApiModelProperty(value = "车站名称", name = "stationName")
/** 车站名称*/
private java.lang.String stationName;
......@@ -147,261 +142,6 @@ public class LiStation implements Serializable {
/** 报警信息*/
private List<EqAlarm> eqAlarmList;
public String getStationId() {
return stationId;
}
public void setStationId(String stationId) {
this.stationId = stationId;
}
public List<EqAlarm> getEqAlarmList() {
return eqAlarmList;
}
public void setEqAlarmList(List<EqAlarm> eqAlarmList) {
this.eqAlarmList = eqAlarmList;
}
public List<LiStationMap> getMapList() {
return mapList;
}
public void setMapList(List<LiStationMap> mapList) {
this.mapList = mapList;
}
public String getX() {
return x;
}
public void setX(String x) {
this.x = x;
}
public String getY() {
return y;
}
public void setY(String y) {
this.y = y;
}
public String getLocation() {
return location;
}
public void setLocation(String location) {
this.location = location;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 线路表id的getter方法 */
public java.lang.String getLineId() {
return lineId;
}
/** 线路表id的setter方法 */
public void setLineId(java.lang.String lineId) {
this.lineId = lineId;
}
/** 线路名称的getter方法 */
public java.lang.String getLineName() {
return lineName;
}
/** 线路名称的setter方法 */
public void setLineName(java.lang.String lineName) {
this.lineName = lineName;
}
/** 车站名称的getter方法 */
public java.lang.String getStationName() {
return stationName;
}
/** 车站名称的setter方法 */
public void setStationName(java.lang.String stationName) {
this.stationName = stationName;
}
/** 车站编号的getter方法 */
public java.lang.String getCode() {
return code;
}
/** 车站编号的setter方法 */
public void setCode(java.lang.String code) {
this.code = code;
}
/** 简称的getter方法 */
public java.lang.String getShortName() {
return shortName;
}
/** 简称的setter方法 */
public void setShortName(java.lang.String shortName) {
this.shortName = shortName;
}
/** 站点类型(1正线车站，2换乘车站)的getter方法 */
public java.lang.String getType() {
return type;
}
/** 站点类型(1正线车站，2换乘车站)的setter方法 */
public void setType(java.lang.String type) {
this.type = type;
}
/** 站点描述的getter方法 */
public java.lang.String getRemark() {
return remark;
}
/** 站点描述的setter方法 */
public void setRemark(java.lang.String remark) {
this.remark = remark;
}
public Integer getIsMaster() {
return isMaster;
}
public void setIsMaster(Integer isMaster) {
this.isMaster = isMaster;
}
/** 排序值的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public java.lang.String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(java.lang.String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public java.lang.String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(java.lang.String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public java.lang.String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(java.lang.String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public java.lang.String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(java.lang.String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public java.lang.String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(java.lang.String byx3) {
this.byx3 = byx3;
}
public Integer getCoordinateX() {
return coordinateX;
}
public void setCoordinateX(Integer coordinateX) {
this.coordinateX = coordinateX;
}
public Integer getCoordinateY() {
return coordinateY;
}
public void setCoordinateY(Integer coordinateY) {
this.coordinateY = coordinateY;
}
public Integer getTextPosition() {
return textPosition;
}
public void setTextPosition(Integer textPosition) {
this.textPosition = textPosition;
}
public String getLineColor() {
return lineColor;
}
public void setLineColor(String lineColor) {
this.lineColor = lineColor;
}
public String getLineCode() {
return lineCode;
}
public void setLineCode(String lineCode) {
this.lineCode = lineCode;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/bean/LiStationMap.java
View file @ 855769e1
......@@ -5,11 +5,14 @@ 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;
/**
* @author Administrator
*/
@Data
@ApiModel(value = "线路站点地图附件表对象", description = "线路站点地图附件表对象")
@TableName("li_station_map")
public class LiStationMap implements Serializable {
......@@ -85,140 +88,4 @@ public class LiStationMap implements Serializable {
/** 文件显示路径*/
private String readPath;
public String getReadPath() {
return readPath;
}
public void setReadPath(String readPath) {
this.readPath = readPath;
}
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 站点表id的getter方法 */
public java.lang.String getStationId() {
return stationId;
}
/** 站点表id的setter方法 */
public void setStationId(java.lang.String stationId) {
this.stationId = stationId;
}
/** 地图名称的getter方法 */
public java.lang.String getName() {
return name;
}
/** 地图名称的setter方法 */
public void setName(java.lang.String name) {
this.name = name;
}
/** 附件名称的getter方法 */
public java.lang.String getFileName() {
return fileName;
}
/** 附件名称的setter方法 */
public void setFileName(java.lang.String fileName) {
this.fileName = fileName;
}
/** 附件路径的getter方法 */
public java.lang.String getFilePath() {
return filePath;
}
/** 附件路径的setter方法 */
public void setFilePath(java.lang.String filePath) {
this.filePath = filePath;
}
/** 排序值的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public java.lang.String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(java.lang.String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public java.lang.String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(java.lang.String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public java.lang.String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(java.lang.String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public java.lang.String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(java.lang.String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public java.lang.String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(java.lang.String byx3) {
this.byx3 = byx3;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiLineController.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.admin.modules.liresource.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.devplatform.admin.common.annotation.SysLogMethod;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.admin.modules.liresource.bean.LiLine;
import com.devplatform.admin.modules.liresource.bean.LiStation;
import com.devplatform.admin.modules.liresource.model.LiLineModel;
import com.devplatform.admin.modules.liresource.service.LiLineService;
import com.devplatform.admin.modules.liresource.service.LiStationService;
import com.devplatform.common.base.validator.ValidatorUtils;
import com.devplatform.common.util.PageUtils;
import com.devplatform.common.util.R;
import com.devplatform.common.util.StringUtil;
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.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.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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Administrator
*/
@Api(tags = {"线路管理表接口"})
@RestController
@RequestMapping("/liLine")
public class LiLineController extends AbstractController {
@Autowired private LiLineService liLineService;
@Autowired private LiStationService liStationService;
/**
* 列表页面列表数据获取
*
* @param params 承接对象
* @return
*/
@ApiOperation(value = "根据条件获取线路管理表分页数据列表", notes = "根据条件获取线路管理表分页数据列表")
@ApiImplicitParam(
name = "params",
value = "参数",
required = true,
dataType = "Map<String, Object>")
@PostMapping("/list")
public R list(@RequestParam Map<String, Object> params) {
PageUtils page = liLineService.queryPage(params, null);
return R.ok().put("page", page);
}
/**
* 添加
*
* @param bean 线路管理表对象
* @return
*/
@SysLogMethod(operation = "新增", blockName = "系统管理", detail = "新增线路数据")
@ApiOperation(value = "新增线路管理表数据", notes = "新增线路管理表数据")
@PostMapping("/save")
public R save(@RequestBody @ApiParam(value = "线路管理表实体对象", required = true) LiLine bean) {
ValidatorUtils.validateEntity(bean);
bean.setCreateUserId(getUserId());
bean.setCreateTime(new Date());
bean.setSysSign(getUser().getSysSystem().getCode());
liLineService.save(bean);
return R.ok();
}
/**
* 修改
*
* @param bean 线路管理表对象
* @return
*/
@SysLogMethod(operation = "修改", blockName = "系统管理", detail = "修改线路数据")
@ApiOperation(value = "修改线路管理表数据", notes = "修改线路管理表数据")
@PostMapping("/update")
public R update(@RequestBody @ApiParam(value = "线路管理表实体对象", required = true) LiLine bean) {
ValidatorUtils.validateEntity(bean);
bean.setUpdateUserId(getUserId());
bean.setUpdateTime(new Date());
bean.setSysSign(getUser().getSysSystem().getCode());
liLineService.update(
bean,
new QueryWrapper<LiLine>().eq(StringUtil.checkNotNull(bean.getId()), "id", bean.getId()));
return R.ok();
}
/**
* 根据ID获取线路管理表对象
*
* @param id 对象主键
* @return
*/
@ApiOperation(value = "根据ID获取线路管理表对象", notes = "根据ID获取线路管理表对象")
@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String")
@GetMapping("/getId/{id}")
public R getId(@PathVariable String id) {
LiLine bean = liLineService.getById(id);
return R.ok().put("bean", bean);
}
/**
* 根据ID获取线路管理表对象
*
* @param ids 线路管理表对象主键数组
* @return
*/
@SysLogMethod(operation = "删除", blockName = "系统管理", detail = "删除线路数据")
@ApiOperation(value = "根据ID批量删除线路管理表数据", notes = "根据ID批量删除线路管理表数据")
@ApiImplicitParam(name = "ids", value = "主键数组", required = true, dataType = "String")
@PostMapping("/delete")
public R delete(@RequestBody String[] ids) {
liLineService.removeByIds(Arrays.asList(ids));
return R.ok();
}
/**
* 列表数据获取
*
* @param model 承接对象
* @return
*/
@ApiOperation(value = "根据条件获取线路管理表数据列表", notes = "根据条件获取线路管理表数据列表")
@ApiImplicitParam(name = "model", value = "参数", required = true, dataType = "LiLineModel")
@PostMapping("/listAll")
public R listAll(@RequestBody LiLineModel model) {
model.setRows(Integer.MAX_VALUE);
if (StringUtils.isBlank(model.getSort())) {
model.setSort("order_num");
model.setOrder("ASC");
}
List<LiLine> list = liLineService.queryPageByList(model);
return R.ok().put("page", getMyPage(list, model));
}
/**
* 获取线路树
*
* @param model 承接对象
* @return
*/
@ApiOperation(value = "获取线路树", notes = "获取线路树")
@ApiImplicitParam(name = "model", value = "参数", required = true, dataType = "LiLineModel")
@PostMapping("/getTreeList")
public R getTreeList(@RequestBody LiLineModel model) {
List<LiLine> list = liLineService.getTreeList(model);
List<Map<String, Object>> tree = new ArrayList<>();
Map<String, Object> root = new HashMap<>(5);
root.put("name", "线路");
root.put("children", list);
tree.add(root);
return R.ok().put("tree", tree);
}
@ApiOperation(value = "获取线路与站点的级联关系", notes = "获取线路与站点的级联关系")
@PostMapping("/getTreeListStation")
public R getTreeListStation() {
List<LiLine> liLines = liLineService.list(new QueryWrapper<LiLine>().orderByAsc("order_num"));
List<LiStation> liStations =
liStationService.list(new QueryWrapper<LiStation>().orderByAsc("order_num"));
return R.ok().put("liList", liLines).put("lisList", liStations);
}
@ApiOperation(value = "根据ID获取线路信息", notes = "根据ID获取线路信息")
@GetMapping("/queryById/{id}")
public R queryById(@PathVariable("id") String id) {
return R.ok().put("bean", liLineService.getOne(new QueryWrapper<LiLine>().eq("id", id)));
}
@ApiOperation(value = "获取所有线路信息", notes = "获取所有线路信息")
@GetMapping("/queryAll")
public R queryAll() {
return R.ok()
.put(
"list",
liLineService.list(
new QueryWrapper<LiLine>().eq("deleted", 0).orderByAsc("order_num")));
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiResourceController.java
View file @ 855769e1
......@@ -40,8 +40,6 @@ public class LiResourceController extends AbstractController {
@Autowired
private LiResourceService liResourceService;
@Autowired
private LiLineService liLineService;
@Autowired
private LiStationService liStationService;
@Autowired
private LiStationMapService liStationMapService;
......@@ -774,7 +772,6 @@ public class LiResourceController extends AbstractController {
mapResource.put("stationId", resource.getStationId());
mapResource.put("subCode", resource.getSubCode());
mapResource.put("tierId", resource.getTierId());
mapResource.put("lineId", resource.getLineId());
nodes.add(mapResource);
});
return R.ok().put("nodes", nodes);
......@@ -804,77 +801,4 @@ public class LiResourceController extends AbstractController {
list = liResourceService.queryResourceType(model);
return R.ok().put("list", list);
}
/**
* 获取线路站点资源树
*
* @return
*/
@ApiOperation(value = "获取线路站点资源树", notes = "获取线路站点资源树")
@ApiImplicitParam(name = "lindId", value = "参数", required = true, dataType = "String")
@GetMapping("/getStationTree/{lindId}")
public R getStationTree(@PathVariable("lindId") String lindId) {
List<LiLine> liLines1 = new ArrayList<>();
List<Map<String, Object>> stationNodes = new ArrayList<>();
liLines1 =
liLineService.list(
new QueryWrapper<LiLine>()
.eq(StringUtils.isNoneBlank(lindId), "id", lindId)
.orderByAsc("order_num"));
if (liLines1.size() > 0) {
List<LiStation> liStations =
liStationService.list(
new QueryWrapper<LiStation>()
.eq(StringUtils.isNoneBlank(lindId), "line_id", lindId)
.orderByAsc("order_num"));
for (LiLine liLines : liLines1) {
Map<String, Object> stationMap = new HashMap<>(liStations.size());
stationMap.put("value", liLines.getId());
stationMap.put("label", liLines.getName());
stationMap.put("level", 1);
List<Map<String, Object>> nodes = new ArrayList<>();
for (LiStation liStation : liStations) {
Map<String, Object> map = new HashMap<>(5);
map.put("value", liStation.getId());
map.put("label", liStation.getStationName());
map.put("level", 2);
nodes.add(map);
}
stationMap.put("children", nodes);
stationNodes.add(stationMap);
}
}
return R.ok().put("node", stationNodes);
}
@ApiOperation(value = "获取线路站点资源树", notes = "获取线路站点资源树")
@GetMapping("/getStationTreeAll")
public R getStationTreeAll() {
List<LiLine> liLines1 = new ArrayList<>();
List<Map<String, Object>> stationNodes = new ArrayList<>();
liLines1 = liLineService.list(new QueryWrapper<LiLine>().eq("deleted",0).eq("type",1).orderByAsc("order_num"));
if (liLines1.size() > 0) {
List<LiStation> liStations =
liStationService.list(new QueryWrapper<LiStation>().orderByAsc("order_num"));
for (LiLine liLines : liLines1) {
Map<String, Object> stationMap = new HashMap<>(10);
stationMap.put("value", liLines.getId());
stationMap.put("label", liLines.getName());
stationMap.put("level", 1);
List<Map<String, Object>> nodes = new ArrayList<>();
for (LiStation liStation : liStations) {
if (liLines.getId().equals(liStation.getLineId())) {
Map<String, Object> map = new HashMap<>(5);
map.put("value", liStation.getId());
map.put("label", liStation.getStationName());
map.put("level", 2);
nodes.add(map);
}
}
stationMap.put("children", nodes);
stationNodes.add(stationMap);
}
}
return R.ok().put("node", stationNodes);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/controller/LiStationController.java
View file @ 855769e1
......@@ -3,12 +3,9 @@ package com.devplatform.admin.modules.liresource.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.devplatform.admin.common.utils.AbstractController;
import com.devplatform.admin.common.utils.Constants;
import com.devplatform.admin.modules.liresource.bean.LiLine;
import com.devplatform.admin.modules.liresource.bean.LiStation;
import com.devplatform.admin.modules.liresource.bean.LiStationMap;
import com.devplatform.admin.modules.liresource.model.LiStationModel;
import com.devplatform.admin.modules.liresource.service.LiLineService;
import com.devplatform.admin.modules.liresource.service.LiStationMapService;
import com.devplatform.admin.modules.liresource.service.LiStationService;
import com.devplatform.admin.modules.sys.bean.SysUserEntity;
......@@ -19,20 +16,14 @@ 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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
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.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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Administrator
......@@ -44,7 +35,6 @@ public class LiStationController extends AbstractController {
@Autowired private LiStationService liStationService;
@Autowired private LiStationMapService liStationMapService;
@Autowired private LiLineService liLineService;
/**
* 列表页面列表数据获取
......@@ -196,40 +186,6 @@ public class LiStationController extends AbstractController {
.orderByAsc("order_num")));
}
/**
* 查询所有站点信息，并按线路分组
*
* @param lineId
* @return
*/
@ApiOperation(value = "获取所有站点信息", notes = "获取所有站点信息")
@GetMapping("/queryAllLineList")
public R queryAllLineList(@RequestParam String lineId) {
List<LiLine> lineList =
liLineService.list(
new QueryWrapper<LiLine>()
.eq(StringUtils.isNoneBlank(lineId), "id", lineId)
.eq("deleted", 0)
.orderByAsc("order_num"));
List<LiStation> stationList =
liStationService.list(
new QueryWrapper<LiStation>()
.eq(StringUtils.isNoneBlank(lineId), "line_id", lineId)
.eq("deleted", 0)
.orderByAsc("line_id")
.orderByAsc("order_num"));
List<List<LiStation>> result = new ArrayList<>();
for (LiLine line : lineList) {
List<LiStation> lineStation = new ArrayList<>();
for (LiStation station : stationList) {
if (line.getId().equals(station.getLineId())) {
lineStation.add(station);
}
}
result.add(lineStation);
}
return R.ok().put("list", result).put("lineList", lineList);
}
/**
* 根据ID获取线路站点管理表对象
......@@ -281,17 +237,4 @@ public class LiStationController extends AbstractController {
return bean.getByx1();
}
/**
* 获取当前线路车站排序值
*
* @param lineId 线路id
* @return
*/
@ApiOperation(value = "获取当前线路车站排序值", notes = "获取当前线路车站排序值")
@ApiImplicitParam(name = "lineId", value = "线路id", required = true, dataType = "String")
@GetMapping("/getOrderNum")
public R getOrderNum(@RequestParam("lineId") String lineId) {
Integer num = liStationService.getOrderNum(lineId);
return R.ok().put("orderNum", num);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/dao/LiLineDao.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.admin.modules.liresource.dao;
import com.devplatform.admin.modules.liresource.bean.LiLine;
import com.devplatform.admin.modules.liresource.model.LiLineModel;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* LiLine Mapper 用于线路管理表的数据库操作
*
* @author Administrator
*/
@Mapper
@Repository
public interface LiLineDao extends MyBaseMapper<LiLine> {
/**
* 分页查询数量
*
* @param model
* @return
*/
Integer queryPageByCount(LiLineModel model);
/**
* 分页查询数据
*
* @param model
* @return
*/
List<LiLine> queryPageByList(LiLineModel model);
/**
* 获取线路树
*
* @param model
* @return
*/
List<LiLine> getTreeList(LiLineModel model);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/dao/LiStationDao.java
View file @ 855769e1
......@@ -3,11 +3,12 @@ package com.devplatform.admin.modules.liresource.dao;
import com.devplatform.admin.modules.liresource.bean.LiStation;
import com.devplatform.admin.modules.liresource.model.LiStationModel;
import com.devplatform.common.dao.MyBaseMapper;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
/**
* LiStation Mapper 用于线路站点管理表的数据库操作
*
......@@ -56,12 +57,4 @@ public interface LiStationDao extends MyBaseMapper<LiStation> {
* @return
*/
List<Map<String, Object>> queryPageByListTakeover(LiStationModel model);
/**
* 获取当前线路车站排序值
*
* @param lineId
* @return
*/
Integer getOrderNum(String lineId);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/model/LiLineModel.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.admin.modules.liresource.model;
import com.devplatform.admin.common.model.BaseModel;
/**
* 线路管理表的Model <br>
*
* @author 代码生成器产生
*/
public class LiLineModel extends BaseModel {
/** 主键id*/
private java.lang.String id;
/** 线路名称*/
private java.lang.String name;
/** 线路编码*/
private java.lang.String code;
/** 线路类型(备用)*/
private Integer type;
/** 线路描述(备用)*/
private java.lang.String remark;
/** 排序值(备用)*/
private Integer orderNum;
/** 状态(1正常，0不可用)*/
private Integer status;
/** 系统标识*/
private java.lang.String sysSign;
/** 是否已删除（0未删除，1已删除）*/
private Integer deleted;
/** 创建人*/
private java.lang.String createUserId;
/** 创建时间*/
private java.util.Date createTime;
/** 修改人*/
private java.lang.String updateUserId;
/** 修改时间*/
private java.util.Date updateTime;
/** 备用项1*/
private java.lang.String byx1;
/** 备用项2*/
private java.lang.String byx2;
/** 备用项3*/
private java.lang.String byx3;
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 线路名称的getter方法 */
public java.lang.String getName() {
return name;
}
/** 线路名称的setter方法 */
public void setName(java.lang.String name) {
this.name = name;
}
/** 线路编码的getter方法 */
public java.lang.String getCode() {
return code;
}
/** 线路编码的setter方法 */
public void setCode(java.lang.String code) {
this.code = code;
}
/** 线路类型(备用)的getter方法 */
public Integer getType() {
return type;
}
/** 线路类型(备用)的setter方法 */
public void setType(Integer type) {
this.type = type;
}
/** 线路描述(备用)的getter方法 */
public java.lang.String getRemark() {
return remark;
}
/** 线路描述(备用)的setter方法 */
public void setRemark(java.lang.String remark) {
this.remark = remark;
}
/** 排序值(备用)的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值(备用)的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public java.lang.String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(java.lang.String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public java.lang.String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(java.lang.String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public java.lang.String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(java.lang.String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public java.lang.String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(java.lang.String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public java.lang.String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(java.lang.String byx3) {
this.byx3 = byx3;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/model/LiStationMapModel.java
View file @ 855769e1
package com.devplatform.admin.modules.liresource.model;
import lombok.Data;
/**
* 线路站点地图附件表的Model <br>
*
* @author 代码生成器产生
*/
@Data
public class LiStationMapModel {
/** 主键id*/
......@@ -48,165 +51,4 @@ public class LiStationMapModel {
private java.lang.String resourceName;
/** 资源点类型*/
private java.lang.String resourceType;
public String getResourceType() {
return resourceType;
}
public void setResourceType(String resourceType) {
this.resourceType = resourceType;
}
public String getSubSystemDicId() {
return subSystemDicId;
}
public void setSubSystemDicId(String subSystemDicId) {
this.subSystemDicId = subSystemDicId;
}
public String getResourceName() {
return resourceName;
}
public void setResourceName(String resourceName) {
this.resourceName = resourceName;
}
/** 主键id的getter方法 */
public java.lang.String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(java.lang.String id) {
this.id = id;
}
/** 站点表id的getter方法 */
public java.lang.String getStationId() {
return stationId;
}
/** 站点表id的setter方法 */
public void setStationId(java.lang.String stationId) {
this.stationId = stationId;
}
/** 地图名称的getter方法 */
public java.lang.String getName() {
return name;
}
/** 地图名称的setter方法 */
public void setName(java.lang.String name) {
this.name = name;
}
/** 附件名称的getter方法 */
public java.lang.String getFileName() {
return fileName;
}
/** 附件名称的setter方法 */
public void setFileName(java.lang.String fileName) {
this.fileName = fileName;
}
/** 附件路径的getter方法 */
public java.lang.String getFilePath() {
return filePath;
}
/** 附件路径的setter方法 */
public void setFilePath(java.lang.String filePath) {
this.filePath = filePath;
}
/** 排序值的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 系统标识的getter方法 */
public java.lang.String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(java.lang.String sysSign) {
this.sysSign = sysSign;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public java.lang.String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(java.lang.String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public java.lang.String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(java.lang.String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public java.lang.String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(java.lang.String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public java.lang.String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(java.lang.String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public java.lang.String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(java.lang.String byx3) {
this.byx3 = byx3;
}
public java.lang.String getSubCode() {
return subCode;
}
public void setSubCode(java.lang.String subCode) {
this.subCode = subCode;
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/LiLineService.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.admin.modules.liresource.service;
import com.devplatform.admin.modules.liresource.bean.LiLine;
import com.devplatform.admin.modules.liresource.model.LiLineModel;
import com.devplatform.common.service.MyBaseService;
import java.util.List;
/**
* 线路管理表的service接口 <br>
* <b>功能：</b>LiLineService<br>
*
* @author 代码生成器产生
*/
public interface LiLineService extends MyBaseService<LiLine> {
/**
* 分页数据查询
*
* @param model
* @return
*/
List<LiLine> queryPageByList(LiLineModel model);
/**
* 获取线路树
*
* @param model
* @return
*/
List<LiLine> getTreeList(LiLineModel model);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/LiStationService.java
View file @ 855769e1
......@@ -51,19 +51,4 @@ public interface LiStationService extends MyBaseService<LiStation> {
*/
List<Map<String, Object>> queryPageByListTakeover(LiStationModel model);
/**
* 获取当前线路车站排序值
*
* @param lineId
* @return
*/
Integer getOrderNum(String lineId);
/**
* 根据线路id获取所有的站点id
*
* @param lineId
* @return
*/
List<String> queryStationIds(String lineId);
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/impl/LiLineServiceImpl.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.admin.modules.liresource.service.impl;
import com.devplatform.admin.modules.liresource.bean.LiLine;
import com.devplatform.admin.modules.liresource.dao.LiLineDao;
import com.devplatform.admin.modules.liresource.model.LiLineModel;
import com.devplatform.admin.modules.liresource.service.LiLineService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import java.util.List;
import org.springframework.stereotype.Service;
/**
* 线路管理表的service接口实现类 <br>
* <b>功能：</b>LiLineServiceImpl<br>
*
* @author 代码生成器产生
*/
@Service("liLineService")
public class LiLineServiceImpl extends MyBaseServiceImpl<LiLineDao, LiLine>
implements LiLineService {
@Override
public List<LiLine> queryPageByList(LiLineModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageByList(model);
}
@Override
public List<LiLine> getTreeList(LiLineModel model) {
return baseMapper.getTreeList(model);
}
}
microservice-admin/src/main/java/com/devplatform/admin/modules/liresource/service/impl/LiStationServiceImpl.java
View file @ 855769e1
......@@ -8,13 +8,12 @@ import com.devplatform.admin.modules.liresource.service.LiStationMapService;
import com.devplatform.admin.modules.liresource.service.LiStationService;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import com.devplatform.common.util.StringUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 线路站点管理表的service接口实现类 <br>
* <b>功能：</b>LiStationServiceImpl<br>
......@@ -67,26 +66,5 @@ public class LiStationServiceImpl extends MyBaseServiceImpl<LiStationDao, LiStat
return baseMapper.queryPageByListTakeover(model);
}
@Override
public Integer getOrderNum(String lineId) {
return baseMapper.getOrderNum(lineId);
}
@Override
public List<String> queryStationIds(String lineId) {
List<LiStation> liStationList = new ArrayList<>();
if (StringUtils.isNotBlank(lineId)) {
liStationList =
list(new QueryWrapper<LiStation>().select("id").eq("deleted", 0).eq("line_id", lineId));
} else {
liStationList = list(new QueryWrapper<LiStation>().select("id").eq("deleted", 0));
}
List<String> stringList = new ArrayList<>();
for (LiStation liStation : liStationList) {
stringList.add(liStation.getId());
}
return stringList;
}
}
microservice-admin/src/main/resources/mapper/liResource/LiLineMapper.xml deleted 100644 → 0
View file @ d171aed5
<?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.liresource.dao.LiLineDao">
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.liresource.bean.LiLine">
<result column="id" property="id"/>
<result column="name" property="name"/>
<result column="code" property="code"/>
<result column="type" property="type"/>
<result column="remark" property="remark"/>
<result column="order_num" property="orderNum"/>
<result column="status" property="status"/>
<result column="sys_sign" property="sysSign"/>
<result column="deleted" property="deleted"/>
<result column="create_user_id" property="createUserId"/>
<result column="create_time" property="createTime"/>
<result column="update_user_id" property="updateUserId"/>
<result column="update_time" property="updateTime"/>
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
</resultMap>
<!-- li_line table all fields -->
<sql id="Base_Column_List">
id,name,code,type,remark,order_num,status,sys_sign,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
</sql>
<!-- 公共查询条件 -->
<sql id="Example_Where_Clause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="name!=null and name!=''">and name = #{name}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="type!=null ">and type = #{type}</if>
<if test="remark!=null and remark!=''">and remark = #{remark}</if>
<if test="orderNum!=null ">and order_num = #{orderNum}</if>
<if test="status!=null ">and status = #{status}</if>
<if test="sysSign!=null and sysSign!=''">and sys_sign = #{sysSign}</if>
<if test="deleted!=null ">and deleted = #{deleted}</if>
<if test="createUserId!=null and createUserId!=''">and create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and create_time = #{createTime}</if>
<if test="updateUserId!=null and updateUserId!=''">and update_user_id = #{updateUserId}</if>
<if test="updateTime!=null ">and update_time = #{updateTime}</if>
<if test="byx1!=null and byx1!=''">and byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and byx3 = #{byx3}</if>
</sql>
<!--查询总数-->
<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">
select count(1) from li_line
<include refid="queryPageByListClause"></include>
</select>
<select id="queryPageByList" parameterType="Object" resultMap="BaseResultMap">
select * from li_line
<include refid="queryPageByListClause"></include>
<if test="pager.orderCondition != null and pager.orderCondition != ''">
${pager.orderCondition}
</if>
<if test="pager.mysqlQueryCondition != null and pager.mysqlQueryCondition != ''">
${pager.mysqlQueryCondition}
</if>
</select>
<!-- 公共查询条件 -->
<sql id="queryPageByListClause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="name!=null and name!=''">and name = #{name}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="type!=null ">and type = #{type}</if>
<if test="remark!=null and remark!=''">and remark = #{remark}</if>
<if test="orderNum!=null ">and order_num = #{orderNum}</if>
<if test="status!=null ">and status = #{status}</if>
<if test="sysSign!=null and sysSign!=''">and sys_sign = #{sysSign}</if>
<if test="deleted!=null ">and deleted = #{deleted}</if>
<if test="createUserId!=null and createUserId!=''">and create_user_id = #{createUserId}</if>
<if test="createTime!=null ">and create_time = #{createTime}</if>
<if test="updateUserId!=null and updateUserId!=''">and update_user_id = #{updateUserId}</if>
<if test="updateTime!=null ">and update_time = #{updateTime}</if>
<if test="byx1!=null and byx1!=''">and byx1 = #{byx1}</if>
<if test="byx2!=null and byx2!=''">and byx2 = #{byx2}</if>
<if test="byx3!=null and byx3!=''">and byx3 = #{byx3}</if>
</sql>
<select id="getTreeList" parameterType="Object" resultMap="BaseResultMap">
select id,name,code from li_line
<include refid="queryPageByListClause"></include>
order by order_num
</select>
</mapper>
microservice-admin/src/main/resources/mapper/liResource/LiResourceMapper.xml
View file @ 855769e1
......@@ -7,12 +7,9 @@
<result column="name" property="name"/>
<result column="code" property="code"/>
<result column="type" property="type"/>
<result column="line_id" property="lineId"/>
<result column="line_name" property="lineName"/>
<result column="station_id" property="stationId"/>
<result column="station_name" property="stationName"/>
<result column="tier_id" property="tierId"/>
<result column="room_Id" property="roomId"/>
<result column="sub_system" property="subSystem"/>
<result column="sub_code" property="subCode"/>
<result column="address_code" property="addressCode"/>
......@@ -49,7 +46,7 @@
<!-- li_resource table all fields -->
<sql id="Base_Column_List">
id,name,code,type,line_id,line_name,station_id,station_name,tier_id,room_Id,sub_system,sub_code,address_code,port,ajj_port,username,password,xpoint,ypoint,width,rotate,deploy_location,operator_id,operator_name,attached_info,remark,icon,parent_name,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3,brand,xlongit,ylat,image_src
id,name,code,type,station_id,station_name,tier_id,sub_system,sub_code,address_code,port,ajj_port,username,password,xpoint,ypoint,width,rotate,deploy_location,operator_id,operator_name,attached_info,remark,icon,parent_name,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3,brand,xlongit,ylat,image_src
</sql>
<!-- 公共查询条件 -->
......@@ -59,12 +56,9 @@
<if test="name!=null and name!=''">and name = #{name}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="type!=null and type!=''">and type = #{type}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="tierId!=null and tierId!=''">and tier_id = #{tierId}</if>
<if test="roomId!=null and roomId!=''">and room_Id = #{roomId}</if>
<if test="subSystem!=null and subSystem!=''">and sub_system = #{subSystem}</if>
<if test="subCode!=null and subCode!=''">and sub_code = #{subCode}</if>
<if test="addressCode!=null and addressCode!=''">and address_code = #{addressCode}</if>
......@@ -117,8 +111,6 @@
<if test="name!=null and name!=''">and INSTR(name, #{name})</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="type!=null and type!=''">and type = #{type}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="tierId!=null and tierId!=''">and tier_id = #{tierId}</if>
......@@ -165,12 +157,9 @@
<if test="name!=null and name!=''">and INSTR(li.name, #{name})</if>
<if test="code!=null and code!=''">and li.code = #{code}</if>
<if test="type!=null and type!=''">and li.type = #{type}</if>
<if test="lineId!=null and lineId!=''">and li.line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and li.line_name = #{lineName}</if>
<if test="stationId!=null and stationId!=''">and li.station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and li.station_name = #{stationName}</if>
<if test="tierId!=null and tierId!=''">and li.tier_id = #{tierId}</if>
<if test="roomId!=null and roomId!=''">and li.room_id = #{roomId}</if>
<if test="subSystem!=null and subSystem!=''">and li.sub_system = #{subSystem}</if>
<if test="subCode!=null and subCode!=''">and li.sub_code = #{subCode}</if>
<if test="addressCode!=null and addressCode!=''">and li.address_code = #{addressCode}</if>
......@@ -266,7 +255,7 @@
where deleted = 0 and tier_id = #{tierId}
</select>
<select id="queryByCode" resultType="com.devplatform.admin.modules.liresource.bean.LiResource">
select lr.id,lr.name,lr.code,sd.name as 'type',lr.address_code,lr.port,lr.ajj_port,lr.username,lr.password,lr.deploy_location,lr.line_name,lr.station_name,lr.sub_system,
select lr.id,lr.name,lr.code,sd.name as 'type',lr.address_code,lr.port,lr.ajj_port,lr.username,lr.password,lr.deploy_location,lr.station_name,lr.sub_system,
sd2.name as brandName,
CASE lr.byx2
WHEN 0 THEN '离线'
......
microservice-admin/src/main/resources/mapper/liResource/LiStationMapper.xml
View file @ 855769e1
......@@ -4,8 +4,6 @@
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.liresource.bean.LiStation">
<result column="id" property="id"/>
<result column="line_id" property="lineId"/>
<result column="line_name" property="lineName"/>
<result column="station_name" property="stationName"/>
<result column="code" property="code"/>
<result column="short_name" property="shortName"/>
......@@ -38,7 +36,7 @@
<!-- li_station table all fields -->
<sql id="Base_Column_List">
id,line_id,line_name,station_name,code,short_name,x,y,location,icon,type,remark,order_num,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
id,station_name,code,short_name,x,y,location,icon,type,remark,order_num,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
,coordinate_x,coordinate_y,text_position,line_color,line_code,station_id,is_master
</sql>
......@@ -46,8 +44,6 @@
<sql id="Example_Where_Clause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="shortName!=null and shortName!=''">and short_name = #{shortName}</if>
......@@ -99,8 +95,6 @@
<sql id="queryPageByListClause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="shortName!=null and shortName!=''">and short_name = #{shortName}</if>
......@@ -132,7 +126,7 @@
</sql>
<select id="getTreeList" parameterType="Object" resultMap="BaseResultMap">
select id,station_name,code,line_id,line_name from li_station
select id,station_name,code from li_station
<include refid="queryPageByListClause"></include>
order by order_num
</select>
......@@ -145,7 +139,7 @@
<select id="queryPageByListTakeover" parameterType="Object" resultType="map">
select
ls.id,ls.line_id as lineId,ls.line_name as lineName,ls.station_name as stationName,ls.type,ls.is_master as isMaster,ls.code,ls.byx1,ls.byx2,ls.short_name as shortName, sst.id as takeoverId,
ls.id,ls.station_name as stationName,ls.type,ls.is_master as isMaster,ls.code,ls.byx1,ls.byx2,ls.short_name as shortName, sst.id as takeoverId,
case when sst.status=2 AND sst.apply_type=1 then 2
when sst.status=2 AND sst.apply_type=2 then 3
ELSE 1 end AS runStatus,sst.status AS takeoverStatus
......@@ -165,8 +159,6 @@
left join sys_station_takeover sst on sst.station_id=ls.id AND sst.deleted=0 AND sst.valids=1
where ls.deleted=0
<if test="id!=null and id!=''">and ls.id = #{id}</if>
<if test="lineId!=null and lineId!=''">and ls.line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and ls.line_name = #{lineName}</if>
<if test="stationName!=null and stationName!=''">and ls.station_name = #{stationName}</if>
<if test="code!=null and code!=''">and ls.code = #{code}</if>
<if test="shortName!=null and shortName!=''">and ls.short_name = #{shortName}</if>
......@@ -196,11 +188,6 @@
<if test="lineColor!=null and lineColor!=''">and ls.line_color = #{lineColor}</if>
<if test="lineCode!=null and lineCode!=''">and ls.line_code = #{lineCode}</if>
</sql>
<select id="getOrderNum" parameterType="Object" resultType="integer">
select max(order_num) from li_station
where deleted=0 and line_id=#{lineId}
</select>
</mapper>
microservice-alram/src/main/java/com/devplatform/alarm/modules/li/bean/LiStation.java
View file @ 855769e1
......@@ -4,12 +4,14 @@ 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;
/**
* @author Administrator
*/
@Data
@ApiModel(value = "线路站点管理表对象", description = "线路站点管理表对象")
@TableName("li_station")
public class LiStation implements Serializable {
......@@ -23,14 +25,6 @@ public class LiStation implements Serializable {
/** 主键id*/
private String id;
@ApiModelProperty(value = "线路表id", name = "lineId")
/** 线路表id*/
private String lineId;
@ApiModelProperty(value = "线路名称", name = "lineName")
/** 线路名称*/
private String lineName;
@ApiModelProperty(value = "车站名称", name = "stationName")
/** 车站名称*/
private String stationName;
......@@ -134,350 +128,4 @@ public class LiStation implements Serializable {
@ApiModelProperty(value = "地铁线路编号", name = "lineCode")
/** 地铁线路编号*/
private String lineCode;
public String getX() {
return x;
}
public void setX(String x) {
this.x = x;
}
public String getY() {
return y;
}
public void setY(String y) {
this.y = y;
}
public String getLocation() {
return location;
}
public void setLocation(String location) {
this.location = location;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
/**
* 主键id的getter方法
*/
public String getId() {
return id;
}
/**
* 主键id的setter方法
*/
public void setId(String id) {
this.id = id;
}
/**
* 线路表id的getter方法
*/
public String getLineId() {
return lineId;
}
/**
* 线路表id的setter方法
*/
public void setLineId(String lineId) {
this.lineId = lineId;
}
/**
* 线路名称的getter方法
*/
public String getLineName() {
return lineName;
}
/**
* 线路名称的setter方法
*/
public void setLineName(String lineName) {
this.lineName = lineName;
}
/**
* 车站名称的getter方法
*/
public String getStationName() {
return stationName;
}
/**
* 车站名称的setter方法
*/
public void setStationName(String stationName) {
this.stationName = stationName;
}
/**
* 车站编号的getter方法
*/
public String getCode() {
return code;
}
/**
* 车站编号的setter方法
*/
public void setCode(String code) {
this.code = code;
}
/**
* 简称的getter方法
*/
public String getShortName() {
return shortName;
}
/**
* 简称的setter方法
*/
public void setShortName(String shortName) {
this.shortName = shortName;
}
/**
* 站点类型(1正线车站，2换乘车站)的getter方法
*/
public String getType() {
return type;
}
/**
* 站点类型(1正线车站，2换乘车站)的setter方法
*/
public void setType(String type) {
this.type = type;
}
/**
* 站点描述的getter方法
*/
public String getRemark() {
return remark;
}
/**
* 站点描述的setter方法
*/
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getIsMaster() {
return isMaster;
}
public void setIsMaster(Integer isMaster) {
this.isMaster = isMaster;
}
/**
* 排序值的getter方法
*/
public Integer getOrderNum() {
return orderNum;
}
/**
* 排序值的setter方法
*/
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/**
* 系统标识的getter方法
*/
public String getSysSign() {
return sysSign;
}
/**
* 系统标识的setter方法
*/
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
/**
* 状态(1正常，0不可用)的getter方法
*/
public Integer getStatus() {
return status;
}
/**
* 状态(1正常，0不可用)的setter方法
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* 是否已删除（0未删除，1已删除）的getter方法
*/
public Integer getDeleted() {
return deleted;
}
/**
* 是否已删除（0未删除，1已删除）的setter方法
*/
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/**
* 创建人的getter方法
*/
public String getCreateUserId() {
return createUserId;
}
/**
* 创建人的setter方法
*/
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
/**
* 创建时间的getter方法
*/
public java.util.Date getCreateTime() {
return createTime;
}
/**
* 创建时间的setter方法
*/
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/**
* 修改人的getter方法
*/
public String getUpdateUserId() {
return updateUserId;
}
/**
* 修改人的setter方法
*/
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
/**
* 修改时间的getter方法
*/
public java.util.Date getUpdateTime() {
return updateTime;
}
/**
* 修改时间的setter方法
*/
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/**
* 备用项1的getter方法
*/
public String getByx1() {
return byx1;
}
/**
* 备用项1的setter方法
*/
public void setByx1(String byx1) {
this.byx1 = byx1;
}
/**
* 备用项2的getter方法
*/
public String getByx2() {
return byx2;
}
/**
* 备用项2的setter方法
*/
public void setByx2(String byx2) {
this.byx2 = byx2;
}
/**
* 备用项3的getter方法
*/
public String getByx3() {
return byx3;
}
/**
* 备用项3的setter方法
*/
public void setByx3(String byx3) {
this.byx3 = byx3;
}
public Integer getCoordinateX() {
return coordinateX;
}
public void setCoordinateX(Integer coordinateX) {
this.coordinateX = coordinateX;
}
public Integer getCoordinateY() {
return coordinateY;
}
public void setCoordinateY(Integer coordinateY) {
this.coordinateY = coordinateY;
}
public Integer getTextPosition() {
return textPosition;
}
public void setTextPosition(Integer textPosition) {
this.textPosition = textPosition;
}
public String getLineColor() {
return lineColor;
}
public void setLineColor(String lineColor) {
this.lineColor = lineColor;
}
public String getLineCode() {
return lineCode;
}
public void setLineCode(String lineCode) {
this.lineCode = lineCode;
}
}
microservice-alram/src/main/java/com/devplatform/alarm/modules/li/model/LiStationModel.java
View file @ 855769e1
package com.devplatform.alarm.modules.li.model;
import com.devplatform.alarm.common.model.BaseModel;
import lombok.Data;
/**
* 线路站点管理表的Model <br>
*
* @author 代码生成器产生
*/
@Data
public class LiStationModel extends BaseModel {
/** 主键id*/
private String id;
/** 线路表id*/
private String lineId;
/** 线路名称*/
private String lineName;
/** 车站名称*/
private String stationName;
/** 车站编号*/
......@@ -68,350 +66,4 @@ public class LiStationModel extends BaseModel {
private String lineColor;
/** 地铁线路编号*/
private String lineCode;
public String getX() {
return x;
}
public void setX(String x) {
this.x = x;
}
public String getY() {
return y;
}
public void setY(String y) {
this.y = y;
}
public String getLocation() {
return location;
}
public void setLocation(String location) {
this.location = location;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
/**
* 主键id的getter方法
*/
public String getId() {
return id;
}
/**
* 主键id的setter方法
*/
public void setId(String id) {
this.id = id;
}
/**
* 线路表id的getter方法
*/
public String getLineId() {
return lineId;
}
/**
* 线路表id的setter方法
*/
public void setLineId(String lineId) {
this.lineId = lineId;
}
/**
* 线路名称的getter方法
*/
public String getLineName() {
return lineName;
}
/**
* 线路名称的setter方法
*/
public void setLineName(String lineName) {
this.lineName = lineName;
}
/**
* 车站名称的getter方法
*/
public String getStationName() {
return stationName;
}
/**
* 车站名称的setter方法
*/
public void setStationName(String stationName) {
this.stationName = stationName;
}
/**
* 车站编号的getter方法
*/
public String getCode() {
return code;
}
/**
* 车站编号的setter方法
*/
public void setCode(String code) {
this.code = code;
}
/**
* 简称的getter方法
*/
public String getShortName() {
return shortName;
}
/**
* 简称的setter方法
*/
public void setShortName(String shortName) {
this.shortName = shortName;
}
/**
* 站点类型(1正线车站，2换乘车站)的getter方法
*/
public String getType() {
return type;
}
/**
* 站点类型(1正线车站，2换乘车站)的setter方法
*/
public void setType(String type) {
this.type = type;
}
/**
* 站点描述的getter方法
*/
public String getRemark() {
return remark;
}
/**
* 站点描述的setter方法
*/
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getIsMaster() {
return isMaster;
}
public void setIsMaster(Integer isMaster) {
this.isMaster = isMaster;
}
/**
* 排序值的getter方法
*/
public Integer getOrderNum() {
return orderNum;
}
/**
* 排序值的setter方法
*/
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/**
* 系统标识的getter方法
*/
public String getSysSign() {
return sysSign;
}
/**
* 系统标识的setter方法
*/
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
/**
* 状态(1正常，0不可用)的getter方法
*/
public Integer getStatus() {
return status;
}
/**
* 状态(1正常，0不可用)的setter方法
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* 是否已删除（0未删除，1已删除）的getter方法
*/
public Integer getDeleted() {
return deleted;
}
/**
* 是否已删除（0未删除，1已删除）的setter方法
*/
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/**
* 创建人的getter方法
*/
public String getCreateUserId() {
return createUserId;
}
/**
* 创建人的setter方法
*/
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
/**
* 创建时间的getter方法
*/
public java.util.Date getCreateTime() {
return createTime;
}
/**
* 创建时间的setter方法
*/
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/**
* 修改人的getter方法
*/
public String getUpdateUserId() {
return updateUserId;
}
/**
* 修改人的setter方法
*/
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
/**
* 修改时间的getter方法
*/
public java.util.Date getUpdateTime() {
return updateTime;
}
/**
* 修改时间的setter方法
*/
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/**
* 备用项1的getter方法
*/
public String getByx1() {
return byx1;
}
/**
* 备用项1的setter方法
*/
public void setByx1(String byx1) {
this.byx1 = byx1;
}
/**
* 备用项2的getter方法
*/
public String getByx2() {
return byx2;
}
/**
* 备用项2的setter方法
*/
public void setByx2(String byx2) {
this.byx2 = byx2;
}
/**
* 备用项3的getter方法
*/
public String getByx3() {
return byx3;
}
/**
* 备用项3的setter方法
*/
public void setByx3(String byx3) {
this.byx3 = byx3;
}
public Integer getCoordinateX() {
return coordinateX;
}
public void setCoordinateX(Integer coordinateX) {
this.coordinateX = coordinateX;
}
public Integer getCoordinateY() {
return coordinateY;
}
public void setCoordinateY(Integer coordinateY) {
this.coordinateY = coordinateY;
}
public Integer getTextPosition() {
return textPosition;
}
public void setTextPosition(Integer textPosition) {
this.textPosition = textPosition;
}
public String getLineColor() {
return lineColor;
}
public void setLineColor(String lineColor) {
this.lineColor = lineColor;
}
public String getLineCode() {
return lineCode;
}
public void setLineCode(String lineCode) {
this.lineCode = lineCode;
}
}
microservice-alram/src/main/resources/mapper/li/LiStationMapper.xml
View file @ 855769e1
......@@ -4,8 +4,6 @@
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.alarm.modules.li.bean.LiStation">
<result column="id" property="id"/>
<result column="line_id" property="lineId"/>
<result column="line_name" property="lineName"/>
<result column="station_name" property="stationName"/>
<result column="code" property="code"/>
<result column="short_name" property="shortName"/>
......@@ -27,7 +25,6 @@
<result column="byx1" property="byx1"/>
<result column="byx2" property="byx2"/>
<result column="byx3" property="byx3"/>
<result column="coordinate_x" property="coordinateX"/>
<result column="coordinate_y" property="coordinateY"/>
<result column="text_position" property="textPosition"/>
......@@ -37,7 +34,7 @@
<!-- li_station table all fields -->
<sql id="Base_Column_List">
id,line_id,line_name,station_name,code,short_name,x,y,location,icon,type,remark,order_num,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
id,station_name,code,short_name,x,y,location,icon,type,remark,order_num,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
,coordinate_x,coordinate_y,text_position,line_color,line_code,is_master
</sql>
......@@ -45,8 +42,6 @@
<sql id="Example_Where_Clause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="shortName!=null and shortName!=''">and short_name = #{shortName}</if>
......
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liline/bean/LiLine.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.equipment.modules.liline.bean;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.devplatform.equipment.modules.listation.bean.LiStation;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.List;
/**
* @author Administrator
*/
@ApiModel(value = "线路管理表对象", description = "线路管理表对象")
@TableName("li_line")
public class LiLine implements Serializable {
/** */
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键ID", name = "id")
@TableId
/** 主键id*/
private String id;
@ApiModelProperty(value = "线路名称", name = "name")
/** 线路名称*/
private String name;
@ApiModelProperty(value = "线路编码", name = "code")
/** 线路编码*/
private String code;
@ApiModelProperty(value = "线路类型(备用)", name = "type")
/** 线路类型(备用)*/
private Integer type;
@ApiModelProperty(value = "线路描述(备用)", name = "remark")
/** 线路描述(备用)*/
private String remark;
@ApiModelProperty(value = "排序值(备用)", name = "orderNum")
/** 排序值(备用)*/
private Integer orderNum;
@ApiModelProperty(value = "状态(1正常，0不可用)", name = "status")
/** 状态(1正常，0不可用)*/
private Integer status;
@ApiModelProperty(value = "系统标识", name = "sysSign")
/** 系统标识*/
private String sysSign;
@ApiModelProperty(value = "是否已删除（0未删除，1已删除）", name = "deleted")
/** 是否已删除（0未删除，1已删除）*/
private Integer deleted;
@ApiModelProperty(value = "创建人", name = "createUserId")
/** 创建人*/
private String createUserId;
@ApiModelProperty(value = "创建时间", name = "createTime")
/** 创建时间*/
private java.util.Date createTime;
@ApiModelProperty(value = "修改人", name = "updateUserId")
/** 修改人*/
private String updateUserId;
@ApiModelProperty(value = "修改时间", name = "updateTime")
/** 修改时间*/
private java.util.Date updateTime;
@ApiModelProperty(value = "备用项1", name = "byx1")
/** 备用项1*/
private String byx1;
@ApiModelProperty(value = "备用项2", name = "byx2")
/** 备用项2*/
private String byx2;
@ApiModelProperty(value = "备用项3", name = "byx3")
/** 备用项3*/
private String byx3;
@TableField(exist = false)
private List<LiStation> liStationList;
/** 主键id的getter方法 */
public String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(String id) {
this.id = id;
}
/** 线路名称的getter方法 */
public String getName() {
return name;
}
/** 线路名称的setter方法 */
public void setName(String name) {
this.name = name;
}
/** 线路编码的getter方法 */
public String getCode() {
return code;
}
/** 线路编码的setter方法 */
public void setCode(String code) {
this.code = code;
}
/** 线路类型(备用)的getter方法 */
public Integer getType() {
return type;
}
/** 线路类型(备用)的setter方法 */
public void setType(Integer type) {
this.type = type;
}
/** 线路描述(备用)的getter方法 */
public String getRemark() {
return remark;
}
/** 线路描述(备用)的setter方法 */
public void setRemark(String remark) {
this.remark = remark;
}
/** 排序值(备用)的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值(备用)的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 系统标识的getter方法 */
public String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(String byx3) {
this.byx3 = byx3;
}
public List<LiStation> getLiStationList() {
return liStationList;
}
public void setLiStationList(List<LiStation> liStationList) {
this.liStationList = liStationList;
}
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liline/controller/LiLineController.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.equipment.modules.liline.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.devplatform.common.base.annotation.SysLog;
import com.devplatform.common.base.validator.ValidatorUtils;
import com.devplatform.common.util.PageUtils;
import com.devplatform.common.util.R;
import com.devplatform.common.util.StringUtil;
import com.devplatform.equipment.common.annotation.SysLogMethod;
import com.devplatform.equipment.common.utils.AbstractController;
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.listation.bean.LiStation;
import com.devplatform.equipment.modules.listation.service.LiStationService;
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.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.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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Administrator
*/
@Api(tags = {"线路管理表接口"})
@RestController
@RequestMapping("/liLine")
public class LiLineController extends AbstractController {
@Autowired private LiLineService liLineService;
@Autowired private LiStationService liStationService;
/**
* 列表页面列表数据获取
*
* @param model 承接对象
* @return
*/
@ApiOperation(value = "根据条件获取线路管理表分页数据列表", notes = "根据条件获取线路管理表分页数据列表")
@ApiImplicitParam(
name = "params",
value = "参数",
required = true,
dataType = "Map<String, Object>")
@PostMapping("/list")
public R list(@RequestParam Map<String, Object> params) {
PageUtils page = liLineService.queryPage(params, null);
return R.ok().put("page", page);
}
/**
* 添加
*
* @param bean 线路管理表对象
* @return
*/
@SysLog("添加线路管理表")
@SysLogMethod(operation = "新增", blockName = "线路管理", detail = "新增线路管理数据")
@ApiOperation(value = "新增线路管理表数据", notes = "新增线路管理表数据")
@PostMapping("/save")
public R save(@RequestBody @ApiParam(value = "线路管理表实体对象", required = true) LiLine bean) {
ValidatorUtils.validateEntity(bean);
bean.setCreateUserId(getUserId());
bean.setCreateTime(new Date());
liLineService.save(bean);
return R.ok();
}
/**
* 修改
*
* @param bean 线路管理表对象
* @return
*/
@SysLog("修改线路管理表")
@SysLogMethod(operation = "修改", blockName = "线路管理", detail = "修改线路管理数据")
@ApiOperation(value = "修改线路管理表数据", notes = "修改线路管理表数据")
@PostMapping("/update")
public R update(@RequestBody @ApiParam(value = "线路管理表实体对象", required = true) LiLine bean) {
ValidatorUtils.validateEntity(bean);
bean.setUpdateUserId(getUserId());
bean.setUpdateTime(new Date());
bean.setSysSign(getUser().getSysSystem().getCode());
liLineService.update(
bean,
new QueryWrapper<LiLine>().eq(StringUtil.checkNotNull(bean.getId()), "id", bean.getId()));
return R.ok();
}
/**
* 根据ID获取线路管理表对象
*
* @param id 对象主键
* @return
*/
@ApiOperation(value = "根据ID获取线路管理表对象", notes = "根据ID获取线路管理表对象")
@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String")
@GetMapping("/getId/{id}")
public R getId(@PathVariable String id) {
LiLine bean = liLineService.getById(id);
return R.ok().put("bean", bean);
}
/**
* 根据ID获取线路管理表对象
*
* @param id[] 线路管理表对象主键数组
* @return
*/
@SysLog("删除线路管理表")
@SysLogMethod(operation = "删除", blockName = "线路管理", detail = "删除线路数据")
@ApiOperation(value = "根据ID批量删除线路管理表数据", notes = "根据ID批量删除线路管理表数据")
@ApiImplicitParam(name = "ids", value = "主键数组", required = true, dataType = "String")
@PostMapping("/delete")
public R delete(@RequestBody String[] ids) {
liLineService.removeByIds(Arrays.asList(ids));
return R.ok();
}
/**
* 列表数据获取
*
* @param model 承接对象
* @return
*/
@ApiOperation(value = "根据条件获取线路管理表数据列表", notes = "根据条件获取线路管理表数据列表")
@ApiImplicitParam(name = "model", value = "参数", required = true, dataType = "LiLineModel")
@PostMapping("/listAll")
public R listAll(@RequestBody LiLineModel model) {
model.setRows(Integer.MAX_VALUE);
if (StringUtils.isBlank(model.getSort())) {
model.setSort("order_num");
model.setOrder("ASC");
}
List<LiLine> list = liLineService.queryPageByList(model);
return R.ok().put("page", getMyPage(list, model));
}
/**
* 获取线路树
*
* @param model 承接对象
* @return
*/
@ApiOperation(value = "获取线路树", notes = "获取线路树")
@ApiImplicitParam(name = "model", value = "参数", required = true, dataType = "LiLineModel")
@PostMapping("/getTreeList")
public R getTreeList(@RequestBody LiLineModel model) {
List<LiLine> list = liLineService.getTreeList(model);
List<Map<String, Object>> tree = new ArrayList<>();
Map<String, Object> root = new HashMap<>(5);
root.put("name", "线路");
root.put("children", list);
tree.add(root);
return R.ok().put("tree", tree);
}
@ApiOperation(value = "获取线路与站点的级联关系", notes = "获取线路与站点的级联关系")
@PostMapping("/getTreeListStation")
public R getTreeListStation() {
List<LiLine> liLines = liLineService.list(new QueryWrapper<LiLine>().orderByAsc("order_num"));
List<LiStation> liStations =
liStationService.list(new QueryWrapper<LiStation>().orderByAsc("order_num"));
return R.ok().put("liList", liLines).put("lisList", liStations);
}
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liline/dao/LiLineDao.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.equipment.modules.liline.dao;
import com.devplatform.common.dao.MyBaseMapper;
import com.devplatform.equipment.modules.liline.bean.LiLine;
import com.devplatform.equipment.modules.liline.model.LiLineModel;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* LiLine Mapper 用于线路管理表的数据库操作
*
* @author Administrator
*/
@Mapper
@Repository
public interface LiLineDao extends MyBaseMapper<LiLine> {
/**
* 分页查询数量
*
* @param model
* @return
*/
Integer queryPageByCount(LiLineModel model);
/**
* 分页查询数据
*
* @param model
* @return
*/
List<LiLine> queryPageByList(LiLineModel model);
/**
* 获取线路树
*
* @param model
* @return
*/
List<LiLine> getTreeList(LiLineModel model);
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liline/model/LiLineModel.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.equipment.modules.liline.model;
import com.devplatform.equipment.common.model.BaseModel;
/**
* 线路管理表的Model <br>
*
* @author 代码生成器产生
*/
public class LiLineModel extends BaseModel {
/** 主键id*/
private String id;
/** 线路名称*/
private String name;
/** 线路编码*/
private String code;
/** 线路类型(备用)*/
private Integer type;
/** 线路描述(备用)*/
private String remark;
/** 排序值(备用)*/
private Integer orderNum;
/** 状态(1正常，0不可用)*/
private Integer status;
/** 系统标识*/
private String sysSign;
/** 是否已删除（0未删除，1已删除）*/
private Integer deleted;
/** 创建人*/
private String createUserId;
/** 创建时间*/
private java.util.Date createTime;
/** 修改人*/
private String updateUserId;
/** 修改时间*/
private java.util.Date updateTime;
/** 备用项1*/
private String byx1;
/** 备用项2*/
private String byx2;
/** 备用项3*/
private String byx3;
/** 主键id的getter方法 */
public String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(String id) {
this.id = id;
}
/** 线路名称的getter方法 */
public String getName() {
return name;
}
/** 线路名称的setter方法 */
public void setName(String name) {
this.name = name;
}
/** 线路编码的getter方法 */
public String getCode() {
return code;
}
/** 线路编码的setter方法 */
public void setCode(String code) {
this.code = code;
}
/** 线路类型(备用)的getter方法 */
public Integer getType() {
return type;
}
/** 线路类型(备用)的setter方法 */
public void setType(Integer type) {
this.type = type;
}
/** 线路描述(备用)的getter方法 */
public String getRemark() {
return remark;
}
/** 线路描述(备用)的setter方法 */
public void setRemark(String remark) {
this.remark = remark;
}
/** 排序值(备用)的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值(备用)的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 系统标识的getter方法 */
public String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(String byx3) {
this.byx3 = byx3;
}
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liline/service/LiLineService.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.equipment.modules.liline.service;
import com.devplatform.common.service.MyBaseService;
import com.devplatform.equipment.modules.liline.bean.LiLine;
import com.devplatform.equipment.modules.liline.model.LiLineModel;
import java.util.List;
/**
* 线路管理表的service接口 <br>
* <b>功能：</b>LiLineService<br>
*
* @author 代码生成器产生
*/
public interface LiLineService extends MyBaseService<LiLine> {
/**
* 分页数据查询
*
* @param model
* @return
*/
List<LiLine> queryPageByList(LiLineModel model);
/**
* 获取线路树
*
* @param model
* @return
*/
List<LiLine> getTreeList(LiLineModel model);
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liline/service/impl/LiLineServiceImpl.java deleted 100644 → 0
View file @ d171aed5
package com.devplatform.equipment.modules.liline.service.impl;
import com.devplatform.common.service.impl.MyBaseServiceImpl;
import com.devplatform.equipment.modules.liline.bean.LiLine;
import com.devplatform.equipment.modules.liline.dao.LiLineDao;
import com.devplatform.equipment.modules.liline.model.LiLineModel;
import com.devplatform.equipment.modules.liline.service.LiLineService;
import java.util.List;
import org.springframework.stereotype.Service;
/**
* 线路管理表的service接口实现类 <br>
* <b>功能：</b>LiLineServiceImpl<br>
*
* @author 代码生成器产生
*/
@Service("liLineService")
public class LiLineServiceImpl extends MyBaseServiceImpl<LiLineDao, LiLine>
implements LiLineService {
@Override
public List<LiLine> queryPageByList(LiLineModel model) {
Integer rowCount = baseMapper.queryPageByCount(model);
model.getPager().setRowCount(rowCount);
return baseMapper.queryPageByList(model);
}
@Override
public List<LiLine> getTreeList(LiLineModel model) {
return baseMapper.getTreeList(model);
}
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liresource/bean/LiResource.java
View file @ 855769e1
......@@ -5,11 +5,14 @@ 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;
/**
* @author Administrator
*/
@Data
@ApiModel(value = "资源点管理表对象", description = "资源点管理表对象")
@TableName("li_resource")
public class LiResource implements Serializable {
......@@ -33,13 +36,6 @@ public class LiResource implements Serializable {
/** 资源点类型*/
private String type;
@ApiModelProperty(value = "线路id", name = "lineId")
/** 线路id*/
private String lineId;
@ApiModelProperty(value = "线路名称", name = "lineName")
/** 线路名称*/
private String lineName;
@ApiModelProperty(value = "站点ID", name = "stationId")
/** 站点ID*/
......@@ -189,349 +185,4 @@ public class LiResource implements Serializable {
/** 资源点类型名称*/
private String typeName;
public String getTierName() {
return tierName;
}
public void setTierName(String tierName) {
this.tierName = tierName;
}
public String getXlongit() {
return xlongit;
}
public void setXlongit(String xlongit) {
this.xlongit = xlongit;
}
public String getYlat() {
return ylat;
}
public void setYlat(String ylat) {
this.ylat = ylat;
}
public String getImageSrc() {
return imageSrc;
}
public void setImageSrc(String imageSrc) {
this.imageSrc = imageSrc;
}
/** 主键id的getter方法 */
public String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(String id) {
this.id = id;
}
/** 资源点名称的getter方法 */
public String getName() {
return name;
}
/** 资源点名称的setter方法 */
public void setName(String name) {
this.name = name;
}
/** 资源点编码的getter方法 */
public String getCode() {
return code;
}
/** 资源点编码的setter方法 */
public void setCode(String code) {
this.code = code;
}
/** 资源点类型(1枪机，2球机)的getter方法 */
public String getType() {
return type;
}
/** 资源点类型(1枪机，2球机)的setter方法 */
public void setType(String type) {
this.type = type;
}
/** 线路id的getter方法 */
public String getLineId() {
return lineId;
}
/** 线路id的setter方法 */
public void setLineId(String lineId) {
this.lineId = lineId;
}
/** 线路名称的getter方法 */
public String getLineName() {
return lineName;
}
/** 线路名称的setter方法 */
public void setLineName(String lineName) {
this.lineName = lineName;
}
/** 站点ID的getter方法 */
public String getStationId() {
return stationId;
}
/** 站点ID的setter方法 */
public void setStationId(String stationId) {
this.stationId = stationId;
}
/** 站点名称的getter方法 */
public String getStationName() {
return stationName;
}
/** 站点名称的setter方法 */
public void setStationName(String stationName) {
this.stationName = stationName;
}
/** 站层id(li_station_map表id)的getter方法 */
public String getTierId() {
return tierId;
}
/** 站层id(li_station_map表id)的setter方法 */
public void setTierId(String tierId) {
this.tierId = tierId;
}
/** 子系统的getter方法 */
public String getSubSystem() {
return subSystem;
}
/** 子系统的setter方法 */
public void setSubSystem(String subSystem) {
this.subSystem = subSystem;
}
/** 子系统资源编码的getter方法 */
public String getSubCode() {
return subCode;
}
/** 子系统资源编码的setter方法 */
public void setSubCode(String subCode) {
this.subCode = subCode;
}
/** 地址码的getter方法 */
public String getAddressCode() {
return addressCode;
}
/** 地址码的setter方法 */
public void setAddressCode(String addressCode) {
this.addressCode = addressCode;
}
/** 端口号的getter方法 */
public String getPort() {
return port;
}
/** 端口号的setter方法 */
public void setPort(String port) {
this.port = port;
}
/** 用户名的getter方法 */
public String getUsername() {
return username;
}
/** 用户名的setter方法 */
public void setUsername(String username) {
this.username = username;
}
/** 密码的getter方法 */
public String getPassword() {
return password;
}
/** 密码的setter方法 */
public void setPassword(String password) {
this.password = password;
}
/** x轴坐标的getter方法 */
public String getXpoint() {
return xpoint;
}
/** x轴坐标的setter方法 */
public void setXpoint(String xpoint) {
this.xpoint = xpoint;
}
/** y轴坐标的getter方法 */
public String getYpoint() {
return ypoint;
}
/** y轴坐标的setter方法 */
public void setYpoint(String ypoint) {
this.ypoint = ypoint;
}
/** 部署位置的getter方法 */
public String getDeployLocation() {
return deployLocation;
}
/** 部署位置的setter方法 */
public void setDeployLocation(String deployLocation) {
this.deployLocation = deployLocation;
}
/** 当前操作员id的getter方法 */
public String getOperatorId() {
return operatorId;
}
/** 当前操作员id的setter方法 */
public void setOperatorId(String operatorId) {
this.operatorId = operatorId;
}
/** 当前操作员姓名的getter方法 */
public String getOperatorName() {
return operatorName;
}
/** 当前操作员姓名的setter方法 */
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
/** 附属信息的getter方法 */
public String getAttachedInfo() {
return attachedInfo;
}
/** 附属信息的setter方法 */
public void setAttachedInfo(String attachedInfo) {
this.attachedInfo = attachedInfo;
}
/** 资源点简介的getter方法 */
public String getRemark() {
return remark;
}
/** 资源点简介的setter方法 */
public void setRemark(String remark) {
this.remark = remark;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
/** 系统标识的getter方法 */
public String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
/** 资源点状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 资源点状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(String byx3) {
this.byx3 = byx3;
}
public String getBrand() {
return brand;
}
public void setBrand(String brand) {
this.brand = brand;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getWidth() {
return width;
}
public void setWidth(String width) {
this.width = width;
}
public String getRotate() {
return rotate;
}
public void setRotate(String rotate) {
this.rotate = rotate;
}
public String getAjjPort() {
return ajjPort;
}
public void setAjjPort(String ajjPort) {
this.ajjPort = ajjPort;
}
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/liresource/model/LiResourceModel.java
View file @ 855769e1
package com.devplatform.equipment.modules.liresource.model;
import com.devplatform.equipment.common.model.BaseModel;
import lombok.Data;
/**
* 资源点管理表的Model <br>
*
* @author 代码生成器产生
*/
@Data
public class LiResourceModel extends BaseModel {
/** 主键id*/
......@@ -17,10 +19,6 @@ public class LiResourceModel extends BaseModel {
private String code;
/** 资源点类型(1枪机，2球机)*/
private String type;
/** 线路id*/
private String lineId;
/** 线路名称*/
private String lineName;
/** 站点ID*/
private String stationId;
/** 站点名称*/
......@@ -92,334 +90,4 @@ public class LiResourceModel extends BaseModel {
private String actionName;
/** 动作指令数据值*/
private String valueInfo;
public String getActionName() {
return actionName;
}
public void setActionName(String actionName) {
this.actionName = actionName;
}
public String getValueInfo() {
return valueInfo;
}
public void setValueInfo(String valueInfo) {
this.valueInfo = valueInfo;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public int getLevelType() {
return levelType;
}
public void setLevelType(int levelType) {
this.levelType = levelType;
}
public int getControlType() {
return controlType;
}
public void setControlType(int controlType) {
this.controlType = controlType;
}
/** 主键id的getter方法 */
public String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(String id) {
this.id = id;
}
/** 资源点名称的getter方法 */
public String getName() {
return name;
}
/** 资源点名称的setter方法 */
public void setName(String name) {
this.name = name;
}
/** 资源点编码的getter方法 */
public String getCode() {
return code;
}
/** 资源点编码的setter方法 */
public void setCode(String code) {
this.code = code;
}
/** 资源点类型(1枪机，2球机)的getter方法 */
public String getType() {
return type;
}
/** 资源点类型(1枪机，2球机)的setter方法 */
public void setType(String type) {
this.type = type;
}
/** 线路id的getter方法 */
public String getLineId() {
return lineId;
}
/** 线路id的setter方法 */
public void setLineId(String lineId) {
this.lineId = lineId;
}
/** 线路名称的getter方法 */
public String getLineName() {
return lineName;
}
/** 线路名称的setter方法 */
public void setLineName(String lineName) {
this.lineName = lineName;
}
/** 站点ID的getter方法 */
public String getStationId() {
return stationId;
}
/** 站点ID的setter方法 */
public void setStationId(String stationId) {
this.stationId = stationId;
}
/** 站点名称的getter方法 */
public String getStationName() {
return stationName;
}
/** 站点名称的setter方法 */
public void setStationName(String stationName) {
this.stationName = stationName;
}
/** 站层id(li_station_map表id)的getter方法 */
public String getTierId() {
return tierId;
}
/** 站层id(li_station_map表id)的setter方法 */
public void setTierId(String tierId) {
this.tierId = tierId;
}
/** 子系统的getter方法 */
public String getSubSystem() {
return subSystem;
}
/** 子系统的setter方法 */
public void setSubSystem(String subSystem) {
this.subSystem = subSystem;
}
/** 子系统资源编码的getter方法 */
public String getSubCode() {
return subCode;
}
/** 子系统资源编码的setter方法 */
public void setSubCode(String subCode) {
this.subCode = subCode;
}
/** 地址码的getter方法 */
public String getAddressCode() {
return addressCode;
}
/** 地址码的setter方法 */
public void setAddressCode(String addressCode) {
this.addressCode = addressCode;
}
/** 端口号的getter方法 */
public String getPort() {
return port;
}
/** 端口号的setter方法 */
public void setPort(String port) {
this.port = port;
}
/** 用户名的getter方法 */
public String getUsername() {
return username;
}
/** 用户名的setter方法 */
public void setUsername(String username) {
this.username = username;
}
/** 密码的getter方法 */
public String getPassword() {
return password;
}
/** 密码的setter方法 */
public void setPassword(String password) {
this.password = password;
}
/** x轴坐标的getter方法 */
public String getXpoint() {
return xpoint;
}
/** x轴坐标的setter方法 */
public void setXpoint(String xpoint) {
this.xpoint = xpoint;
}
/** y轴坐标的getter方法 */
public String getYpoint() {
return ypoint;
}
/** y轴坐标的setter方法 */
public void setYpoint(String ypoint) {
this.ypoint = ypoint;
}
/** 部署位置的getter方法 */
public String getDeployLocation() {
return deployLocation;
}
/** 部署位置的setter方法 */
public void setDeployLocation(String deployLocation) {
this.deployLocation = deployLocation;
}
/** 当前操作员id的getter方法 */
public String getOperatorId() {
return operatorId;
}
/** 当前操作员id的setter方法 */
public void setOperatorId(String operatorId) {
this.operatorId = operatorId;
}
/** 当前操作员姓名的getter方法 */
public String getOperatorName() {
return operatorName;
}
/** 当前操作员姓名的setter方法 */
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
/** 附属信息的getter方法 */
public String getAttachedInfo() {
return attachedInfo;
}
/** 附属信息的setter方法 */
public void setAttachedInfo(String attachedInfo) {
this.attachedInfo = attachedInfo;
}
/** 资源点简介的getter方法 */
public String getRemark() {
return remark;
}
/** 资源点简介的setter方法 */
public void setRemark(String remark) {
this.remark = remark;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
/** 系统标识的getter方法 */
public String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
/** 资源点状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 资源点状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(String byx3) {
this.byx3 = byx3;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getBrand() {
return brand;
}
public void setBrand(String brand) {
this.brand = brand;
}
public String getAjjPort() {
return ajjPort;
}
public void setAjjPort(String ajjPort) {
this.ajjPort = ajjPort;
}
}
microservice-equipment/src/main/java/com/devplatform/equipment/modules/listation/bean/LiStation.java
View file @ 855769e1
......@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.devplatform.equipment.modules.listationmap.bean.LiStationMap;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Administrator
*/
@Data
@ApiModel(value = "线路站点管理表对象", description = "线路站点管理表对象")
@TableName("li_station")
public class LiStation implements Serializable {
......@@ -23,14 +26,6 @@ public class LiStation implements Serializable {
/** 主键id*/
private String id;
@ApiModelProperty(value = "线路表id", name = "lineId")
/** 线路表id*/
private String lineId;
@ApiModelProperty(value = "线路名称", name = "lineName")
/** 线路名称*/
private String lineName;
@ApiModelProperty(value = "车站名称", name = "stationName")
/** 车站名称*/
private String stationName;
......@@ -139,246 +134,4 @@ public class LiStation implements Serializable {
@TableField(exist = false)
/** 站点地图*/
private List<LiStationMap> mapList;
public List<LiStationMap> getMapList() {
return mapList;
}
public void setMapList(List<LiStationMap> mapList) {
this.mapList = mapList;
}
public String getX() {
return x;
}
public void setX(String x) {
this.x = x;
}
public String getY() {
return y;
}
public void setY(String y) {
this.y = y;
}
public String getLocation() {
return location;
}
public void setLocation(String location) {
this.location = location;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
/** 主键id的getter方法 */
public String getId() {
return id;
}
/** 主键id的setter方法 */
public void setId(String id) {
this.id = id;
}
/** 线路表id的getter方法 */
public String getLineId() {
return lineId;
}
/** 线路表id的setter方法 */
public void setLineId(String lineId) {
this.lineId = lineId;
}
/** 线路名称的getter方法 */
public String getLineName() {
return lineName;
}
/** 线路名称的setter方法 */
public void setLineName(String lineName) {
this.lineName = lineName;
}
/** 车站名称的getter方法 */
public String getStationName() {
return stationName;
}
/** 车站名称的setter方法 */
public void setStationName(String stationName) {
this.stationName = stationName;
}
/** 车站编号的getter方法 */
public String getCode() {
return code;
}
/** 车站编号的setter方法 */
public void setCode(String code) {
this.code = code;
}
/** 简称的getter方法 */
public String getShortName() {
return shortName;
}
/** 简称的setter方法 */
public void setShortName(String shortName) {
this.shortName = shortName;
}
/** 站点类型(1正线车站，2换乘车站)的getter方法 */
public String getType() {
return type;
}
/** 站点类型(1正线车站，2换乘车站)的setter方法 */
public void setType(String type) {
this.type = type;
}
/** 站点描述的getter方法 */
public String getRemark() {
return remark;
}
/** 站点描述的setter方法 */
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getIsMaster() {
return isMaster;
}
public void setIsMaster(Integer isMaster) {
this.isMaster = isMaster;
}
/** 排序值的getter方法 */
public Integer getOrderNum() {
return orderNum;
}
/** 排序值的setter方法 */
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
/** 系统标识的getter方法 */
public String getSysSign() {
return sysSign;
}
/** 系统标识的setter方法 */
public void setSysSign(String sysSign) {
this.sysSign = sysSign;
}
/** 状态(1正常，0不可用)的getter方法 */
public Integer getStatus() {
return status;
}
/** 状态(1正常，0不可用)的setter方法 */
public void setStatus(Integer status) {
this.status = status;
}
/** 是否已删除（0未删除，1已删除）的getter方法 */
public Integer getDeleted() {
return deleted;
}
/** 是否已删除（0未删除，1已删除）的setter方法 */
public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
/** 创建人的getter方法 */
public String getCreateUserId() {
return createUserId;
}
/** 创建人的setter方法 */
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
/** 创建时间的getter方法 */
public java.util.Date getCreateTime() {
return createTime;
}
/** 创建时间的setter方法 */
public void setCreateTime(java.util.Date createTime) {
this.createTime = createTime;
}
/** 修改人的getter方法 */
public String getUpdateUserId() {
return updateUserId;
}
/** 修改人的setter方法 */
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
/** 修改时间的getter方法 */
public java.util.Date getUpdateTime() {
return updateTime;
}
/** 修改时间的setter方法 */
public void setUpdateTime(java.util.Date updateTime) {
this.updateTime = updateTime;
}
/** 备用项1的getter方法 */
public String getByx1() {
return byx1;
}
/** 备用项1的setter方法 */
public void setByx1(String byx1) {
this.byx1 = byx1;
}
/** 备用项2的getter方法 */
public String getByx2() {
return byx2;
}
/** 备用项2的setter方法 */
public void setByx2(String byx2) {
this.byx2 = byx2;
}
/** 备用项3的getter方法 */
public String getByx3() {
return byx3;
}
/** 备用项3的setter方法 */
public void setByx3(String byx3) {
this.byx3 = byx3;
}
public Integer getCoordinateX() {
return coordinateX;
}
public void setCoordinateX(Integer coordinateX) {
this.coordinateX = coordinateX;
}
public Integer getCoordinateY() {
return coordinateY;
}
public void setCoordinateY(Integer coordinateY) {
this.coordinateY = coordinateY;
}
public Integer getTextPosition() {
return textPosition;
}
public void setTextPosition(Integer textPosition) {
this.textPosition = textPosition;
}
public String getLineColor() {
return lineColor;
}
public void setLineColor(String lineColor) {
this.lineColor = lineColor;
}
public String getLineCode() {
return lineCode;
}
public void setLineCode(String lineCode) {
this.lineCode = lineCode;
}
}
microservice-equipment/src/main/resources/mapper/liResource/LiResourceMapper.xml
View file @ 855769e1
......@@ -7,8 +7,6 @@
<result column="name" property="name"/>
<result column="code" property="code"/>
<result column="type" property="type"/>
<result column="line_id" property="lineId"/>
<result column="line_name" property="lineName"/>
<result column="station_id" property="stationId"/>
<result column="station_name" property="stationName"/>
<result column="tier_id" property="tierId"/>
......@@ -48,7 +46,7 @@
<!-- li_resource table all fields -->
<sql id="Base_Column_List">
id,name,code,type,line_id,line_name,station_id,station_name,tier_id,sub_system,sub_code,address_code,port,ajj_port,username,password,xpoint,ypoint,width,rotate,deploy_location,operator_id,operator_name,attached_info,remark,icon,parent_name,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3,brand,xlongit,ylat,image_src
id,name,code,type,station_id,station_name,tier_id,sub_system,sub_code,address_code,port,ajj_port,username,password,xpoint,ypoint,width,rotate,deploy_location,operator_id,operator_name,attached_info,remark,icon,parent_name,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3,brand,xlongit,ylat,image_src
</sql>
<!-- 公共查询条件 -->
......@@ -58,8 +56,6 @@
<if test="name!=null and name!=''">and name = #{name}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="type!=null and type!=''">and type = #{type}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="tierId!=null and tierId!=''">and tier_id = #{tierId}</if>
......@@ -115,8 +111,6 @@
<if test="name!=null and name!=''">and name = #{name}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="type!=null and type!=''">and type = #{type}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationId!=null and stationId!=''">and station_id = #{stationId}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="tierId!=null and tierId!=''">and tier_id = #{tierId}</if>
......
microservice-equipment/src/main/resources/mapper/liStation/LiStationMapper.xml
View file @ 855769e1
......@@ -4,8 +4,6 @@
<!-- Result Map -->
<resultMap id="BaseResultMap" type="com.devplatform.equipment.modules.listation.bean.LiStation">
<result column="id" property="id"/>
<result column="line_id" property="lineId"/>
<result column="line_name" property="lineName"/>
<result column="station_name" property="stationName"/>
<result column="code" property="code"/>
<result column="short_name" property="shortName"/>
......@@ -37,7 +35,7 @@
<!-- li_station table all fields -->
<sql id="Base_Column_List">
id,line_id,line_name,station_name,code,short_name,x,y,location,icon,type,remark,order_num,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
id,station_name,code,short_name,x,y,location,icon,type,remark,order_num,sys_sign,status,deleted,create_user_id,create_time,update_user_id,update_time,byx1,byx2,byx3
,coordinate_x,coordinate_y,text_position,line_color,line_code,is_master
</sql>
......@@ -45,8 +43,6 @@
<sql id="Example_Where_Clause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="shortName!=null and shortName!=''">and short_name = #{shortName}</if>
......@@ -97,8 +93,6 @@
<sql id="queryPageByListClause">
where deleted=0
<if test="id!=null and id!=''">and id = #{id}</if>
<if test="lineId!=null and lineId!=''">and line_id = #{lineId}</if>
<if test="lineName!=null and lineName!=''">and line_name = #{lineName}</if>
<if test="stationName!=null and stationName!=''">and station_name = #{stationName}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
<if test="shortName!=null and shortName!=''">and short_name = #{shortName}</if>
......@@ -129,7 +123,7 @@
</sql>
<select id="getTreeList" parameterType="Object" resultMap="BaseResultMap">
select id,station_name,code,line_id,line_name from li_station
select id,station_name,code from li_station
<include refid="queryPageByListClause"></include>
order by order_num
</select>
......
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