From 59e177d50dab8a054a222527a6fafda5edc12db5 Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Fri, 5 May 2023 16:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=A3=E5=BD=B1=E7=AE=A1=E7=90=86=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=A3=85=E7=BD=AE=E9=80=9A=E9=81=93=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TerminalPhotoController.java       | 15 +++++++++++++++
 .../shxy/xymanager_dao/dao/TerminalPhotoDao.java  |  2 ++
 .../main/resources/mappers/TerminalPhotoDao.xml   |  8 ++++++++
 .../impl/TerminalPhotoServiceImpl.java            |  6 ++++++
 .../shxy/xymanager_service/interaction/Cma.java   | 11 ++++++++++-
 .../service/TerminalPhotoService.java             |  9 +++++++++
 6 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
index 0e8181f..72db079 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
@@ -5,6 +5,7 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.TerminalPhoto;
 import com.shxy.xymanager_common.model.TerminalPhotoListModel;
 import com.shxy.xymanager_common.vo.TerminalAndChannelIdAndTimeVo;
 import com.shxy.xymanager_common.vo.TerminalPhotoVo;
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -71,4 +73,17 @@ public class TerminalPhotoController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "最新图片查询", notes = "图片查询接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getReturnedPhoto")
+    @Log(title = "最新图片查询", type = "查询")
+    public ResponseReult<TerminalPhoto> getReturnedPhoto(@RequestParam("termId")String termId) {
+        ServiceBody<TerminalPhoto> serviceBody = terminalPhotoService.getReturnedPhoto(termId);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
 }
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 567cee9..3468593 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
@@ -23,4 +23,6 @@ public interface TerminalPhotoDao {
     int updateByPrimaryKeySelective(TerminalPhoto record);
 
     int updateByPrimaryKey(TerminalPhoto record);
+
+    TerminalPhoto getLatestPhoto(@Param("termId")String termId);
 }
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index 5037cce..4571646 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -26,6 +26,14 @@
         where term_id = #{terminalid} and channel_id = #{channelid} and photo_time between #{starttime} and #{endtime}
     </select>
 
+    <select id="getLatestPhoto" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from terminal_photos
+        where term_id = #{termId}
+        order by create_time desc limit 1
+    </select>
+
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
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 877a7a1..3e5cd0c 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
@@ -89,4 +89,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         return  Asserts.success(hasNew);
     }
 
+    @Override
+    public ServiceBody<TerminalPhoto> getReturnedPhoto(String termId) {
+        TerminalPhoto photo = terminalPhotoDao.getLatestPhoto(termId);
+        return Asserts.success(photo);
+    }
+
 }
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java
index ecb4cb2..df6dee5 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java
@@ -3,7 +3,16 @@ package com.shxy.xymanager_service.interaction;
 public class Cma {
 
     static {
-        System.load(System.getProperty("user.dir")+"\\libs\\xympj.dll");
+        String osName = System.getProperties().getProperty("os.name");
+        if(osName.equals("Linux"))
+        {
+            System.load(System.getProperty("user.dir")+"\\libs\\xympj.so");
+        }
+        else
+        {
+            System.load(System.getProperty("user.dir")+"\\libs\\xympj.dll");
+        }
+
         initCmaEnv();
     }
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
index c47ada9..a62cf2c 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
@@ -1,6 +1,7 @@
 package com.shxy.xymanager_service.service;
 
 import com.shxy.xymanager_common.bean.ServiceBody;
+import com.shxy.xymanager_common.entity.TerminalPhoto;
 import com.shxy.xymanager_common.model.TerminalPhotoListModel;
 import com.shxy.xymanager_common.vo.TerminalAndChannelIdAndTimeVo;
 import com.shxy.xymanager_common.vo.TerminalPhotoVo;
@@ -25,4 +26,12 @@ public interface TerminalPhotoService {
      */
     ServiceBody<Boolean> getLatestPhoto(TerminalPhotoVo vo);
 
+
+    /**
+     * 根据通道和装置id获取最新图片
+     *
+     * @return
+     */
+    ServiceBody<TerminalPhoto> getReturnedPhoto(String termId);
+
 }