#20230529 欣影管理平台拍照时间表代码

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

@@ -30,7 +30,7 @@ public class TermSetController extends BaseController {
     @Autowired
     TermSetService termSetService;
 
-    @ApiOperation(value = "声光报警", notes = "装置cma控制", httpMethod = "POST")
+    @ApiOperation(value = "声光报警", notes = "声光报警", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/alarmMark")
     @Log(title = "声光报警", type = "查询")

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

@@ -96,25 +96,11 @@
   </sql>
     <select id="selectPhotoList" resultMap="PhotoResultMap">
         select
-        tp.id as id, tp.term_id as term_id, tp.channel_id as channel_id,tp.orginal_id as orginal_id,
+        <include refid="Base_Column_List"/>
-        tp.media_type as media_type,tp.preset_id as preset_id, tp.width as width, tp.height as height,
+        from terminal_photos
-        tp.file_size as file_size, tp.photo_time as photo_time, tp.recv_time as recv_time,
+        where term_id = #{terminalid} and photo_time between #{starttime} and #{endtime}
-        tp.path as path, tp.thumb as thumb,tp.create_time  as create_time,
+        <if test="channelid != null">
-        tpm.width as width,
+            and channel_id in
-        tpm.height as height,
-        tpm.color as color,
-        tpm.boder_width as boder_width,
-        tpm.id as mark_id,
-        tpmp.id as path_id,
-        tpmp.x1 as x1,
-        tpmp.x2 as x2,
-        tpmp.y1 as y1,
-        tpmp.y2 as y2
-        from terminal_photos tp left join terminal_photo_marks tpm on tp.mark_id = tpm.id
-        left join terminal_photo_mark_paths tpmp on tpmp.mark_id = tpm.id
-        where tp.term_id = #{terminalid} and photo_time between #{starttime} and #{endtime}
-        <if test="channelid != null and channelid.size>0">
-            and tp.channel_id in
             <foreach collection="channelid" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>

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

@@ -63,7 +63,7 @@ public class TerminalVideoServiceImpl implements TerminalVideoService {
     @Override
     public ServiceBody<GetModel> videoParamGet(VideoGetVo vo) {
         GetModel model = new GetModel();
-        String cmd = Constants.CMD + "videoparams --clientid=10 --flag=0 --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--channel=" + vo.getChannelId();
+        String cmd = Constants.CMD + "videoparams --clientid=10 --flag=0 --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID;
         ProcessExecUtils.exec(cmd);
         model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
         Constants.REQUEST_ID.addAndGet(1);