diff --git a/sql/sql b/sql/sql index 7954024..631eeb9 100644 --- a/sql/sql +++ b/sql/sql @@ -45,3 +45,6 @@ VIEW `v_dy_line_towe_terminals` AS LEFT JOIN `lines` `b` ON ((`a`.`id` = `b`.`dy_level_id`))) LEFT JOIN `towers` `c` ON ((`b`.`id` = `c`.`line_id`))) JOIN `terminals` `d` ON ((`c`.`id` = `d`.`tower_id`))) + +ALTER TABLE `xymp`.`sys_users` +ADD COLUMN `notes` VARCHAR(1024) NULL DEFAULT NULL AFTER `password`; \ No newline at end of file diff --git a/sql/xiugai b/sql/xiugai new file mode 100644 index 0000000..9a9cb39 --- /dev/null +++ b/sql/xiugai @@ -0,0 +1 @@ +getdyList \ No newline at end of file diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java index 50b8e90..e34650e 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java @@ -5,8 +5,8 @@ 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.DyLevel; import com.shxy.xymanager_common.model.DyLineTreeListModel; -import com.shxy.xymanager_common.model.DyListModel; import com.shxy.xymanager_common.model.TerminalPhotosModel; import com.shxy.xymanager_common.util.xinyin.HeaderUtil; import com.shxy.xymanager_common.vo.DyListVo; @@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Api(value = "电压等级接口", tags = "电压等级接口描述") @RestController @@ -65,8 +67,8 @@ public class DyLevelController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getdyList") @Log(title = "获取电压等级列表", type = "查询") - public ResponseReult getdyList() { - ServiceBody serviceBody = dyLevelService.getdyList(); + public ResponseReult> getdyList() { + ServiceBody> serviceBody = dyLevelService.getdyList(); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java index 071f16e..88a24e0 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java @@ -5,9 +5,9 @@ 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.Lines; import com.shxy.xymanager_common.model.LineAndGtAndChannelListModel; -import com.shxy.xymanager_common.model.LineListModel; -import com.shxy.xymanager_common.model.DyLineTreeListModel; +import com.shxy.xymanager_common.page.TableDataInfo; import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_service.service.LineService; import io.swagger.annotations.Api; @@ -34,8 +34,8 @@ public class LineController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLineList") @Log(title = "获取线路列表", type = "查询") - public ResponseReult getLineList(@RequestBody @Validated SelectVo vo) { - ServiceBody serviceBody = lineService.getLineList(vo); + public ResponseReult> getLineList(@RequestBody @Validated SelectVo vo) { + ServiceBody> serviceBody = lineService.getLineList(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java index 66a4e8f..bb095ca 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java @@ -82,7 +82,6 @@ public class SysLoginController { } } - /** * 查询用户列表 * 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 78d47bd..1212604 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 @@ -1,12 +1,11 @@ package com.shxy.xymanager_admin.controller; -import com.github.pagehelper.PageInfo; 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.dto.TerminalsAndStatusDto; +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; import com.shxy.xymanager_common.model.*; @@ -43,8 +42,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> getTerminalList(@RequestBody @Validated TerminalSelectVo vo) { - ServiceBody> serviceBody = terminalService.getTerminalList(vo); + public ResponseReult> getTerminalList(@RequestBody @Validated TerminalSelectVo vo) { + ServiceBody> serviceBody = terminalService.getTerminalList(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java index e45c749..30ea57f 100644 --- a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java +++ b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_admin; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; @@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import java.math.BigInteger; +import java.sql.Array; import java.sql.Time; import java.util.ArrayList; import java.util.Date; @@ -341,6 +343,152 @@ View_Dy_Line_Tower_TerminalsDao view_dy_line_tower_terminalsDao; // example.createCriteria().andDyIdIn(list); // List view_dy_line_tower_terminals = view_dy_line_tower_terminalsDao.selectByExample(example); // System.out.println(view_dy_line_tower_terminals); + + Integer dyid = 1; + Integer lineid = 10; + Integer tower = 12; + String search = "fdsafd"; +// View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample(); +// example.setOrderByClause("d.id desc"); +// View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); +// if (BeanUtil.isNotEmpty(dyid)) { +// criteria.andDyIdEqualTo(dyid); +// } +// if (BeanUtil.isNotEmpty(lineid)) { +// criteria.andLineIdEqualTo(lineid); +// } +// if (BeanUtil.isNotEmpty(tower)) { +// criteria.andTowerIdEqualTo(tower); +// } +// View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or(); +// or.andDyNameLike(search); +// View_Dy_Line_Tower_TerminalsExample.Criteria or1 = example.or(); +// or1.andLineNameLike(search); +// +// List view_dy_line_tower_terminals = view_dy_line_tower_terminalsDao.selectByExample(example); +// System.out.println(view_dy_line_tower_terminals); + + +// View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample(); +// example.setOrderByClause("id desc"); +// View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); +// if (BeanUtil.isNotEmpty(dyid)) { +// criteria.andDyIdEqualTo(dyid); +// } +// if (BeanUtil.isNotEmpty(lineid)) { +// criteria.andLineIdEqualTo(lineid); +// } +// if (BeanUtil.isNotEmpty(tower)) { +// criteria.andTowerIdEqualTo(tower); +// } +// if (StrUtil.isNotEmpty(search)) { +// criteria.andDyNameLike(search); +// } +// View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or(); +// if (BeanUtil.isNotEmpty(dyid)) { +// or.andDyIdEqualTo(dyid); +// } +// if (BeanUtil.isNotEmpty(lineid)) { +// or.andLineIdEqualTo(lineid); +// } +// if (BeanUtil.isNotEmpty(tower)) { +// or.andTowerIdEqualTo(tower); +// } +// if (StrUtil.isNotEmpty(search)) { +// or.andLineNameLike(search); +// } +// View_Dy_Line_Tower_TerminalsExample.Criteria toweror = example.or(); +// if (BeanUtil.isNotEmpty(dyid)) { +// toweror.andDyIdEqualTo(dyid); +// } +// if (BeanUtil.isNotEmpty(lineid)) { +// toweror.andLineIdEqualTo(lineid); +// } +// if (BeanUtil.isNotEmpty(tower)) { +// toweror.andTowerIdEqualTo(tower); +// } +// if (StrUtil.isNotEmpty(search)) { +// toweror.andTowerNameLike(search); +// } +// +// List view_dy_line_tower_terminals = view_dy_line_tower_terminalsDao.selectByExample(example); +// System.out.println(view_dy_line_tower_terminals); + + + String[] array = new String[]{"XYIGQ10C231000009", + "XYIGQ10C231000018", + "XYIGQ10C231000039", + "XYIGQ10C231000125", + "XYIGQ10C231000132", + "XYIGQ10C231000192", + "XYIGQ10C231000202", + "XYIGQ10C231000232", + "XYIGQ10C231000240", + "XYIGQ10C231000268", + "XYIGQ10C231000284", + "XYIGQ10C231000325", + "XYIGQ10C231000357", + "XYIGQ10C231000375", + "XYIGQ10C231000427", + "XYIGQ10C231000501", + "XYIGQ10C231000502", + "XYIGQ10C231000516", + "XYIGQ10C231000520", + "XYIGQ10C231000526", + "XYIGQ10C231000543", + "XYIGQ10C231000546", + "XYIGQ10C231000556", + "XYIGQ10C231000558", + "XYIGQ10C231000561", + "XYIGQ10C231000563", + "XYIGQ10C231000569", + "XYIGQ10C231000571", + "XYIGQ10C231000576", + "XYIGQ10C231000588", + "XYIGQ10C231000592", + "XYIGQ10C231000597", + "XYIGQ10C231000601", + "XYIGQ10C231000605", + "XYIGQ10C231000608", + "XYIGQ10C231000611", + "XYIGQ10C231000613", + "XYIGQ10C231000618", + "XYIGQ10C231000619", + "XYIGQ10C231000621", + "XYIGQ10C231000627", + "XYIGQ10C231000630", + "XYIGQ10C231000633", + "XYIGQ10C231000644", + "XYIGQ10C231000647", + "XYIGQ10C231000663", + "XYIGQ10C231000664", + "XYIGQ10C231000667", + "XYIGQ10C231000668", + "XYIGQ10C231000669", + "XYIGQ10C231000671", + "XYIGQ10C231000674", + "XYIGQ10C231000675", + "XYIGQ10C231000679", + "XYIGQ10C231000681", + "XYIGQ10C231000683", + "XYIGQ10C231000689", + "XYIGQ10C231000692", + "XYIGQ10C231000698", + "XYIGQ10C231000699", + "XYYFV12XJ2403D001", + "XYYFV12XJ2403C002"}; + + String s = ""; + Integer towerd = 0; + for (String item :array) { + towerd++; +// s+= "INSERT INTO `terminals`(id,`line_id`, `tower_id`, `cmdid`) VALUES("+towerd+",1," + towerd + ", '" + item + "');"; + s+= "INSERT INTO `terminal_channel_mapper`(`term_id`, `channel_id`) VALUES("+towerd+",1);"; + s+= "INSERT INTO `terminal_channel_mapper`(`term_id`, `channel_id`) VALUES("+towerd+",2);"; + s+= "INSERT INTO `terminal_channel_mapper`(`term_id`, `channel_id`) VALUES("+towerd+",3);"; + } + + System.out.println(s); } } diff --git a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/test.java b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/test.java new file mode 100644 index 0000000..c3526a1 --- /dev/null +++ b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/test.java @@ -0,0 +1,38 @@ +package com.shxy.xymanager_admin; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.shxy.xymanager_common.util.MyDateUtils; + +import java.math.BigInteger; +import java.util.Date; + +public class test { + public static void main(String[] args){ +// JSONObject jsonObject = XML.toJSONObject("\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// "\n" + +// ""); +// JSONObject response = (JSONObject) jsonObject.get("response"); +// +// JSONObject result = (JSONObject) response.get("result"); +// Integer code = (Integer) result.get("code"); +// System.out.println(jsonObject.toString()); + +// DateTime dateTime = DateUtil.offsetDay(new Date(), -7); +// System.out.println(dateTime); +// BigInteger bigInteger = BigInteger.valueOf(1710432000000l); +// long start = MyDateUtils.TimeMillSecond2Second(DateTime.of(bigInteger.longValue())); +// System.out.println(start); + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTowertDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTowertDto.java index 74b5009..e624871 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTowertDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTowertDto.java @@ -4,7 +4,7 @@ import lombok.Data; @Data -public class DyLineAndTowertDto { +public class DyLineAndTowertDto { private Integer dyId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndDyNameDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndDyNameDto.java deleted file mode 100644 index 1023199..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndDyNameDto.java +++ /dev/null @@ -1,23 +0,0 @@ -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; - -} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusDto.java index f2e1c45..484752e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusDto.java @@ -25,7 +25,7 @@ public class TerminalsAndStatusDto implements Serializable { @ApiModelProperty(value = "电压编号", example = "123456") private Integer dyId; - @ApiModelProperty(value = "电压名称", example = "123456") + @ApiModelProperty(value = "电压编号", example = "123456") private String dyName; @ApiModelProperty(value = "线路编号", example = "123456") @@ -112,8 +112,8 @@ public class TerminalsAndStatusDto implements Serializable { @ApiModelProperty(value = "电源电压", example = "213") private float batteryVoltage; - @ApiModelProperty(value = "最后一次心跳时间", example = "213") - private BigInteger lastHeartbeat; + @ApiModelProperty(value = "最后一次心跳时间", example = "213") + private BigInteger lastHeartbeat; @ApiModelProperty(value = "在线状态", example = "0--掉线1--在线") private Integer onlinestatus; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DevType.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DevType.java index d2aeb5f..5812846 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DevType.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DevType.java @@ -1,8 +1,11 @@ package com.shxy.xymanager_common.entity; +import lombok.Data; + import java.io.Serializable; import java.util.Date; +@Data public class DevType implements Serializable { private Integer id; @@ -14,35 +17,4 @@ public class DevType implements Serializable { private static final long serialVersionUID = 1L; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java index 1fcb3a3..f3cdd19 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java @@ -33,6 +33,9 @@ public class Lines implements Serializable { private Date updateTime; + @ApiModelProperty(value = "电压等级名称", example = "123456") + private String dyLevelName; + @ApiModelProperty(value = "杆塔信息", example = "123456") private List list = new ArrayList<>(); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java index cdda438..49549a8 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java @@ -33,6 +33,8 @@ public class SysUser { @ApiModelProperty(value="用户昵称", name="nickName") private String nickName; + private String notes; + @JsonIgnore private String password; /** diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserExample.java index 61f9107..772b8de 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserExample.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUserExample.java @@ -495,6 +495,76 @@ public class SysUserExample { return (Criteria) this; } + public Criteria andNotesIsNull() { + addCriterion("notes is null"); + return (Criteria) this; + } + + public Criteria andNotesIsNotNull() { + addCriterion("notes is not null"); + return (Criteria) this; + } + + public Criteria andNotesEqualTo(String value) { + addCriterion("notes =", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesNotEqualTo(String value) { + addCriterion("notes <>", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesGreaterThan(String value) { + addCriterion("notes >", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesGreaterThanOrEqualTo(String value) { + addCriterion("notes >=", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesLessThan(String value) { + addCriterion("notes <", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesLessThanOrEqualTo(String value) { + addCriterion("notes <=", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesLike(String value) { + addCriterion("notes like", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesNotLike(String value) { + addCriterion("notes not like", value, "notes"); + return (Criteria) this; + } + + public Criteria andNotesIn(List values) { + addCriterion("notes in", values, "notes"); + return (Criteria) this; + } + + public Criteria andNotesNotIn(List values) { + addCriterion("notes not in", values, "notes"); + return (Criteria) this; + } + + public Criteria andNotesBetween(String value1, String value2) { + addCriterion("notes between", value1, value2, "notes"); + return (Criteria) this; + } + + public Criteria andNotesNotBetween(String value1, String value2) { + addCriterion("notes not between", value1, value2, "notes"); + return (Criteria) this; + } + public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannelMapperExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannelMapperExample.java new file mode 100644 index 0000000..8bbadbb --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannelMapperExample.java @@ -0,0 +1,691 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TerminalChannelMapperExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalChannelMapperExample() { + 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(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer 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(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer 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 andChannelIdIsNull() { + addCriterion("channel_id is null"); + return (Criteria) this; + } + + public Criteria andChannelIdIsNotNull() { + addCriterion("channel_id is not null"); + return (Criteria) this; + } + + public Criteria andChannelIdEqualTo(Byte value) { + addCriterion("channel_id =", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotEqualTo(Byte value) { + addCriterion("channel_id <>", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThan(Byte value) { + addCriterion("channel_id >", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThanOrEqualTo(Byte value) { + addCriterion("channel_id >=", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThan(Byte value) { + addCriterion("channel_id <", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThanOrEqualTo(Byte value) { + addCriterion("channel_id <=", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdIn(List values) { + addCriterion("channel_id in", values, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotIn(List values) { + addCriterion("channel_id not in", values, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdBetween(Byte value1, Byte value2) { + addCriterion("channel_id between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotBetween(Byte value1, Byte value2) { + addCriterion("channel_id not between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andAliasIsNull() { + addCriterion("alias is null"); + return (Criteria) this; + } + + public Criteria andAliasIsNotNull() { + addCriterion("alias is not null"); + return (Criteria) this; + } + + public Criteria andAliasEqualTo(String value) { + addCriterion("alias =", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasNotEqualTo(String value) { + addCriterion("alias <>", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasGreaterThan(String value) { + addCriterion("alias >", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasGreaterThanOrEqualTo(String value) { + addCriterion("alias >=", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasLessThan(String value) { + addCriterion("alias <", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasLessThanOrEqualTo(String value) { + addCriterion("alias <=", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasLike(String value) { + addCriterion("alias like", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasNotLike(String value) { + addCriterion("alias not like", value, "alias"); + return (Criteria) this; + } + + public Criteria andAliasIn(List values) { + addCriterion("alias in", values, "alias"); + return (Criteria) this; + } + + public Criteria andAliasNotIn(List values) { + addCriterion("alias not in", values, "alias"); + return (Criteria) this; + } + + public Criteria andAliasBetween(String value1, String value2) { + addCriterion("alias between", value1, value2, "alias"); + return (Criteria) this; + } + + public Criteria andAliasNotBetween(String value1, String value2) { + addCriterion("alias not between", value1, value2, "alias"); + return (Criteria) this; + } + + public Criteria andPhotoIdIsNull() { + addCriterion("photo_id is null"); + return (Criteria) this; + } + + public Criteria andPhotoIdIsNotNull() { + addCriterion("photo_id is not null"); + return (Criteria) this; + } + + public Criteria andPhotoIdEqualTo(Long value) { + addCriterion("photo_id =", value, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdNotEqualTo(Long value) { + addCriterion("photo_id <>", value, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdGreaterThan(Long value) { + addCriterion("photo_id >", value, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdGreaterThanOrEqualTo(Long value) { + addCriterion("photo_id >=", value, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdLessThan(Long value) { + addCriterion("photo_id <", value, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdLessThanOrEqualTo(Long value) { + addCriterion("photo_id <=", value, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdIn(List values) { + addCriterion("photo_id in", values, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdNotIn(List values) { + addCriterion("photo_id not in", values, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdBetween(Long value1, Long value2) { + addCriterion("photo_id between", value1, value2, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoIdNotBetween(Long value1, Long value2) { + addCriterion("photo_id not between", value1, value2, "photoId"); + return (Criteria) this; + } + + public Criteria andPhotoTimeIsNull() { + addCriterion("photo_time is null"); + return (Criteria) this; + } + + public Criteria andPhotoTimeIsNotNull() { + addCriterion("photo_time is not null"); + return (Criteria) this; + } + + public Criteria andPhotoTimeEqualTo(Long value) { + addCriterion("photo_time =", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeNotEqualTo(Long value) { + addCriterion("photo_time <>", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeGreaterThan(Long value) { + addCriterion("photo_time >", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeGreaterThanOrEqualTo(Long value) { + addCriterion("photo_time >=", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeLessThan(Long value) { + addCriterion("photo_time <", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeLessThanOrEqualTo(Long value) { + addCriterion("photo_time <=", value, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeIn(List values) { + addCriterion("photo_time in", values, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeNotIn(List values) { + addCriterion("photo_time not in", values, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeBetween(Long value1, Long value2) { + addCriterion("photo_time between", value1, value2, "photoTime"); + return (Criteria) this; + } + + public Criteria andPhotoTimeNotBetween(Long value1, Long value2) { + addCriterion("photo_time not between", value1, value2, "photoTime"); + 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 Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + 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/entity/Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java index 5d2f8cf..162b022 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java @@ -23,17 +23,25 @@ public class Terminals implements Serializable { @ApiModelProperty(value = "装置编号", example = "123456") private Integer id; - private Integer lineid; - + private Integer lineId; @ApiModelProperty(value = "杆塔编号", example = "123456") - private Integer towerid; + private Integer towerId; @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") private String cmdid; - private Short orgId; + private String sn; + + private Integer orgId; + + private String iccid; + + private String phase; + + private String equipmentType; + + private String cellphone; - @ApiModelProperty(value = "装置名称", example = "名称名称") private String equipName; private String displayName; @@ -44,12 +52,8 @@ public class Terminals implements Serializable { private String bsManufacturer; - private String sim; - private Date bsProductionDate; - private Date workingDate; - private String bsIdentifier; private Double latitude; @@ -60,6 +64,12 @@ public class Terminals implements Serializable { private Date updateTime; + private String sim; + + private Date workingDate; + + private String password; + private Integer onlineStatus; private BigInteger lastheartbeat; @@ -101,8 +111,6 @@ public class Terminals implements Serializable { return cmdid; } - - 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/View_Dy_Line_Tower_Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java index 177ebed..1370f32 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java @@ -1,17 +1,35 @@ package com.shxy.xymanager_common.entity; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import com.shxy.xymanager_common.enums.CommonStatus; +import com.shxy.xymanager_common.util.MyDateUtils; +import com.shxy.xymanager_common.util.xinyin.TerminalUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; +import java.math.BigInteger; import java.util.Date; +import java.util.List; +@Data +@ApiModel(value = "设备列表", description = "获取设备列表信息") public class View_Dy_Line_Tower_Terminals implements Serializable { + @ApiModelProperty(value = "设备编号", example = "123456") private Integer id; + @ApiModelProperty(value = "电压编号", example = "123456") private Integer dyId; + @ApiModelProperty(value = "电压编号", example = "123456") private String dyName; + @ApiModelProperty(value = "线路编号", example = "123456") private Integer lineId; + @ApiModelProperty(value = "线路名称", example = "123456") private String lineName; private String lineBsManufacturer; @@ -32,7 +50,7 @@ public class View_Dy_Line_Tower_Terminals implements Serializable { private String essentialInfoVersion; - private Byte hasPan; + private Integer hasPan; private String bsManufacturer; @@ -46,243 +64,51 @@ public class View_Dy_Line_Tower_Terminals implements Serializable { private Integer status; + @ApiModelProperty(value = "规约编号", example = "21223") private Integer protocol; - private String sim; + @ApiModelProperty(value = "规约名称", example = "21223") + private String protocolName; private Date workingDate; - private Byte netType; - - private Byte devType; - - private String phase; - - private String equipmentType; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getDyId() { - return dyId; - } - - public void setDyId(Integer dyId) { - this.dyId = dyId; - } - - public String getDyName() { - return dyName; - } - - public void setDyName(String dyName) { - this.dyName = dyName == null ? null : dyName.trim(); - } - - public Integer getLineId() { - return lineId; - } - - public void setLineId(Integer lineId) { - this.lineId = lineId; - } - - public String getLineName() { - return lineName; - } - - public void setLineName(String lineName) { - this.lineName = lineName == null ? null : lineName.trim(); - } - - public String getLineBsManufacturer() { - return lineBsManufacturer; - } - - public void setLineBsManufacturer(String lineBsManufacturer) { - this.lineBsManufacturer = lineBsManufacturer == null ? null : lineBsManufacturer.trim(); - } - - public Integer getTowerId() { - return towerId; - } - - public void setTowerId(Integer towerId) { - this.towerId = towerId; - } - - public String getTowerName() { - return towerName; - } - - public void setTowerName(String towerName) { - this.towerName = towerName == null ? null : towerName.trim(); - } - - public String getCmdid() { - return cmdid; - } - - public void setCmdid(String cmdid) { - this.cmdid = cmdid == null ? null : cmdid.trim(); - } - - public Short getOrgId() { - return orgId; - } - - public void setOrgId(Short orgId) { - this.orgId = orgId; - } - - public String getEquipName() { - return equipName; - } - - public void setEquipName(String equipName) { - this.equipName = equipName == null ? null : equipName.trim(); - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName == null ? null : displayName.trim(); - } - - public String getModel() { - return model; - } - - public void setModel(String model) { - this.model = model == null ? null : model.trim(); - } - - public String getEssentialInfoVersion() { - return essentialInfoVersion; - } - - public void setEssentialInfoVersion(String essentialInfoVersion) { - this.essentialInfoVersion = essentialInfoVersion == null ? null : essentialInfoVersion.trim(); - } - - public Byte getHasPan() { - return hasPan; - } - - public void setHasPan(Byte hasPan) { - this.hasPan = hasPan; - } - - public String getBsManufacturer() { - return bsManufacturer; - } - - public void setBsManufacturer(String bsManufacturer) { - this.bsManufacturer = bsManufacturer == null ? null : bsManufacturer.trim(); - } - - public Date getBsProductionDate() { - return bsProductionDate; - } - - public void setBsProductionDate(Date bsProductionDate) { - this.bsProductionDate = bsProductionDate; - } - - public String getBsIdentifier() { - return bsIdentifier; - } - - public void setBsIdentifier(String bsIdentifier) { - this.bsIdentifier = bsIdentifier == null ? null : bsIdentifier.trim(); - } - - public Double getLatitude() { - return latitude; - } - - public void setLatitude(Double latitude) { - this.latitude = latitude; - } - - public Double getLongitude() { - return longitude; - } - - public void setLongitude(Double longitude) { - this.longitude = longitude; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Integer getProtocol() { - return protocol; - } - - public void setProtocol(Integer protocol) { - this.protocol = protocol; - } - - public String getSim() { - return sim; - } - - public void setSim(String sim) { - this.sim = sim == null ? null : sim.trim(); - } - - public Date getWorkingDate() { - return workingDate; - } - - public void setWorkingDate(Date workingDate) { - this.workingDate = workingDate; - } + @ApiModelProperty(value = "sim卡号", example = "123456") + private String sim; - public Byte getNetType() { - return netType; - } + @ApiModelProperty(value = "网络类型", example = "网络类型") + private Integer netType; - public void setNetType(Byte netType) { - this.netType = netType; - } - public Byte getDevType() { - return devType; - } - - public void setDevType(Byte devType) { - this.devType = devType; - } + @ApiModelProperty(value = "网络类型", example = "网络类型") + private Integer devType; - public String getPhase() { - return phase; - } + @ApiModelProperty(value = "设备名称", example = "123456") + private String devName; - public void setPhase(String phase) { - this.phase = phase == null ? null : phase.trim(); - } + private String phase; - public String getEquipmentType() { - return equipmentType; - } + private String equipmentType; - public void setEquipmentType(String equipmentType) { - this.equipmentType = equipmentType == null ? null : equipmentType.trim(); - } + @ApiModelProperty(value = "最后一次心跳时间", example = "213") + private BigInteger lastHeartbeat; + + @ApiModelProperty(value = "在线状态", example = "0--掉线1--在线") + private Integer onlinestatus; + + public Integer getOnlinestatus() { + if (lastHeartbeat == null) { + return CommonStatus.DELETE.value(); + } + long time = MyDateUtils.TimeSecond2MillSecond(lastHeartbeat.longValue()); + DateTime date = MyDateUtils.date(time); + long between = MyDateUtils.between(MyDateUtils.getNowDate(), date, DateUnit.MINUTE); + if (between > TerminalUtils.hearttime) { + return CommonStatus.DELETE.value(); + } else { + return CommonStatus.EFFECTIVE.value(); + } + } + @ApiModelProperty(value = "通道编号和名称", example = "213") + private List list; + 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/View_Dy_Line_Tower_TerminalsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_TerminalsExample.java index 559e684..b5dde8a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_TerminalsExample.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_TerminalsExample.java @@ -1951,6 +1951,66 @@ public class View_Dy_Line_Tower_TerminalsExample { addCriterion("equipment_type not between", value1, value2, "equipmentType"); return (Criteria) this; } + + public Criteria andLastHeartbeatIsNull() { + addCriterion("last_heartbeat is null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIsNotNull() { + addCriterion("last_heartbeat is not null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatEqualTo(Long value) { + addCriterion("last_heartbeat =", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatNotEqualTo(Long value) { + addCriterion("last_heartbeat <>", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatGreaterThan(Long value) { + addCriterion("last_heartbeat >", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatGreaterThanOrEqualTo(Long value) { + addCriterion("last_heartbeat >=", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatLessThan(Long value) { + addCriterion("last_heartbeat <", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatLessThanOrEqualTo(Long value) { + addCriterion("last_heartbeat <=", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIn(List values) { + addCriterion("last_heartbeat in", values, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatNotIn(List values) { + addCriterion("last_heartbeat not in", values, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatBetween(Long value1, Long value2) { + addCriterion("last_heartbeat between", value1, value2, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatNotBetween(Long value1, Long value2) { + addCriterion("last_heartbeat not between", value1, value2, "lastHeartbeat"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyListModel.java deleted file mode 100644 index f5601cb..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyListModel.java +++ /dev/null @@ -1,33 +0,0 @@ -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 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; - - } -} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineListModel.java deleted file mode 100644 index 567fdde..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineListModel.java +++ /dev/null @@ -1,52 +0,0 @@ -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.Date; -import java.util.List; - -/** - * 杆塔线路列表 - */ -@Data -@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 list; - - @Data - public static class LineBean { - - @ApiModelProperty(value = "线路编号", example = "123456") - private Integer id; - - @ApiModelProperty(value = "线路名称", example = "AAAA") - private String name; - - @ApiModelProperty(value = "单位", example = "123456") - private String bsManufacturer; - - @ApiModelProperty(value = "电压等级编号", example = "123456") - private Integer dyLevelid; - - @ApiModelProperty(value = "电压等级名称", example = "123456") - private String dyLevelname; - - @ApiModelProperty(value = "线路状态", example = "123456") - private Integer status; - - } -} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java index ca519ba..1ee7ba5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java @@ -4,13 +4,9 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; -import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.dto.TerminalImgAlarmsDto; import com.shxy.xymanager_common.dto.TowerDto; -import com.shxy.xymanager_common.entity.TerminalChannelMapper; -import com.shxy.xymanager_common.entity.TerminalChannels; -import com.shxy.xymanager_common.entity.TerminalPhoto; -import com.shxy.xymanager_common.entity.Terminals; +import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.model.TerminalPhotoListModel; import com.shxy.xymanager_common.model.TerminalPhotoSelectListModel; @@ -133,7 +129,7 @@ public class TerminalUtils { * @param photoList * @return */ - public static List setPhotoList(String requestIp, List list, Map lineMap, Map termchannelMapMap, Map terminalMap, Map termchannelMap, Map towerMap, List photoList,List imgarlarmsList) { + public static List setPhotoList(String requestIp, List list, Map lineMap, Map termchannelMapMap, Map terminalMap, Map termchannelMap, Map towerMap, List photoList, List imgarlarmsList) { List beans = new ArrayList<>(); for (TerminalChannelMapper item : list) { TerminalPhotosModel.PhotosBean photosBean = new TerminalPhotosModel.PhotosBean(); @@ -144,11 +140,11 @@ public class TerminalUtils { photosBean.setTermid(termid); Terminals terminals = terminalMap.get(termid); if (terminals != null) { - lineid = terminals.getLineid(); + lineid = terminals.getLineId(); photosBean.setLineid(lineid); photosBean.setDisplayname(terminals.getDisplayName()); photosBean.setCmdid(terminals.getCmdid()); - Integer towerid = terminals.getTowerid(); + Integer towerid = terminals.getTowerId(); TowerDto towerDto = towerMap.get(towerid); if (towerDto != null) { photosBean.setTowername(towerDto.getName()); @@ -173,7 +169,7 @@ public class TerminalUtils { photosBean.setAlias(""); } if (lineid != null) { - LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineid); + Lines lineAndDyNameDto = lineMap.get(lineid); if (lineAndDyNameDto != null) { photosBean.setLinename(lineAndDyNameDto.getName()); } else { @@ -262,7 +258,7 @@ public class TerminalUtils { * @param imgarlarmsList * @return */ - public static List setTowerPhotoList(String requestIp, List list, Map lineMap, Map termchannelMapMap, Map terminalMap, Map termchannelMap, Map towerMap, List photoList, List imgarlarmsList) { + public static List setTowerPhotoList(String requestIp, List list, Map lineMap, Map termchannelMapMap, Map terminalMap, Map termchannelMap, Map towerMap, List photoList, List imgarlarmsList) { List beans = new ArrayList<>(); for (TerminalChannelMapper item : list) { TerminalPhotosModel.PhotosBean photosBean = new TerminalPhotosModel.PhotosBean(); @@ -273,11 +269,11 @@ public class TerminalUtils { photosBean.setTermid(termid); Terminals terminals = terminalMap.get(termid); if (terminals != null) { - lineid = terminals.getLineid(); + lineid = terminals.getLineId(); photosBean.setLineid(lineid); photosBean.setDisplayname(terminals.getDisplayName()); photosBean.setCmdid(terminals.getCmdid()); - Integer towerid = terminals.getTowerid(); + Integer towerid = terminals.getTowerId(); TowerDto towerDto = towerMap.get(towerid); if (towerDto != null) { photosBean.setTowername(towerDto.getName()); @@ -303,7 +299,7 @@ public class TerminalUtils { photosBean.setAlias(""); } if (lineid != null) { - LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineid); + Lines lineAndDyNameDto = lineMap.get(lineid); if (lineAndDyNameDto != null) { photosBean.setLinename(lineAndDyNameDto.getName()); } else { @@ -381,7 +377,7 @@ public class TerminalUtils { } - public static List fdsa(String requestIp, List list, Map terminalMap, Map lineMap, Map towerMap, Map termchannelMap, Map termchannelMapMap, List imgarlarmsList) { + public static List fdsa(String requestIp, List list, Map terminalMap, Map lineMap, Map towerMap, Map termchannelMap, Map termchannelMapMap, List imgarlarmsList) { List beans = new ArrayList<>(); for (TerminalPhoto item : list) { TerminalPhotoSelectListModel.PhotoBean photoBean = new TerminalPhotoSelectListModel.PhotoBean(); @@ -391,13 +387,13 @@ public class TerminalUtils { Integer mediaType = item.getMediaType(); if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { photoBean.setDisplayname(terminals.getDisplayName()); - Integer towerid = terminals.getTowerid(); + Integer towerid = terminals.getTowerId(); if (towerMap != null) { TowerDto towerDto = towerMap.get(towerid); Integer lineId = towerDto.getLineId(); photoBean.setLineid(lineId); if (lineMap != null) { - LineAndDyNameDto lineAndDyNameDto = lineMap.get(lineId); + Lines lineAndDyNameDto = lineMap.get(lineId); if (lineAndDyNameDto != null) { photoBean.setLinename(lineAndDyNameDto.getName()); } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserUpdateVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserUpdateVo.java index ef18424..f135876 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserUpdateVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserUpdateVo.java @@ -23,5 +23,8 @@ public class SysUserUpdateVo { @ApiModelProperty(value = "密码", example = "123455") private String password; + @ApiModelProperty(value = "密码", example = "123455") + private String notes; + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserVo.java index 26bf4d3..c725dfc 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SysUserVo.java @@ -22,5 +22,9 @@ public class SysUserVo { @ApiModelProperty(value = "密码", example = "123455") private String password; + @NotNull(message = "备注") + @ApiModelProperty(value = "备注", example = "123455") + private String notes; + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java index 54ab440..8ba23eb 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java @@ -1,5 +1,6 @@ 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; @@ -25,5 +26,5 @@ public class TerminalAndChannelIdAndTimeVo { @NotNull(message = "查询时间不能缺少") @ApiModelProperty(value = "查询时间", example = "123455") - private Date time; + private DateTime time; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java index 93ea941..e251ed5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java @@ -15,11 +15,7 @@ public class TerminalIdListVo { @NotEmpty(message = "不能传入空值") @ApiModelProperty(value = "装置对象数组", required = true, example = "A0001") - private List list; + private List list; - @Min(value = 0, message = "开关标志最小为0") - @Max(value = 1, message = "开关标志最大为1") - @ApiModelProperty(value = "开关标志", required = true, example = "0---关闭 1---打开") - private Integer type; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java index 7a83a61..ec20de4 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoSelectVo.java @@ -1,5 +1,6 @@ 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; @@ -32,11 +33,11 @@ public class TerminalPhotoSelectVo { @NotNull(message = "查询时间不能缺少") @ApiModelProperty(value = "查询时间", example = "123455") - private Date starttime; + private DateTime starttime; @NotNull(message = "查询结束时间不能缺少") @ApiModelProperty(value = "查询结束时间", example = "123455") - private Date endtime; + private DateTime endtime; @ApiModelProperty(value = "搜索内容", example = "搜索内容字段") private String search; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java index 29816a8..c542791 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java @@ -25,9 +25,9 @@ public class TerminalVo { @ApiModelProperty(value = "sim卡号", example = "123456") private String sim; - @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") + @ApiModelProperty(value = "图像监测i装置 ID（17 位编码）", example = "12345678") @NotBlank(message = "图像监测装置不能缺少") - private String cmdId; + private String cmdid; @ApiModelProperty(value = "原始 ID，各厂家内部识别号", example = "12345678") private Short orgId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java index 54d02b8..38f0e68 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java @@ -32,7 +32,7 @@ public class UpdateTerminalVo { @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") @NotBlank(message = "图像监测装置不能缺少") - private String cmdId; + private String cmdid; @ApiModelProperty(value = "原始 ID，各厂家内部识别号", example = "12345678") private Short orgId; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index d9c8b83..687558d 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -18,9 +18,6 @@ public interface DyLevelDao { List selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("status") Integer status); - List selectAll(@Param("status") Integer status); - - long countByExample(DyLevelExample example); List selectByExample(DyLevelExample example); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java index caa57f8..a66c2c1 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java @@ -1,6 +1,5 @@ package com.shxy.xymanager_dao.dao; -import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.entity.Lines; import com.shxy.xymanager_common.entity.LinesExample; import org.apache.ibatis.annotations.Param; @@ -10,17 +9,8 @@ import java.util.List; public interface LinesDao { - - List selectAll(@Param("status") Integer status, @Param("search") String search); - int insertList(@Param("list") List record, @Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update); - - List selectLineByDyId(@Param("dyid") Integer dyid, @Param("status") Integer status); - - int updateByPrimaryKeySelective(@Param("data") Lines record, @Param("updateat") Date update); - - long countByExample(LinesExample example); int deleteByExample(LinesExample example); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java index 1f7c6d7..56526cc 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/SysUserMapperDao.java @@ -54,15 +54,6 @@ public interface SysUserMapperDao { public SysUser selectUserById(Long userId); - /** - * 重置用户密码 - * - * @param userName 用户名 - * @param password 密码 - * @return 结果 - */ - int resetUserPwd(@Param("userName") String userName, @Param("password") String password); - int deleteUserById(String userId); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java index a976fd7..d4f8ae7 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelMapperDao.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.TerminalChannelMapper; +import com.shxy.xymanager_common.entity.TerminalChannelMapperExample; import org.apache.ibatis.annotations.Param; import java.math.BigInteger; @@ -8,29 +9,42 @@ import java.util.Date; import java.util.List; public interface TerminalChannelMapperDao { - int deleteByTermId(Integer id); - int insert(TerminalChannelMapper record); - - int insertSelective(TerminalChannelMapper record); - - int insertList(@Param("list") List record, @Param("createat") Date create, @Param("updateat") Date update); List selectTermAndMapByTowerId(@Param("status") Integer status, @Param("towerlist") List towerlist); List selectByTermid(Integer id); - TerminalChannelMapper selectByPrimaryKey(Integer id); - TerminalChannelMapper selectByTermidAndChannelid(@Param("termid") Integer termid, @Param("channelid")Integer channelid, @Param("status") Integer status); List selectAll(); - List selectAllByPhotoTime(@Param("status") Integer status,@Param("termlist")List termlist); + List selectAllByPhotoTime(@Param("status") Integer status,@Param("list")List termlist); + + + + int insertList(@Param("list") List record); + + long countByExample(TerminalChannelMapperExample example); + + int deleteByExample(TerminalChannelMapperExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(TerminalChannelMapper record); + + int insertSelective(TerminalChannelMapper record); + + List selectByExample(TerminalChannelMapperExample example); + + TerminalChannelMapper selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") TerminalChannelMapper record, @Param("example") TerminalChannelMapperExample example); + + int updateByExample(@Param("record") TerminalChannelMapper record, @Param("example") TerminalChannelMapperExample example); int updateByPrimaryKeySelective(TerminalChannelMapper record); int updateByPrimaryKey(TerminalChannelMapper record); - } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java index d2f7672..a3d0411 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java @@ -15,7 +15,6 @@ import java.util.List; public interface TerminalPhotoDao { - List selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); List selectPhotoListByOrginIdAndTermList(@Param("list") List list); 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 4f0f986..c206783 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 @@ -4,42 +4,22 @@ import com.shxy.xymanager_common.dto.*; import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.entity.TerminalsExample; import com.shxy.xymanager_common.vo.RelateTerminalListRuleIdVo; -import com.shxy.xymanager_common.vo.TerminalIdUpdateVo; import org.apache.ibatis.annotations.Param; -import java.math.BigInteger; -import java.util.Date; import java.util.List; public interface TerminalsDao { - - List selectTermAndPosition(@Param("status") Integer status); - List selectTermAndStatusList(@Param("status") Integer status, @Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("search") String search,@Param("isonline") Integer isonline,@Param("time") BigInteger time); - List selectTermAndStatusStatisticsList(@Param("status") Integer status); List selectTermAndStatusAndLastPicList(@Param("status") Integer status); - Terminals selectByCmdid(@Param("cmdid") String cmdid, @Param("status") Integer status); - - List selectByTowerId(@Param("towerid") Integer towerid, @Param("status") Integer status); - - List selectByToweridAndLineid(@Param("toweridlist") List towerid, @Param("status") Integer status); - - - int deleteById(@Param("list") List record, @Param("status") Integer status, @Param("updateat") Date update); - List selectByIdList(@Param("list") List list, @Param("status") Integer status); List selectList(@Param("dyid") List dyplist, @Param("lineid") List lineplist, @Param("towerid") List towplist, @Param("termid") List termid,@Param("isSuper") Integer isSuper); - String getCmdIdByTermId(Integer termId); - - - long countByExample(TerminalsExample example); int deleteByExample(TerminalsExample example); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java index 7c14b8f..3a6f48a 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java @@ -15,10 +15,6 @@ public interface TowerDao { List selectAll(@Param("status") Integer status,@Param("search") String search); - List selectAllByLineid(@Param("lineid") Integer id, @Param("status") Integer status); - - int updateByPrimaryKeySelective(@Param("data") Towers record, @Param("update") Date update); - TowerDto getInfoByPrimaryKey(@Param("id") Integer id, @Param("status") Integer status); long countByExample(TowersExample example); @@ -42,4 +38,5 @@ public interface TowerDao { int updateByPrimaryKeySelective(Towers record); int updateByPrimaryKey(Towers record); + } \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index 2830d46..03396e9 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -53,12 +53,12 @@ - - - - - - + + +
@@ -87,12 +87,20 @@ - - -
+ + + + + + + + + + + + + + @@ -169,13 +177,11 @@ - - - - - - - + + + + + diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index ae49bb2..4c4acd9 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -46,7 +46,7 @@ - + @@ -325,12 +325,6 @@ from dy_level where id = #{id,jdbcType=INTEGER} - delete from dy_level diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index 3e3a2d6..1ff535a 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -10,14 +10,6 @@ - - - - - - - - @@ -80,39 +72,6 @@ id, name, bs_manufacturer, dy_level_id, status, create_time, update_time - - - - insert into `lines` (name,bs_manufacturer,dy_level_id,status,create_time,update_time) diff --git a/xymanager_dao/src/main/resources/mappers/SysUserDao.xml b/xymanager_dao/src/main/resources/mappers/SysUserDao.xml index e601972..49510b0 100644 --- a/xymanager_dao/src/main/resources/mappers/SysUserDao.xml +++ b/xymanager_dao/src/main/resources/mappers/SysUserDao.xml @@ -8,6 +8,7 @@ + @@ -70,7 +71,7 @@ - uid, user_name, status, nick_name, password, role, create_time, update_time + uid, user_name, status, nick_name, password, role, notes, create_time, update_time - - update sys_users set password = #{password} where user_name = #{userName} - - insert into sys_users(user_name,nick_name,password,role,create_time) values(#{userName},#{userName},#{password},#{role},#{createTime}) diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml index 1d46bd3..3fba2c9 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelMapperDao.xml @@ -4,51 +4,91 @@ - + + + + + + + + + + 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, channel_id,alias, photo_id,photo_time,create_time, update_time - - - + id, term_id, channel_id, alias, photo_id, photo_time, create_time, update_time - select + + distinct + from terminal_channel_mapper - where term_id = #{termid} and channel_id = #{channelid} - - - + - + + + insert into terminal_channel_mapper (id, term_id, channel_id, + alias, photo_id, photo_time, + create_time, update_time) + values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=TINYINT}, + #{alias,jdbcType=VARCHAR}, #{photoId,jdbcType=BIGINT}, #{photoTime,jdbcType=BIGINT}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - delete from terminal_channel_mapper - where term_id = #{id} - - - insert into terminal_channel_mapper (id, term_id, channel_id, - create_time, update_time) - values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=INTEGER}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - + insert into terminal_channel_mapper @@ -99,6 +131,15 @@ channel_id, + + alias, + + + photo_id, + + + photo_time, + create_time, @@ -114,7 +155,16 @@ #{termId,jdbcType=INTEGER}, - #{channelId,jdbcType=INTEGER}, + #{channelId,jdbcType=TINYINT}, + + + #{alias,jdbcType=VARCHAR}, + + + #{photoId,jdbcType=BIGINT}, + + + #{photoTime,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, @@ -124,18 +174,68 @@ - - insert into terminal_channel_mapper (term_id, channel_id,alias, - create_time, update_time) + create_time) VALUES - (#{item.termId},#{item.channelId},#{item.alias},#{createat},#{updateat}) + (#{item.termId},#{item.channelId},#{item.alias},#{item.createTime}) - + + + update terminal_channel_mapper + + + id = #{record.id,jdbcType=INTEGER}, + + + term_id = #{record.termId,jdbcType=INTEGER}, + + + channel_id = #{record.channelId,jdbcType=TINYINT}, + + + alias = #{record.alias,jdbcType=VARCHAR}, + + + photo_id = #{record.photoId,jdbcType=BIGINT}, + + + photo_time = #{record.photoTime,jdbcType=BIGINT}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update terminal_channel_mapper + set id = #{record.id,jdbcType=INTEGER}, + term_id = #{record.termId,jdbcType=INTEGER}, + channel_id = #{record.channelId,jdbcType=TINYINT}, + alias = #{record.alias,jdbcType=VARCHAR}, + photo_id = #{record.photoId,jdbcType=BIGINT}, + photo_time = #{record.photoTime,jdbcType=BIGINT}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + update terminal_channel_mapper @@ -143,7 +243,16 @@ term_id = #{termId,jdbcType=INTEGER}, - channel_id = #{channelId,jdbcType=INTEGER}, + channel_id = #{channelId,jdbcType=TINYINT}, + + + alias = #{alias,jdbcType=VARCHAR}, + + + photo_id = #{photoId,jdbcType=BIGINT}, + + + photo_time = #{photoTime,jdbcType=BIGINT}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -155,11 +264,71 @@ where id = #{id,jdbcType=INTEGER} - update terminal_channel_mapper - set term_id = #{termId,jdbcType=INTEGER}, - channel_id = #{channelId,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - + + update terminal_channel_mapper + set term_id = #{termId,jdbcType=INTEGER}, + channel_id = #{channelId,jdbcType=TINYINT}, + alias = #{alias,jdbcType=VARCHAR}, + photo_id = #{photoId,jdbcType=BIGINT}, + photo_time = #{photoTime,jdbcType=BIGINT}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + + + + + + + + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 8cdaec4..d769ea8 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -155,20 +155,6 @@ recv_time, recv_end_time, width, height, file_size, flags, create_time, mark_id - - + select + + distinct + + + from terminals + + + + + order by ${orderByClause} + + + delete from terminals where id = #{id,jdbcType=INTEGER} @@ -198,6 +225,199 @@ #{workingDate,jdbcType=DATE}, #{netType,jdbcType=TINYINT}, #{password,jdbcType=VARCHAR}, #{isfavor,jdbcType=INTEGER}) + + insert into terminals + + + id, + + + line_id, + + + tower_id, + + + cmdid, + + + status, + + + online_status, + + + dev_type, + + + org_id, + + + sn, + + + iccid, + + + protocol, + + + phase, + + + equipment_type, + + + cellphone, + + + equip_name, + + + display_name, + + + model, + + + essential_info_version, + + + has_pan, + + + bs_manufacturer, + + + bs_production_date, + + + bs_identifier, + + + latitude, + + + longitude, + + + create_time, + + + update_time, + + + sim, + + + working_date, + + + net_type, + + + password, + + + isfavor, + + + + + #{id,jdbcType=INTEGER}, + + + #{lineId,jdbcType=INTEGER}, + + + #{towerId,jdbcType=INTEGER}, + + + #{cmdid,jdbcType=VARCHAR}, + + + #{status,jdbcType=INTEGER}, + + + #{onlineStatus,jdbcType=TINYINT}, + + + #{devType,jdbcType=TINYINT}, + + + #{orgId,jdbcType=SMALLINT}, + + + #{sn,jdbcType=VARCHAR}, + + + #{iccid,jdbcType=VARCHAR}, + + + #{protocol,jdbcType=INTEGER}, + + + #{phase,jdbcType=VARCHAR}, + + + #{equipmentType,jdbcType=VARCHAR}, + + + #{cellphone,jdbcType=VARCHAR}, + + + #{equipName,jdbcType=VARCHAR}, + + + #{displayName,jdbcType=VARCHAR}, + + + #{model,jdbcType=VARCHAR}, + + + #{essentialInfoVersion,jdbcType=VARCHAR}, + + + #{hasPan,jdbcType=TINYINT}, + + + #{bsManufacturer,jdbcType=VARCHAR}, + + + #{bsProductionDate,jdbcType=DATE}, + + + #{bsIdentifier,jdbcType=VARCHAR}, + + + #{latitude,jdbcType=DOUBLE}, + + + #{longitude,jdbcType=DOUBLE}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{sim,jdbcType=VARCHAR}, + + + #{workingDate,jdbcType=DATE}, + + + #{netType,jdbcType=TINYINT}, + + + #{password,jdbcType=VARCHAR}, + + + #{isfavor,jdbcType=INTEGER}, + + + - select - - distinct - - - from terminals - - - - - order by ${orderByClause} - - + + update terminals + + + line_id = #{lineId,jdbcType=INTEGER}, + + + tower_id = #{towerId,jdbcType=INTEGER}, + + + cmdid = #{cmdid,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=INTEGER}, + + + online_status = #{onlineStatus,jdbcType=TINYINT}, + + + dev_type = #{devType,jdbcType=TINYINT}, + + + org_id = #{orgId,jdbcType=SMALLINT}, + + + sn = #{sn,jdbcType=VARCHAR}, + + + iccid = #{iccid,jdbcType=VARCHAR}, + + + protocol = #{protocol,jdbcType=INTEGER}, + + + phase = #{phase,jdbcType=VARCHAR}, + + + equipment_type = #{equipmentType,jdbcType=VARCHAR}, + + + cellphone = #{cellphone,jdbcType=VARCHAR}, + + + equip_name = #{equipName,jdbcType=VARCHAR}, + + + display_name = #{displayName,jdbcType=VARCHAR}, + + + model = #{model,jdbcType=VARCHAR}, + + + essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR}, + + + has_pan = #{hasPan,jdbcType=TINYINT}, + + + bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, + + + bs_production_date = #{bsProductionDate,jdbcType=DATE}, + + + bs_identifier = #{bsIdentifier,jdbcType=VARCHAR}, + + + latitude = #{latitude,jdbcType=DOUBLE}, + + + longitude = #{longitude,jdbcType=DOUBLE}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + sim = #{sim,jdbcType=VARCHAR}, + + + working_date = #{workingDate,jdbcType=DATE}, + + + net_type = #{netType,jdbcType=TINYINT}, + + + password = #{password,jdbcType=VARCHAR}, + + + isfavor = #{isfavor,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminals + set line_id = #{lineId,jdbcType=INTEGER}, + tower_id = #{towerId,jdbcType=INTEGER}, + cmdid = #{cmdid,jdbcType=VARCHAR}, + status = #{status,jdbcType=INTEGER}, + online_status = #{onlineStatus,jdbcType=TINYINT}, + dev_type = #{devType,jdbcType=TINYINT}, + org_id = #{orgId,jdbcType=SMALLINT}, + sn = #{sn,jdbcType=VARCHAR}, + iccid = #{iccid,jdbcType=VARCHAR}, + protocol = #{protocol,jdbcType=INTEGER}, + phase = #{phase,jdbcType=VARCHAR}, + equipment_type = #{equipmentType,jdbcType=VARCHAR}, + cellphone = #{cellphone,jdbcType=VARCHAR}, + equip_name = #{equipName,jdbcType=VARCHAR}, + display_name = #{displayName,jdbcType=VARCHAR}, + model = #{model,jdbcType=VARCHAR}, + essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR}, + has_pan = #{hasPan,jdbcType=TINYINT}, + bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, + bs_production_date = #{bsProductionDate,jdbcType=DATE}, + bs_identifier = #{bsIdentifier,jdbcType=VARCHAR}, + latitude = #{latitude,jdbcType=DOUBLE}, + longitude = #{longitude,jdbcType=DOUBLE}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + sim = #{sim,jdbcType=VARCHAR}, + working_date = #{workingDate,jdbcType=DATE}, + net_type = #{netType,jdbcType=TINYINT}, + password = #{password,jdbcType=VARCHAR}, + isfavor = #{isfavor,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} + - - - - - - - - - - - - insert into terminals - - - id, - - - cmdid, - - - org_id, - - - equip_name, - - - display_name, - - - model, - - - essential_info_version, - - - has_pan, - - - bs_manufacturer, - - - bs_production_date, - - - bs_identifier, - - - latitude, - - - longitude, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{cmdid,jdbcType=VARCHAR}, - - - #{orgId,jdbcType=SMALLINT}, - - - #{equipName,jdbcType=VARCHAR}, - - - #{displayName,jdbcType=VARCHAR}, - - - #{model,jdbcType=VARCHAR}, - - - #{essentialInfoVersion,jdbcType=VARCHAR}, - - - #{hasPan,jdbcType=TINYINT}, - - - #{bsManufacturer,jdbcType=VARCHAR}, - - - #{bsProductionDate,jdbcType=DATE}, - - - #{bsIdentifier,jdbcType=VARCHAR}, - - - #{latitude,jdbcType=DOUBLE}, - - - #{longitude,jdbcType=DOUBLE}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - - update terminals - set status = #{status}, - update_time = #{updateat} - where id in - - #{item.id} - - - - - update terminals - - - line_id = #{record.lineid}, - - - tower_id = #{record.towerid}, - - - cmdid = #{record.cmdid}, - - - org_id = #{record.orgId,jdbcType=SMALLINT}, - - - equip_name = #{record.equipName,jdbcType=VARCHAR}, - - - display_name = #{record.displayName,jdbcType=VARCHAR}, - - - model = #{record.model,jdbcType=VARCHAR}, - - - essential_info_version = #{record.essentialInfoVersion,jdbcType=VARCHAR}, - - - has_pan = #{record.hasPan,jdbcType=TINYINT}, - - - bs_manufacturer = #{record.bsManufacturer,jdbcType=VARCHAR}, - - - bs_production_date = #{record.bsProductionDate,jdbcType=DATE}, - - - bs_identifier = #{record.bsIdentifier,jdbcType=VARCHAR}, - - - latitude = #{record.latitude,jdbcType=DOUBLE}, - - - longitude = #{record.longitude,jdbcType=DOUBLE}, - - - update_time = #{record.updateTime,jdbcType=TIMESTAMP}, - - - sim = #{record.sim}, - - - net_type = #{record.netType}, - - - dev_type = #{record.devType}, - - - working_date = #{record.workingDate}, - - - protocol = #{record.protocol}, - - - where id = #{record.id,jdbcType=INTEGER} - - - - update terminals - set cmdid = #{cmdid,jdbcType=VARCHAR}, - org_id = #{orgId,jdbcType=SMALLINT}, - equip_name = #{equipName,jdbcType=VARCHAR}, - display_name = #{displayName,jdbcType=VARCHAR}, - model = #{model,jdbcType=VARCHAR}, - essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR}, - has_pan = #{hasPan,jdbcType=TINYINT}, - bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, - bs_production_date = #{bsProductionDate,jdbcType=DATE}, - bs_identifier = #{bsIdentifier,jdbcType=VARCHAR}, - latitude = #{latitude,jdbcType=DOUBLE}, - longitude = #{longitude,jdbcType=DOUBLE}, - update_time = #{updateat} - where id = #{id,jdbcType=INTEGER} - - - \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TowerDao.xml b/xymanager_dao/src/main/resources/mappers/TowerDao.xml index 2b7a416..fdb6de8 100644 --- a/xymanager_dao/src/main/resources/mappers/TowerDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TowerDao.xml @@ -95,17 +95,6 @@ - - select @@ -125,7 +126,7 @@ latitude, longitude, status, protocol, sim, working_date, net_type, dev_type, phase, - equipment_type) + equipment_type, last_heartbeat) values (#{id,jdbcType=INTEGER}, #{dyId,jdbcType=INTEGER}, #{dyName,jdbcType=VARCHAR}, #{lineId,jdbcType=INTEGER}, #{lineName,jdbcType=VARCHAR}, #{lineBsManufacturer,jdbcType=VARCHAR}, #{towerId,jdbcType=INTEGER}, #{towerName,jdbcType=VARCHAR}, #{cmdid,jdbcType=VARCHAR}, @@ -135,7 +136,7 @@ #{latitude,jdbcType=DOUBLE}, #{longitude,jdbcType=DOUBLE}, #{status,jdbcType=INTEGER}, #{protocol,jdbcType=INTEGER}, #{sim,jdbcType=VARCHAR}, #{workingDate,jdbcType=DATE}, #{netType,jdbcType=TINYINT}, #{devType,jdbcType=TINYINT}, #{phase,jdbcType=VARCHAR}, - #{equipmentType,jdbcType=VARCHAR}) + #{equipmentType,jdbcType=VARCHAR}, #{lastHeartbeat,jdbcType=BIGINT}) insert into v_dy_line_tower_terminals @@ -224,6 +225,9 @@ equipment_type, + + last_heartbeat, + @@ -310,6 +314,9 @@ #{equipmentType,jdbcType=VARCHAR}, + + #{lastHeartbeat,jdbcType=BIGINT}, +