Просмотр исходного кода

电子信息牌接口开发 2023-03-29

donggaosheng лет назад: 2
Родитель
Сommit
d0fab0b835

+ 1 - 1
zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -409,7 +409,7 @@ public class SIPCommander implements ISIPCommander {
 				}
 			}
 			//验证1:获取码流
-			//content.append("a="+MediaStream.getMediaStreamA(dpi)+"\r\n");
+			//content.append("a="+MediaStream.getMe diaStreamA(dpi)+"\r\n");
 			content.append("y="+ssrcInfo.getSsrc()+"\r\n");//ssrc
 			//验证2:设置编码格式、分辨率、帧数、码率类型、码率大小、编码格式、码率大小
 			content.append("f="+MediaStream.getMediaStreamF(dpi)+"\r\n");

+ 18 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpDutyController.java

@@ -150,4 +150,22 @@ public class LabXxpDutyController extends BaseController
         return ResultData.result(xxpDutyService.deleteXxpDutyById(id));
     }
 
+
+    /*--------------------------------------------------------------------------------*/
+    @RequestMapping("/api/selectDutyUser")
+    @ApiOperation(value = "查询值班列表")
+    public ResultData<List<Map<String,Object>>> list(Long labId,String dateTime)
+    {
+        List<Map<String,Object>> list = xxpDutyService.selectDutyUser(labId,dateTime);
+        return ResultData.success(list);
+    }
+
+
+    @RequestMapping("/api/selectDutyUserList")
+    @ApiOperation(value = "查询值班人员列表")
+    public ResultData<List<Map<String,Object>>> selectDutyUserList(Long labId,String startTime,String endTime)
+    {
+        List<Map<String,Object>> list = xxpDutyService.selectDutyUserList(labId,startTime,endTime);
+        return ResultData.success(list);
+    }
 }

+ 1 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/XxpDutyMapper.java

@@ -3,6 +3,7 @@ package com.zd.laboratory.mapper;
 import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.vo.XxpDutyVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;

+ 2 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/IXxpDutyService.java

@@ -99,4 +99,6 @@ public interface IXxpDutyService
      */
     public List<Map<String,Object>> selectDutyUserList(Long labId,String startTime,String endTime);
 
+
+
 }

+ 1 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/XxpDutyServiceImpl.java

@@ -12,6 +12,7 @@ import com.zd.laboratory.mapper.XxpInspectionMapper;
 import com.zd.laboratory.service.IXxpDutyService;
 import com.zd.laboratory.service.IXxpInspectionService;
 import com.zd.model.entity.SysUser;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;