From d3e4646977c91e3013bf502677555b875f6f9489 Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Tue, 30 May 2023 10:46:25 +0800
Subject: [PATCH] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shxy/xymanager_common/entity/TerminalPhoto.java | 10 ----------
 .../model/TerminalPhotoListModel.java               | 13 -------------
 .../src/main/resources/mappers/TerminalPhotoDao.xml |  2 +-
 .../resources/mappers/TerminalResolutionDao.xml     |  2 +-
 .../impl/TerminalPhotoServiceImpl.java              |  5 -----
 5 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
index a7c817e..ca5eb95 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
@@ -38,16 +38,6 @@ public class TerminalPhoto implements Serializable {
 
     private Date createTime;
 
-    private Integer markWidth;
-
-    private Integer markHeight;
-
-    private String color;
-
-    private Short boderWidth;
-
-    private List<TermChannelCoordinateDto> lineList;
-
     private static final long serialVersionUID = 1L;
 
 }
\ No newline at end of file
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
index 3f8e601..20a949a 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
@@ -67,19 +67,6 @@ public class TerminalPhotoListModel implements Serializable {
         @ApiModelProperty(value = "拍照类型", example = "123456")
         private Integer mediaType;
 
-        @ApiModelProperty(value = "绘制宽度", example = "123456")
-        private Integer markWidth;
-
-        @ApiModelProperty(value = "绘制高度", example = "123456")
-        private Integer markHeight;
-
-        @ApiModelProperty(value = "颜色", example = "123456")
-        private String color;
-
-        private Short boderWidth;
-
-        @ApiModelProperty(value = "坐标", example = "123456")
-        private List<TermChannelCoordinateDto> list;
 
     }
 }
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index eb8514e..1bbd0bd 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -94,7 +94,7 @@
     id, term_id, channel_id,orginal_id, media_type,preset_id, width, height, file_size, photo_time, recv_time,
     path, thumb,create_time
   </sql>
-    <select id="selectPhotoList" resultMap="PhotoResultMap">
+    <select id="selectPhotoList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from terminal_photos
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml
index d6311aa..46ef553 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml
@@ -8,7 +8,7 @@
     <select id="selectAllList" resultMap="BaseResultMap">
         select
         id,name
-        from resolution and type = #{type}
+        from resolution where type = #{type}
     </select>
     <insert id="insert" parameterType="com.shxy.xymanager_common.entity.Resolution">
         insert into resolution (id, name)
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
index ea82804..36d9970 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
@@ -124,11 +124,6 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 photoBean.setPhotoTime(MyDateUtils.date(phototime.longValue()));
                 BigInteger rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue());
                 photoBean.setRecvTime(MyDateUtils.date(rectime.longValue()));
-                photoBean.setColor(item.getColor());
-                photoBean.setBoderWidth(item.getBoderWidth());
-                photoBean.setMarkHeight(item.getMarkHeight());
-                photoBean.setMarkWidth(item.getMarkWidth());
-                photoBean.setList(item.getLineList());
                 beans.add(photoBean);
             }
             model.setList(beans);