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 new file mode 100644 index 0000000..c6531c7 --- /dev/null +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java @@ -0,0 +1,57 @@ +package com.shxy.xymanager_admin.controller; + +import com.shxy.xymanager_common.annotation.Log; +import com.shxy.xymanager_common.base.BaseController; +import com.shxy.xymanager_common.base.ResponseReult; +import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.bean.ServiceStatus; +import com.shxy.xymanager_common.model.DyLineTreeListModel; +import com.shxy.xymanager_common.model.DyListModel; +import com.shxy.xymanager_common.vo.TerminalIdVo; +import com.shxy.xymanager_service.service.DyLevelService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api(value = "电压等级接口", tags = "电压等级接口描述") +@RestController +@Slf4j +public class DyLevelController extends BaseController { + + @Autowired + DyLevelService dyLevelService; + + @ApiOperation(value = "获取电压等级树状列表接口", notes = "获取电压等级树状列表接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getdyTreeList") + @Log(title = "获取电压等级树状列表接口", type = "查询") + public ResponseReult getdyTreeList() { + ServiceBody serviceBody = dyLevelService.getdyTreeList(); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + + @ApiOperation(value = "获取电压等级列表", notes = "获取电压等级列表", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getdyList") + @Log(title = "获取电压等级列表", type = "查询") + public ResponseReult getdyList() { + ServiceBody serviceBody = dyLevelService.getdyList(); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } +} 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 6f0fbdb..330d04f 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 @@ -6,19 +6,17 @@ import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; import com.shxy.xymanager_common.model.LineListModel; -import com.shxy.xymanager_common.model.LineTreeListModel; -import com.shxy.xymanager_common.model.TerminalListModel; +import com.shxy.xymanager_common.model.DyLineTreeListModel; import com.shxy.xymanager_common.vo.LineIdVo; import com.shxy.xymanager_common.vo.LineVo; +import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.UpdateLineVo; import com.shxy.xymanager_service.service.LineService; -import com.shxy.xymanager_service.service.TerminalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; -import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; @@ -34,25 +32,12 @@ public class LineController extends BaseController { @Autowired LineService lineService; - @ApiOperation(value = "获取线路树状图", notes = "获取线路树状图接口", httpMethod = "POST") - @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/getLineTreeList") - @Log(title = "获取线路树状图", type = "查询") - public ResponseReult getLineTreeList() { - ServiceBody serviceBody = lineService.getLineTreeList(); - if (serviceBody.getCode() == ServiceStatus.SUCCESS) { - return ResponseReult.success(serviceBody.getData()); - } else { - return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); - } - } - @ApiOperation(value = "获取线路列表", notes = "获取线路列表接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLineList") @Log(title = "获取线路列表", type = "查询") - public ResponseReult getLineList() { - ServiceBody serviceBody = lineService.getLineList(); + public ResponseReult getLineList(@RequestBody @Validated PageVo 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/TerminalController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java index f1df6cb..a798e72 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 @@ -6,6 +6,7 @@ import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; import com.shxy.xymanager_common.model.TerminalListModel; +import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.TerminalIdListVo; import com.shxy.xymanager_common.vo.TerminalVo; import com.shxy.xymanager_common.vo.UpdateTerminalVo; @@ -32,8 +33,8 @@ public class TerminalController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getTerminalList") @Log(title = "获取设备列表", type = "查询") - public ResponseReult getTerminalList() { - ServiceBody serviceBody = terminalService.getTerminalList(); + public ResponseReult getTerminalList(@RequestBody @Validated PageVo vo) { + ServiceBody serviceBody = terminalService.getTerminalList(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/TerminalScheduleRuleController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java index c1287e7..4f31832 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalScheduleRuleController.java @@ -33,8 +33,8 @@ public class TerminalScheduleRuleController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getScheduleRulelList") @Log(title = "获取任务规则列表", type = "查询") - public ResponseReult getSchedulelRuleList() { - ServiceBody serviceBody = terminalScheduleRuleService.getScheduleRuleList(); + public ResponseReult getSchedulelRuleList(@RequestBody @Validated PageVo vo) { + ServiceBody serviceBody = terminalScheduleRuleService.getScheduleRuleList(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTerminalDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTerminalDto.java new file mode 100644 index 0000000..955cf18 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTerminalDto.java @@ -0,0 +1,18 @@ +package com.shxy.xymanager_common.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class DyLineAndTerminalDto { + + private Integer id; + + private String name; + + private Integer dyValue; + + private List list; + +} 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 new file mode 100644 index 0000000..1023199 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndDyNameDto.java @@ -0,0 +1,23 @@ +package com.shxy.xymanager_common.dto; + +import lombok.Data; + +/** + * 线路和电压等级名称对象 + */ +@Data +public class LineAndDyNameDto { + + private Integer id; + + private String name; + + private String bsManufacturer; + + private Integer dyLevelId; + + private String dyLevelName; + + private Integer status; + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java index 347b119..9cba2b2 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalDto.java @@ -14,7 +14,7 @@ public class LineAndTerminalDto { private String bsManufacturer; - private Byte dyLevel; + private Integer dyLevel; private List list; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java new file mode 100644 index 0000000..f20d5ab --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java @@ -0,0 +1,24 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class DyLevel implements Serializable { + private Integer id; + + private String name; + + private Integer dyValue; + + private Integer status; + + private Date createTime; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + +} \ 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 cc5b4f5..540d069 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 @@ -12,7 +12,7 @@ public class Lines implements Serializable { private String bsManufacturer; - private Byte dyLevel; + private Integer dyLevelId; private Integer status; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java index 9957c8a..615c313 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleRule.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_common.entity; import lombok.Data; import java.io.Serializable; +import java.sql.Time; import java.util.Date; @Data @@ -12,9 +13,9 @@ public class TerminalScheduleRule implements Serializable { private String name; - private Date startTime; + private Time startTime; - private Date endTime; + private Time endTime; private Integer span; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java similarity index 65% rename from xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineTreeListModel.java rename to xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java index d7f14a1..ccf396f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineTreeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java @@ -8,14 +8,28 @@ import java.io.Serializable; import java.util.List; /** - * 线路树状图列表 + * 电压线路树状图列表 */ @Data -@ApiModel(value = "获取线路树状图列表", description = "获取线路树状图列表信息") -public class LineTreeListModel implements Serializable { +@ApiModel(value = "获取电压线路树状图列表", description = "获取电压线路树状图列表信息") +public class DyLineTreeListModel implements Serializable { + @ApiModelProperty(value = "电压列表", example = "[]") + private List list; - @ApiModelProperty(value = "线路列表", example = "[]") - private List list; + @Data + public static class DyListBean { + @ApiModelProperty(value = "电压编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "电压名称", example = "AAAA") + private String name; + + @ApiModelProperty(value = "电压大小", example = "AAAA") + private Integer dyValue; + + @ApiModelProperty(value = "线路列表", example = "[]") + private List list; + } @Data public static class LineBean { @@ -29,9 +43,6 @@ public class LineTreeListModel implements Serializable { @ApiModelProperty(value = "单位", example = "123456") private String bsManufacturer; - @ApiModelProperty(value = "dyLevel", example = "123456") - private Byte dyLevel; - @ApiModelProperty(value = "装置信息", example = "123456") private List list; 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 new file mode 100644 index 0000000..d66aca1 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyListModel.java @@ -0,0 +1,32 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 电压等级列表 + */ +@Data +@ApiModel(value = "获取电压等级列表", description = "获取电压等级列表信息") +public class DyListModel implements Serializable { + @ApiModelProperty(value = "电压等级列表", example = "[]") + private List 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 index 3b6076e..567fdde 100644 --- 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 @@ -15,6 +15,15 @@ import java.util.List; @ApiModel(value = "获取杆塔线路列表", description = "获取杆塔线路列表信息") public class LineListModel implements Serializable { + @ApiModelProperty(value = "总记录数", example = "120") + private long total; + @ApiModelProperty(value = "总页数", example = "120") + private int totalpage; + @ApiModelProperty(value = "当前页", example = "1") + private int currentpage; + @ApiModelProperty(value = "每页记录数", example = "1") + private int pagesize; + @ApiModelProperty(value = "杆塔线路列表", example = "[]") private List list; @@ -30,8 +39,14 @@ public class LineListModel implements Serializable { @ApiModelProperty(value = "单位", example = "123456") private String bsManufacturer; - @ApiModelProperty(value = "dyLevel", example = "123456") - private Byte dyLevel; + @ApiModelProperty(value = "电压等级编号", example = "123456") + private Integer dyLevelid; + + @ApiModelProperty(value = "电压等级名称", example = "123456") + private String dyLevelname; + + @ApiModelProperty(value = "线路状态", example = "123456") + private Integer status; } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index db77199..8fc0656 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -15,7 +15,14 @@ import java.util.List; @Data @ApiModel(value = "获取设备列表", description = "获取设备列表信息") public class TerminalListModel implements Serializable { - + @ApiModelProperty(value = "总记录数", example = "120") + private long total; + @ApiModelProperty(value = "总页数", example = "120") + private int totalpage; + @ApiModelProperty(value = "当前页", example = "1") + private int currentpage; + @ApiModelProperty(value = "每页记录数", example = "1") + private int pagesize; @ApiModelProperty(value = "设备列表", example = "[]") private List list; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java index 9d66224..f7993fc 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java @@ -15,14 +15,8 @@ import java.util.List; @ApiModel(value = "图片列表对象", description = "图片列表对象信息") public class TerminalPhotoListModel implements Serializable { - @ApiModelProperty(value = "总记录数", example = "120") - private long total; - @ApiModelProperty(value = "总页数", example = "120") - private int totalpage; - @ApiModelProperty(value = "当前页", example = "1") - private int currentpage; - @ApiModelProperty(value = "每页记录数", example = "1") - private int pagesize; + @ApiModelProperty(value = "时间", example = "[]") + private Date time; @ApiModelProperty(value = "照片对象", example = "[]") private List list; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java index 3cb671d..e8a1ae9 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleListModel.java @@ -15,6 +15,14 @@ import java.util.List; @Data @ApiModel(value = "时间任务列表", description = "获取时间任务列表信息") public class TerminalScheduleRuleListModel implements Serializable { + @ApiModelProperty(value = "总记录数", example = "120") + private long total; + @ApiModelProperty(value = "总页数", example = "120") + private int totalpage; + @ApiModelProperty(value = "当前页", example = "1") + private int currentpage; + @ApiModelProperty(value = "每页记录数", example = "1") + private int pagesize; @ApiModelProperty(value = "时间任务列表", example = "[]") private List list; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java index 90b6719..b52a708 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleModel.java @@ -25,10 +25,10 @@ public class TerminalScheduleRuleModel implements Serializable { private Integer span; @ApiModelProperty(value = "开始时间", example = "2022-06-08") - private String startTime; + private Time startTime; @ApiModelProperty(value = "结束时间", example = "2022-06-08") - private String endTime; + private Time endTime; @ApiModelProperty(value = "备注", example = "erwsafsasa") private String remark; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java index 5ea3bd1..775715f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java @@ -25,9 +25,9 @@ public class LineVo { @NotBlank(message = "单位不能缺少") private String bsManufacturer; - @ApiModelProperty(value = "dyLevel", example = "型号型号") - @NotBlank(message = "dyLevel不能缺少") - private Byte dyLevel; + @ApiModelProperty(value = "电压等级编号", example = "型号型号") + @NotBlank(message = "电压编号不能缺少") + private Integer dyLevelid; } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java new file mode 100644 index 0000000..4e7ab51 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PageVo.java @@ -0,0 +1,19 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; + +@Data +@ApiModel(value = "分页对象", description = "分页对象描述") +public class PageVo { + @Min(value = 1, message = "分页位置最小从1开始") + @ApiModelProperty(value = "分页位置从1开始", required = true, example = "1") + private int pageindex; + + @Min(value = 1, message = "分页大小最小为1") + @ApiModelProperty(value = "分页大小", required = true, example = "1") + private int pagesize; +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdVo.java index ec383f5..9d30ce3 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdVo.java @@ -6,9 +6,10 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; +import java.util.Date; @Data -@ApiModel(value = "装置编号", description = "装置编号描述") +@ApiModel(value = "装置和通道编号", description = "装置和通道描述") public class TerminalAndChannelIdVo { @NotNull(message = "装置编号不能缺少") @@ -19,11 +20,7 @@ public class TerminalAndChannelIdVo { @ApiModelProperty(value = "通道编号", example = "123455") private Integer channelid; - @Min(value = 1, message = "分页位置最小从1开始") - @ApiModelProperty(value = "分页位置从1开始", required = true, example = "1") - private int pageindex; - - @Min(value = 1, message = "分页大小最小为1") - @ApiModelProperty(value = "分页大小", required = true, example = "1") - private int pagesize; + @NotNull(message = "查询时间不能缺少") + @ApiModelProperty(value = "查询时间", example = "123455") + private Date time; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleVo.java index 9f3f68b..5790ecd 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalRuleVo.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; +import java.sql.Time; import java.util.List; @Data @@ -21,11 +22,11 @@ public class TerminalRuleVo { @ApiModelProperty(value = "开始时间", example = "单位") @NotBlank(message = "开始时间不能缺少") - private String startTime; + private Time startTime; @ApiModelProperty(value = "结束时间", example = "型号型号") @NotBlank(message = "结束时间不能缺少") - private String endTime; + private Time endTime; @ApiModelProperty(value = "时间间隔", example = "型号型号") @NotBlank(message = "时间间隔不能缺少") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java index 8c609df..3fb6262 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java @@ -24,8 +24,8 @@ public class UpdateLineVo { @NotBlank(message = "单位不能缺少") private String bsManufacturer; - @ApiModelProperty(value = "dyLevel", example = "型号型号") - @NotBlank(message = "dyLevel不能缺少") - private Byte dyLevel; + @ApiModelProperty(value = "电压等级编号", example = "型号型号") + @NotBlank(message = "电压编号不能缺少") + private Integer dyLevelid; } 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 new file mode 100644 index 0000000..aab1ae1 --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -0,0 +1,25 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.dto.DyLineAndTerminalDto; +import com.shxy.xymanager_common.entity.DyLevel; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface DyLevelDao { + int deleteByPrimaryKey(Integer id); + + int insert(DyLevel record); + + int insertSelective(DyLevel record); + + DyLevel selectByPrimaryKey(Integer id); + + List selectAll(@Param("status") Integer status); + + List selectTreeList(@Param("status") Integer status); + + int updateByPrimaryKeySelective(DyLevel record); + + int updateByPrimaryKey(DyLevel record); +} \ No newline at end of file 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 b23b6e4..d00574d 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,6 @@ package com.shxy.xymanager_dao.dao; -import com.shxy.xymanager_common.dto.LineAndTerminalDto; +import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.entity.Lines; import org.apache.ibatis.annotations.Param; @@ -9,9 +9,7 @@ import java.util.List; public interface LinesDao { - List selectAll(@Param("status") Integer status); - - List selectLineAndTerminalList(@Param("status") Integer status); + List selectAll(@Param("status") Integer status); int insertList(@Param("list") List record,@Param("status") Integer status,@Param("createat") Date create,@Param("updateat") Date update); 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 32273f6..dbdf667 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 @@ -3,11 +3,13 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.TerminalPhoto; import org.apache.ibatis.annotations.Param; +import javax.xml.crypto.Data; +import java.util.Date; import java.util.List; public interface TerminalPhotoDao { - List selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid); + List selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid, @Param("time") Date time); int deleteByPrimaryKey(Long id); diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index 5286114..034a6c4 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -112,17 +112,25 @@ - - -
+ + + + + + + + + + + + + + + - diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml new file mode 100644 index 0000000..b7b330d --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, name, dy_value, status, create_time, update_time + + + + + + + + + + insert into dy_level (id, name, dy_value, + status, create_time, update_time + ) + values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{dyValue,jdbcType=INTEGER}, + #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into dy_level + + + id, + + + name, + + + dy_value, + + + status, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{dyValue,jdbcType=INTEGER}, + + + #{status,jdbcType=INTEGER}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + update dy_level + + + name = #{name,jdbcType=VARCHAR}, + + + dy_value = #{dyValue,jdbcType=INTEGER}, + + + status = #{status,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update dy_level + set name = #{name,jdbcType=VARCHAR}, + dy_value = #{dyValue,jdbcType=INTEGER}, + status = #{status,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index a4da790..14a9c2e 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -5,36 +5,36 @@ - + - - + - - - - - - - - - + + + + - id, name, bs_manufacturer, dy_level + id, name, bs_manufacturer, dy_level_id - select - - from `lines` - where status = #{status} + x.id as id, + x.name as name, + x.bs_manufacturer as bs_manufacturer, + x.dy_level_id as dy_level_id, + x.status as status, + y.name as dy_level_name + from `lines` x, + dy_level y + where x.dy_level_id = y.id and x.status = #{status} - insert into `lines` - (name,bs_manufacturer,dy_level,status,create_time,update_time) + (name,bs_manufacturer,dy_level_id,status,create_time,update_time) VALUES - (#{item.name},#{item.bsManufacturer},#{item.dyLevel},#{status},#{createat},#{updateat}) + (#{item.name},#{item.bsManufacturer},#{item.dyLevelId},#{status},#{createat},#{updateat}) @@ -84,8 +69,8 @@ bs_manufacturer = #{data.bsManufacturer,jdbcType=VARCHAR}, - - dy_level = #{data.dyLevel,jdbcType=TINYINT}, + + dy_level_id = #{data.dyLevelId,jdbcType=TINYINT}, update_time = #{updateat,jdbcType=TIMESTAMP}, @@ -98,7 +83,7 @@ update `lines` set name = #{name,jdbcType=VARCHAR}, bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, - dy_level = #{dyLevel,jdbcType=TINYINT} + dy_level_id = #{dyLevelId,jdbcType=TINYINT} where id = #{id,jdbcType=INTEGER} \ 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 07ea9ba..b856509 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -23,7 +23,7 @@ select from terminal_photos - where term_id = #{terminalid} and channel_id = #{channelid} + where term_id = #{terminalid} and channel_id = #{channelid} and photo_time = date_format(#{time},'%y%m%d')