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

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java

@@ -32,7 +32,7 @@ public interface TerminalPhotoDao {
 
     int updateByPrimaryKey(TerminalPhoto record);
 
-    BigInteger getLatestPhoto(@Param("termId") Integer termId);
+    TerminalPhoto getLatestPhoto(@Param("termId") Integer termId);
 
     List<PhotoAndLineAndChannelDto> selectPhotos();
 

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

@@ -117,9 +117,9 @@
         GROUP BY term_id , channel_id
     </select>
 
-    <select id="getLatestPhoto" resultType="java.math.BigInteger">
+    <select id="getLatestPhoto" resultMap="BaseResultMap">
         select
-        recv_time photoTime
+        <include refid="Base_Column_List"/>
         from terminal_photos
         where term_id = #{termId}
         order by recv_time desc limit 1

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

@@ -296,9 +296,14 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     @Override
     public ServiceBody<Boolean> getReturnedPhoto(ReturnedPhotoVo vo) {
         Boolean hasNew = false;
-        BigInteger photoTime = terminalPhotoDao.getLatestPhoto(vo.getTermId());
+        TerminalPhoto photo = terminalPhotoDao.getLatestPhoto(vo.getTermId());
         BigInteger localPhotoTime = MyDateUtils.TimeMillSecond2Second(vo.getPhotoTime());
-        hasNew = photoTime.compareTo(localPhotoTime) < 0 ? false : true;
+        hasNew = photo.getRecvTime().compareTo(localPhotoTime) < 0 ? false : true;
+        if(hasNew){
+            if(!StringUtils.isNotBlank(photo.getThumb())){
+                hasNew=false;
+            }
+        }
         return Asserts.success(hasNew);
     }