diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java index 1212604..5bcbc81 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java @@ -5,6 +5,7 @@ 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.entity.TerminalFaults; import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals; import com.shxy.xymanager_common.excelbean.TerminalAndLastPicListExcelModel; import com.shxy.xymanager_common.excelbean.TerminalListExcelModel; @@ -57,7 +58,7 @@ public class TerminalController extends BaseController { @Log(title = "获取设备列表", type = "查询") public void getTerminalListExcel(HttpServletResponse response) throws IOException { ServiceBody> serviceBody = terminalService.getTerminalListExcel(null); - EasyExcelUtil.createExcel(response,"设备表",serviceBody.getData(), TerminalListExcelModel.class); + EasyExcelUtil.createExcel(response, "设备表", serviceBody.getData(), TerminalListExcelModel.class); } @ApiOperation(value = "获取绘制图标", notes = "绘制坐标保存接口", httpMethod = "POST") @@ -273,9 +274,9 @@ public class TerminalController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getOnlineTerminalListExcel") @Log(title = "导出设备在线和心跳时间和照片时间列表Excel", type = "查询") - public void getOnlineTerminalListExcel(HttpServletResponse response,@Param("type") Integer type) throws IOException { + public void getOnlineTerminalListExcel(HttpServletResponse response, @Param("type") Integer type) throws IOException { ServiceBody> serviceBody = terminalService.getOnlineTerminalList(type); - EasyExcelUtil.createExcel(response,"设备在线表",serviceBody.getData(), TerminalAndLastPicListExcelModel.class); + EasyExcelUtil.createExcel(response, "设备在线表", serviceBody.getData(), TerminalAndLastPicListExcelModel.class); } @ApiOperation(value = "获取规约列表", notes = "获取规约列表", httpMethod = "POST") @@ -321,12 +322,36 @@ public class TerminalController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/addFavorList") @Log(title = "新增收藏夹接口", type = "新增") - public ResponseReult addFavorList( @RequestBody FavorVo vo) { + public ResponseReult addFavorList(@RequestBody FavorVo vo) { ServiceBody serviceBody = terminalService.addFavorList(vo); 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("/getTermFaults") + @Log(title = "设备故障接口", type = "查询") + public ResponseReult> getTermFaults(@RequestBody TermFaultsVo vo) { + ServiceBody> serviceBody = terminalService.getTermFaults(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + + @ApiOperation(value = "导出设备故障列表Excel", notes = "导出设备列表Excel", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getTermFaultsExcel") + @Log(title = "获取设备列表", type = "查询") + public void getTermFaultsExcel(HttpServletResponse response,@RequestBody TermFaultsVo vo) throws IOException { + ServiceBody> serviceBody = terminalService.getTermFaults(vo); + EasyExcelUtil.createExcel(response, "设备故障列表", serviceBody.getData().getList(), TerminalFaults.class); + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFaults.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFaults.java new file mode 100644 index 0000000..88e38a8 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFaults.java @@ -0,0 +1,44 @@ +package com.shxy.xymanager_common.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigInteger; +import java.util.Date; +@Data +public class TerminalFaults implements Serializable { + @ApiModelProperty(value = "线路名称", example = "123456") + private BigInteger id; + + @ApiModelProperty(value = "线路名称", example = "123456") + private Integer termId; + + @ColumnWidth(20) + @ExcelProperty("设备编号") + @ApiModelProperty(value = "线路名称", example = "123456") + private String cmdid; + + @ColumnWidth(20) + @ExcelProperty("故障时间") + @ApiModelProperty(value = "线路名称", example = "123456") + private Date faultTime; + + @ColumnWidth(20) + @ExcelProperty("故障编号") + @ApiModelProperty(value = "线路名称", example = "123456") + private Integer faultCode; + + @ExcelProperty("故障名称") + @ApiModelProperty(value = "线路名称", example = "123456") + private String msg; + + @ApiModelProperty(value = "线路名称", example = "123456") + private Date createTime; + + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFaultsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFaultsExample.java new file mode 100644 index 0000000..2b2ea6a --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFaultsExample.java @@ -0,0 +1,571 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TerminalFaultsExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalFaultsExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andTermIdIsNull() { + addCriterion("term_id is null"); + return (Criteria) this; + } + + public Criteria andTermIdIsNotNull() { + addCriterion("term_id is not null"); + return (Criteria) this; + } + + public Criteria andTermIdEqualTo(Integer value) { + addCriterion("term_id =", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotEqualTo(Integer value) { + addCriterion("term_id <>", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThan(Integer value) { + addCriterion("term_id >", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThanOrEqualTo(Integer value) { + addCriterion("term_id >=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThan(Integer value) { + addCriterion("term_id <", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThanOrEqualTo(Integer value) { + addCriterion("term_id <=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdIn(List values) { + addCriterion("term_id in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotIn(List values) { + addCriterion("term_id not in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdBetween(Integer value1, Integer value2) { + addCriterion("term_id between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotBetween(Integer value1, Integer value2) { + addCriterion("term_id not between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andFaultTimeIsNull() { + addCriterion("fault_time is null"); + return (Criteria) this; + } + + public Criteria andFaultTimeIsNotNull() { + addCriterion("fault_time is not null"); + return (Criteria) this; + } + + public Criteria andFaultTimeEqualTo(Date value) { + addCriterion("fault_time =", value, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeNotEqualTo(Date value) { + addCriterion("fault_time <>", value, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeGreaterThan(Date value) { + addCriterion("fault_time >", value, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeGreaterThanOrEqualTo(Date value) { + addCriterion("fault_time >=", value, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeLessThan(Date value) { + addCriterion("fault_time <", value, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeLessThanOrEqualTo(Date value) { + addCriterion("fault_time <=", value, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeIn(List values) { + addCriterion("fault_time in", values, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeNotIn(List values) { + addCriterion("fault_time not in", values, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeBetween(Date value1, Date value2) { + addCriterion("fault_time between", value1, value2, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultTimeNotBetween(Date value1, Date value2) { + addCriterion("fault_time not between", value1, value2, "faultTime"); + return (Criteria) this; + } + + public Criteria andFaultCodeIsNull() { + addCriterion("fault_code is null"); + return (Criteria) this; + } + + public Criteria andFaultCodeIsNotNull() { + addCriterion("fault_code is not null"); + return (Criteria) this; + } + + public Criteria andFaultCodeEqualTo(Integer value) { + addCriterion("fault_code =", value, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeNotEqualTo(Integer value) { + addCriterion("fault_code <>", value, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeGreaterThan(Integer value) { + addCriterion("fault_code >", value, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeGreaterThanOrEqualTo(Integer value) { + addCriterion("fault_code >=", value, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeLessThan(Integer value) { + addCriterion("fault_code <", value, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeLessThanOrEqualTo(Integer value) { + addCriterion("fault_code <=", value, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeIn(List values) { + addCriterion("fault_code in", values, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeNotIn(List values) { + addCriterion("fault_code not in", values, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeBetween(Integer value1, Integer value2) { + addCriterion("fault_code between", value1, value2, "faultCode"); + return (Criteria) this; + } + + public Criteria andFaultCodeNotBetween(Integer value1, Integer value2) { + addCriterion("fault_code not between", value1, value2, "faultCode"); + return (Criteria) this; + } + + public Criteria andMsgIsNull() { + addCriterion("msg is null"); + return (Criteria) this; + } + + public Criteria andMsgIsNotNull() { + addCriterion("msg is not null"); + return (Criteria) this; + } + + public Criteria andMsgEqualTo(String value) { + addCriterion("msg =", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotEqualTo(String value) { + addCriterion("msg <>", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgGreaterThan(String value) { + addCriterion("msg >", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgGreaterThanOrEqualTo(String value) { + addCriterion("msg >=", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgLessThan(String value) { + addCriterion("msg <", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgLessThanOrEqualTo(String value) { + addCriterion("msg <=", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgLike(String value) { + addCriterion("msg like", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotLike(String value) { + addCriterion("msg not like", value, "msg"); + return (Criteria) this; + } + + public Criteria andMsgIn(List values) { + addCriterion("msg in", values, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotIn(List values) { + addCriterion("msg not in", values, "msg"); + return (Criteria) this; + } + + public Criteria andMsgBetween(String value1, String value2) { + addCriterion("msg between", value1, value2, "msg"); + return (Criteria) this; + } + + public Criteria andMsgNotBetween(String value1, String value2) { + addCriterion("msg not between", value1, value2, "msg"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/excelbean/TerminalListExcelModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/excelbean/TerminalListExcelModel.java index 8797e3e..e671d2c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/excelbean/TerminalListExcelModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/excelbean/TerminalListExcelModel.java @@ -17,9 +17,6 @@ import java.util.List; @Data @ApiModel(value = "设备列表excel", description = "设备列表excel") public class TerminalListExcelModel implements Serializable { - - - @ColumnWidth(20) @ExcelProperty("线路名称") @ApiModelProperty(value = "线路名称", example = "123456") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TermFaultsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TermFaultsVo.java new file mode 100644 index 0000000..52c1a6d --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TermFaultsVo.java @@ -0,0 +1,33 @@ +package com.shxy.xymanager_common.vo; + +import cn.hutool.core.date.DateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import java.util.List; + +@Data +@ApiModel(value = "装置故障对象", description = "装置故障对象") +public class TermFaultsVo { + + @NotEmpty(message = "不能传入空值") + @ApiModelProperty(value = "装置编号", required = true, example = "A0001") + private Integer termid; + + @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; + + @ApiModelProperty(value = "开始时间", example = "123455") + private DateTime starttime; + + @ApiModelProperty(value = "结束时间", example = "123455") + private DateTime endtime; +} diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalFaultsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalFaultsDao.java new file mode 100644 index 0000000..c78dfd1 --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalFaultsDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalFaults; +import com.shxy.xymanager_common.entity.TerminalFaultsExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TerminalFaultsDao { + long countByExample(TerminalFaultsExample example); + + int deleteByExample(TerminalFaultsExample example); + + int deleteByPrimaryKey(Long id); + + int insert(TerminalFaults record); + + int insertSelective(TerminalFaults record); + + List selectByExample(TerminalFaultsExample example); + + TerminalFaults selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") TerminalFaults record, @Param("example") TerminalFaultsExample example); + + int updateByExample(@Param("record") TerminalFaults record, @Param("example") TerminalFaultsExample example); + + int updateByPrimaryKeySelective(TerminalFaults record); + + int updateByPrimaryKey(TerminalFaults record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java index c206783..7818ea6 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java @@ -38,7 +38,7 @@ public interface TerminalsDao { int updateByExample(@Param("record") Terminals record, @Param("example") TerminalsExample example); - int updateByPrimaryKeySelective(@Param("record")Terminals record); + int updateByPrimaryKeySelective(Terminals record); int updateByPrimaryKey(Terminals record); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalFaultsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalFaultsDao.xml new file mode 100644 index 0000000..4f5f486 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalFaultsDao.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, term_id, fault_time, fault_code, msg, create_time + + + + + delete from terminal_faults + where id = #{id,jdbcType=BIGINT} + + + delete from terminal_faults + + + + + + insert into terminal_faults (id, term_id, fault_time, + fault_code, msg, create_time + ) + values (#{id,jdbcType=BIGINT}, #{termId,jdbcType=INTEGER}, #{faultTime,jdbcType=TIMESTAMP}, + #{faultCode,jdbcType=INTEGER}, #{msg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP} + ) + + + insert into terminal_faults + + + id, + + + term_id, + + + fault_time, + + + fault_code, + + + msg, + + + create_time, + + + + + #{id,jdbcType=BIGINT}, + + + #{termId,jdbcType=INTEGER}, + + + #{faultTime,jdbcType=TIMESTAMP}, + + + #{faultCode,jdbcType=INTEGER}, + + + #{msg,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + + + + update terminal_faults + + + id = #{record.id,jdbcType=BIGINT}, + + + term_id = #{record.termId,jdbcType=INTEGER}, + + + fault_time = #{record.faultTime,jdbcType=TIMESTAMP}, + + + fault_code = #{record.faultCode,jdbcType=INTEGER}, + + + msg = #{record.msg,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + + + + + + update terminal_faults + set id = #{record.id,jdbcType=BIGINT}, + term_id = #{record.termId,jdbcType=INTEGER}, + fault_time = #{record.faultTime,jdbcType=TIMESTAMP}, + fault_code = #{record.faultCode,jdbcType=INTEGER}, + msg = #{record.msg,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP} + + + + + + update terminal_faults + + + term_id = #{termId,jdbcType=INTEGER}, + + + fault_time = #{faultTime,jdbcType=TIMESTAMP}, + + + fault_code = #{faultCode,jdbcType=INTEGER}, + + + msg = #{msg,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update terminal_faults + set term_id = #{termId,jdbcType=INTEGER}, + fault_time = #{faultTime,jdbcType=TIMESTAMP}, + fault_code = #{faultCode,jdbcType=INTEGER}, + msg = #{msg,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index 1d9de79..48c5cd0 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.constant.Constants; import com.shxy.xymanager_common.dto.*; @@ -30,7 +29,6 @@ import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_dao.dao.*; import com.shxy.xymanager_service.service.CacheService; import com.shxy.xymanager_service.service.TerminalService; -import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -83,6 +81,9 @@ public class TerminalServiceImpl implements TerminalService { @Autowired View_Dy_Line_Tower_TerminalsDao view_dy_line_tower_terminalsDao; + @Autowired + TerminalFaultsDao terminalFaultsDao; + /** * 获取所有设备列表 * @@ -793,5 +794,42 @@ public class TerminalServiceImpl implements TerminalService { return Asserts.success("修改成功"); } + /** + * 设备故障接口 + * + * @param vo + * @return + */ + @Override + public ServiceBody> getTermFaults(TermFaultsVo vo) { + Map terminalMap = cacheService.getTerminalMap(); + Integer termid = vo.getTermid(); + Integer pageindex = vo.getPageindex(); + Integer pagesize = vo.getPagesize(); + DateTime starttime = vo.getStarttime(); + DateTime endtime = vo.getEndtime(); + TerminalFaultsExample example = new TerminalFaultsExample(); + TerminalFaultsExample.Criteria criteria = example.createCriteria(); + criteria.andTermIdEqualTo(termid); + if (BeanUtil.isNotEmpty(pageindex) && BeanUtil.isNotEmpty(pagesize)) { + PageUtils.SetPage(pageindex, pagesize); + } + if (starttime != null) { + criteria.andFaultTimeGreaterThanOrEqualTo(starttime); + } + if (endtime != null) { + criteria.andFaultTimeLessThanOrEqualTo(endtime); + } + List list = terminalFaultsDao.selectByExample(example); + if (CollectionUtil.isNotEmpty(list)) { + for (TerminalFaults item:list) { + item.setCmdid(terminalMap.get(termid).getCmdid()); + } + } + TableDataInfo dataTable = PageUtils.getDataTable(list); + return Asserts.success(dataTable); + } + + } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java index 7001c6a..c8e6417 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java @@ -1,8 +1,7 @@ package com.shxy.xymanager_service.service; -import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.dto.TerminalsAndStatusDto; +import com.shxy.xymanager_common.entity.TerminalFaults; import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals; import com.shxy.xymanager_common.excelbean.TerminalAndLastPicListExcelModel; import com.shxy.xymanager_common.excelbean.TerminalListExcelModel; @@ -159,4 +158,12 @@ public interface TerminalService { * @return */ ServiceBody addFavorList(FavorVo vo); + + /** + * 设备故障接口 + * @param vo + * @return + */ + ServiceBody> getTermFaults(TermFaultsVo vo); + }