From 1aff6c8affc3a1fa57498075f0d3132c49c1378a Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Thu, 18 May 2023 16:02:20 +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

---
 .../com/shxy/xymanager_dao/dao/TerminalPhotoDao.java     | 2 +-
 .../src/main/resources/mappers/TerminalPhotoDao.xml      | 4 ++--
 .../xymanager_service/impl/TerminalPhotoServiceImpl.java | 9 +++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
index 6cc76f2..54752fd 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
+++ b/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();
 
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index eacf857..7f30041 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/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
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
index 3196269..69c216f 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
+++ b/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);
     }