From 21b87aa9f53ece6673522faef9a63f73cc9d56fd Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Wed, 24 May 2023 17:49:01 +0800
Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/PhotoMarkModel.java                 | 16 ++-------
 .../shxy/xymanager_common/vo/PhotoMarkVo.java |  6 ----
 .../resources/mappers/TerminalPhotoDao.xml    | 35 +++++++++----------
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java
index d1e3162..2c6109e 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java
@@ -1,5 +1,6 @@
 package com.shxy.xymanager_common.model;
 
+import com.shxy.xymanager_common.dto.TermChannelCoordinateDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,19 +42,6 @@ public class PhotoMarkModel implements Serializable {
         private String path;
 
         @ApiModelProperty(value = "通道编号和名称", example = "213")
-        private List<CoordinateBeans> list;
-
-
-    @Data
-    public static class CoordinateBeans {
-        @ApiModelProperty(value = "线段起始坐标x", example = "213")
-        private float x1;
-        @ApiModelProperty(value = "线段结束坐标x", example = "213")
-        private float x2;
-        @ApiModelProperty(value = "线段起始坐标y", example = "213")
-        private float y1;
-        @ApiModelProperty(value = "线段结束坐标y", example = "213")
-        private float y2;
-    }
+        private List<TermChannelCoordinateDto> list;
 
 }
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java
index de5a58c..0677ce5 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java
@@ -39,10 +39,6 @@ public class PhotoMarkVo {
     @ApiModelProperty(value = "绘制编号", example = "213")
     private Integer id;
 
-    @ApiModelProperty(value = "照片编号", example = "213")
-    private Integer photoId;
-
-
     @ApiModelProperty(value = "绘制编号", example = "213")
     private Date createTime;
 
@@ -51,8 +47,6 @@ public class PhotoMarkVo {
 
     @Data
     public static class CoordinateBeans {
-        @ApiModelProperty(value = "线段ID", example = "213")
-        private Integer markId;
         @ApiModelProperty(value = "线段起始坐标x", example = "213")
         private float x1;
         @ApiModelProperty(value = "线段结束坐标x", example = "213")
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index dc703ba..7e53250 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -18,22 +18,6 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
     </resultMap>
 
-    <resultMap id="PhotoMarkMap" type="com.shxy.xymanager_common.dto.PhotoMarkDto">
-        <result column="id" jdbcType="INTEGER" property="markId"/>
-        <result column="width" jdbcType="INTEGER" property="width"/>
-        <result column="mark_id" jdbcType="INTEGER" property="markId"/>
-        <result column="height" jdbcType="INTEGER" property="height"/>
-        <result column="color" jdbcType="VARCHAR" property="color"/>
-        <result column="boder_width" jdbcType="SMALLINT" property="boderWidth"/>
-        <result column="path" jdbcType="VARCHAR" property="path"/>
-        <collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.TermChannelCoordinateDto">
-            <result column="x1" jdbcType="FLOAT" property="x1"/>
-            <result column="x2" jdbcType="FLOAT" property="x2"/>
-            <result column="y1" jdbcType="FLOAT" property="y1"/>
-            <result column="y2" jdbcType="FLOAT" property="y2"/>
-        </collection>
-    </resultMap>
-
     <resultMap id="PhotoAndLineAndChannelMap" type="com.shxy.xymanager_common.dto.PhotoAndLineAndChannelDto">
         <result column="term_id" jdbcType="INTEGER" property="termid"/>
         <result column="display_name" jdbcType="VARCHAR" property="displayname"/>
@@ -50,6 +34,22 @@
         <result column="media_type" jdbcType="VARCHAR" property="mediatype"/>
     </resultMap>
 
+    <resultMap id="PhotoMarkMap" type="com.shxy.xymanager_common.dto.PhotoMarkDto">
+        <result column="id" jdbcType="INTEGER" property="markId"/>
+        <result column="width" jdbcType="INTEGER" property="width"/>
+        <result column="mark_id" jdbcType="INTEGER" property="markId"/>
+        <result column="height" jdbcType="INTEGER" property="height"/>
+        <result column="color" jdbcType="VARCHAR" property="color"/>
+        <result column="boder_width" jdbcType="SMALLINT" property="boderWidth"/>
+        <result column="path" jdbcType="VARCHAR" property="path"/>
+        <collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.TermChannelCoordinateDto">
+            <result column="x1" jdbcType="FLOAT" property="x1"/>
+            <result column="x2" jdbcType="FLOAT" property="x2"/>
+            <result column="y1" jdbcType="FLOAT" property="y1"/>
+            <result column="y2" jdbcType="FLOAT" property="y2"/>
+        </collection>
+    </resultMap>
+
     <resultMap id="TermAndChannelLatestPhotoMap" type="com.shxy.xymanager_common.dto.TermAndChannelLatestPhotoMapperDto">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="term_id" jdbcType="INTEGER" property="termid"/>
@@ -469,7 +469,6 @@
         tpm.color as color,
         tpm.boder_width as boder_width,
         tpm.id as mark_id,
-        tpmp.id as path_id,
         tpmp.x1 as x1,
         tpmp.x2 as x2,
         tpmp.y1 as y1,
@@ -486,7 +485,6 @@
         where tp.term_id = #{termId}  and tp.channel_id =  #{channelId}
     </select>
 
-
     <select id="selectPhotoWithoutPic" resultMap="PhotoMarkMap" parameterType="com.shxy.xymanager_common.vo.MarkReqVo">
         select
         tpm.id as id,
@@ -495,7 +493,6 @@
         tpm.color as color,
         tpm.boder_width as boder_width,
         tpm.id as mark_id,
-        tpmp.id as path_id,
         tpmp.x1 as x1,
         tpmp.x2 as x2,
         tpmp.y1 as y1,