From 91f8134686e07d6c69c2cf69669dfe0da1bbd6c4 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 23 Sep 2024 14:38:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A2=84=E7=BD=AE=E4=BD=8D=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalPresetController.java | 59 ++ .../entity/TerminalPresets.java | 136 +++- .../entity/TerminalPresetsExample.java | 671 ++++++++++++++++++ .../entity/TerminalPresetsKey.java | 69 ++ .../xymanager_dao/dao/TerminalPresetsDao.java | 17 - .../dao/TerminalPresetsMapper.java | 98 +++ .../resources/mappers/TerminalPresetsDao.xml | 117 --- .../mappers/TerminalPresetsMapper.xml | 286 ++++++++ .../impl/TerminalPresetServiceImpl.java | 38 +- .../service/TerminalPresetsService.java | 15 +- 10 files changed, 1326 insertions(+), 180 deletions(-) create mode 100644 xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPresetController.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresetsExample.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresetsKey.java delete mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java create mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsMapper.java delete mode 100644 xymanager_dao/src/main/resources/mappers/TerminalPresetsDao.xml create mode 100644 xymanager_dao/src/main/resources/mappers/TerminalPresetsMapper.xml diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPresetController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPresetController.java new file mode 100644 index 0000000..13a1a5a --- /dev/null +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPresetController.java @@ -0,0 +1,59 @@ +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.entity.TerminalPresets; +import com.shxy.xymanager_common.exception.ApiException; +import com.shxy.xymanager_service.service.TerminalPresetsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.constraints.NotNull; +import java.util.List; + +@RestController +@Api(tags = {"装置预置位相关接口"}) +@RequestMapping("preset") +@Slf4j +public class TerminalPresetController extends BaseController { + + @Resource + TerminalPresetsService service; + + @GetMapping("list") + @ApiOperation("查询列表") + @Log(title = "查询装置预置位列表", type = "查询") + public ResponseReult> list(@RequestParam(value = "termId", required = true) Integer termId) { + List result = service.list(termId); + return ResponseReult.success(result); + } + + @PostMapping("save") + @ApiOperation("保存") + @Log(title = "保存装置预置位", type = "保存") + public ResponseReult save(@Validated @RequestBody TerminalPresets item) throws Exception { + service.save(item); + return ResponseReult.success("OK"); + } + + @PostMapping("delete") + @ApiOperation("删除") + @Log(title = "删除装置预置位", type = "删除") + public ResponseReult delete(@Validated @NotNull(message = "termId不能为空!") Integer termId, + @Validated @NotNull(message = "presetNo不能为空!") Integer presetNo) throws Exception { + if (termId == null) { + throw new ApiException("termId不能为空!"); + } + if (presetNo == null) { + throw new ApiException("presetNo不能为空!"); + } + service.delete(termId, presetNo); + return ResponseReult.success("OK"); + } + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresets.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresets.java index 5dd0ec3..c1d7dc2 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresets.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresets.java @@ -1,76 +1,134 @@ package com.shxy.xymanager_common.entity; -import java.io.Serializable; - -public class TerminalPresets implements Serializable { - private Integer id; - - private Integer termId; - - private Byte presetNo; - - private Byte name; - +public class TerminalPresets extends TerminalPresetsKey { + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column terminal_presets.name + * + * @mbg.generated + */ + private String name; + + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column terminal_presets.angle_x + * + * @mbg.generated + */ private Float angleX; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column terminal_presets.angle_y + * + * @mbg.generated + */ private Float angleY; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column terminal_presets.velocity + * + * @mbg.generated + */ private Float velocity; - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getTermId() { - return termId; - } - - public void setTermId(Integer termId) { - this.termId = termId; - } - - public Byte getPresetNo() { - return presetNo; - } - - public void setPresetNo(Byte presetNo) { - this.presetNo = presetNo; - } - - public Byte getName() { + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column terminal_presets.name + * + * @return the value of terminal_presets.name + * + * @mbg.generated + */ + public String getName() { return name; } - public void setName(Byte name) { + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column terminal_presets.name + * + * @param name the value for terminal_presets.name + * + * @mbg.generated + */ + public void setName(String name) { this.name = name; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column terminal_presets.angle_x + * + * @return the value of terminal_presets.angle_x + * + * @mbg.generated + */ public Float getAngleX() { return angleX; } + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column terminal_presets.angle_x + * + * @param angleX the value for terminal_presets.angle_x + * + * @mbg.generated + */ public void setAngleX(Float angleX) { this.angleX = angleX; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column terminal_presets.angle_y + * + * @return the value of terminal_presets.angle_y + * + * @mbg.generated + */ public Float getAngleY() { return angleY; } + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column terminal_presets.angle_y + * + * @param angleY the value for terminal_presets.angle_y + * + * @mbg.generated + */ public void setAngleY(Float angleY) { this.angleY = angleY; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column terminal_presets.velocity + * + * @return the value of terminal_presets.velocity + * + * @mbg.generated + */ public Float getVelocity() { return velocity; } + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column terminal_presets.velocity + * + * @param velocity the value for terminal_presets.velocity + * + * @mbg.generated + */ public void setVelocity(Float velocity) { this.velocity = velocity; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresetsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresetsExample.java new file mode 100644 index 0000000..046a858 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresetsExample.java @@ -0,0 +1,671 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.List; + +public class TerminalPresetsExample { + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table terminal_presets + * + * @mbg.generated + */ + protected String orderByClause; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table terminal_presets + * + * @mbg.generated + */ + protected boolean distinct; + + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database table terminal_presets + * + * @mbg.generated + */ + protected List oredCriteria; + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public TerminalPresetsExample() { + oredCriteria = new ArrayList<>(); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public String getOrderByClause() { + return orderByClause; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public boolean isDistinct() { + return distinct; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public List getOredCriteria() { + return oredCriteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table terminal_presets + * + * @mbg.generated + */ + 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 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 andPresetNoIsNull() { + addCriterion("preset_no is null"); + return (Criteria) this; + } + + public Criteria andPresetNoIsNotNull() { + addCriterion("preset_no is not null"); + return (Criteria) this; + } + + public Criteria andPresetNoEqualTo(Integer value) { + addCriterion("preset_no =", value, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoNotEqualTo(Integer value) { + addCriterion("preset_no <>", value, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoGreaterThan(Integer value) { + addCriterion("preset_no >", value, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoGreaterThanOrEqualTo(Integer value) { + addCriterion("preset_no >=", value, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoLessThan(Integer value) { + addCriterion("preset_no <", value, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoLessThanOrEqualTo(Integer value) { + addCriterion("preset_no <=", value, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoIn(List values) { + addCriterion("preset_no in", values, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoNotIn(List values) { + addCriterion("preset_no not in", values, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoBetween(Integer value1, Integer value2) { + addCriterion("preset_no between", value1, value2, "presetNo"); + return (Criteria) this; + } + + public Criteria andPresetNoNotBetween(Integer value1, Integer value2) { + addCriterion("preset_no not between", value1, value2, "presetNo"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("`name` is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("`name` is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("`name` =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("`name` <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("`name` >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("`name` >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("`name` <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("`name` <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("`name` like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("`name` not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("`name` in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("`name` not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("`name` between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("`name` not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andAngleXIsNull() { + addCriterion("angle_x is null"); + return (Criteria) this; + } + + public Criteria andAngleXIsNotNull() { + addCriterion("angle_x is not null"); + return (Criteria) this; + } + + public Criteria andAngleXEqualTo(Float value) { + addCriterion("angle_x =", value, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXNotEqualTo(Float value) { + addCriterion("angle_x <>", value, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXGreaterThan(Float value) { + addCriterion("angle_x >", value, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXGreaterThanOrEqualTo(Float value) { + addCriterion("angle_x >=", value, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXLessThan(Float value) { + addCriterion("angle_x <", value, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXLessThanOrEqualTo(Float value) { + addCriterion("angle_x <=", value, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXIn(List values) { + addCriterion("angle_x in", values, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXNotIn(List values) { + addCriterion("angle_x not in", values, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXBetween(Float value1, Float value2) { + addCriterion("angle_x between", value1, value2, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleXNotBetween(Float value1, Float value2) { + addCriterion("angle_x not between", value1, value2, "angleX"); + return (Criteria) this; + } + + public Criteria andAngleYIsNull() { + addCriterion("angle_y is null"); + return (Criteria) this; + } + + public Criteria andAngleYIsNotNull() { + addCriterion("angle_y is not null"); + return (Criteria) this; + } + + public Criteria andAngleYEqualTo(Float value) { + addCriterion("angle_y =", value, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYNotEqualTo(Float value) { + addCriterion("angle_y <>", value, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYGreaterThan(Float value) { + addCriterion("angle_y >", value, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYGreaterThanOrEqualTo(Float value) { + addCriterion("angle_y >=", value, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYLessThan(Float value) { + addCriterion("angle_y <", value, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYLessThanOrEqualTo(Float value) { + addCriterion("angle_y <=", value, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYIn(List values) { + addCriterion("angle_y in", values, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYNotIn(List values) { + addCriterion("angle_y not in", values, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYBetween(Float value1, Float value2) { + addCriterion("angle_y between", value1, value2, "angleY"); + return (Criteria) this; + } + + public Criteria andAngleYNotBetween(Float value1, Float value2) { + addCriterion("angle_y not between", value1, value2, "angleY"); + return (Criteria) this; + } + + public Criteria andVelocityIsNull() { + addCriterion("velocity is null"); + return (Criteria) this; + } + + public Criteria andVelocityIsNotNull() { + addCriterion("velocity is not null"); + return (Criteria) this; + } + + public Criteria andVelocityEqualTo(Float value) { + addCriterion("velocity =", value, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityNotEqualTo(Float value) { + addCriterion("velocity <>", value, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityGreaterThan(Float value) { + addCriterion("velocity >", value, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityGreaterThanOrEqualTo(Float value) { + addCriterion("velocity >=", value, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityLessThan(Float value) { + addCriterion("velocity <", value, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityLessThanOrEqualTo(Float value) { + addCriterion("velocity <=", value, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityIn(List values) { + addCriterion("velocity in", values, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityNotIn(List values) { + addCriterion("velocity not in", values, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityBetween(Float value1, Float value2) { + addCriterion("velocity between", value1, value2, "velocity"); + return (Criteria) this; + } + + public Criteria andVelocityNotBetween(Float value1, Float value2) { + addCriterion("velocity not between", value1, value2, "velocity"); + return (Criteria) this; + } + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table terminal_presets + * + * @mbg.generated do_not_delete_during_merge + */ + public static class Criteria extends GeneratedCriteria { + protected Criteria() { + super(); + } + } + + /** + * This class was generated by MyBatis Generator. + * This class corresponds to the database table terminal_presets + * + * @mbg.generated + */ + 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/TerminalPresetsKey.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresetsKey.java new file mode 100644 index 0000000..4c288f5 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPresetsKey.java @@ -0,0 +1,69 @@ +package com.shxy.xymanager_common.entity; + +public class TerminalPresetsKey { + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column terminal_presets.term_id + * + * @mbg.generated + */ + private Integer termId; + + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column terminal_presets.preset_no + * + * @mbg.generated + */ + private Integer presetNo; + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column terminal_presets.term_id + * + * @return the value of terminal_presets.term_id + * + * @mbg.generated + */ + public Integer getTermId() { + return termId; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column terminal_presets.term_id + * + * @param termId the value for terminal_presets.term_id + * + * @mbg.generated + */ + public void setTermId(Integer termId) { + this.termId = termId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column terminal_presets.preset_no + * + * @return the value of terminal_presets.preset_no + * + * @mbg.generated + */ + public Integer getPresetNo() { + return presetNo; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column terminal_presets.preset_no + * + * @param presetNo the value for terminal_presets.preset_no + * + * @mbg.generated + */ + public void setPresetNo(Integer presetNo) { + this.presetNo = presetNo; + } +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java deleted file mode 100644 index a40c17c..0000000 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.shxy.xymanager_dao.dao; - -import com.shxy.xymanager_common.entity.TerminalPresets; - -public interface TerminalPresetsDao { - int deleteByPrimaryKey(Integer id); - - int insert(TerminalPresets record); - - int insertSelective(TerminalPresets record); - - TerminalPresets selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TerminalPresets record); - - int updateByPrimaryKey(TerminalPresets record); -} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsMapper.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsMapper.java new file mode 100644 index 0000000..6e94949 --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsMapper.java @@ -0,0 +1,98 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalPresets; +import com.shxy.xymanager_common.entity.TerminalPresetsExample; +import com.shxy.xymanager_common.entity.TerminalPresetsKey; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface TerminalPresetsMapper { + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + long countByExample(TerminalPresetsExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int deleteByExample(TerminalPresetsExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int deleteByPrimaryKey(TerminalPresetsKey key); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int insert(TerminalPresets row); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int insertSelective(TerminalPresets row); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + List selectByExample(TerminalPresetsExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + TerminalPresets selectByPrimaryKey(TerminalPresetsKey key); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int updateByExampleSelective(@Param("row") TerminalPresets row, @Param("example") TerminalPresetsExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int updateByExample(@Param("row") TerminalPresets row, @Param("example") TerminalPresetsExample example); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int updateByPrimaryKeySelective(TerminalPresets row); + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table terminal_presets + * + * @mbg.generated + */ + int updateByPrimaryKey(TerminalPresets row); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPresetsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPresetsDao.xml deleted file mode 100644 index 99afd06..0000000 --- a/xymanager_dao/src/main/resources/mappers/TerminalPresetsDao.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - id, term_id, preset_no, name, angle_x, angle_y, velocity - - - - delete from terminal_presets - where id = #{id,jdbcType=INTEGER} - - - insert into terminal_presets (id, term_id, preset_no, - name, angle_x, angle_y, velocity - ) - values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{presetNo,jdbcType=TINYINT}, - #{name,jdbcType=TINYINT}, #{angleX,jdbcType=REAL}, #{angleY,jdbcType=REAL}, #{velocity,jdbcType=REAL} - ) - - - insert into terminal_presets - - - id, - - - term_id, - - - preset_no, - - - name, - - - angle_x, - - - angle_y, - - - velocity, - - - - - #{id,jdbcType=INTEGER}, - - - #{termId,jdbcType=INTEGER}, - - - #{presetNo,jdbcType=TINYINT}, - - - #{name,jdbcType=TINYINT}, - - - #{angleX,jdbcType=REAL}, - - - #{angleY,jdbcType=REAL}, - - - #{velocity,jdbcType=REAL}, - - - - - update terminal_presets - - - term_id = #{termId,jdbcType=INTEGER}, - - - preset_no = #{presetNo,jdbcType=TINYINT}, - - - name = #{name,jdbcType=TINYINT}, - - - angle_x = #{angleX,jdbcType=REAL}, - - - angle_y = #{angleY,jdbcType=REAL}, - - - velocity = #{velocity,jdbcType=REAL}, - - - where id = #{id,jdbcType=INTEGER} - - - update terminal_presets - set term_id = #{termId,jdbcType=INTEGER}, - preset_no = #{presetNo,jdbcType=TINYINT}, - name = #{name,jdbcType=TINYINT}, - angle_x = #{angleX,jdbcType=REAL}, - angle_y = #{angleY,jdbcType=REAL}, - velocity = #{velocity,jdbcType=REAL} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPresetsMapper.xml b/xymanager_dao/src/main/resources/mappers/TerminalPresetsMapper.xml new file mode 100644 index 0000000..80d03a5 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/TerminalPresetsMapper.xml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + + term_id, preset_no, `name`, angle_x, angle_y, velocity + + + + + + delete from terminal_presets + where term_id = #{termId,jdbcType=INTEGER} + and preset_no = #{presetNo,jdbcType=INTEGER} + + + + delete from terminal_presets + + + + + + + insert into terminal_presets (term_id, preset_no, `name`, + angle_x, angle_y, velocity) + values (#{termId,jdbcType=INTEGER}, #{presetNo,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, + #{angleX,jdbcType=REAL}, #{angleY,jdbcType=REAL}, #{velocity,jdbcType=REAL}) + + + + insert into terminal_presets + + + term_id, + + + preset_no, + + + `name`, + + + angle_x, + + + angle_y, + + + velocity, + + + + + #{termId,jdbcType=INTEGER}, + + + #{presetNo,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{angleX,jdbcType=REAL}, + + + #{angleY,jdbcType=REAL}, + + + #{velocity,jdbcType=REAL}, + + + + + + + update terminal_presets + + + term_id = #{row.termId,jdbcType=INTEGER}, + + + preset_no = #{row.presetNo,jdbcType=INTEGER}, + + + `name` = #{row.name,jdbcType=VARCHAR}, + + + angle_x = #{row.angleX,jdbcType=REAL}, + + + angle_y = #{row.angleY,jdbcType=REAL}, + + + velocity = #{row.velocity,jdbcType=REAL}, + + + + + + + + + update terminal_presets + set term_id = #{row.termId,jdbcType=INTEGER}, + preset_no = #{row.presetNo,jdbcType=INTEGER}, + `name` = #{row.name,jdbcType=VARCHAR}, + angle_x = #{row.angleX,jdbcType=REAL}, + angle_y = #{row.angleY,jdbcType=REAL}, + velocity = #{row.velocity,jdbcType=REAL} + + + + + + + update terminal_presets + + + `name` = #{name,jdbcType=VARCHAR}, + + + angle_x = #{angleX,jdbcType=REAL}, + + + angle_y = #{angleY,jdbcType=REAL}, + + + velocity = #{velocity,jdbcType=REAL}, + + + where term_id = #{termId,jdbcType=INTEGER} + and preset_no = #{presetNo,jdbcType=INTEGER} + + + + update terminal_presets + set `name` = #{name,jdbcType=VARCHAR}, + angle_x = #{angleX,jdbcType=REAL}, + angle_y = #{angleY,jdbcType=REAL}, + velocity = #{velocity,jdbcType=REAL} + where term_id = #{termId,jdbcType=INTEGER} + and preset_no = #{presetNo,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java index 54158a4..04024cd 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPresetServiceImpl.java @@ -1,15 +1,49 @@ package com.shxy.xymanager_service.impl; +import com.shxy.xymanager_common.entity.TerminalPresets; +import com.shxy.xymanager_common.entity.TerminalPresetsExample; +import com.shxy.xymanager_common.entity.TerminalPresetsKey; +import com.shxy.xymanager_dao.dao.TerminalPresetsMapper; import com.shxy.xymanager_service.service.TerminalPresetsService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** - * 杆塔信息实现层 - * + * 图像采集装置预置位 */ @Service @Slf4j public class TerminalPresetServiceImpl implements TerminalPresetsService { + @Resource + TerminalPresetsMapper mapper; + + @Override + public List list(Integer termId) { + TerminalPresetsExample example = new TerminalPresetsExample(); + TerminalPresetsExample.Criteria criteria = example.createCriteria(); + criteria.andTermIdEqualTo(termId); + return mapper.selectByExample(example); + } + + @Override + public void save(TerminalPresets item) throws Exception { + TerminalPresets record = mapper.selectByPrimaryKey(item); + if (record == null) { + mapper.insert(item); + } else { + mapper.updateByPrimaryKey(item); + } + } + + @Override + public void delete(Integer termId, Integer presetNo) throws Exception { + TerminalPresetsKey key = new TerminalPresets(); + key.setTermId(termId); + key.setPresetNo(presetNo); + mapper.deleteByPrimaryKey(key); + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPresetsService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPresetsService.java index 6bd7991..95811f6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPresetsService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPresetsService.java @@ -1,11 +1,16 @@ package com.shxy.xymanager_service.service; -/** - * 设备接口 - * - * @author 晶晶 - */ +import com.shxy.xymanager_common.entity.TerminalPresets; + +import java.util.List; + + public interface TerminalPresetsService { + List list(Integer termId); + + void save(TerminalPresets item) throws Exception; + + void delete(Integer termId, Integer presetNo) throws Exception; }