Merge branch 'master' of https://gitee.com/xinyingpower/xymanagerbackend

Conflicts: xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
2 years ago · 4d6191ec3c
parent c681ebbb5c df73f959d4
commit 4d6191ec3c
8 changed files with 153 additions and 29 deletions
--- 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
@ -61,6 +61,20 @@ public class TerminalPhotoController extends BaseController {
        }
    }

+    @ApiOperation(value = "拍照时间表", notes = "图片查询接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getPhotoTime")
+    @Log(title = "拍照时间表", type = "查询")
+    public ResponseReult<Boolean> getPhotoTime(@RequestBody @Validated TerminalPhotoTimeVo vo) {
+        ServiceBody<Boolean> serviceBody = terminalPhotoService.getPhotoTime(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+
    @ApiOperation(value = "图片查询", notes = "图片查询接口", httpMethod = "POST")
    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
    @RequestMapping("/getPhotoList")
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalPhotoScheduleDto.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalPhotoScheduleDto.java
@ -0,0 +1,22 @@
+package com.shxy.xymanager_common.dto;
+
+import cn.hutool.core.date.DateTime;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class TerminalPhotoScheduleDto implements Serializable {
+    private String cmid;
+
+    private Short span;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private static final long serialVersionUID = 1L;
+
+}
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
@ -128,6 +128,16 @@ public class MyDateUtils extends DateUtil {
        return format(str, "MM/dd");
    }

+    /**
+     * 日期型转化为"HH/MM" 格式
+     */
+    public static String parseHourAndMinute(Date str) {
+        if (str == null) {
+            return null;
+        }
+        return format(str, "HH/mm");
+    }
+
    /**
     * 获取服务器启动时间
     */
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeVo.java
@ -0,0 +1,22 @@
+package com.shxy.xymanager_common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "拍照时间表请求参数", description = "拍照时间表请求参数")
+public class TerminalPhotoTimeVo {
+
+    @NotNull(message = "通道号")
+    @ApiModelProperty(value = "通道号", example = "123455")
+    private Short channel;
+
+    @NotNull(message = "装置ID不能缺少")
+    @ApiModelProperty(value = "装置ID", example = "123455")
+    private Short termId;
+
+
+}
--- 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
@ -1,6 +1,8 @@
 package com.shxy.xymanager_dao.dao;

+import com.shxy.xymanager_common.dto.TerminalPhotoScheduleDto;
 import com.shxy.xymanager_common.entity.TerminalPhoto;
+import com.shxy.xymanager_common.vo.TerminalPhotoTimeVo;
 import org.apache.ibatis.annotations.Param;

 import javax.xml.crypto.Data;
@ -29,4 +31,8 @@ public interface TerminalPhotoDao {
    List<TerminalPhoto> selectPhotos();

    List<TerminalPhoto> selectPhotoListForOpen(@Param("termId") Integer terminalid,@Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
+
+
+    List<TerminalPhotoScheduleDto> selectPhotoSchedule(TerminalPhotoTimeVo vo);
+
 }
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@ -57,6 +57,18 @@
        order by photo_time desc
    </select>

+    <select id="selectPhotoSchedule" resultType="com.shxy.xymanager_common.dto.TerminalPhotoScheduleDto">
+        select
+        t.cmdid cmid,
+        tscr.start_time startTime,
+        end_time endTime,
+        span
+        from terminal_schedule_mapper  tm left join terminal_schedule_rule tscr on tm.schedule_id = tscr.schedule_id
+        left join terminals t on tm.term_id=t.id
+        where tm.term_id = #{termId} and tm.channel_id = #{channel}
+    </select>
+
+

    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
        select
--- 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
@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.ServiceBody;
+import com.shxy.xymanager_common.dto.TerminalPhotoScheduleDto;
 import com.shxy.xymanager_common.entity.TerminalPhoto;
 import com.shxy.xymanager_common.entity.Terminals;
 import com.shxy.xymanager_common.enums.CommonStatus;
@ -15,6 +16,7 @@ import com.shxy.xymanager_common.model.TerminalPhotoSelectListModel;
 import com.shxy.xymanager_common.model.TerminalPhotosModel;
 import com.shxy.xymanager_common.page.PageUtils;
 import com.shxy.xymanager_common.util.MyDateUtils;
+import com.shxy.xymanager_common.util.ProcessExecUtils;
 import com.shxy.xymanager_common.util.StringUtils;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_dao.dao.TerminalPhotoDao;
@ -22,6 +24,7 @@ import com.shxy.xymanager_dao.dao.TerminalsDao;
 import com.shxy.xymanager_service.interaction.Cma;
 import com.shxy.xymanager_service.service.TerminalPhotoService;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.expression.StringValue;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@ -32,9 +35,8 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;

 /**
 * 装置图片实现层
@ -222,33 +224,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
    @Override
    public ServiceBody<Boolean> getLatestPhoto(TerminalPhotoVo vo) {
        /*  Cma cma = new Cma(server, port);*/
-
-        String line = "";
-        StringBuffer sb = new StringBuffer();
-        String result = "";
        Boolean hasNew = false;
-        try {
        String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=capture --cmdid="+vo.getCmdid() +"\t" +"--channel="+ vo.getChannel() +"\t"+ "--preset=255 --type=0";
-            Process ps = Runtime.getRuntime().exec(cmd);
-            log.info("传入cmd信息:{}", cmd);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(ps.getInputStream()));
-            int sendToCode = ps.waitFor();
-            log.info("进程返回结果:{}", sendToCode);
-            while ((line = reader.readLine()) != null) {
-                sb.append(line).append("\n");
-            }
-            result = sb.toString();
-            if (StringUtils.isNotBlank(result)) {
-                log.info("查询最新图片结果:{}", result);
-                hasNew = true;
-            }
-
-        } catch (IOException e) {
-            log.error("IOException", e);
-        } catch (InterruptedException e) {
-            log.error("InterruptedException", e);
-        }
-
+        Integer result = ProcessExecUtils.exec(cmd);
+        hasNew = result == 0?true:false;
        /*   Boolean hasNew = cma.requestCapture(vo.getCmdid(), vo.getChannel(), vo.getPreset(), vo.getCaptureType());*/
        return Asserts.success(hasNew);
    }
