Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/MonitorViewController.java

@@ -94,15 +94,17 @@ public class MonitorViewController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "分页查询视图下的视频列表")
 	@RequestMapping(value = "/video/page", method = RequestMethod.GET)
-	public ResponseModel<Page<VideoListVo>> queryUncheckedVideoList(@RequestParam(value = "viewId") Long viewId,
-			@RequestParam(value = "videoName", required = false) String videoName,
-			@RequestParam(value = "videoCode", required = false) String videoCode,
-			@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) throws Exception {
+	public ResponseModel<Page<VideoListVo>> queryVideoPage(@RequestParam(value = "viewId") Long viewId,
+			@RequestParam(value = "nodeId") Long nodeId,
+			@RequestParam(value = "nodeType") String nodeType,
+			@RequestParam(value = "current") int current, 
+			@RequestParam(value = "size") int size) throws Exception {
+		
 		Page<VideoListVo> page = new Page<VideoListVo>();
 		page.setCurrent(current);
 		page.setSize(size);
 		return ResponseHelper
-				.buildResponse(monitorViewService.queryVideoPageByViewId(page, viewId, videoName, videoCode));
+				.buildResponse(monitorViewService.queryVideoPageByViewId(page, nodeId, nodeType));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MonitorViewService.java

@@ -230,8 +230,8 @@ public class MonitorViewService
 	 * @param viewId
 	 * @return
 	 */
-	public Page<VideoListVo> queryVideoPageByViewId(Page<VideoListVo> page, Long viewId,
-			String videoName, String videoCode)
+	public Page<VideoListVo> queryVideoPageByViewId(Page<VideoListVo> page, Long nodeId,
+			String nodeType)
 	{
 		//获取所有行为分析视频
 		List<VideoListVo> videoList = videoService.listByType(VideoTypeEnum.BEHAVIOURAL.getName());
@@ -240,17 +240,27 @@ public class MonitorViewService
 		{
 			videoListVoMap.put(videoListVo.getId(), videoListVo);
 		}
-		//分页获取视图下视频
-		Page<MonitorViewVideoDto> monitorViewVideoDtos = monitorViewVideoService.queryForPage(page, viewId);
-		List<MonitorViewVideoDto> monitorViewVideoDtoList = monitorViewVideoDtos.getRecords();
 		List<VideoListVo> viewVideoList = new ArrayList<>();
-		for (MonitorViewVideoDto monitorViewVideoDto : monitorViewVideoDtoList)
+		long total = 0;
+		if (nodeType.equals("video") && !ValidationUtil.isEmpty(videoListVoMap.get(nodeId)))
 		{
-			viewVideoList.add(videoListVoMap.get(monitorViewVideoDto.getVideoId()));
-		}
+			viewVideoList.add(videoListVoMap.get(nodeId));
+			total = 1;
+		}else 
+			if (nodeType.equals("view")) 
+			{
+				//分页获取视图下视频
+				Page<MonitorViewVideoDto> monitorViewVideoDtos = monitorViewVideoService.queryForPage(page, nodeId);
+				List<MonitorViewVideoDto> monitorViewVideoDtoList = monitorViewVideoDtos.getRecords();
+				for (MonitorViewVideoDto monitorViewVideoDto : monitorViewVideoDtoList)
+				{
+					viewVideoList.add(videoListVoMap.get(monitorViewVideoDto.getVideoId()));
+				}
+				total = monitorViewVideoDtos.getTotal();
+			}
 		
 		page.setRecords(viewVideoList);
-		page.setTotal(monitorViewVideoDtos.getTotal());
+		page.setTotal(total);
 		return page;
 	}
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/feign/MultipartSupportConfig.java

-package com.yeejoin.amos.patrol.feign;
-
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.request.RequestContextListener;
-
-/**
- * @Author: xinglei
- * @Description:
- * @Date: 2020/3/30 16:26
- */
-@Configuration
-public class MultipartSupportConfig {
-
-    @Autowired
-    private ObjectFactory<HttpMessageConverters> messageConverters;
-
-    @Bean
-    public Encoder feignFormEncoder() {
-        return new SpringFormEncoder(new SpringEncoder(messageConverters));
-    }
-
-    /**
-     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
-     * @return
-     */
-    @Bean
-    public RequestContextListener requestInterceptor() {
-        return new RequestContextListener();
-    }
-}
+//package com.yeejoin.amos.patrol.feign;
+//
+//import feign.codec.Encoder;
+//import feign.form.spring.SpringFormEncoder;
+//import org.springframework.beans.factory.ObjectFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+//import org.springframework.cloud.openfeign.support.SpringEncoder;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.context.request.RequestContextListener;
+//
+///**
+// * @Author: xinglei
+// * @Description:
+// * @Date: 2020/3/30 16:26
+// */
+//@Configuration
+//public class MultipartSupportConfig {
+//
+//    @Autowired
+//    private ObjectFactory<HttpMessageConverters> messageConverters;
+//
+//    @Bean
+//    public Encoder feignFormEncoder() {
+//        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+//    }
+//
+//    /**
+//     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
+//     * @return
+//     */
+//    @Bean
+//    public RequestContextListener requestInterceptor() {
+//        return new RequestContextListener();
+//    }
+//}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/feign/PushFeign.java

 package com.yeejoin.amos.patrol.feign;
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;