#20230529 欣影管理平台拍照时间表代码

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

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

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

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)

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