@ -308,4 +287,56 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
        return Asserts.success(model);
    }

+    @Override
+    public ServiceBody<Boolean> getPhotoTime(TerminalPhotoTimeVo vo) {
+        List<TerminalPhotoScheduleDto> dtoList = terminalPhotoDao.selectPhotoSchedule(vo);
+        Map<String,List<TerminalPhotoScheduleDto>> map =dtoList.stream().collect(Collectors.groupingBy(TerminalPhotoScheduleDto :: getCmid)) ;
+        map.forEach((key,value) ->{
+            Short[] timeList = new Short[255];
+            int i = 0 ;
+           for(int j = 0; j<value.size();j++){
+                Short span = value.get(j).getSpan();
+                Date startTime = value.get(j).getStartTime();
+                Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
+                Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
+
+                timeList[i]= startHour;
+                i++;
+                timeList[i]= startMin;
+                i++;
+                timeList[i]= 255;
+                Date endTime = value.get(j).getStartTime();
+                Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
+                Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
+               i++;
+                timeList[i]= endTimeHour;
+               i++;
+                timeList[i]= endTimeMin;
+               i++;
+                timeList[i]= 255;
+
+                String spanStr;
+                if(span/60 > 0) {
+                    i++;
+                    timeList[i]= (short)(span/60);
+                    i++;
+                    timeList[i]= (short)(span % 60);
+                }else if(span<60 ){
+                    i++;
+                    timeList[i]= (short)0;
+                    i++;
+                    timeList[i]= span ;
+
+                }
+               i++;
+                timeList[i]= 255 ;
+
+            };
+            String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=updateSchedule[0xCA] --cmdid="+key +"\t" +"--channel="+ vo.getChannel() +"\t"+ "--scheduleData="+timeList;
+            ProcessExecUtils.exec(cmd);
+        });
+
+        return Asserts.success(true);
+    }
+
 }
--- 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
@ -57,4 +57,11 @@ public interface TerminalPhotoService {
     */
    ServiceBody<TerminalPhotosModel> getPhotoBanner(PageVo vo);

+    /**
+     * 拍照时间表
+     *
+     * @return
+     */
+    ServiceBody<Boolean> getPhotoTime(TerminalPhotoTimeVo vo);
+
 }