欣影管理平台新增电压等级接口

jni
liuguijing 2 years ago
parent cb0a6a2c8b
commit b7be61c7fd

@ -0,0 +1,57 @@
package com.shxy.xymanager_admin.controller;
import com.shxy.xymanager_common.annotation.Log;
import com.shxy.xymanager_common.base.BaseController;
import com.shxy.xymanager_common.base.ResponseReult;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.bean.ServiceStatus;
import com.shxy.xymanager_common.model.DyLineTreeListModel;
import com.shxy.xymanager_common.model.DyListModel;
import com.shxy.xymanager_common.vo.TerminalIdVo;
import com.shxy.xymanager_service.service.DyLevelService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(value = "电压等级接口", tags = "电压等级接口描述")
@RestController
@Slf4j
public class DyLevelController extends BaseController {
@Autowired
DyLevelService dyLevelService;
@ApiOperation(value = "获取电压等级树状列表接口", notes = "获取电压等级树状列表接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getdyTreeList")
@Log(title = "获取电压等级树状列表接口", type = "查询")
public ResponseReult<DyLineTreeListModel> getdyTreeList() {
ServiceBody<DyLineTreeListModel> serviceBody = dyLevelService.getdyTreeList();
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
}
}
@ApiOperation(value = "获取电压等级列表", notes = "获取电压等级列表", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getdyList")
@Log(title = "获取电压等级列表", type = "查询")
public ResponseReult<DyListModel> getdyList() {
ServiceBody<DyListModel> serviceBody = dyLevelService.getdyList();
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
}
}
}

