From ce490f51c6be0095b1e8b6f39595ad4ac2618ebf Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Wed, 24 May 2023 16:26:06 +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

---
 .../xymanager_common/dto/PhotoMarkDto.java    |  4 +-
 .../resources/mappers/TerminalPhotoDao.xml    | 40 ++++++++++---------
 .../impl/TerminalScheduleRuleServiceImpl.java |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java
index 69dfe42..9794262 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java
@@ -7,7 +7,7 @@ import java.util.List;
 @Data
 public class PhotoMarkDto {
 
-    private Integer id;
+    private Integer markId;
 
     private Integer termId;
 
@@ -23,6 +23,6 @@ public class PhotoMarkDto {
 
     private Short boderWidth;
 
-    private List<TermChannelCoordinateDto> lineList;
+    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 8f494fb..dc703ba 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -19,13 +19,14 @@
     </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.TerminalChannelsDto">
+        <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"/>
@@ -462,32 +463,33 @@
 
     <select id="selectPhotoMark" resultMap="PhotoMarkMap" parameterType="com.shxy.xymanager_common.vo.MarkReqVo">
         select
-            tpm.width as width,
-            tpm.height as height,
-            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,
-            tpmp.y2 as y2,
-            tp.path as path
+        tpm.id as id,
+        tpm.width as width,
+        tpm.height as height,
+        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,
+        tpmp.y2 as y2,
+        tp.path as path
         from
-        terminal_photo_marks tpm left join terminal_photo_mark_paths  tpmp on tpmp.mark_id = tpm.id
-        left join
         (
-            SELECT path,term_id,channel_id
-            from terminal_photos where id =  (select max(id) from terminal_photos where media_type =0 and
-            term_id =  #{termId} and channel_id = #{channelId})
-        )tp on tpm.term_id = tp.term_id and tpm.channel_id = tp.channel_id
-        where tpm.term_id = #{termId} and tpm.channel_id =  #{channelId}
+        SELECT path,term_id,channel_id
+        from terminal_photos where id =  (select max(id) from terminal_photos where media_type =0 and
+        term_id =  #{termId}  and channel_id = #{channelId})
+        )tp left join terminal_photo_marks tpm  on tpm.term_id = tp.term_id and tpm.channel_id = tp.channel_id
 
+        left join terminal_photo_mark_paths  tpmp on tpmp.mark_id = tpm.id
+        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,
         tpm.width as width,
         tpm.height as height,
         tpm.color as color,
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
index 8edbb40..e9e9b4c 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
@@ -276,7 +276,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
             String string = "--hour" + indexOri + "=" + startHour + "\t" + "--min" + indexOri + "=" + startMin + "\t" + "--preset" + indexOri + "=255 --hour=" + (indexAdd) + "=" + endTimeHour + "\t" + "--min" + (indexAdd) + "=" + endTimeMin + "\t"
                     + "--preset" + (indexAdd) + "=255 --hour" + indexAddT + "=" + span1 + "\t" + "--min" + indexAddT + "=" + span2 + "\t" + "--preset" + indexAddT + "=255";
             timestr.append(string);
-            index++;
+            index = indexAddT+1;
         }
 
         ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();