Explorar el Código

摄像头功能改造

fanxw hace 1 año
padre
commit
4bbf7c7704

+ 15 - 0
src/main/java/com/chinaitop/depot/basic/controller/MonitorCameraController.java

@@ -218,4 +218,19 @@ public class MonitorCameraController {
218 218
         }
219 219
         return errormsg;
220 220
     }
221
+
222
+    @RequestMapping(value="/queryAllCameraByKqdm", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
223
+	@ApiOperation(value="查询市平台的摄像头信息", notes = "")
224
+    @ApiImplicitParams({
225
+        @ApiImplicitParam(name="kqdm", value="库区国标代码", paramType="query")
226
+    })
227
+    public List<MonitorCamera> queryAllCameraByKqdm(String kqdm) {
228
+    	List<MonitorCamera> list = null;
229
+    	try {
230
+			list = cameraService.queryAllCameraByKqdm(kqdm);
231
+		} catch (Exception e) {
232
+			e.printStackTrace();
233
+		}
234
+    	return list;
235
+    }
221 236
 }

+ 7 - 0
src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.java

@@ -39,4 +39,11 @@ public interface MonitorCameraMapper {
39 39
     List<Map<String,Object>> getAgentVideo(Map<String, Object> map);
40 40
 
41 41
     List<Map<String,Object>> selectByGroupId(String groupIds);
42
+
43
+    /**
44
+     * 查询市平台的摄像头信息
45
+     * @param kqdm 库区国标代码
46
+     * @return
47
+     */
48
+	List<MonitorCamera> queryAllCameraByKqdm(String kqdm);
42 49
 }

+ 10 - 0
src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -605,4 +605,14 @@
605 605
     AND
606 606
      gc.groupid = #{groupid,jdbcType=VARCHAR}
607 607
   </select>
608
+  
609
+  <select id="queryAllCameraByKqdm" resultMap="BaseResultMap" parameterType="java.lang.String">
610
+    select 
611
+      a.jkdbm serial_number, a.jkdmc name, c.class_gov_cname live
612
+    from up:hlht_sbxx a 
613
+    left join base:d_kdxxsjy b on b.kddm=a.kqbm
614
+    left join up:sys_class_gov c on c.class_str_id=a.zzjgdm
615
+    where b.kqdm=#{kqdm,jdbcType=VARCHAR}
616
+    order by a.id
617
+  </select>
608 618
 </mapper>

+ 7 - 0
src/main/java/com/chinaitop/depot/basic/service/MonitorCameraService.java

@@ -42,4 +42,11 @@ public interface MonitorCameraService {
42 42
      * @return 
43 43
      */
44 44
 	String importData(List<List<String>> list, Integer orgId);
45
+
46
+	/**
47
+	 * 查询市平台的摄像头信息
48
+	 * @param kqdm 库区国标代码
49
+	 * @return
50
+	 */
51
+	List<MonitorCamera> queryAllCameraByKqdm(String kqdm) throws Exception;
45 52
 }

+ 5 - 0
src/main/java/com/chinaitop/depot/basic/service/impl/MonitorCameraServiceImpl.java

@@ -341,4 +341,9 @@ public class MonitorCameraServiceImpl implements MonitorCameraService {
341 341
         return msg;
342 342
 	}
343 343
 
344
+	@Override
345
+	public List<MonitorCamera> queryAllCameraByKqdm(String kqdm) throws Exception {
346
+		return cameraMapper.queryAllCameraByKqdm(kqdm);
347
+	}
348
+
344 349
 }