#20230506 欣影管理平台拍照功能代码

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java

@@ -6,6 +6,7 @@ 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.model.TerminalListModel;
+import com.shxy.xymanager_common.model.TerminalModel;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_service.service.TerminalService;
 import io.swagger.annotations.Api;
@@ -91,6 +92,19 @@ public class TerminalController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "获取装置信息", notes = "获取装置信息接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTerminalInfo")
+    @Log(title = "获取装置信息", type = "修改")
+    public ResponseReult<TerminalModel> getTerminalInfo(@RequestParam("termId") Integer termId) {
+        ServiceBody<TerminalModel> serviceBody = terminalService.getTerminalInfo(termId);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
 
 
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
 
 
 @Api(value = "图片接口", tags = "图片接口相关")
@@ -52,8 +53,8 @@ public class TerminalPhotoController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getLatestPhoto")
     @Log(title = "获取最新图片", type = "查询")
-    public ResponseReult<Boolean> getLatestPhoto(@RequestBody @Validated TerminalPhotoVo vo) {
+    public ResponseReult<Date> getLatestPhoto(@RequestBody @Validated TerminalPhotoVo vo) {
-        ServiceBody<Boolean> serviceBody = terminalPhotoService.getLatestPhoto(vo);
+        ServiceBody<Date> serviceBody = terminalPhotoService.getLatestPhoto(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -105,8 +106,8 @@ public class TerminalPhotoController extends BaseController {
     @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) {
+    public ResponseReult<Boolean> getReturnedPhoto(@RequestBody @Validated ReturnedPhotoVo vo) {
-        ServiceBody<TerminalPhoto> serviceBody = terminalPhotoService.getReturnedPhoto(termId);
+        ServiceBody<Boolean> serviceBody = terminalPhotoService.getReturnedPhoto(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalInfoDto.java

@@ -0,0 +1,29 @@
+package com.shxy.xymanager_common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TerminalInfoDto implements Serializable {
+    private Integer termId;
+
+    private Integer batteryCapacity;
+
+    private Integer batteryVoltage;
+
+    private Integer workingTime;
+
+    private Integer floatingCharge;
+
+    private Integer totalWorkingTime;
+
+    private Integer connectionState;
+
+    private Integer wsUpdateTime;
+
+    private String cmId;
+
+    private static final long serialVersionUID = 1L;
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java

@@ -0,0 +1,42 @@
+package com.shxy.xymanager_common.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 设备信息列表
+ */
+@Data
+@ApiModel(value = "获取设备状态信息", description = "获取设备状态信息")
+public class TerminalModel implements Serializable {
+
+    @ApiModelProperty(value = "装置编号", example = "123456")
+    private Integer termId;
+
+    @ApiModelProperty(value = "电池电量", example = "123456")
+    private Integer batteryCapacity;
+
+    @ApiModelProperty(value = "电池电压", example = "123456")
+    private Integer batteryVoltage;
+
+    @ApiModelProperty(value = "本次连续工作时间（小时）", example = "12345678")
+    private Integer workingTime;
+
+    @ApiModelProperty(value = "浮充状态：充电  放电", example = "12345678")
+    private Integer floatingCharge;
+
+    @ApiModelProperty(value = "工作总时间（小时）", example = "名称名称")
+    private Integer totalWorkingTime;
+
+    @ApiModelProperty(value = "网络连接状态 ", example = "名称名称")
+    private Integer connectionState;
+
+    @ApiModelProperty(value = "cmId", example = "123456")
+    private String cmId;
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/util/ProcessExecUtils.java

@@ -35,6 +35,7 @@ public class ProcessExecUtils
             while ((line = reader.readLine()) != null) {
                 sb.append(line).append("\n");
             }
+            result = sb.toString();
             if(StringUtils.isNotBlank(result)){
                 log.info("查询最新结果:{}",result);
             }

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoVo.java

@@ -0,0 +1,21 @@
+package com.shxy.xymanager_common.vo;
+
+import cn.hutool.core.date.DateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "返回图片查询", description = "返回图片查询")
+public class ReturnedPhotoVo {
+    @NotNull(message = "不能传入空值")
+    @ApiModelProperty(value = "装置id", required = true, example = "A0001")
+    private Integer termId;
+
+
+    @ApiModelProperty(value = "手动拍照时间", required = true, example = "A0001")
+    private DateTime photoTime;
+}

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java

@@ -27,7 +27,7 @@ public interface TerminalPhotoDao {
 
     int updateByPrimaryKey(TerminalPhoto record);
 
-    TerminalPhoto getLatestPhoto(@Param("termId") String termId);
+    BigInteger getLatestPhoto(@Param("termId") Integer termId);
 
     List<PhotoAndLineAndChannelDto> selectPhotos();
 

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java

@@ -1,5 +1,6 @@
 package com.shxy.xymanager_dao.dao;
 
+import com.shxy.xymanager_common.dto.TerminalInfoDto;
 import com.shxy.xymanager_common.entity.Terminals;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,6 @@ public interface TerminalsDao {
 
     int updateByPrimaryKey(Terminals record);
 
+    TerminalInfoDto getTerminalInfo(@Param("termId")Integer termId);
+
 }

xymanager_dao/src/main/resources/mappers/SystemConfigDao.xml

@@ -5,12 +5,12 @@
 
 
 
-  <insert id="getTerminalParams" parameterType="java.lang.String">
+  <select id="getTerminalParams" parameterType="java.lang.String">
     select
     param_name as paramValue
     from global_param
     where param_name = #{key,jdbcType=VARCHAR}
-  </insert>
+  </select>
 
   <select id="getGlobalTime" parameterType="java.lang.String">
     select

xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml

@@ -78,9 +78,9 @@
         order by photo_time desc
     </select>
 
-    <select id="getLatestPhoto" resultMap="BaseResultMap">
+    <select id="getLatestPhoto" resultType="java.math.BigInteger">
         select
-        <include refid="Base_Column_List"/>
+            photo_time photoTime
         from terminal_photos
         where term_id = #{termId}
         order by create_time desc limit 1

xymanager_dao/src/main/resources/mappers/TerminalsDao.xml

@@ -333,4 +333,12 @@
       update_time = #{updateat}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+    <select id="getTerminalInfo" resultType="com.shxy.xymanager_common.dto.TerminalInfoDto">
+        select
+        ts.term_id termId, ts.battery_voltage batteryVoltage, ts.battery_capacity batteryCapacity, ts.floating_charge floatingCharge, ts.total_working_time totalWorkingTime,
+        ts.working_time workingTime, ts.connection_state connectionState, ts.ws_update_time wsUpdateTime,t.cmdid cmId
+        from terminal_status ts left join terminals t on ts.term_id = t.id
+        where ts.termId = #{termId,jdbcType=INTEGER}
+    </select>
 </mapper>

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -247,20 +247,22 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     }
 
     @Override
-    public ServiceBody<Boolean> getLatestPhoto(TerminalPhotoVo vo) {
+    public ServiceBody<Date> getLatestPhoto(TerminalPhotoVo vo) {
         /*  Cma cma = new Cma(server, port);*/
-        Boolean hasNew = false;
+        DateTime now = DateTime.now();
-        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";
+        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";
-        Integer result = ProcessExecUtils.exec(cmd);
+        ProcessExecUtils.exec(cmd);
-        hasNew = result == 0 ? true : false;
         /*   Boolean hasNew = cma.requestCapture(vo.getCmdid(), vo.getChannel(), vo.getPreset(), vo.getCaptureType());*/
-        return Asserts.success(hasNew);
+        return Asserts.success(now);
     }
 
     @Override
-    public ServiceBody<TerminalPhoto> getReturnedPhoto(String termId) {
+    public ServiceBody<Boolean> getReturnedPhoto(ReturnedPhotoVo vo) {
-        TerminalPhoto photo = terminalPhotoDao.getLatestPhoto(termId);
+        Boolean hasNew = false;
-        return Asserts.success(photo);
+        BigInteger photoTime = terminalPhotoDao.getLatestPhoto(vo.getTermId());
+        BigInteger localPhotoTime = MyDateUtils.TimeMillSecond2Second(vo.getPhotoTime());
+        hasNew = photoTime.compareTo(localPhotoTime)<0?false:true;
+        return Asserts.success(hasNew);
     }
 
     /**
@@ -317,10 +319,10 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     @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<String,List<TerminalPhotoScheduleDto>> map =dtoList.stream().collect(Collectors.groupingBy(TerminalPhotoScheduleDto :: getCmid)) ;
-        map.forEach((key, value) -> {
+        map.forEach((key,value) ->{
 
-            for (int j = 0; j < value.size(); j++) {
+           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]);
@@ -331,24 +333,21 @@ 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;
-                String spanStr;
+               Short span2 =-1;
-                Short span1 = -1;
+                if(span/60 > 0) {
-                Short span2 = -1;
+                    span1 =(short)(span/60);
-                if (span / 60 > 0) {
+                    span2 =(short)(span % 60);
-                    span1 = (short) (span / 60);
+                }else if(span<60 ){
-                    span2 = (short) (span % 60);
+                    span1 = (short)0;
-                } 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=" + key + "\t" + "--channel=" + vo.getChannel() + "\t"
+               String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid="+key +"\t" +"--channel="+ vo.getChannel() +"\t"
-                        + "--group=3 --hour1=" + startHour + "\t" + "--min1=" + startMin + "\t" + "--preset1=255 --hour2=" + endTimeHour + "\t" + "--min2=" + endTimeMin + "\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";
+                       +"--preset2=255 --hour3=" + span1 +"\t" + "--min3=" + span2 +"\t"+"--preset3=255";
                ProcessExecUtils.exec(cmd);
 
-            }
+            };
-            ;
 
         });
 

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -5,12 +5,14 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.ServiceBody;
+import com.shxy.xymanager_common.dto.TerminalInfoDto;
 import com.shxy.xymanager_common.entity.TerminalChannelMapper;
 import com.shxy.xymanager_common.entity.TerminalStatus;
 import com.shxy.xymanager_common.entity.Terminals;
 import com.shxy.xymanager_common.enums.CommonStatus;
 import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.model.TerminalListModel;
+import com.shxy.xymanager_common.model.TerminalModel;
 import com.shxy.xymanager_common.page.PageUtils;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_dao.dao.TerminalChannelMapperDao;
@@ -20,6 +22,7 @@ import com.shxy.xymanager_dao.dao.TerminalsDao;
 import com.shxy.xymanager_service.interaction.Cma;
 import com.shxy.xymanager_service.service.TerminalService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -178,6 +181,16 @@ public class TerminalServiceImpl implements TerminalService {
 //        }
     }
 
+    @Override
+    public ServiceBody<TerminalModel> getTerminalInfo(Integer termId) {
+        TerminalModel model = new TerminalModel();
+        TerminalInfoDto dto = terminalsDao.getTerminalInfo(termId);
+        if(null!=dto) {
+            BeanUtils.copyProperties(dto, model);
+        }
+        return Asserts.success(model);
+    }
+
 
 }
 

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java

@@ -8,6 +8,8 @@ import com.shxy.xymanager_common.model.TerminalPhotoSelectListModel;
 import com.shxy.xymanager_common.model.TerminalPhotosModel;
 import com.shxy.xymanager_common.vo.*;
 
+import java.util.Date;
+
 /**
  * 装置图片接口
  *
@@ -40,15 +42,15 @@ public interface TerminalPhotoService {
      *
      * @return
      */
-    ServiceBody<Boolean> getLatestPhoto(TerminalPhotoVo vo);
+    ServiceBody<Date> getLatestPhoto(TerminalPhotoVo vo);
 
 
     /**
-     * 根据通道和装置id获取最新图片
+     * 获取最新图片
      *
      * @return
      */
-    ServiceBody<TerminalPhoto> getReturnedPhoto(String termId);
+    ServiceBody<Boolean> getReturnedPhoto(ReturnedPhotoVo vo);
 
     /**
      * 图片轮询接口

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java

@@ -2,6 +2,7 @@ package com.shxy.xymanager_service.service;
 
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.model.TerminalListModel;
+import com.shxy.xymanager_common.model.TerminalModel;
 import com.shxy.xymanager_common.vo.*;
 
 /**
@@ -48,4 +49,7 @@ public interface TerminalService {
      */
     ServiceBody<String> resetTerminal(TerminalIdVo vo);
 
+
+    ServiceBody<TerminalModel> getTerminalInfo(Integer termId);
+
 }