设备故障接口新增

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<List<TerminalListExcelModel>> 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<List<TerminalAndLastPicListExcelModel>> 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<String> addFavorList( @RequestBody FavorVo vo) {
+    public ResponseReult<String> addFavorList(@RequestBody FavorVo vo) {
         ServiceBody<String> 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<TableDataInfo<TerminalFaults>> getTermFaults(@RequestBody TermFaultsVo vo) {
+        ServiceBody<TableDataInfo<TerminalFaults>> 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<TableDataInfo<TerminalFaults>> serviceBody = terminalService.getTermFaults(vo);
+        EasyExcelUtil.createExcel(response, "设备故障列表", serviceBody.getData().getList(), TerminalFaults.class);
+    }
 
 }

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;
+
+}

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<Criteria> oredCriteria;
+
+    public TerminalFaultsExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> 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<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> 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<Integer> values) {
+            addCriterion("term_id in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotIn(List<Integer> 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<Date> values) {
+            addCriterion("fault_time in", values, "faultTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaultTimeNotIn(List<Date> 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<Integer> values) {
+            addCriterion("fault_code in", values, "faultCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaultCodeNotIn(List<Integer> 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<String> values) {
+            addCriterion("msg in", values, "msg");
+            return (Criteria) this;
+        }
+
+        public Criteria andMsgNotIn(List<String> 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<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> 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);
+        }
+    }
+}

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")

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;
+}

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<TerminalFaults> 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);
+}

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);
 

xymanager_dao/src/main/resources/mappers/TerminalFaultsDao.xml

@@ -0,0 +1,228 @@
+<?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.TerminalFaultsDao">
+  <resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalFaults">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="term_id" jdbcType="INTEGER" property="termId" />
+    <result column="fault_time" jdbcType="TIMESTAMP" property="faultTime" />
+    <result column="fault_code" jdbcType="INTEGER" property="faultCode" />
+    <result column="msg" jdbcType="VARCHAR" property="msg" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, term_id, fault_time, fault_code, msg, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalFaultsExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from terminal_faults
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from terminal_faults
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from terminal_faults
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TerminalFaultsExample">
+    delete from terminal_faults
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalFaults">
+    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>
+  <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalFaults">
+    insert into terminal_faults
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="termId != null">
+        term_id,
+      </if>
+      <if test="faultTime != null">
+        fault_time,
+      </if>
+      <if test="faultCode != null">
+        fault_code,
+      </if>
+      <if test="msg != null">
+        msg,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="termId != null">
+        #{termId,jdbcType=INTEGER},
+      </if>
+      <if test="faultTime != null">
+        #{faultTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="faultCode != null">
+        #{faultCode,jdbcType=INTEGER},
+      </if>
+      <if test="msg != null">
+        #{msg,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalFaultsExample" resultType="java.lang.Long">
+    select count(*) from terminal_faults
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update terminal_faults
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.termId != null">
+        term_id = #{record.termId,jdbcType=INTEGER},
+      </if>
+      <if test="record.faultTime != null">
+        fault_time = #{record.faultTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.faultCode != null">
+        fault_code = #{record.faultCode,jdbcType=INTEGER},
+      </if>
+      <if test="record.msg != null">
+        msg = #{record.msg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    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}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalFaults">
+    update terminal_faults
+    <set>
+      <if test="termId != null">
+        term_id = #{termId,jdbcType=INTEGER},
+      </if>
+      <if test="faultTime != null">
+        fault_time = #{faultTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="faultCode != null">
+        fault_code = #{faultCode,jdbcType=INTEGER},
+      </if>
+      <if test="msg != null">
+        msg = #{msg,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalFaults">
+    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}
+  </update>
+</mapper>

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<TableDataInfo<TerminalFaults>> getTermFaults(TermFaultsVo vo) {
+        Map<Integer, Terminals> 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<TerminalFaults> 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);
+    }
+
+
 }
 

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<String> addFavorList(FavorVo vo);
+
+    /**
+     * 设备故障接口
+     * @param vo
+     * @return
+     */
+    ServiceBody<TableDataInfo<TerminalFaults>> getTermFaults(TermFaultsVo vo);
+
 }