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 b62d2ec..c32e802 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 @@ -27,21 +27,24 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.validation.constraints.NotNull; import java.util.List; + @Api(value = "电压等级接口", tags = "电压等级接口描述") @RestController @Slf4j +@RequestMapping("dy") public class DyLevelController extends BaseController { @Autowired DyLevelService dyLevelService; - @ApiOperation(value = "获取电压等级树状列表接口", notes = "获取电压等级树状列表接口", httpMethod = "POST") + @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(@RequestBody @Validated DyTreeListVo vo) { - ServiceBody serviceBody = dyLevelService.getdyTreeList(vo); + @RequestMapping("/add") + @Log(title = "增加电压", type = "查询") + public ResponseReult addDy(@RequestBody DyLevel vo) { + ServiceBody serviceBody = dyLevelService.add(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -49,12 +52,12 @@ public class DyLevelController extends BaseController { } } - @ApiOperation(value = "郑州测试获取电压等级树状列表接口", notes = "郑州测试获取电压等级树状列表接口", httpMethod = "POST") + @ApiOperation(value = "删除电压", notes = "删除电压", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/getzzdyTreeList") - @Log(title = "郑州测试获取电压等级树状列表接口", type = "查询") - public ResponseReult getzzdyTreeList(@RequestBody @Validated DyListVo vo) { - ServiceBody serviceBody = dyLevelService.getzzdyTreeList(vo.getType(),vo.getLineid()); + @RequestMapping("/delete") + @Log(title = "删除电压", type = "查询") + public ResponseReult deleteDy(@Validated @NotNull(message = "id不能为空!") Integer vo) { + ServiceBody serviceBody = dyLevelService.delete(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -62,12 +65,12 @@ public class DyLevelController extends BaseController { } } - @ApiOperation(value = "获取电压等级列表", notes = "获取电压等级列表", httpMethod = "POST") + @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(); + @RequestMapping("/update") + @Log(title = "修改电压", type = "查询") + public ResponseReult update(@RequestBody DyLevel vo) { + ServiceBody serviceBody = dyLevelService.update(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -75,13 +78,12 @@ public class DyLevelController extends BaseController { } } - @ApiOperation(value = "根据电压或者线路获取所有杆塔和最新照片", notes = "根据电压或者线路获取所有杆塔和最新照片", httpMethod = "POST") + @ApiOperation(value = "查询电压", notes = "查询电压", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/getTowerAndPhotoList") - @Log(title = "根据电压或者线路获取所有杆塔和最新照片", type = "查询") - public ResponseReult getLastTowerList(@RequestHeader HttpHeaders headers, @RequestBody LastTowerVo vo) { - String requestIp = HeaderUtil.getRequestIp(headers); - ServiceBody serviceBody = dyLevelService.getLastTowerList(requestIp,vo); + @RequestMapping("/listAll") + @Log(title = "查询电压", type = "查询") + public ResponseReult> listAll() { + ServiceBody> serviceBody = dyLevelService.listAll(); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyTreeController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyTreeController.java new file mode 100644 index 0000000..60ba578 --- /dev/null +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyTreeController.java @@ -0,0 +1,93 @@ +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.entity.DyLevel; +import com.shxy.xymanager_common.model.DyLineTreeListModel; +import com.shxy.xymanager_common.model.TerminalPhotosModel; +import com.shxy.xymanager_common.util.xinyin.HeaderUtil; +import com.shxy.xymanager_common.vo.DyListVo; +import com.shxy.xymanager_common.vo.DyTreeListVo; +import com.shxy.xymanager_common.vo.LastTowerVo; +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.http.HttpHeaders; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Api(value = "电压等级接口", tags = "电压等级接口描述") +@RestController +@Slf4j +public class DyTreeController 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(@RequestBody @Validated DyTreeListVo vo) { + ServiceBody serviceBody = dyLevelService.getdyTreeList(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + + @ApiOperation(value = "郑州测试获取电压等级树状列表接口", notes = "郑州测试获取电压等级树状列表接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getzzdyTreeList") + @Log(title = "郑州测试获取电压等级树状列表接口", type = "查询") + public ResponseReult getzzdyTreeList(@RequestBody @Validated DyListVo vo) { + ServiceBody serviceBody = dyLevelService.getzzdyTreeList(vo.getType(), vo.getLineid()); + 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()); + } + } + + @ApiOperation(value = "根据电压或者线路获取所有杆塔和最新照片", notes = "根据电压或者线路获取所有杆塔和最新照片", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getTowerAndPhotoList") + @Log(title = "根据电压或者线路获取所有杆塔和最新照片", type = "查询") + public ResponseReult getLastTowerList(@RequestHeader HttpHeaders headers, @RequestBody LastTowerVo vo) { + String requestIp = HeaderUtil.getRequestIp(headers); + ServiceBody serviceBody = dyLevelService.getLastTowerList(requestIp, vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java deleted file mode 100644 index 9794262..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.shxy.xymanager_common.dto; - -import lombok.Data; - -import java.util.List; - -@Data -public class PhotoMarkDto { - - private Integer markId; - - private Integer termId; - - private Integer channelId; - - private Integer width; - - private Integer height; - - private String color; - - private String path; - - private Short boderWidth; - - private List list; - -} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoExample.java index 5eb397b..d34c601 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoExample.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoExample.java @@ -415,52 +415,52 @@ public class TerminalPhotoExample { return (Criteria) this; } - public Criteria andMediaTypeEqualTo(Byte value) { + public Criteria andMediaTypeEqualTo(Integer value) { addCriterion("media_type =", value, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeNotEqualTo(Byte value) { + public Criteria andMediaTypeNotEqualTo(Integer value) { addCriterion("media_type <>", value, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeGreaterThan(Byte value) { + public Criteria andMediaTypeGreaterThan(Integer value) { addCriterion("media_type >", value, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeGreaterThanOrEqualTo(Byte value) { + public Criteria andMediaTypeGreaterThanOrEqualTo(Integer value) { addCriterion("media_type >=", value, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeLessThan(Byte value) { + public Criteria andMediaTypeLessThan(Integer value) { addCriterion("media_type <", value, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeLessThanOrEqualTo(Byte value) { + public Criteria andMediaTypeLessThanOrEqualTo(Integer value) { addCriterion("media_type <=", value, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeIn(List values) { + public Criteria andMediaTypeIn(List values) { addCriterion("media_type in", values, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeNotIn(List values) { + public Criteria andMediaTypeNotIn(List values) { addCriterion("media_type not in", values, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeBetween(Byte value1, Byte value2) { + public Criteria andMediaTypeBetween(Integer value1, Integer value2) { addCriterion("media_type between", value1, value2, "mediaType"); return (Criteria) this; } - public Criteria andMediaTypeNotBetween(Byte value1, Byte value2) { + public Criteria andMediaTypeNotBetween(Integer value1, Integer value2) { addCriterion("media_type not between", value1, value2, "mediaType"); return (Criteria) this; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java new file mode 100644 index 0000000..917838b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPaths.java @@ -0,0 +1,22 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +@Data +public class TerminalPhotoMarkPaths implements Serializable { + private Integer id; + + private Integer markId; + + private Float x1; + + private Float y1; + + private Float x2; + + private Float y2; + + 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/TerminalPhotoMarkPathsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java new file mode 100644 index 0000000..16305d7 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarkPathsExample.java @@ -0,0 +1,560 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.List; + +public class TerminalPhotoMarkPathsExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalPhotoMarkPathsExample() { + 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 andMarkIdIsNull() { + addCriterion("mark_id is null"); + return (Criteria) this; + } + + public Criteria andMarkIdIsNotNull() { + addCriterion("mark_id is not null"); + return (Criteria) this; + } + + public Criteria andMarkIdEqualTo(Integer value) { + addCriterion("mark_id =", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotEqualTo(Integer value) { + addCriterion("mark_id <>", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdGreaterThan(Integer value) { + addCriterion("mark_id >", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdGreaterThanOrEqualTo(Integer value) { + addCriterion("mark_id >=", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdLessThan(Integer value) { + addCriterion("mark_id <", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdLessThanOrEqualTo(Integer value) { + addCriterion("mark_id <=", value, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdIn(List values) { + addCriterion("mark_id in", values, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotIn(List values) { + addCriterion("mark_id not in", values, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdBetween(Integer value1, Integer value2) { + addCriterion("mark_id between", value1, value2, "markId"); + return (Criteria) this; + } + + public Criteria andMarkIdNotBetween(Integer value1, Integer value2) { + addCriterion("mark_id not between", value1, value2, "markId"); + return (Criteria) this; + } + + public Criteria andX1IsNull() { + addCriterion("x1 is null"); + return (Criteria) this; + } + + public Criteria andX1IsNotNull() { + addCriterion("x1 is not null"); + return (Criteria) this; + } + + public Criteria andX1EqualTo(Float value) { + addCriterion("x1 =", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1NotEqualTo(Float value) { + addCriterion("x1 <>", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1GreaterThan(Float value) { + addCriterion("x1 >", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1GreaterThanOrEqualTo(Float value) { + addCriterion("x1 >=", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1LessThan(Float value) { + addCriterion("x1 <", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1LessThanOrEqualTo(Float value) { + addCriterion("x1 <=", value, "x1"); + return (Criteria) this; + } + + public Criteria andX1In(List values) { + addCriterion("x1 in", values, "x1"); + return (Criteria) this; + } + + public Criteria andX1NotIn(List values) { + addCriterion("x1 not in", values, "x1"); + return (Criteria) this; + } + + public Criteria andX1Between(Float value1, Float value2) { + addCriterion("x1 between", value1, value2, "x1"); + return (Criteria) this; + } + + public Criteria andX1NotBetween(Float value1, Float value2) { + addCriterion("x1 not between", value1, value2, "x1"); + return (Criteria) this; + } + + public Criteria andY1IsNull() { + addCriterion("y1 is null"); + return (Criteria) this; + } + + public Criteria andY1IsNotNull() { + addCriterion("y1 is not null"); + return (Criteria) this; + } + + public Criteria andY1EqualTo(Float value) { + addCriterion("y1 =", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1NotEqualTo(Float value) { + addCriterion("y1 <>", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1GreaterThan(Float value) { + addCriterion("y1 >", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1GreaterThanOrEqualTo(Float value) { + addCriterion("y1 >=", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1LessThan(Float value) { + addCriterion("y1 <", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1LessThanOrEqualTo(Float value) { + addCriterion("y1 <=", value, "y1"); + return (Criteria) this; + } + + public Criteria andY1In(List values) { + addCriterion("y1 in", values, "y1"); + return (Criteria) this; + } + + public Criteria andY1NotIn(List values) { + addCriterion("y1 not in", values, "y1"); + return (Criteria) this; + } + + public Criteria andY1Between(Float value1, Float value2) { + addCriterion("y1 between", value1, value2, "y1"); + return (Criteria) this; + } + + public Criteria andY1NotBetween(Float value1, Float value2) { + addCriterion("y1 not between", value1, value2, "y1"); + return (Criteria) this; + } + + public Criteria andX2IsNull() { + addCriterion("x2 is null"); + return (Criteria) this; + } + + public Criteria andX2IsNotNull() { + addCriterion("x2 is not null"); + return (Criteria) this; + } + + public Criteria andX2EqualTo(Float value) { + addCriterion("x2 =", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2NotEqualTo(Float value) { + addCriterion("x2 <>", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2GreaterThan(Float value) { + addCriterion("x2 >", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2GreaterThanOrEqualTo(Float value) { + addCriterion("x2 >=", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2LessThan(Float value) { + addCriterion("x2 <", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2LessThanOrEqualTo(Float value) { + addCriterion("x2 <=", value, "x2"); + return (Criteria) this; + } + + public Criteria andX2In(List values) { + addCriterion("x2 in", values, "x2"); + return (Criteria) this; + } + + public Criteria andX2NotIn(List values) { + addCriterion("x2 not in", values, "x2"); + return (Criteria) this; + } + + public Criteria andX2Between(Float value1, Float value2) { + addCriterion("x2 between", value1, value2, "x2"); + return (Criteria) this; + } + + public Criteria andX2NotBetween(Float value1, Float value2) { + addCriterion("x2 not between", value1, value2, "x2"); + return (Criteria) this; + } + + public Criteria andY2IsNull() { + addCriterion("y2 is null"); + return (Criteria) this; + } + + public Criteria andY2IsNotNull() { + addCriterion("y2 is not null"); + return (Criteria) this; + } + + public Criteria andY2EqualTo(Float value) { + addCriterion("y2 =", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2NotEqualTo(Float value) { + addCriterion("y2 <>", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2GreaterThan(Float value) { + addCriterion("y2 >", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2GreaterThanOrEqualTo(Float value) { + addCriterion("y2 >=", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2LessThan(Float value) { + addCriterion("y2 <", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2LessThanOrEqualTo(Float value) { + addCriterion("y2 <=", value, "y2"); + return (Criteria) this; + } + + public Criteria andY2In(List values) { + addCriterion("y2 in", values, "y2"); + return (Criteria) this; + } + + public Criteria andY2NotIn(List values) { + addCriterion("y2 not in", values, "y2"); + return (Criteria) this; + } + + public Criteria andY2Between(Float value1, Float value2) { + addCriterion("y2 between", value1, value2, "y2"); + return (Criteria) this; + } + + public Criteria andY2NotBetween(Float value1, Float value2) { + addCriterion("y2 not between", value1, value2, "y2"); + 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/TerminalPhotoMarks.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java new file mode 100644 index 0000000..7347f26 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarks.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class TerminalPhotoMarks implements Serializable { + private Integer id; + + private Integer termId; + + private Integer channelId; + + private Integer width; + + private Integer height; + + private String color; + + private Integer boderWidth; + + 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/TerminalPhotoMarksExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java new file mode 100644 index 0000000..75f538b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhotoMarksExample.java @@ -0,0 +1,751 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TerminalPhotoMarksExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalPhotoMarksExample() { + 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(Integer value) { + addCriterion("channel_id =", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotEqualTo(Integer value) { + addCriterion("channel_id <>", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThan(Integer value) { + addCriterion("channel_id >", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdGreaterThanOrEqualTo(Integer value) { + addCriterion("channel_id >=", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThan(Integer value) { + addCriterion("channel_id <", value, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdLessThanOrEqualTo(Integer 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(Integer value1, Integer value2) { + addCriterion("channel_id between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andChannelIdNotBetween(Integer value1, Integer value2) { + addCriterion("channel_id not between", value1, value2, "channelId"); + return (Criteria) this; + } + + public Criteria andWidthIsNull() { + addCriterion("width is null"); + return (Criteria) this; + } + + public Criteria andWidthIsNotNull() { + addCriterion("width is not null"); + return (Criteria) this; + } + + public Criteria andWidthEqualTo(Integer value) { + addCriterion("width =", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotEqualTo(Integer value) { + addCriterion("width <>", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthGreaterThan(Integer value) { + addCriterion("width >", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthGreaterThanOrEqualTo(Integer value) { + addCriterion("width >=", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthLessThan(Integer value) { + addCriterion("width <", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthLessThanOrEqualTo(Integer value) { + addCriterion("width <=", value, "width"); + return (Criteria) this; + } + + public Criteria andWidthIn(List values) { + addCriterion("width in", values, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotIn(List values) { + addCriterion("width not in", values, "width"); + return (Criteria) this; + } + + public Criteria andWidthBetween(Integer value1, Integer value2) { + addCriterion("width between", value1, value2, "width"); + return (Criteria) this; + } + + public Criteria andWidthNotBetween(Integer value1, Integer value2) { + addCriterion("width not between", value1, value2, "width"); + return (Criteria) this; + } + + public Criteria andHeightIsNull() { + addCriterion("height is null"); + return (Criteria) this; + } + + public Criteria andHeightIsNotNull() { + addCriterion("height is not null"); + return (Criteria) this; + } + + public Criteria andHeightEqualTo(Integer value) { + addCriterion("height =", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotEqualTo(Integer value) { + addCriterion("height <>", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThan(Integer value) { + addCriterion("height >", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightGreaterThanOrEqualTo(Integer value) { + addCriterion("height >=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThan(Integer value) { + addCriterion("height <", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightLessThanOrEqualTo(Integer value) { + addCriterion("height <=", value, "height"); + return (Criteria) this; + } + + public Criteria andHeightIn(List values) { + addCriterion("height in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotIn(List values) { + addCriterion("height not in", values, "height"); + return (Criteria) this; + } + + public Criteria andHeightBetween(Integer value1, Integer value2) { + addCriterion("height between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andHeightNotBetween(Integer value1, Integer value2) { + addCriterion("height not between", value1, value2, "height"); + return (Criteria) this; + } + + public Criteria andColorIsNull() { + addCriterion("color is null"); + return (Criteria) this; + } + + public Criteria andColorIsNotNull() { + addCriterion("color is not null"); + return (Criteria) this; + } + + public Criteria andColorEqualTo(String value) { + addCriterion("color =", value, "color"); + return (Criteria) this; + } + + public Criteria andColorNotEqualTo(String value) { + addCriterion("color <>", value, "color"); + return (Criteria) this; + } + + public Criteria andColorGreaterThan(String value) { + addCriterion("color >", value, "color"); + return (Criteria) this; + } + + public Criteria andColorGreaterThanOrEqualTo(String value) { + addCriterion("color >=", value, "color"); + return (Criteria) this; + } + + public Criteria andColorLessThan(String value) { + addCriterion("color <", value, "color"); + return (Criteria) this; + } + + public Criteria andColorLessThanOrEqualTo(String value) { + addCriterion("color <=", value, "color"); + return (Criteria) this; + } + + public Criteria andColorLike(String value) { + addCriterion("color like", value, "color"); + return (Criteria) this; + } + + public Criteria andColorNotLike(String value) { + addCriterion("color not like", value, "color"); + return (Criteria) this; + } + + public Criteria andColorIn(List values) { + addCriterion("color in", values, "color"); + return (Criteria) this; + } + + public Criteria andColorNotIn(List values) { + addCriterion("color not in", values, "color"); + return (Criteria) this; + } + + public Criteria andColorBetween(String value1, String value2) { + addCriterion("color between", value1, value2, "color"); + return (Criteria) this; + } + + public Criteria andColorNotBetween(String value1, String value2) { + addCriterion("color not between", value1, value2, "color"); + return (Criteria) this; + } + + public Criteria andBoderWidthIsNull() { + addCriterion("boder_width is null"); + return (Criteria) this; + } + + public Criteria andBoderWidthIsNotNull() { + addCriterion("boder_width is not null"); + return (Criteria) this; + } + + public Criteria andBoderWidthEqualTo(Integer value) { + addCriterion("boder_width =", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthNotEqualTo(Integer value) { + addCriterion("boder_width <>", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthGreaterThan(Integer value) { + addCriterion("boder_width >", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthGreaterThanOrEqualTo(Integer value) { + addCriterion("boder_width >=", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthLessThan(Integer value) { + addCriterion("boder_width <", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthLessThanOrEqualTo(Integer value) { + addCriterion("boder_width <=", value, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthIn(List values) { + addCriterion("boder_width in", values, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthNotIn(List values) { + addCriterion("boder_width not in", values, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthBetween(Integer value1, Integer value2) { + addCriterion("boder_width between", value1, value2, "boderWidth"); + return (Criteria) this; + } + + public Criteria andBoderWidthNotBetween(Integer value1, Integer value2) { + addCriterion("boder_width not between", value1, value2, "boderWidth"); + 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/model/PhotoMarkModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java index 5a24e12..8ab3dac 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java @@ -16,35 +16,35 @@ import java.util.List; @ApiModel(value = "获取绘制信息", description = "获取绘制信息") public class PhotoMarkModel implements Serializable { - @ApiModelProperty(value = "通道编号", example = "213") - private Integer termId; + @ApiModelProperty(value = "通道编号", example = "213") + private Integer termId; - @ApiModelProperty(value = "绘制ID", example = "213") - private Integer markId; + @ApiModelProperty(value = "绘制ID", example = "213") + private Integer markId; - @NotNull(message = "通道编号") - @ApiModelProperty(value = "通道编号", example = "213") - private Integer channelId; + @NotNull(message = "通道编号") + @ApiModelProperty(value = "通道编号", example = "213") + private Integer channelId; - @ApiModelProperty(value = "参考图片宽", example = "213") - private Integer width; + @ApiModelProperty(value = "参考图片宽", example = "213") + private Integer width; - @ApiModelProperty(value = "参考图片高", example = "213") - private Integer height; + @ApiModelProperty(value = "参考图片高", example = "213") + private Integer height; - @ApiModelProperty(value = "线条颜色", example = "213") - private String color; + @ApiModelProperty(value = "线条颜色", example = "213") + private String color; - @ApiModelProperty(value = "线条宽度", example = "213") - private Short boderWidth; + @ApiModelProperty(value = "线条宽度", example = "213") + private Integer boderWidth; - @ApiModelProperty(value = "图片地址", example = "213") - private String path; + @ApiModelProperty(value = "图片地址", example = "213") + private String path; - @ApiModelProperty(value = "通道编号和名称", example = "213") - private List list; + @ApiModelProperty(value = "通道编号和名称", example = "213") + private List list; - @ApiModelProperty(value = "", example = "0--关 1---开启") - private Integer markEnable; + @ApiModelProperty(value = "", example = "0--关 1---开启") + private Integer markEnable; } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java new file mode 100644 index 0000000..be21c3f --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarkPathsDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalPhotoMarkPaths; +import com.shxy.xymanager_common.entity.TerminalPhotoMarkPathsExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TerminalPhotoMarkPathsDao { + long countByExample(TerminalPhotoMarkPathsExample example); + + int deleteByExample(TerminalPhotoMarkPathsExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(TerminalPhotoMarkPaths record); + + int insertSelective(TerminalPhotoMarkPaths record); + + List selectByExample(TerminalPhotoMarkPathsExample example); + + TerminalPhotoMarkPaths selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") TerminalPhotoMarkPaths record, @Param("example") TerminalPhotoMarkPathsExample example); + + int updateByExample(@Param("record") TerminalPhotoMarkPaths record, @Param("example") TerminalPhotoMarkPathsExample example); + + int updateByPrimaryKeySelective(TerminalPhotoMarkPaths record); + + int updateByPrimaryKey(TerminalPhotoMarkPaths record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java new file mode 100644 index 0000000..24db8ae --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoMarksDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalPhotoMarks; +import com.shxy.xymanager_common.entity.TerminalPhotoMarksExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TerminalPhotoMarksDao { + long countByExample(TerminalPhotoMarksExample example); + + int deleteByExample(TerminalPhotoMarksExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(TerminalPhotoMarks record); + + int insertSelective(TerminalPhotoMarks record); + + List selectByExample(TerminalPhotoMarksExample example); + + TerminalPhotoMarks selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") TerminalPhotoMarks record, @Param("example") TerminalPhotoMarksExample example); + + int updateByExample(@Param("record") TerminalPhotoMarks record, @Param("example") TerminalPhotoMarksExample example); + + int updateByPrimaryKeySelective(TerminalPhotoMarks record); + + int updateByPrimaryKey(TerminalPhotoMarks 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 2143119..50c04dd 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -122,12 +122,12 @@ - - -
+ + + + + + @@ -195,13 +195,19 @@ - - - - - - - + + +
+ + + +
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index d769ea8..f1b8e25 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -7,7 +7,7 @@ - + @@ -36,23 +36,6 @@ - - - - - - - - - - - - - - - - - @@ -365,52 +348,6 @@ - - - - diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml new file mode 100644 index 0000000..279c622 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarkPathsDao.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + 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, mark_id, x1, y1, x2, y2 + + + + + delete from terminal_photo_mark_paths + where id = #{id,jdbcType=INTEGER} + + + delete from terminal_photo_mark_paths + + + + + + insert into terminal_photo_mark_paths (id, mark_id, x1, + y1, x2, y2) + values (#{id,jdbcType=INTEGER}, #{markId,jdbcType=INTEGER}, #{x1,jdbcType=REAL}, + #{y1,jdbcType=REAL}, #{x2,jdbcType=REAL}, #{y2,jdbcType=REAL}) + + + insert into terminal_photo_mark_paths + + + id, + + + mark_id, + + + x1, + + + y1, + + + x2, + + + y2, + + + + + #{id,jdbcType=INTEGER}, + + + #{markId,jdbcType=INTEGER}, + + + #{x1,jdbcType=REAL}, + + + #{y1,jdbcType=REAL}, + + + #{x2,jdbcType=REAL}, + + + #{y2,jdbcType=REAL}, + + + + + + update terminal_photo_mark_paths + + + id = #{record.id,jdbcType=INTEGER}, + + + mark_id = #{record.markId,jdbcType=INTEGER}, + + + x1 = #{record.x1,jdbcType=REAL}, + + + y1 = #{record.y1,jdbcType=REAL}, + + + x2 = #{record.x2,jdbcType=REAL}, + + + y2 = #{record.y2,jdbcType=REAL}, + + + + + + + + update terminal_photo_mark_paths + set id = #{record.id,jdbcType=INTEGER}, + mark_id = #{record.markId,jdbcType=INTEGER}, + x1 = #{record.x1,jdbcType=REAL}, + y1 = #{record.y1,jdbcType=REAL}, + x2 = #{record.x2,jdbcType=REAL}, + y2 = #{record.y2,jdbcType=REAL} + + + + + + update terminal_photo_mark_paths + + + mark_id = #{markId,jdbcType=INTEGER}, + + + x1 = #{x1,jdbcType=REAL}, + + + y1 = #{y1,jdbcType=REAL}, + + + x2 = #{x2,jdbcType=REAL}, + + + y2 = #{y2,jdbcType=REAL}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminal_photo_mark_paths + set mark_id = #{markId,jdbcType=INTEGER}, + x1 = #{x1,jdbcType=REAL}, + y1 = #{y1,jdbcType=REAL}, + x2 = #{x2,jdbcType=REAL}, + y2 = #{y2,jdbcType=REAL} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml new file mode 100644 index 0000000..b5154be --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoMarksDao.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + 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, width, height, color, boder_width, create_time, update_time + + + + + delete from terminal_photo_marks + where id = #{id,jdbcType=INTEGER} + + + delete from terminal_photo_marks + + + + + + insert into terminal_photo_marks (id, term_id, channel_id, + width, height, color, + boder_width, create_time, update_time + ) + values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=TINYINT}, + #{width,jdbcType=INTEGER}, #{height,jdbcType=INTEGER}, #{color,jdbcType=VARCHAR}, + #{boderWidth,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into terminal_photo_marks + + + id, + + + term_id, + + + channel_id, + + + width, + + + height, + + + color, + + + boder_width, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{termId,jdbcType=INTEGER}, + + + #{channelId,jdbcType=TINYINT}, + + + #{width,jdbcType=INTEGER}, + + + #{height,jdbcType=INTEGER}, + + + #{color,jdbcType=VARCHAR}, + + + #{boderWidth,jdbcType=TINYINT}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + update terminal_photo_marks + + + id = #{record.id,jdbcType=INTEGER}, + + + term_id = #{record.termId,jdbcType=INTEGER}, + + + channel_id = #{record.channelId,jdbcType=TINYINT}, + + + width = #{record.width,jdbcType=INTEGER}, + + + height = #{record.height,jdbcType=INTEGER}, + + + color = #{record.color,jdbcType=VARCHAR}, + + + boder_width = #{record.boderWidth,jdbcType=TINYINT}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update terminal_photo_marks + set id = #{record.id,jdbcType=INTEGER}, + term_id = #{record.termId,jdbcType=INTEGER}, + channel_id = #{record.channelId,jdbcType=TINYINT}, + width = #{record.width,jdbcType=INTEGER}, + height = #{record.height,jdbcType=INTEGER}, + color = #{record.color,jdbcType=VARCHAR}, + boder_width = #{record.boderWidth,jdbcType=TINYINT}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + + + update terminal_photo_marks + + + term_id = #{termId,jdbcType=INTEGER}, + + + channel_id = #{channelId,jdbcType=TINYINT}, + + + width = #{width,jdbcType=INTEGER}, + + + height = #{height,jdbcType=INTEGER}, + + + color = #{color,jdbcType=VARCHAR}, + + + boder_width = #{boderWidth,jdbcType=TINYINT}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminal_photo_marks + set term_id = #{termId,jdbcType=INTEGER}, + channel_id = #{channelId,jdbcType=TINYINT}, + width = #{width,jdbcType=INTEGER}, + height = #{height,jdbcType=INTEGER}, + color = #{color,jdbcType=VARCHAR}, + boder_width = #{boderWidth,jdbcType=TINYINT}, + 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_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index 3ed01a7..30cf500 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -302,4 +302,29 @@ public class DyLevelServiceImpl implements DyLevelService { return Asserts.success(model); } + @Override + public ServiceBody add(DyLevel vo) { + dyLevelDao.insertSelective(vo); + return Asserts.success("success"); + } + + @Override + public ServiceBody delete(Integer vo) { + dyLevelDao.deleteByPrimaryKey(vo); + return Asserts.success("success"); + } + + @Override + public ServiceBody update(DyLevel vo) { + dyLevelDao.updateByPrimaryKey(vo); + return Asserts.success("success"); + } + + @Override + public ServiceBody> listAll() { + DyLevelExample example = new DyLevelExample(); + List dyLevels = dyLevelDao.selectByExample(example); + return Asserts.success(dyLevels); + } + } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index afa9c1c..bc9f8ec 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -39,6 +39,7 @@ import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotNull; import java.math.BigInteger; import java.util.ArrayList; import java.util.Date; @@ -64,6 +65,12 @@ public class TerminalServiceImpl implements TerminalService { @Autowired TerminalPhotoDao terminalPhotoDao; + @Autowired + TerminalPhotoMarksDao terminalPhotoMarksDao; + + @Autowired + TerminalPhotoMarkPathsDao terminalPhotoMarkPathsDao; + @Autowired DyLevelDao dyLevelDao; @@ -508,6 +515,8 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody getCoordinate(String requestIp, MarkReqVo vo) { + Integer termId = vo.getTermId(); + Integer channelId = vo.getChannelId(); Map globalParams = cacheService.getGolobalMap(); String s = globalParams.get(GloableParamsType.ImgMark.value()); Integer integer = null; @@ -517,21 +526,51 @@ public class TerminalServiceImpl implements TerminalService { integer = Integer.valueOf(s); } PhotoMarkModel model = new PhotoMarkModel(); + model.setTermId(termId); + model.setChannelId(channelId); model.setMarkEnable(integer); - PhotoMarkDto dto = null; if (vo.getNeedPic() == 0) { - dto = terminalPhotoDao.selectPhotoMark(vo); - if (null != dto && StringUtils.isNotBlank(dto.getPath())) { - String photoPath = TerminalUtils.getPhotoPath(0, requestIp, dto.getPath()); - dto.setPath(photoPath); + PageUtils.SetPage(1, 1); + TerminalPhotoExample example = new TerminalPhotoExample(); + TerminalPhotoExample.Criteria criteria = example.createCriteria(); + criteria.andChannelIdEqualTo(channelId).andTermIdEqualTo(termId).andMediaTypeEqualTo(CommonStatus.DELETE.value()); + example.setOrderByClause("id desc"); + List photoList = terminalPhotoDao.selectByExample(example); + if (CollectionUtil.isNotEmpty(photoList)) { + TerminalPhoto terminalPhoto = photoList.get(0); + if (null != terminalPhoto && StringUtils.isNotBlank(terminalPhoto.getPath())) { + String photoPath = TerminalUtils.getPhotoPath(0, requestIp, terminalPhoto.getPath()); + model.setPath(photoPath); + } } - } else { - dto = terminalPhotoDao.selectPhotoWithoutPic(vo); } - - if (null != dto) { - BeanUtils.copyProperties(dto, model); + ArrayList list = new ArrayList<>(); + TerminalPhotoMarksExample example1 = new TerminalPhotoMarksExample(); + example1.createCriteria().andTermIdEqualTo(termId).andChannelIdEqualTo(channelId); + List terminalPhotoMarks = terminalPhotoMarksDao.selectByExample(example1); + if (CollectionUtil.isNotEmpty(terminalPhotoMarks)) { + TerminalPhotoMarks terminalPhotoMarks1 = terminalPhotoMarks.get(0); + Integer marks1Id = terminalPhotoMarks1.getId(); + model.setMarkId(marks1Id); + model.setBoderWidth(terminalPhotoMarks1.getBoderWidth()); + model.setColor(terminalPhotoMarks1.getColor()); + model.setHeight(terminalPhotoMarks1.getHeight()); + model.setWidth(terminalPhotoMarks1.getWidth()); + TerminalPhotoMarkPathsExample example2 = new TerminalPhotoMarkPathsExample(); + example2.createCriteria().andMarkIdEqualTo(marks1Id); + List terminalPhotoMarkPaths = terminalPhotoMarkPathsDao.selectByExample(example2); + if (CollectionUtil.isNotEmpty(terminalPhotoMarkPaths)) { + for (TerminalPhotoMarkPaths item : terminalPhotoMarkPaths) { + TermChannelCoordinateDto termChannelCoordinateDto = new TermChannelCoordinateDto(); + termChannelCoordinateDto.setX1(item.getX1()); + termChannelCoordinateDto.setX2(item.getX2()); + termChannelCoordinateDto.setY1(item.getY1()); + termChannelCoordinateDto.setY2(item.getY2()); + list.add(termChannelCoordinateDto); + } + } } + model.setList(list); return Asserts.success(model); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java index 3647efe..f1fe00d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/DyLevelService.java @@ -45,4 +45,13 @@ public interface DyLevelService { * @return */ ServiceBody getLastTowerList(String requestIp, LastTowerVo vo); + + ServiceBody add(DyLevel vo); + + ServiceBody delete(Integer vo); + + ServiceBody update(DyLevel vo); + + ServiceBody> listAll(); + }