Merge remote-tracking branch 'origin/master'

# Conflicts:
#	xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java

@@ -32,6 +32,8 @@ public class TerminalPhoto implements Serializable {
 
     private String path;
 
+    private String thumb;
+
     private Date createTime;
 
     private static final long serialVersionUID = 1L;

xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java

@@ -57,6 +57,9 @@ public class TerminalPhotoListModel implements Serializable {
         @ApiModelProperty(value = "照片路径", example = "123456")
         private String path;
 
+        @ApiModelProperty(value = "视频缩略图", example = "123456")
+        private String thumb;
+
         @ApiModelProperty(value = "拍照方式", example = "123456")
         private Integer manualRequest;
 

xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml

@@ -14,6 +14,7 @@
         <result column="photo_time" jdbcType="BIGINT" property="photoTime"/>
         <result column="recv_time" jdbcType="BIGINT" property="recvTime"/>
         <result column="path" jdbcType="VARCHAR" property="path"/>
+        <result column="thumb" jdbcType="VARCHAR" property="thumb"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
     </resultMap>
 
@@ -34,7 +35,7 @@
     </resultMap>
     <sql id="Base_Column_List">
     id, term_id, channel_id,orginal_id, media_type,preset_id, width, height, file_size, photo_time, recv_time,
-    path, create_time
+    path, thumb,create_time
   </sql>
     <select id="selectPhotoList" resultMap="BaseResultMap">
         select

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -117,6 +117,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                     photoBean.setPath(photoaddress + item.getPath());
                 } else {
                     photoBean.setPath(videoaddress + item.getPath());
+                    photoBean.setThumb(videoaddress + item.getThumb());
                 }
                 photoBean.setId(item.getId());
                 photoBean.setTermId(item.getTermId());
@@ -388,7 +389,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                     + "--group=3 --hour1=" + startHour + "\t" + "--min1=" + startMin + "\t" + "--preset1=255 --hour2=" + endTimeHour + "\t" + "--min2=" + endTimeMin + "\t"
                     + "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255";
             ProcessExecUtils.exec(cmd);
-        };
+        }
+        ;
         return Asserts.success("修改成功");
     }