feat: 预置位相关接口

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<TerminalPresets>> list(@RequestParam(value = "termId", required = true) Integer termId) {
+        List<TerminalPresets> result = service.list(termId);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("save")
+    @ApiOperation("保存")
+    @Log(title = "保存装置预置位", type = "保存")
+    public ResponseReult<String> save(@Validated @RequestBody TerminalPresets item) throws Exception {
+        service.save(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    @Log(title = "删除装置预置位", type = "删除")
+    public ResponseReult<String> 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");
+    }
+
+}

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

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<Criteria> 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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andTermIdIsNull() {
+            addCriterion("term_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNotNull() {
+            addCriterion("term_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdEqualTo(Integer value) {
+            addCriterion("term_id =", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotEqualTo(Integer value) {
+            addCriterion("term_id <>", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThan(Integer value) {
+            addCriterion("term_id >", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("term_id >=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThan(Integer value) {
+            addCriterion("term_id <", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+            addCriterion("term_id <=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIn(List<Integer> values) {
+            addCriterion("term_id in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotIn(List<Integer> values) {
+            addCriterion("term_id not in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdBetween(Integer value1, Integer value2) {
+            addCriterion("term_id between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("term_id not between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria 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<Integer> values) {
+            addCriterion("preset_no in", values, "presetNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPresetNoNotIn(List<Integer> 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<String> values) {
+            addCriterion("`name` in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> 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<Float> values) {
+            addCriterion("angle_x in", values, "angleX");
+            return (Criteria) this;
+        }
+
+        public Criteria andAngleXNotIn(List<Float> 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<Float> values) {
+            addCriterion("angle_y in", values, "angleY");
+            return (Criteria) this;
+        }
+
+        public Criteria andAngleYNotIn(List<Float> 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<Float> values) {
+            addCriterion("velocity in", values, "velocity");
+            return (Criteria) this;
+        }
+
+        public Criteria andVelocityNotIn(List<Float> 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);
+        }
+    }
+}

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

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPresetsDao.java

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

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

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

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.shxy.xymanager_dao.dao.TerminalPresetsDao">
-  <resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalPresets">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="term_id" jdbcType="INTEGER" property="termId" />
-    <result column="preset_no" jdbcType="TINYINT" property="presetNo" />
-    <result column="name" jdbcType="TINYINT" property="name" />
-    <result column="angle_x" jdbcType="REAL" property="angleX" />
-    <result column="angle_y" jdbcType="REAL" property="angleY" />
-    <result column="velocity" jdbcType="REAL" property="velocity" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, term_id, preset_no, name, angle_x, angle_y, velocity
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from terminal_presets
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from terminal_presets
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
-    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>
-  <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
-    insert into terminal_presets
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="termId != null">
-        term_id,
-      </if>
-      <if test="presetNo != null">
-        preset_no,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="angleX != null">
-        angle_x,
-      </if>
-      <if test="angleY != null">
-        angle_y,
-      </if>
-      <if test="velocity != null">
-        velocity,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="termId != null">
-        #{termId,jdbcType=INTEGER},
-      </if>
-      <if test="presetNo != null">
-        #{presetNo,jdbcType=TINYINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=TINYINT},
-      </if>
-      <if test="angleX != null">
-        #{angleX,jdbcType=REAL},
-      </if>
-      <if test="angleY != null">
-        #{angleY,jdbcType=REAL},
-      </if>
-      <if test="velocity != null">
-        #{velocity,jdbcType=REAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
-    update terminal_presets
-    <set>
-      <if test="termId != null">
-        term_id = #{termId,jdbcType=INTEGER},
-      </if>
-      <if test="presetNo != null">
-        preset_no = #{presetNo,jdbcType=TINYINT},
-      </if>
-      <if test="name != null">
-        name = #{name,jdbcType=TINYINT},
-      </if>
-      <if test="angleX != null">
-        angle_x = #{angleX,jdbcType=REAL},
-      </if>
-      <if test="angleY != null">
-        angle_y = #{angleY,jdbcType=REAL},
-      </if>
-      <if test="velocity != null">
-        velocity = #{velocity,jdbcType=REAL},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
-    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}
-  </update>
-</mapper>

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

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.shxy.xymanager_dao.dao.TerminalPresetsMapper">
+  <resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalPresets">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="term_id" jdbcType="INTEGER" property="termId" />
+    <id column="preset_no" jdbcType="INTEGER" property="presetNo" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="angle_x" jdbcType="REAL" property="angleX" />
+    <result column="angle_y" jdbcType="REAL" property="angleY" />
+    <result column="velocity" jdbcType="REAL" property="velocity" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    term_id, preset_no, `name`, angle_x, angle_y, velocity
+  </sql>
+  <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPresetsExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from terminal_presets
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalPresetsKey" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from terminal_presets
+    where term_id = #{termId,jdbcType=INTEGER}
+      and preset_no = #{presetNo,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalPresetsKey">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from terminal_presets
+    where term_id = #{termId,jdbcType=INTEGER}
+      and preset_no = #{presetNo,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPresetsExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from terminal_presets
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    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>
+  <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into terminal_presets
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="termId != null">
+        term_id,
+      </if>
+      <if test="presetNo != null">
+        preset_no,
+      </if>
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="angleX != null">
+        angle_x,
+      </if>
+      <if test="angleY != null">
+        angle_y,
+      </if>
+      <if test="velocity != null">
+        velocity,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="termId != null">
+        #{termId,jdbcType=INTEGER},
+      </if>
+      <if test="presetNo != null">
+        #{presetNo,jdbcType=INTEGER},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="angleX != null">
+        #{angleX,jdbcType=REAL},
+      </if>
+      <if test="angleY != null">
+        #{angleY,jdbcType=REAL},
+      </if>
+      <if test="velocity != null">
+        #{velocity,jdbcType=REAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPresetsExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from terminal_presets
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update terminal_presets
+    <set>
+      <if test="row.termId != null">
+        term_id = #{row.termId,jdbcType=INTEGER},
+      </if>
+      <if test="row.presetNo != null">
+        preset_no = #{row.presetNo,jdbcType=INTEGER},
+      </if>
+      <if test="row.name != null">
+        `name` = #{row.name,jdbcType=VARCHAR},
+      </if>
+      <if test="row.angleX != null">
+        angle_x = #{row.angleX,jdbcType=REAL},
+      </if>
+      <if test="row.angleY != null">
+        angle_y = #{row.angleY,jdbcType=REAL},
+      </if>
+      <if test="row.velocity != null">
+        velocity = #{row.velocity,jdbcType=REAL},
+      </if>
+    </set>
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    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}
+    <if test="example != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update terminal_presets
+    <set>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="angleX != null">
+        angle_x = #{angleX,jdbcType=REAL},
+      </if>
+      <if test="angleY != null">
+        angle_y = #{angleY,jdbcType=REAL},
+      </if>
+      <if test="velocity != null">
+        velocity = #{velocity,jdbcType=REAL},
+      </if>
+    </set>
+    where term_id = #{termId,jdbcType=INTEGER}
+      and preset_no = #{presetNo,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalPresets">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    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}
+  </update>
+</mapper>

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

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<TerminalPresets> list(Integer termId);
+
+    void save(TerminalPresets item) throws Exception;
+
+    void delete(Integer termId, Integer presetNo) throws Exception;
 }