From b4aff2d8fb211378446bc652f640f7e4b00cd252 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Mon, 15 May 2023 10:26:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=86=E9=A2=91=E7=BC=A9?=
 =?UTF-8?q?=E7=95=A5=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/TerminalPhoto.java                 |  2 +
 .../model/TerminalPhotoListModel.java         |  3 +
 .../resources/mappers/TerminalPhotoDao.xml    |  3 +-
 .../impl/TerminalPhotoServiceImpl.java        | 62 ++++++++++---------
 4 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
index 081811b..c80342c 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
+++ b/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;
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
index b007b21..cef0ec3 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
+++ b/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;
 
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index 9f0603c..3d17d6b 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/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
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 cebf6c9..e0ce174 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
@@ -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());
@@ -363,8 +364,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     public ServiceBody<String> getPhotoTime(TerminalPhotoTimeVo vo) {
         List<TerminalPhotoScheduleDto> dtoList = terminalPhotoDao.selectPhotoSchedule(vo);
 
-       for(int j = 0; j<dtoList.size();j++){
-           TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
+        for (int j = 0; j < dtoList.size(); j++) {
+            TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
             Short span = dtoList.get(j).getSpan();
             Date startTime = dtoList.get(j).getStartTime();
             Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
@@ -375,26 +376,27 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
             Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
             Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
 
-           Short span1 =-1;
-           Short span2 =-1;
-            if(span/60 > 0) {
-                span1 =(short)(span/60);
-                span2 =(short)(span % 60);
-            }else if(span<60 ){
-                span1 = (short)0;
+            Short span1 = -1;
+            Short span2 = -1;
+            if (span / 60 > 0) {
+                span1 = (short) (span / 60);
+                span2 = (short) (span % 60);
+            } else if (span < 60) {
+                span1 = (short) 0;
                 span2 = span;
             }
-           String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid="+ dtoList.get(j).getCmid() +"\t"+"--channel="+ vo.getChannel() +"\t"
-                   + "--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);
-        };
+            String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid=" + dtoList.get(j).getCmid() + "\t" + "--channel=" + vo.getChannel() + "\t"
+                    + "--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("修改成功");
     }
 
     @Override
     public ServiceBody<String> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
-        String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+vo.getCmdId() +"\t" +"--clientid=10 --reqid="+Constants.REQUEST_ID+"--flag=1 --rf=7 --channel="  + vo.getChannelId();
+        String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid=" + vo.getCmdId() + "\t" + "--clientid=10 --reqid=" + Constants.REQUEST_ID + "--flag=1 --rf=7 --channel=" + vo.getChannelId();
         ProcessExecUtils.exec(cmd);
      /*   TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
         PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(termId);
@@ -406,10 +408,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 
     @Override
     public ServiceBody<Integer> addOrUpdatePhotoParams(PhotoParamsVo vo) {
-        Integer result =  terminalPhotoDao.updateOrInsertParams(vo);
-        if (result>0) {
+        Integer result = terminalPhotoDao.updateOrInsertParams(vo);
+        if (result > 0) {
             String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --clientid=10 --cmdid=" + vo.getCmdId() + "\t" + "--color=" + vo.getColor() + "\t" + "--resolution=" + vo.getResolution() + "\t"
-                    + "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation()+ "\t" + "--reqid=" + Constants.REQUEST_ID+ "\t" + "--channel=" + vo.getChannelId();
+                    + "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--channel=" + vo.getChannelId();
             ProcessExecUtils.exec(cmd);
             return Asserts.success(Constants.REQUEST_ID.addAndGet(1));
         }
@@ -421,12 +423,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     public ServiceBody<TerminalPhotosParamsModel> getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo) {
         String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
         TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
-        if(StringUtils.isNotBlank(result)) {
+        if (StringUtils.isNotBlank(result)) {
             JSONObject resultObj = JSONObject.parseObject(result);
             model = JSONObject.parseObject(resultObj.get("groupData").toString(), TerminalPhotosParamsModel.class);
-        }else{
-            PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(vo);
-            if(dto!=null) {
+        } else {
+            PhotoParamsDto dto = terminalPhotoDao.selectPhotoParams(vo);
+            if (dto != null) {
                 BeanUtils.copyProperties(dto, model);
             }
         }
@@ -437,15 +439,15 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     public ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo) {
         String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
         TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
-        if(StringUtils.isNotBlank(result)){
-            JSONObject resultObj =JSONObject.parseObject(result);
+        if (StringUtils.isNotBlank(result)) {
+            JSONObject resultObj = JSONObject.parseObject(result);
             List<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class);
             List<String> resultList = Lists.newArrayList();
-            String startTimeStr =  resultDtoList.get(0).getHour()+":"+resultDtoList.get(0).getMinute()+":00";
-            String endTimeStr =  resultDtoList.get(1).getHour()+":"+resultDtoList.get(1).getMinute()+":00";
+            String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00";
+            String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00";
             Date startTime = DateUtil.parseTime(startTimeStr);
             Date endTime = DateUtil.parseTime(endTimeStr);
-            Integer span =  resultDtoList.get(2).getHour()*60+resultDtoList.get(2).getMinute();
+            Integer span = resultDtoList.get(2).getHour() * 60 + resultDtoList.get(2).getMinute();
             List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
             for (DateTime data : dateTimes) {
                 String dateTime = DateUtil.formatTime(data);
@@ -453,9 +455,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
             }
             model.setList(resultList);
             model.setIsNew(true);
-        }else {
+        } else {
             TerminalAndChannelIdVo idVo = new TerminalAndChannelIdVo();
-            BeanUtils.copyProperties(vo,idVo);
+            BeanUtils.copyProperties(vo, idVo);
             ServiceBody<TerminalScheduleRuleTimeListModel> listModel = terminalScheduleRuleService.getChannelSchelduleRule(idVo);
             model = listModel.getData();
         }
@@ -464,7 +466,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 
     @Override
     public ServiceBody<Integer> selectPhotoTimeGet(TerminalReqPhotoTimeVo vo) {
-        String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=alarmMark --cmdid="+vo.getCmdId()+ "\t" + "--reqid="+Constants.REQUEST_ID+ "\t"+ "--clientid=10--flag=1 --rf=7";
+        String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=alarmMark --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--clientid=10--flag=1 --rf=7";
         ProcessExecUtils.exec(cmd);
         return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString()));
     }