#20230510 欣影管理平台装置信息查询代码

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

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.id as id,
-            tpm.height as height,
+        tpm.width as width,
-            tpm.color as color,
+        tpm.height as height,
-            tpm.boder_width as boder_width,
+        tpm.color as color,
-            tpm.id as mark_id,
+        tpm.boder_width as boder_width,
-            tpmp.id as path_id,
+        tpm.id as mark_id,
-            tpmp.x1 as x1,
+        tpmp.id as path_id,
-            tpmp.x2 as x2,
+        tpmp.x1 as x1,
-            tpmp.y1 as y1,
+        tpmp.x2 as x2,
-            tpmp.y2 as y2,
+        tpmp.y1 as y1,
-            tp.path as path
+        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
+        SELECT path,term_id,channel_id
-            from terminal_photos where id =  (select max(id) from terminal_photos where media_type =0 and
+        from terminal_photos where id =  (select max(id) from terminal_photos where media_type =0 and
-            term_id =  #{termId} and channel_id = #{channelId})
+        term_id =  #{termId}  and channel_id = #{channelId})
-        )tp on tpm.term_id = tp.term_id and tpm.channel_id = tp.channel_id
+        )tp left join terminal_photo_marks tpm  on tpm.term_id = tp.term_id and tpm.channel_id = tp.channel_id
-        where tpm.term_id = #{termId} and tpm.channel_id =  #{channelId}
 
+        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,

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<>();