@ -6,19 +6,17 @@ import com.shxy.xymanager_common.base.ResponseReult;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.bean.ServiceStatus;
import com.shxy.xymanager_common.model.LineListModel;
import com.shxy.xymanager_common.model.LineTreeListModel;
import com.shxy.xymanager_common.model.TerminalListModel;
import com.shxy.xymanager_common.model.DyLineTreeListModel;
import com.shxy.xymanager_common.vo.LineIdVo;
import com.shxy.xymanager_common.vo.LineVo;
import com.shxy.xymanager_common.vo.PageVo;
import com.shxy.xymanager_common.vo.UpdateLineVo;
import com.shxy.xymanager_service.service.LineService;
import com.shxy.xymanager_service.service.TerminalService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
@ -34,25 +32,12 @@ public class LineController extends BaseController {
@Autowired
LineService lineService;
@ApiOperation(value = "获取线路树状图", notes = "获取线路树状图接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getLineTreeList")
@Log(title = "获取线路树状图", type = "查询")
public ResponseReult<LineTreeListModel> getLineTreeList() {
ServiceBody<LineTreeListModel> serviceBody = lineService.getLineTreeList();
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
}
}
@ApiOperation(value = "获取线路列表", notes = "获取线路列表接口", httpMethod = "POST")
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getLineList")
@Log(title = "获取线路列表", type = "查询")
public ResponseReult<LineListModel> getLineList() {
ServiceBody<LineListModel> serviceBody = lineService.getLineList();
public ResponseReult<LineListModel> getLineList(@RequestBody @Validated PageVo vo) {
ServiceBody<LineListModel> serviceBody = lineService.getLineList(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {

@ -6,6 +6,7 @@ import com.shxy.xymanager_common.base.ResponseReult;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.bean.ServiceStatus;
import com.shxy.xymanager_common.model.TerminalListModel;
import com.shxy.xymanager_common.vo.PageVo;
import com.shxy.xymanager_common.vo.TerminalIdListVo;
import com.shxy.xymanager_common.vo.TerminalVo;
import com.shxy.xymanager_common.vo.UpdateTerminalVo;
@ -32,8 +33,8 @@ public class TerminalController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getTerminalList")
@Log(title = "获取设备列表", type = "查询")
public ResponseReult<TerminalListModel> getTerminalList() {
ServiceBody<TerminalListModel> serviceBody = terminalService.getTerminalList();
public ResponseReult<TerminalListModel> getTerminalList(@RequestBody @Validated PageVo vo) {
ServiceBody<TerminalListModel> serviceBody = terminalService.getTerminalList(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {

@ -33,8 +33,8 @@ public class TerminalScheduleRuleController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getScheduleRulelList")
@Log(title = "获取任务规则列表", type = "查询")
public ResponseReult<TerminalScheduleRuleListModel> getSchedulelRuleList() {
ServiceBody<TerminalScheduleRuleListModel> serviceBody = terminalScheduleRuleService.getScheduleRuleList();
public ResponseReult<TerminalScheduleRuleListModel> getSchedulelRuleList(@RequestBody @Validated PageVo vo) {
ServiceBody<TerminalScheduleRuleListModel> serviceBody = terminalScheduleRuleService.getScheduleRuleList(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {

@ -0,0 +1,18 @@
package com.shxy.xymanager_common.dto;
import lombok.Data;
import java.util.List;
@Data
public class DyLineAndTerminalDto {
private Integer id;
private String name;
private Integer dyValue;
private List<LineAndTerminalDto> list;
}

@ -0,0 +1,23 @@
package com.shxy.xymanager_common.dto;
import lombok.Data;
/**
* 线
*/
@Data
public class LineAndDyNameDto {
private Integer id;
private String name;
private String bsManufacturer;
private Integer dyLevelId;
private String dyLevelName;
private Integer status;
}

@ -14,7 +14,7 @@ public class LineAndTerminalDto {
private String bsManufacturer;
private Byte dyLevel;
private Integer dyLevel;
private List<Terminals> list;

@ -0,0 +1,24 @@
package com.shxy.xymanager_common.entity;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class DyLevel implements Serializable {
private Integer id;
private String name;
private Integer dyValue;
private Integer status;
private Date createTime;
private Date updateTime;
private static final long serialVersionUID = 1L;
}

@ -12,7 +12,7 @@ public class Lines implements Serializable {
private String bsManufacturer;
private Byte dyLevel;
private Integer dyLevelId;
private Integer status;

@ -3,6 +3,7 @@ package com.shxy.xymanager_common.entity;
import lombok.Data;
import java.io.Serializable;
import java.sql.Time;
import java.util.Date;
@Data
@ -12,9 +13,9 @@ public class TerminalScheduleRule implements Serializable {
private String name;
private Date startTime;
private Time startTime;
private Date endTime;
private Time endTime;
private Integer span;

@ -8,14 +8,28 @@ import java.io.Serializable;
import java.util.List;
/**
* 线
* 线
*/
@Data
@ApiModel(value = "获取线路树状图列表", description = "获取线路树状图列表信息")
public class LineTreeListModel implements Serializable {
@ApiModel(value = "获取电压线路树状图列表", description = "获取电压线路树状图列表信息")
public class DyLineTreeListModel implements Serializable {
@ApiModelProperty(value = "电压列表", example = "[]")
private List<DyListBean> list;
@ApiModelProperty(value = "线路列表", example = "[]")
private List<LineBean> list;
@Data
public static class DyListBean {
@ApiModelProperty(value = "电压编号", example = "123456")
private Integer id;
@ApiModelProperty(value = "电压名称", example = "AAAA")
private String name;
@ApiModelProperty(value = "电压大小", example = "AAAA")
private Integer dyValue;
@ApiModelProperty(value = "线路列表", example = "[]")
private List<LineBean> list;
}
@Data
public static class LineBean {
@ -29,9 +43,6 @@ public class LineTreeListModel implements Serializable {
@ApiModelProperty(value = "单位", example = "123456")
private String bsManufacturer;
@ApiModelProperty(value = "dyLevel", example = "123456")
private Byte dyLevel;
@ApiModelProperty(value = "装置信息", example = "123456")
private List<TerminalBean> list;

@ -0,0 +1,32 @@
package com.shxy.xymanager_common.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
*
*/
@Data
@ApiModel(value = "获取电压等级列表", description = "获取电压等级列表信息")
public class DyListModel implements Serializable {
@ApiModelProperty(value = "电压等级列表", example = "[]")
private List<DyBean> list;
@Data
public static class DyBean {
@ApiModelProperty(value = "电压编号", example = "123456")
private Integer id;
@ApiModelProperty(value = "电压名称", example = "AAAA")
private String name;
@ApiModelProperty(value = "电压大小", example = "AAAA")
private Integer dyValue;
}
}

@ -15,6 +15,15 @@ import java.util.List;
@ApiModel(value = "获取杆塔线路列表", description = "获取杆塔线路列表信息")
public class LineListModel implements Serializable {
@ApiModelProperty(value = "总记录数", example = "120")
private long total;
@ApiModelProperty(value = "总页数", example = "120")
private int totalpage;
@ApiModelProperty(value = "当前页", example = "1")
private int currentpage;
@ApiModelProperty(value = "每页记录数", example = "1")
private int pagesize;
@ApiModelProperty(value = "杆塔线路列表", example = "[]")
private List<LineBean> list;
@ -30,8 +39,14 @@ public class LineListModel implements Serializable {
@ApiModelProperty(value = "单位", example = "123456")
private String bsManufacturer;
@ApiModelProperty(value = "dyLevel", example = "123456")
private Byte dyLevel;
@ApiModelProperty(value = "电压等级编号", example = "123456")
private Integer dyLevelid;
@ApiModelProperty(value = "电压等级名称", example = "123456")
private String dyLevelname;
@ApiModelProperty(value = "线路状态", example = "123456")
private Integer status;
}
}

@ -15,7 +15,14 @@ import java.util.List;
@Data
@ApiModel(value = "获取设备列表", description = "获取设备列表信息")
public class TerminalListModel implements Serializable {
@ApiModelProperty(value = "总记录数", example = "120")
private long total;
@ApiModelProperty(value = "总页数", example = "120")
private int totalpage;
@ApiModelProperty(value = "当前页", example = "1")
private int currentpage;
@ApiModelProperty(value = "每页记录数", example = "1")
private int pagesize;
@ApiModelProperty(value = "设备列表", example = "[]")
private List<TerminalBean> list;

@ -15,14 +15,8 @@ import java.util.List;
@ApiModel(value = "图片列表对象", description = "图片列表对象信息")
public class TerminalPhotoListModel implements Serializable {
@ApiModelProperty(value = "总记录数", example = "120")
private long total;
@ApiModelProperty(value = "总页数", example = "120")
private int totalpage;
@ApiModelProperty(value = "当前页", example = "1")
private int currentpage;
@ApiModelProperty(value = "每页记录数", example = "1")
private int pagesize;
@ApiModelProperty(value = "时间", example = "[]")
private Date time;
@ApiModelProperty(value = "照片对象", example = "[]")
private List<PhotoBean> list;

@ -15,6 +15,14 @@ import java.util.List;
@Data
@ApiModel(value = "时间任务列表", description = "获取时间任务列表信息")
public class TerminalScheduleRuleListModel implements Serializable {
@ApiModelProperty(value = "总记录数", example = "120")
private long total;
@ApiModelProperty(value = "总页数", example = "120")
private int totalpage;
@ApiModelProperty(value = "当前页", example = "1")
private int currentpage;
@ApiModelProperty(value = "每页记录数", example = "1")
private int pagesize;
@ApiModelProperty(value = "时间任务列表", example = "[]")
private List<ScheduleRuleBean> list;

@ -25,10 +25,10 @@ public class TerminalScheduleRuleModel implements Serializable {
private Integer span;
@ApiModelProperty(value = "开始时间", example = "2022-06-08")
private String startTime;
private Time startTime;
@ApiModelProperty(value = "结束时间", example = "2022-06-08")
private String endTime;
private Time endTime;
@ApiModelProperty(value = "备注", example = "erwsafsasa")
private String remark;

@ -25,9 +25,9 @@ public class LineVo {
@NotBlank(message = "单位不能缺少")
private String bsManufacturer;
@ApiModelProperty(value = "dyLevel", example = "型号型号")
@NotBlank(message = "dyLevel不能缺少")
private Byte dyLevel;
@ApiModelProperty(value = "电压等级编号", example = "型号型号")
@NotBlank(message = "电压编号不能缺少")
private Integer dyLevelid;
}
}

@ -0,0 +1,19 @@
package com.shxy.xymanager_common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
@Data
@ApiModel(value = "分页对象", description = "分页对象描述")
public class PageVo {
@Min(value = 1, message = "分页位置最小从1开始")
@ApiModelProperty(value = "分页位置从1开始", required = true, example = "1")
private int pageindex;
@Min(value = 1, message = "分页大小最小为1")
@ApiModelProperty(value = "分页大小", required = true, example = "1")
private int pagesize;
}

@ -6,9 +6,10 @@ import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@ApiModel(value = "装置编号", description = "装置编号描述")
@ApiModel(value = "装置和通道编号", description = "装置和通道描述")
public class TerminalAndChannelIdVo {
@NotNull(message = "装置编号不能缺少")
@ -19,11 +20,7 @@ public class TerminalAndChannelIdVo {
@ApiModelProperty(value = "通道编号", example = "123455")
private Integer channelid;
@Min(value = 1, message = "分页位置最小从1开始")
@ApiModelProperty(value = "分页位置从1开始", required = true, example = "1")
private int pageindex;
@Min(value = 1, message = "分页大小最小为1")
@ApiModelProperty(value = "分页大小", required = true, example = "1")
private int pagesize;
@NotNull(message = "查询时间不能缺少")
@ApiModelProperty(value = "查询时间", example = "123455")
private Date time;
}

@ -6,6 +6,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.sql.Time;
import java.util.List;
@Data
@ -21,11 +22,11 @@ public class TerminalRuleVo {
@ApiModelProperty(value = "开始时间", example = "单位")
@NotBlank(message = "开始时间不能缺少")
private String startTime;
private Time startTime;
@ApiModelProperty(value = "结束时间", example = "型号型号")
@NotBlank(message = "结束时间不能缺少")
private String endTime;
private Time endTime;
@ApiModelProperty(value = "时间间隔", example = "型号型号")
@NotBlank(message = "时间间隔不能缺少")

@ -24,8 +24,8 @@ public class UpdateLineVo {
@NotBlank(message = "单位不能缺少")
private String bsManufacturer;
@ApiModelProperty(value = "dyLevel", example = "型号型号")
@NotBlank(message = "dyLevel不能缺少")
private Byte dyLevel;
@ApiModelProperty(value = "电压等级编号", example = "型号型号")
@NotBlank(message = "电压编号不能缺少")
private Integer dyLevelid;
}

@ -0,0 +1,25 @@
package com.shxy.xymanager_dao.dao;
import com.shxy.xymanager_common.dto.DyLineAndTerminalDto;
import com.shxy.xymanager_common.entity.DyLevel;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DyLevelDao {
int deleteByPrimaryKey(Integer id);
int insert(DyLevel record);
int insertSelective(DyLevel record);
DyLevel selectByPrimaryKey(Integer id);
List<DyLevel> selectAll(@Param("status") Integer status);
List<DyLineAndTerminalDto> selectTreeList(@Param("status") Integer status);
int updateByPrimaryKeySelective(DyLevel record);
int updateByPrimaryKey(DyLevel record);
}

@ -1,6 +1,6 @@
package com.shxy.xymanager_dao.dao;
import com.shxy.xymanager_common.dto.LineAndTerminalDto;
import com.shxy.xymanager_common.dto.LineAndDyNameDto;
import com.shxy.xymanager_common.entity.Lines;
import org.apache.ibatis.annotations.Param;
@ -9,9 +9,7 @@ import java.util.List;
public interface LinesDao {
List<Lines> selectAll(@Param("status") Integer status);
List<LineAndTerminalDto> selectLineAndTerminalList(@Param("status") Integer status);
List<LineAndDyNameDto> selectAll(@Param("status") Integer status);
int insertList(@Param("list") List<Lines> record,@Param("status") Integer status,@Param("createat") Date create,@Param("updateat") Date update);

@ -3,11 +3,13 @@ package com.shxy.xymanager_dao.dao;
import com.shxy.xymanager_common.entity.TerminalPhoto;
import org.apache.ibatis.annotations.Param;
import javax.xml.crypto.Data;
import java.util.Date;
import java.util.List;
public interface TerminalPhotoDao {
List<TerminalPhoto> selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid);
List<TerminalPhoto> selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid, @Param("time") Date time);
int deleteByPrimaryKey(Long id);

@ -112,17 +112,25 @@
<!-- </table>-->
<table tableName="terminal_schedulemapper"
domainObjectName="TerminalScheduleMapper"
mapperName="TerminalScheduleMapperDao"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
<!-- <property name="useActualColumnNames" value="false"/>-->
</table>
<!-- <table tableName="terminal_schedulemapper"-->
<!-- domainObjectName="TerminalScheduleMapper"-->
<!-- mapperName="TerminalScheduleMapperDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<!-- <table tableName="terminal_schedulerule"-->
<!-- domainObjectName="TerminalScheduleRule"-->
<!-- mapperName="TerminalScheduleRuleDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="terminal_schedulerule"
domainObjectName="TerminalScheduleRule"
mapperName="TerminalScheduleRuleDao"
<table tableName="dy_level"
domainObjectName="DyLevel"
mapperName="DyLevelDao"
enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
enableSelectByExample="false" selectByExampleQueryId="false">
<!-- <property name="useActualColumnNames" value="false"/>-->

@ -0,0 +1,153 @@
<?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.shxy.xymanager_dao.dao.DyLevelDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.DyLevel">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="dy_value" jdbcType="INTEGER" property="dyValue"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<resultMap id="LineAndTerminalMap" type="com.shxy.xymanager_common.dto.DyLineAndTerminalDto">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="dyvalue" jdbcType="INTEGER" property="dyValue"/>
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.LineAndTerminalDto">
<id column="line_id" jdbcType="INTEGER" property="id"/>
<result column="line_name" jdbcType="VARCHAR" property="name"/>
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer"/>
<result column="dy_level_id" jdbcType="INTEGER" property="dyLevel"/>
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.entity.Terminals">
<result column="term_id" jdbcType="INTEGER" property="id"/>
<result column="tower_id" jdbcType="INTEGER" property="towerid"/>
<result column="cmdid" jdbcType="VARCHAR" property="cmdid"/>
<result column="equip_name" jdbcType="VARCHAR" property="equipName"/>
<result column="display_name" jdbcType="VARCHAR" property="displayName"/>
<result column="model" jdbcType="VARCHAR" property="model"/>
</collection>
</collection>
</resultMap>
<sql id="Base_Column_List">
id, name, dy_value, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from dy_level
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectAll" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from dy_level
where status = #{status}
</select>
<select id="selectTreeList" resultMap="LineAndTerminalMap">
select
z.id as id,
z.name as name,
z.dy_value as dyvalue,
x.id as line_id,
x.name as line_name,
x.bs_manufacturer as bs_manufacturer,
x.dy_level_id as dy_level_id,
y.id as term_id,
y.tower_id as tower_id,
y.cmdid as cmdid,
y.equip_name as equip_name,
y.display_name as display_name,
y.model as model
from `lines` x,
terminals y,
dy_level z
where z.id = x.dy_level_id and x.id = y.line_id and x.status = #{status} and y.status = #{status} and z.status = #{status}
</select>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.DyLevel">
insert into dy_level (id, name, dy_value,
status, create_time, update_time
)
values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{dyValue,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.DyLevel">
insert into dy_level
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="dyValue != null">
dy_value,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="dyValue != null">
#{dyValue,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.DyLevel">
update dy_level
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="dyValue != null">
dy_value = #{dyValue,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.DyLevel">
update dy_level
set name = #{name,jdbcType=VARCHAR},
dy_value = #{dyValue,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>

@ -5,36 +5,36 @@
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer"/>
<result column="dy_level" jdbcType="TINYINT" property="dyLevel"/>
<result column="dy_level_id" jdbcType="INTEGER" property="dyLevelId"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<resultMap id="LineAndTerminalMap" type="com.shxy.xymanager_common.dto.LineAndTerminalDto">
<resultMap id="LineAndDyNameMap" type="com.shxy.xymanager_common.dto.LineAndDyNameDto">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer"/>
<result column="dy_level" jdbcType="TINYINT" property="dyLevel"/>
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.entity.Terminals">
<result column="term_id" jdbcType="INTEGER" property="id"/>
<result column="tower_id" jdbcType="INTEGER" property="towerid"/>
<result column="cmdid" jdbcType="VARCHAR" property="cmdid"/>
<result column="equip_name" jdbcType="VARCHAR" property="equipName"/>
<result column="display_name" jdbcType="VARCHAR" property="displayName"/>
<result column="model" jdbcType="VARCHAR" property="model"/>
</collection>
<result column="dy_level_id" jdbcType="INTEGER" property="dyLevelId"/>
<result column="dy_level_name" jdbcType="INTEGER" property="dyLevelName"/>
<result column="status" jdbcType="INTEGER" property="status"/>
</resultMap>
<sql id="Base_Column_List">
id, name, bs_manufacturer, dy_level
id, name, bs_manufacturer, dy_level_id
</sql>
<select id="selectAll" resultMap="BaseResultMap">
<select id="selectAll" resultMap="LineAndDyNameMap">
select
<include refid="Base_Column_List"/>
from `lines`
where status = #{status}
x.id as id,
x.name as name,
x.bs_manufacturer as bs_manufacturer,
x.dy_level_id as dy_level_id,
x.status as status,
y.name as dy_level_name
from `lines` x,
dy_level y
where x.dy_level_id = y.id and x.status = #{status}
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
@ -42,28 +42,13 @@
from `lines`
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectLineAndTerminalList" resultMap="LineAndTerminalMap">
select x.id as id,
x.name as name,
x.bs_manufacturer as bs_manufacturer,
x.dy_level as dy_level,
y.id as term_id,
y.tower_id as tower_id,
y.cmdid as cmdid,
y.equip_name as equip_name,
y.display_name as display_name,
y.model as model
from `lines` x,
terminals y
where x.id = y.line_id and x.status = #{status}
</select>
<insert id="insertList" parameterType="java.util.List">
insert into `lines`
(name,bs_manufacturer,dy_level,status,create_time,update_time)
(name,bs_manufacturer,dy_level_id,status,create_time,update_time)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.name},#{item.bsManufacturer},#{item.dyLevel},#{status},#{createat},#{updateat})
(#{item.name},#{item.bsManufacturer},#{item.dyLevelId},#{status},#{createat},#{updateat})
</foreach>
</insert>
<update id="deleteById">
@ -84,8 +69,8 @@
<if test="data.bsManufacturer != null">
bs_manufacturer = #{data.bsManufacturer,jdbcType=VARCHAR},
</if>
<if test="data.dyLevel != null">
dy_level = #{data.dyLevel,jdbcType=TINYINT},
<if test="data.dyLevelId != null">
dy_level_id = #{data.dyLevelId,jdbcType=TINYINT},
</if>
<if test="updateat != null">
update_time = #{updateat,jdbcType=TIMESTAMP},
@ -98,7 +83,7 @@
update `lines`
set name = #{name,jdbcType=VARCHAR},
bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR},
dy_level = #{dyLevel,jdbcType=TINYINT}
dy_level_id = #{dyLevelId,jdbcType=TINYINT}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>

@ -23,7 +23,7 @@
select
<include refid="Base_Column_List"/>
from terminal_photos
where term_id = #{terminalid} and channel_id = #{channelid}
where term_id = #{terminalid} and channel_id = #{channelid} and photo_time = date_format(#{time},'%y%m%d')
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">

@ -0,0 +1,78 @@
package com.shxy.xymanager_service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.dto.DyLineAndTerminalDto;
import com.shxy.xymanager_common.entity.DyLevel;
import com.shxy.xymanager_common.entity.Lines;
import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_common.exception.Asserts;
import com.shxy.xymanager_common.model.DyLineTreeListModel;
import com.shxy.xymanager_common.model.DyListModel;
import com.shxy.xymanager_common.vo.TerminalIdVo;
import com.shxy.xymanager_dao.dao.DyLevelDao;
import com.shxy.xymanager_service.service.DyLevelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
*
*/
@Service
@Slf4j
public class DyLevelServiceImpl implements DyLevelService {
@Autowired
DyLevelDao dyLevelDao;
/**
* 线
*
* @return
*/
@Override
public ServiceBody<DyLineTreeListModel> getdyTreeList() {
DyLineTreeListModel model = new DyLineTreeListModel();
List<DyLineAndTerminalDto> list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
model.setList(new ArrayList<>());
} else {
List<DyLineTreeListModel.DyListBean> beans = BeanUtil.copyToList(list, DyLineTreeListModel.DyListBean.class);
for (int i = 0; i < beans.size(); i++) {
for (int j = 0; j < beans.get(i).getList().size(); j++) {
for (int k = 0; k < beans.get(i).getList().get(j).getList().size(); k++) {
beans.get(i).getList().get(j).getList().get(k).setName(list.get(i).getList().get(j).getList().get(k).getDisplayName());
}
}
}
model.setList(beans);
}
return Asserts.success(model);
}
/**
*
*
* @return
*/
@Override
public ServiceBody<DyListModel> getdyList() {
DyListModel model = new DyListModel();
List<DyLevel> list = dyLevelDao.selectAll(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
model.setList(new ArrayList<>());
} else {
List<DyListModel.DyBean> models = BeanUtil.copyToList(list, DyListModel.DyBean.class);
model.setList(models);
}
return Asserts.success(model);
}
}

@ -3,15 +3,19 @@ package com.shxy.xymanager_service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollectionUtil;
import com.github.pagehelper.PageInfo;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.dto.LineAndTerminalDto;
import com.shxy.xymanager_common.dto.LineAndDyNameDto;
import com.shxy.xymanager_common.entity.Lines;
import com.shxy.xymanager_common.entity.TerminalPhoto;
import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_common.exception.Asserts;
import com.shxy.xymanager_common.model.LineListModel;
import com.shxy.xymanager_common.model.LineTreeListModel;
import com.shxy.xymanager_common.model.TerminalPhotoListModel;
import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.vo.LineIdVo;
import com.shxy.xymanager_common.vo.LineVo;
import com.shxy.xymanager_common.vo.PageVo;
import com.shxy.xymanager_common.vo.UpdateLineVo;
import com.shxy.xymanager_dao.dao.LinesDao;
import com.shxy.xymanager_service.service.LineService;
@ -36,46 +40,37 @@ public class LineServiceImpl implements LineService {
@Autowired
private LinesDao linesDao;
/**
* 线
*
* @return
*/
@Override
public ServiceBody<LineTreeListModel> getLineTreeList() {
LineTreeListModel model = new LineTreeListModel();
List<LineAndTerminalDto> list = linesDao.selectLineAndTerminalList(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
model.setList(new ArrayList<>());
} else {
List<LineTreeListModel.LineBean> lineBeans = BeanUtil.copyToList(list, LineTreeListModel.LineBean.class, CopyOptions.create().ignoreCase());
for (int i = 0; i < lineBeans.size(); i++) {
for (int j = 0; j < lineBeans.get(i).getList().size(); j++) {
lineBeans.get(i).getList().get(j).setName(list.get(i).getList().get(j).getDisplayName());
}
}
model.setList(lineBeans);
}
return Asserts.success(model);
}
/**
* 线
*
* @return
*/
@Override
public ServiceBody<LineListModel> getLineList() {
public ServiceBody<LineListModel> getLineList(PageVo vo) {
LineListModel model = new LineListModel();
List<Lines> terminals = linesDao.selectAll(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(terminals);
int pageindex = vo.getPageindex();
int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize);
List<LineAndDyNameDto> list = linesDao.selectAll(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
model.setList(new ArrayList<>());
} else {
List<LineListModel.LineBean> list = BeanUtil.copyToList(terminals, LineListModel.LineBean.class, CopyOptions.create().ignoreCase());
model.setList(list);
List<LineListModel.LineBean> beans = BeanUtil.copyToList(list, LineListModel.LineBean.class, CopyOptions.create().ignoreCase());
model.setList(beans);
}
PageInfo pageData = PageUtils.getPageData(list);
int currentpage = pageData.getPageNum();
model.setCurrentpage(currentpage);
long total = pageData.getTotal();
model.setTotal(total);
int pageSize = pageData.getPageSize();
model.setPagesize(pageSize);
int pages = pageData.getPages();
model.setTotalpage(pages);
return Asserts.success(model);
}
@ -87,7 +82,7 @@ public class LineServiceImpl implements LineService {
*/
@Override
public ServiceBody<String> addLine(LineVo vo) {
List<Lines> lines = BeanUtil.copyToList(vo.getList(), Lines.class);
List<Lines> lines = BeanUtil.copyToList(vo.getList(), Lines.class, CopyOptions.create().ignoreCase());
Date date = new Date();
int i = linesDao.insertList(lines, CommonStatus.EFFECTIVE.value(), date, date);
if (i != 0) {
@ -124,7 +119,8 @@ public class LineServiceImpl implements LineService {
*/
@Override
public ServiceBody<String> updateLine(UpdateLineVo vo) {
Lines lines = BeanUtil.copyProperties(vo, Lines.class);
Lines lines = new Lines();
BeanUtil.copyProperties(vo, lines, true);
int i = linesDao.updateByPrimaryKeySelective(lines, new Date());
if (i != 0) {
return Asserts.success("修改成功");

@ -9,6 +9,7 @@ import com.shxy.xymanager_common.entity.TerminalPhoto;
import com.shxy.xymanager_common.exception.Asserts;
import com.shxy.xymanager_common.model.TerminalPhotoListModel;
import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.util.MyDateUtils;
import com.shxy.xymanager_common.vo.TerminalAndChannelIdVo;
import com.shxy.xymanager_dao.dao.TerminalPhotoDao;
import com.shxy.xymanager_service.service.TerminalPhotoService;
@ -38,27 +39,15 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
@Override
public ServiceBody<TerminalPhotoListModel> getTerminalPhotoList(TerminalAndChannelIdVo vo) {
TerminalPhotoListModel model = new TerminalPhotoListModel();
int pageindex = vo.getPageindex();
int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize);
List<TerminalPhoto> list = terminalPhotoDao.selectPhotoList(vo.getTerminalid(), vo.getChannelid());
List<TerminalPhoto> list = terminalPhotoDao.selectPhotoList(vo.getTerminalid(), vo.getChannelid(),vo.getTime());
boolean empty = CollectionUtil.isEmpty(list);
model.setTime(vo.getTime());
if (empty) {
model.setList(new ArrayList<>());
} else {
List<TerminalPhotoListModel.PhotoBean> beans = BeanUtil.copyToList(list, TerminalPhotoListModel.PhotoBean.class, CopyOptions.create().ignoreCase());
model.setList(beans);
}
PageInfo pageData = PageUtils.getPageData(list);
int currentpage = pageData.getPageNum();
model.setCurrentpage(currentpage);
long total = pageData.getTotal();
model.setTotal(total);
int pageSize = pageData.getPageSize();
model.setPagesize(pageSize);
int pages = pageData.getPages();
model.setTotalpage(pages);
return Asserts.success(model);
}

@ -3,12 +3,14 @@ package com.shxy.xymanager_service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollectionUtil;
import com.github.pagehelper.PageInfo;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.entity.TerminalScheduleRule;
import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_common.exception.Asserts;
import com.shxy.xymanager_common.model.TerminalScheduleRuleListModel;
import com.shxy.xymanager_common.model.TerminalScheduleRuleModel;
import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.util.MyDateUtils;
import com.shxy.xymanager_common.vo.*;
import com.shxy.xymanager_dao.dao.TerminalScheduleRuleDao;
@ -37,8 +39,11 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
* @return
*/
@Override
public ServiceBody<TerminalScheduleRuleListModel> getScheduleRuleList() {
public ServiceBody<TerminalScheduleRuleListModel> getScheduleRuleList(PageVo vo) {
TerminalScheduleRuleListModel model = new TerminalScheduleRuleListModel();
int pageindex = vo.getPageindex();
int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize);
List<TerminalScheduleRule> list = terminalScheduleRuleDao.selectAll(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
@ -47,6 +52,16 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
List<TerminalScheduleRuleListModel.ScheduleRuleBean> beans = BeanUtil.copyToList(list, TerminalScheduleRuleListModel.ScheduleRuleBean.class, CopyOptions.create().ignoreCase());
model.setList(beans);
}
PageInfo pageData = PageUtils.getPageData(list);
int currentpage = pageData.getPageNum();
model.setCurrentpage(currentpage);
long total = pageData.getTotal();
model.setTotal(total);
int pageSize = pageData.getPageSize();
model.setPagesize(pageSize);
int pages = pageData.getPages();
model.setTotalpage(pages);
return Asserts.success(model);
}
@ -65,8 +80,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
TerminalScheduleRuleModel bean = new TerminalScheduleRuleModel();
bean.setId(item.getId());
bean.setName(item.getName());
bean.setStartTime(MyDateUtils.parseHourAndMin(item.getStartTime()));
bean.setEndTime(MyDateUtils.parseHourAndMin(item.getEndTime()));
bean.setStartTime(item.getStartTime());
bean.setEndTime(item.getEndTime());
bean.setSpan(item.getSpan());
bean.setRemark(item.getRemark());
return Asserts.success(bean);
@ -85,8 +100,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
for (TerminalRuleVo item : vo.getList()) {
TerminalScheduleRule bean = new TerminalScheduleRule();
bean.setName(item.getName());
bean.setStartTime(MyDateUtils.myparseDate(item.getStartTime()));
bean.setEndTime(MyDateUtils.myparseDate(item.getEndTime()));
bean.setStartTime(item.getStartTime());
bean.setEndTime(item.getEndTime());
bean.setSpan(item.getSpan());
bean.setRemark(item.getRemark());
bean.setStatus(CommonStatus.EFFECTIVE.value());
@ -112,8 +127,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
TerminalScheduleRule bean = new TerminalScheduleRule();
bean.setId(vo.getId());
bean.setName(vo.getName());
bean.setStartTime(MyDateUtils.myparseDate(vo.getStartTime()));
bean.setEndTime(MyDateUtils.myparseDate(vo.getEndTime()));
bean.setStartTime(vo.getStartTime());
bean.setEndTime(vo.getEndTime());
bean.setSpan(vo.getSpan());
bean.setRemark(vo.getRemark());
bean.setStatus(CommonStatus.EFFECTIVE.value());

@ -3,11 +3,14 @@ package com.shxy.xymanager_service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollectionUtil;
import com.github.pagehelper.PageInfo;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.entity.Terminals;
import com.shxy.xymanager_common.enums.CommonStatus;
import com.shxy.xymanager_common.exception.Asserts;
import com.shxy.xymanager_common.model.TerminalListModel;
import com.shxy.xymanager_common.page.PageUtils;
import com.shxy.xymanager_common.vo.PageVo;
import com.shxy.xymanager_common.vo.TerminalIdListVo;
import com.shxy.xymanager_common.vo.TerminalVo;
import com.shxy.xymanager_common.vo.UpdateTerminalVo;
@ -40,16 +43,29 @@ public class TerminalServiceImpl implements TerminalService {
* @return
*/
@Override
public ServiceBody<TerminalListModel> getTerminalList() {
public ServiceBody<TerminalListModel> getTerminalList(PageVo vo) {
TerminalListModel model = new TerminalListModel();
List<Terminals> terminals = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(terminals);
int pageindex = vo.getPageindex();
int pagesize = vo.getPagesize();
PageUtils.SetPage(pageindex, pagesize);
List<Terminals> list = terminalsDao.selectAll(CommonStatus.EFFECTIVE.value());
boolean empty = CollectionUtil.isEmpty(list);
if (empty) {
model.setList(new ArrayList<>());
} else {
List<TerminalListModel.TerminalBean> list = BeanUtil.copyToList(terminals, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase());
model.setList(list);
List<TerminalListModel.TerminalBean> beans = BeanUtil.copyToList(list, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase());
model.setList(beans);
}
PageInfo pageData = PageUtils.getPageData(list);
int currentpage = pageData.getPageNum();
model.setCurrentpage(currentpage);
long total = pageData.getTotal();
model.setTotal(total);
int pageSize = pageData.getPageSize();
model.setPagesize(pageSize);
int pages = pageData.getPages();
model.setTotalpage(pages);
return Asserts.success(model);
}

@ -0,0 +1,29 @@
package com.shxy.xymanager_service.service;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.model.DyLineTreeListModel;
import com.shxy.xymanager_common.model.DyListModel;
import com.shxy.xymanager_common.vo.TerminalIdVo;
/**
*
*
* @author
*/
public interface DyLevelService {
/**
* 线
*
* @return
*/
ServiceBody<DyLineTreeListModel> getdyTreeList();
/**
*
*
* @return
*/
ServiceBody<DyListModel> getdyList();
}

@ -2,11 +2,10 @@ package com.shxy.xymanager_service.service;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.model.LineListModel;
import com.shxy.xymanager_common.model.LineTreeListModel;
import com.shxy.xymanager_common.model.TerminalListModel;
import com.shxy.xymanager_common.model.DyLineTreeListModel;
import com.shxy.xymanager_common.vo.LineIdVo;
import com.shxy.xymanager_common.vo.LineVo;
import com.shxy.xymanager_common.vo.TerminalVo;
import com.shxy.xymanager_common.vo.PageVo;
import com.shxy.xymanager_common.vo.UpdateLineVo;
/**
@ -15,19 +14,13 @@ import com.shxy.xymanager_common.vo.UpdateLineVo;
* @author
*/
public interface LineService {
/**
* 线
*
* @return
*/
ServiceBody<LineTreeListModel> getLineTreeList();
/**
* 线
*
* @return
*/
ServiceBody<LineListModel> getLineList();
ServiceBody<LineListModel> getLineList(PageVo vo);
/**
* 线

@ -13,7 +13,7 @@ import com.shxy.xymanager_common.vo.TerminalVo;
*/
public interface TerminalChannelService {
/**
*
*
*
* @return
*/

@ -16,7 +16,7 @@ public interface TerminalScheduleRuleService {
*
* @return
*/
ServiceBody<TerminalScheduleRuleListModel> getScheduleRuleList();
ServiceBody<TerminalScheduleRuleListModel> getScheduleRuleList(PageVo vo);
/**
*

@ -2,6 +2,7 @@ package com.shxy.xymanager_service.service;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.model.TerminalListModel;
import com.shxy.xymanager_common.vo.PageVo;
import com.shxy.xymanager_common.vo.TerminalIdListVo;
import com.shxy.xymanager_common.vo.TerminalVo;
import com.shxy.xymanager_common.vo.UpdateTerminalVo;
@ -17,7 +18,7 @@ public interface TerminalService {
*
* @return
*/
ServiceBody<TerminalListModel> getTerminalList();
ServiceBody<TerminalListModel> getTerminalList(PageVo vo);
/**
*

Loading…
Cancel
Save