Commit 3b547583 authored by KeYong's avatar KeYong

修改bug

parent 1b0d9b18
......@@ -81,7 +81,7 @@ public class ControllerAop {
// 不需要添加请求头的接口
String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
"/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
"/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/common/duty-person/new-duty-detail"};
"/openapi/bizToken/applyToken","/fire-patrol-report/download","/fire-patrol-report/allPage","/jcs/common/duty-person/new-duty-detail","/equip/car/state/info"};
// 获取请求路径
for (String uri : url) {
if (request.getRequestURI().indexOf(uri) != -1) {
......
......@@ -1274,7 +1274,7 @@ public class CarController extends AbstractBaseController {
* @return
*/
@RequestMapping(value = "/state/info", method = RequestMethod.GET)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "根据车牌号查询车辆信息", notes = "根据车牌号查询车辆信息")
public ResponseModel getCarStateInfoByCarNum(@RequestParam(required = false) String carNum) {
return CommonResponseUtil.success(iCarService.getCarStateInfoByCarNum(carNum));
......
......@@ -58,10 +58,12 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
@Override
public List<AlamVideoVO> queryVideoList(String bizOrgCode) {
List<AlamVideoVO> list = supervisionVideoMapper.getVideoByCompany(bizOrgCode);
if (0 < list.size()) {
list.forEach(action -> {
action.setVedioFormat(action.getVideoType());
action.setUrl(videoService.getVideoUrl(action.getName(), action.getPresetPosition(), action.getUrl(), action.getCode()));
});
}
return list;
}
......
......@@ -12,7 +12,7 @@
wv.video_type as videoType,
wv.preset_position as presetPosition
from wl_supervision_video wsv left join wl_video wv on wsv.camera_id = wv.id
where wsv.biz_org_code like concat(#{bizOrgCode},'%');
where wsv.biz_org_code like concat(#{bizOrgCode},'%') AND wv.id IS NOT NULL;
</select>
<select id="queryVideoAllId" resultType="java.lang.String">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment