perf:优化装置查询附带额外信息的查询方法

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java

@@ -10,7 +10,7 @@ import com.shxy.xymanager_common.exception.ApiException;
 import com.shxy.xymanager_common.model.*;
 import com.shxy.xymanager_common.util.EasyExcelUtil;
 import com.shxy.xymanager_common.vo.TerminalSelectVo;
-import com.shxy.xymanager_dao.dao.TerminalPositionsDao;
+import com.shxy.xymanager_dao.dao.TerminalPositionsMapper;
 import com.shxy.xymanager_dao.dao.TerminalStatusDao;
 import com.shxy.xymanager_service.service.*;
 import io.swagger.annotations.Api;
@@ -44,7 +44,7 @@ public class TerminalExtController extends BaseController {
     @Resource
     TerminalStatusDao terminalStatusDao;
     @Resource
-    TerminalPositionsDao terminalPositionsDao;
+    TerminalPositionsMapper terminalPositionsMapper;
     @Resource
     TerminalBasicInfoHistoryService infoHistoryService;
     @Resource
@@ -147,7 +147,9 @@ public class TerminalExtController extends BaseController {
         log.info("getTerminalList cost=" + cost);
         if (!CollectionUtils.isEmpty(result.getList())) {
             cost = System.currentTimeMillis();
+            List<Integer> terminalIds = new ArrayList<>();
             for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                terminalIds.add(terminal.getId());
                 if (dataFlag.contains("G")) {
                     TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId())
                             .getData();
@@ -157,14 +159,6 @@ public class TerminalExtController extends BaseController {
                     PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end);
                     terminal.setPhotoInfo(photoInfo);
                 }
-                if (dataFlag.contains("S")) {
-                    TerminalStatus status = terminalStatusDao.selectByPrimaryKey(terminal.getId());
-                    terminal.setWorkingStatus(status);
-                }
-                if (dataFlag.contains("O")) {
-                    TerminalPositions positions = terminalPositionsDao.selectByPrimaryKey(terminal.getId());
-                    terminal.setPositions(positions);
-                }
                 if (dataFlag.contains("C")) {
                     long rebootCount = infoHistoryService.count(terminal.getId(), start, end);
                     terminal.setRebootCount(rebootCount);
@@ -174,6 +168,35 @@ public class TerminalExtController extends BaseController {
                     terminal.setLastInfo(info);
                 }
             }
+
+            if (dataFlag.contains("S")) {
+                TerminalStatusExample example = new TerminalStatusExample();
+                TerminalStatusExample.Criteria criteria = example.createCriteria();
+                criteria.andTermIdIn(terminalIds);
+                List<TerminalStatus> terminalStatuses = terminalStatusDao.selectByExample(example);
+                for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                    for (TerminalStatus terminalStatus : terminalStatuses) {
+                        if (terminal.getId() == terminalStatus.getTermId()) {
+                            terminal.setWorkingStatus(terminalStatus);
+                        }
+                    }
+                }
+            }
+
+            if (dataFlag.contains("O")) {
+                TerminalPositionsExample example = new TerminalPositionsExample();
+                TerminalPositionsExample.Criteria criteria = example.createCriteria();
+                criteria.andTermIdIn(terminalIds);
+                List<TerminalPositions> terminalPositions = terminalPositionsMapper.selectByExample(example);
+                for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                    for (TerminalPositions terminalPosition : terminalPositions) {
+                        if (terminal.getId() == terminalPosition.getTermId()) {
+                            terminal.setPositions(terminalPosition);
+                        }
+                    }
+                }
+            }
+
             cost = System.currentTimeMillis() - cost;
             log.info("listWithAll cost=" + cost);
         }

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPositions.java

@@ -1,10 +1,7 @@
 package com.shxy.xymanager_common.entity;
 
-import lombok.Data;
-
 import java.io.Serializable;
 
-@Data
 public class TerminalPositions implements Serializable {
     private Integer termId;
 
@@ -20,4 +17,51 @@ public class TerminalPositions implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public Integer getTermId() {
+        return termId;
+    }
+
+    public void setTermId(Integer termId) {
+        this.termId = termId;
+    }
+
+    public Byte getCoordinateType() {
+        return coordinateType;
+    }
+
+    public void setCoordinateType(Byte coordinateType) {
+        this.coordinateType = coordinateType;
+    }
+
+    public Integer getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Integer radius) {
+        this.radius = radius;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Long getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Long updateTime) {
+        this.updateTime = updateTime;
+    }
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPositionsExample.java

@@ -0,0 +1,560 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TerminalPositionsExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TerminalPositionsExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        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 andCoordinateTypeIsNull() {
+            addCriterion("coordinate_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeIsNotNull() {
+            addCriterion("coordinate_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeEqualTo(Byte value) {
+            addCriterion("coordinate_type =", value, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeNotEqualTo(Byte value) {
+            addCriterion("coordinate_type <>", value, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeGreaterThan(Byte value) {
+            addCriterion("coordinate_type >", value, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("coordinate_type >=", value, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeLessThan(Byte value) {
+            addCriterion("coordinate_type <", value, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("coordinate_type <=", value, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeIn(List<Byte> values) {
+            addCriterion("coordinate_type in", values, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeNotIn(List<Byte> values) {
+            addCriterion("coordinate_type not in", values, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeBetween(Byte value1, Byte value2) {
+            addCriterion("coordinate_type between", value1, value2, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoordinateTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("coordinate_type not between", value1, value2, "coordinateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusIsNull() {
+            addCriterion("radius is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusIsNotNull() {
+            addCriterion("radius is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusEqualTo(Integer value) {
+            addCriterion("radius =", value, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusNotEqualTo(Integer value) {
+            addCriterion("radius <>", value, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusGreaterThan(Integer value) {
+            addCriterion("radius >", value, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("radius >=", value, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusLessThan(Integer value) {
+            addCriterion("radius <", value, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusLessThanOrEqualTo(Integer value) {
+            addCriterion("radius <=", value, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusIn(List<Integer> values) {
+            addCriterion("radius in", values, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusNotIn(List<Integer> values) {
+            addCriterion("radius not in", values, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusBetween(Integer value1, Integer value2) {
+            addCriterion("radius between", value1, value2, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andRadiusNotBetween(Integer value1, Integer value2) {
+            addCriterion("radius not between", value1, value2, "radius");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeIsNull() {
+            addCriterion("latitude is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeIsNotNull() {
+            addCriterion("latitude is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeEqualTo(Double value) {
+            addCriterion("latitude =", value, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeNotEqualTo(Double value) {
+            addCriterion("latitude <>", value, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeGreaterThan(Double value) {
+            addCriterion("latitude >", value, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeGreaterThanOrEqualTo(Double value) {
+            addCriterion("latitude >=", value, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeLessThan(Double value) {
+            addCriterion("latitude <", value, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeLessThanOrEqualTo(Double value) {
+            addCriterion("latitude <=", value, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeIn(List<Double> values) {
+            addCriterion("latitude in", values, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeNotIn(List<Double> values) {
+            addCriterion("latitude not in", values, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeBetween(Double value1, Double value2) {
+            addCriterion("latitude between", value1, value2, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLatitudeNotBetween(Double value1, Double value2) {
+            addCriterion("latitude not between", value1, value2, "latitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeIsNull() {
+            addCriterion("longitude is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeIsNotNull() {
+            addCriterion("longitude is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeEqualTo(Double value) {
+            addCriterion("longitude =", value, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeNotEqualTo(Double value) {
+            addCriterion("longitude <>", value, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeGreaterThan(Double value) {
+            addCriterion("longitude >", value, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeGreaterThanOrEqualTo(Double value) {
+            addCriterion("longitude >=", value, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeLessThan(Double value) {
+            addCriterion("longitude <", value, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeLessThanOrEqualTo(Double value) {
+            addCriterion("longitude <=", value, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeIn(List<Double> values) {
+            addCriterion("longitude in", values, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeNotIn(List<Double> values) {
+            addCriterion("longitude not in", values, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeBetween(Double value1, Double value2) {
+            addCriterion("longitude between", value1, value2, "longitude");
+            return (Criteria) this;
+        }
+
+        public Criteria andLongitudeNotBetween(Double value1, Double value2) {
+            addCriterion("longitude not between", value1, value2, "longitude");
+            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(Long value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Long value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Long value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Long value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Long value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Long> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Long> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Long value1, Long value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Long value1, Long 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);
+        }
+    }
+}

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

@@ -1,9 +0,0 @@
-package com.shxy.xymanager_dao.dao;
-
-import com.shxy.xymanager_common.entity.TerminalPositions;
-
-import java.math.BigInteger;
-
-public interface TerminalPositionsDao {
-    TerminalPositions selectByPrimaryKey(Integer termId);
-}

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

@@ -0,0 +1,30 @@
+package com.shxy.xymanager_dao.dao;
+
+import com.shxy.xymanager_common.entity.TerminalPositions;
+import com.shxy.xymanager_common.entity.TerminalPositionsExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TerminalPositionsMapper {
+    long countByExample(TerminalPositionsExample example);
+
+    int deleteByExample(TerminalPositionsExample example);
+
+    int deleteByPrimaryKey(Integer termId);
+
+    int insert(TerminalPositions record);
+
+    int insertSelective(TerminalPositions record);
+
+    List<TerminalPositions> selectByExample(TerminalPositionsExample example);
+
+    TerminalPositions selectByPrimaryKey(Integer termId);
+
+    int updateByExampleSelective(@Param("record") TerminalPositions record, @Param("example") TerminalPositionsExample example);
+
+    int updateByExample(@Param("record") TerminalPositions record, @Param("example") TerminalPositionsExample example);
+
+    int updateByPrimaryKeySelective(TerminalPositions record);
+
+    int updateByPrimaryKey(TerminalPositions record);
+}

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

@@ -1,22 +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.TerminalPositionsDao">
-    <resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalPositions">
-        <id column="term_id" jdbcType="INTEGER" property="termId"/>
-        <result column="coordinate_type" jdbcType="TINYINT" property="coordinateType"/>
-        <result column="radius" jdbcType="INTEGER" property="radius"/>
-        <result column="latitude" jdbcType="DOUBLE" property="latitude"/>
-        <result column="longitude" jdbcType="DOUBLE" property="longitude"/>
-        <result column="update_time" jdbcType="BIGINT" property="updateTime"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-    term_id, coordinate_type, radius, latitude, longitude, update_time
-  </sql>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from terminal_positions
-        where term_id = #{termId,jdbcType=INTEGER}
-    </select>
-
-</mapper>

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

@@ -0,0 +1,228 @@
+<?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.TerminalPositionsMapper">
+  <resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalPositions">
+    <id column="term_id" jdbcType="INTEGER" property="termId" />
+    <result column="coordinate_type" jdbcType="TINYINT" property="coordinateType" />
+    <result column="radius" jdbcType="INTEGER" property="radius" />
+    <result column="latitude" jdbcType="DOUBLE" property="latitude" />
+    <result column="longitude" jdbcType="DOUBLE" property="longitude" />
+    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <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">
+    <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">
+    term_id, coordinate_type, radius, latitude, longitude, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPositionsExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from terminal_positions
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from terminal_positions
+    where term_id = #{termId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from terminal_positions
+    where term_id = #{termId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPositionsExample">
+    delete from terminal_positions
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalPositions">
+    insert into terminal_positions (term_id, coordinate_type, radius, 
+      latitude, longitude, update_time
+      )
+    values (#{termId,jdbcType=INTEGER}, #{coordinateType,jdbcType=TINYINT}, #{radius,jdbcType=INTEGER}, 
+      #{latitude,jdbcType=DOUBLE}, #{longitude,jdbcType=DOUBLE}, #{updateTime,jdbcType=BIGINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalPositions">
+    insert into terminal_positions
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="termId != null">
+        term_id,
+      </if>
+      <if test="coordinateType != null">
+        coordinate_type,
+      </if>
+      <if test="radius != null">
+        radius,
+      </if>
+      <if test="latitude != null">
+        latitude,
+      </if>
+      <if test="longitude != null">
+        longitude,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="termId != null">
+        #{termId,jdbcType=INTEGER},
+      </if>
+      <if test="coordinateType != null">
+        #{coordinateType,jdbcType=TINYINT},
+      </if>
+      <if test="radius != null">
+        #{radius,jdbcType=INTEGER},
+      </if>
+      <if test="latitude != null">
+        #{latitude,jdbcType=DOUBLE},
+      </if>
+      <if test="longitude != null">
+        #{longitude,jdbcType=DOUBLE},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalPositionsExample" resultType="java.lang.Long">
+    select count(*) from terminal_positions
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update terminal_positions
+    <set>
+      <if test="record.termId != null">
+        term_id = #{record.termId,jdbcType=INTEGER},
+      </if>
+      <if test="record.coordinateType != null">
+        coordinate_type = #{record.coordinateType,jdbcType=TINYINT},
+      </if>
+      <if test="record.radius != null">
+        radius = #{record.radius,jdbcType=INTEGER},
+      </if>
+      <if test="record.latitude != null">
+        latitude = #{record.latitude,jdbcType=DOUBLE},
+      </if>
+      <if test="record.longitude != null">
+        longitude = #{record.longitude,jdbcType=DOUBLE},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update terminal_positions
+    set term_id = #{record.termId,jdbcType=INTEGER},
+      coordinate_type = #{record.coordinateType,jdbcType=TINYINT},
+      radius = #{record.radius,jdbcType=INTEGER},
+      latitude = #{record.latitude,jdbcType=DOUBLE},
+      longitude = #{record.longitude,jdbcType=DOUBLE},
+      update_time = #{record.updateTime,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalPositions">
+    update terminal_positions
+    <set>
+      <if test="coordinateType != null">
+        coordinate_type = #{coordinateType,jdbcType=TINYINT},
+      </if>
+      <if test="radius != null">
+        radius = #{radius,jdbcType=INTEGER},
+      </if>
+      <if test="latitude != null">
+        latitude = #{latitude,jdbcType=DOUBLE},
+      </if>
+      <if test="longitude != null">
+        longitude = #{longitude,jdbcType=DOUBLE},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=BIGINT},
+      </if>
+    </set>
+    where term_id = #{termId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalPositions">
+    update terminal_positions
+    set coordinate_type = #{coordinateType,jdbcType=TINYINT},
+      radius = #{radius,jdbcType=INTEGER},
+      latitude = #{latitude,jdbcType=DOUBLE},
+      longitude = #{longitude,jdbcType=DOUBLE},
+      update_time = #{updateTime,jdbcType=BIGINT}
+    where term_id = #{termId,jdbcType=INTEGER}
+  </update>
+</mapper>

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java

@@ -13,7 +13,7 @@ import com.shxy.xymanager_common.util.MyDateUtils;
 import com.shxy.xymanager_common.util.xinyin.ProcessExecUtils;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_dao.dao.TerminalPhotoDao;
-import com.shxy.xymanager_dao.dao.TerminalPositionsDao;
+import com.shxy.xymanager_dao.dao.TerminalPositionsMapper;
 import com.shxy.xymanager_service.service.TerminalGpsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +33,7 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
 
 
     @Autowired
-    private TerminalPositionsDao terminalPositionsDao;
+    private TerminalPositionsMapper terminalPositionsMapper;
 
     @Autowired
     TerminalPhotoDao terminalPhotoDao;
@@ -72,7 +72,7 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
 //        boolean b = cma.requestGpsInfo(vo.getTermid().toString());
 
         DateTime now = DateTime.now();
-        TerminalPositions bean = terminalPositionsDao.selectByPrimaryKey(vo.getTermid());
+        TerminalPositions bean = terminalPositionsMapper.selectByPrimaryKey(vo.getTermid());
         Boolean hasNew = false;
         if (!BeanUtil.isEmpty(bean)) {
             model.setRadius(bean.getRadius());
@@ -105,7 +105,7 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
     @Override
     public ServiceBody<TerminalGpsModel> getTermLastGPSPosition(Integer termid) {
         TerminalGpsModel model = new TerminalGpsModel();
-        TerminalPositions bean = terminalPositionsDao.selectByPrimaryKey(termid);
+        TerminalPositions bean = terminalPositionsMapper.selectByPrimaryKey(termid);
         if (BeanUtil.isEmpty(bean)) {
             model.setTermid(termid);
             model.setLatitude(0);