From 496990423c0489c21e85d2f9551c9f63f690e4b9 Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Wed, 24 May 2023 09:59:13 +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

---
 .../xymanager_admin/XymanagerAdminApplicationTests.java   | 8 --------
 .../src/main/resources/mappers/TerminalPhotoDao.xml       | 2 +-
 .../xymanager_service/impl/TerminalPhotoServiceImpl.java  | 2 +-
 .../shxy/xymanager_service/impl/TerminalServiceImpl.java  | 3 +--
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
index d9720c3..0cf4051 100644
--- a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
+++ b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java
@@ -1,17 +1,11 @@
 package com.shxy.xymanager_admin;
 
-import com.shxy.xymanager_common.entity.TerminalSchedulesTemp;
-import com.shxy.xymanager_common.enums.CommonStatus;
-import com.shxy.xymanager_common.model.TerminalScheduleRuleTimeListModel;
-import com.shxy.xymanager_common.util.SaltUtil;
 import com.shxy.xymanager_dao.dao.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 @SpringBootTest
 class XymanagerAdminApplicationTests {
@@ -127,8 +121,6 @@ class XymanagerAdminApplicationTests {
         requestidlist.add(3);
 
 
-        List<TerminalSchedulesTemp> terminalSchedulesTemps = terminalSchedulesTempDao.updateStatusByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value(), new Date());
-        System.out.println(terminalSchedulesTemps.toArray());
 
 
     }
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index e14464e..13ca232 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -446,7 +446,7 @@
                 mark_id = #{id,jdbcType=VARCHAR},
             </if>
         </set>
-        where id = #{photoId}
+        where term_id = #{termId} and  channel_id = #{channelId}
     </update>
 
     <delete id="deleteByMarkId">
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 28b46d6..eaf2ecb 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
@@ -427,7 +427,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     @Override
     public ServiceBody<GetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
         GetModel model = new GetModel();
-        String cmd = Constants.CMD + "act=imgparams --cmdid=" + vo.getCmdId() + "\t" + "--clientid=10 --reqid=" + Constants.REQUEST_ID + "\t" + "--flag=0 --rf=7 --channel=" + vo.getChannelId();
+        String cmd = Constants.CMD + "imgparams --cmdid=" + vo.getCmdId() + "\t" + "--clientid=10 --reqid=" + Constants.REQUEST_ID + "\t" + "--flag=0 --rf=7 --channel=" + vo.getChannelId();
         ProcessExecUtils.exec(cmd);
         model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
         Constants.REQUEST_ID.addAndGet(1);
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
index 38e6d7d..238787f 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
@@ -326,7 +326,6 @@ public class TerminalServiceImpl implements TerminalService {
     @Override
     @Transactional
     public ServiceBody<String> updateCoordinate(PhotoMarkVo vo) {
-        int result = 0;
         Date date = new Date();
         vo.setCreateTime(date);
         if(null!=vo.getId()) {
@@ -337,7 +336,7 @@ public class TerminalServiceImpl implements TerminalService {
 
         }
         if(CollectionUtil.isNotEmpty(vo.getList())) {
-            result = terminalPhotoDao.addPhotoMarkPath(vo.getList(), vo.getId());
+           terminalPhotoDao.addPhotoMarkPath(vo.getList(), vo.getId());
         }
         terminalPhotoDao.updatePhotoMarkId(vo);