#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_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java

@@ -38,16 +38,6 @@ public class TerminalPhoto implements Serializable {
 
     private Date createTime;
 
-    private Integer markWidth;
-
-    private Integer markHeight;
-
-    private String color;
-
-    private Short boderWidth;
-
-    private List<TermChannelCoordinateDto> lineList;
-
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -67,19 +67,6 @@ public class TerminalPhotoListModel implements Serializable {
         @ApiModelProperty(value = "拍照类型", example = "123456")
         private Integer mediaType;
 
-        @ApiModelProperty(value = "绘制宽度", example = "123456")
-        private Integer markWidth;
-
-        @ApiModelProperty(value = "绘制高度", example = "123456")
-        private Integer markHeight;
-
-        @ApiModelProperty(value = "颜色", example = "123456")
-        private String color;
-
-        private Short boderWidth;
-
-        @ApiModelProperty(value = "坐标", example = "123456")
-        private List<TermChannelCoordinateDto> list;
 
     }
 }

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

@@ -94,27 +94,13 @@
     id, term_id, channel_id,orginal_id, media_type,preset_id, width, height, file_size, photo_time, recv_time,
     path, thumb,create_time
   </sql>
-    <select id="selectPhotoList" resultMap="PhotoResultMap">
+    <select id="selectPhotoList" resultMap="BaseResultMap">
         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_dao/src/main/resources/mappers/TerminalResolutionDao.xml

@@ -8,7 +8,7 @@
     <select id="selectAllList" resultMap="BaseResultMap">
         select
         id,name
-        from resolution and type = #{type}
+        from resolution where type = #{type}
     </select>
     <insert id="insert" parameterType="com.shxy.xymanager_common.entity.Resolution">
         insert into resolution (id, name)

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

@@ -124,11 +124,6 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 photoBean.setPhotoTime(MyDateUtils.date(phototime.longValue()));
                 BigInteger rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue());
                 photoBean.setRecvTime(MyDateUtils.date(rectime.longValue()));
-                photoBean.setColor(item.getColor());
-                photoBean.setBoderWidth(item.getBoderWidth());
-                photoBean.setMarkHeight(item.getMarkHeight());
-                photoBean.setMarkWidth(item.getMarkWidth());
-                photoBean.setList(item.getLineList());
                 beans.add(photoBean);
             }
             model.setList(beans);

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);