Selaa lähdekoodia

手机端增加资源,摄像头,物联网,云广播按名称检索

Wang-Xiao-Ran 1 vuosi sitten
vanhempi
commit
ee1ead3570

+ 2 - 2
src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteMonitorBaseService.java

@@ -45,7 +45,7 @@ public interface RemoteMonitorBaseService {
     public AjaxResult selectCameraByDeptId(@RequestBody VisuForestMonitorCenterVO vo);
 
     @GetMapping("/broadcast/getDlblistBydeptId")
-    public AjaxResult getDlblistBydeptId(@RequestParam("deptId") Long deptId, @RequestParam("broadcastUse") String broadcastUse, @RequestParam("type") String type);
+    public AjaxResult getDlblistBydeptId(@RequestParam("deptId") Long deptId, @RequestParam("broadcastUse") String broadcastUse, @RequestParam("type") String type, @RequestParam("name") String name);
 
     @GetMapping("device/getSensorListByDeptId")
     public AjaxResult getSensorListByDeptId(@RequestParam("deptId") Long deptId);
@@ -57,7 +57,7 @@ public interface RemoteMonitorBaseService {
     public AjaxResult findCameraByEventCoordinate(@PathVariable("longitude") String lng, @PathVariable("latitude") String lat, @PathVariable("type") String type);
 
     @GetMapping("/device/getMonitorDeviceAndDataList")
-    public AjaxResult getMonitorDeviceAndDataList(@RequestParam("deptId") String deptId, @RequestParam("deviceType") String deviceType);
+    public AjaxResult getMonitorDeviceAndDataList(@RequestParam("deptId") String deptId, @RequestParam("deviceType") String deviceType, @RequestParam("deviceName") String deviceName);
 
     @GetMapping("/DahuaController/getToken")
     String getToken();

+ 2 - 2
src/main/java/com/sooka/sponest/mobile/remoteapi/factory/RemoteMonitorBaseServiceFallbackFactory.java

@@ -62,7 +62,7 @@ public class RemoteMonitorBaseServiceFallbackFactory implements FallbackFactory<
             }
 
             @Override
-            public AjaxResult getDlblistBydeptId(Long deptId,String broadcastUse, String type) {
+            public AjaxResult getDlblistBydeptId(Long deptId,String broadcastUse, String type, String name) {
                 return null;
             }
 
@@ -82,7 +82,7 @@ public class RemoteMonitorBaseServiceFallbackFactory implements FallbackFactory<
             }
 
             @Override
-            public AjaxResult getMonitorDeviceAndDataList(String deptId, String deviceType) {
+            public AjaxResult getMonitorDeviceAndDataList(String deptId, String deviceType, String deviceName) {
                 return null;
             }
 

+ 3 - 3
src/main/java/com/sooka/sponest/mobile/system/camera/controller/AppCameraController.java

@@ -110,8 +110,8 @@ public class AppCameraController extends AppBaseController {
      * @since 2023/4/24 14:22
      */
     @GetMapping("/getDlblistBydeptId")
-    public AjaxResult getDlblistBydeptId(Long deptId, String broadcastUse) {
-        return appCameraService.getDlblistBydeptId(deptId, broadcastUse);
+    public AjaxResult getDlblistBydeptId(Long deptId, String broadcastUse, String name) {
+        return appCameraService.getDlblistBydeptId(deptId, broadcastUse, name);
     }
 
     /**
@@ -173,7 +173,7 @@ public class AppCameraController extends AppBaseController {
         boolean other = "other".equals(centermonitorTMonitoringDevice.getRequestType());//普通人员
         boolean leader = "leader".equals(centermonitorTMonitoringDevice.getRequestType());//领导页面
         if (other || (leader && !"".equals(centermonitorTMonitoringDevice.getDeviceType()))) {
-            AjaxResult monitorDeviceAndDataList = remoteMonitorBaseService.getMonitorDeviceAndDataList(centermonitorTMonitoringDevice.getDeptId(), centermonitorTMonitoringDevice.getDeviceType());
+            AjaxResult monitorDeviceAndDataList = remoteMonitorBaseService.getMonitorDeviceAndDataList(centermonitorTMonitoringDevice.getDeptId(), centermonitorTMonitoringDevice.getDeviceType(), centermonitorTMonitoringDevice.getDeviceName());
             result = (List<LinkedHashMap>) monitorDeviceAndDataList.get("data");
             for (LinkedHashMap maps : result) {
                 if (maps.containsKey("data")) {

+ 1 - 13
src/main/java/com/sooka/sponest/mobile/system/camera/domain/CentermonitorTMonitoringDevice.java

@@ -24,79 +24,66 @@ public class CentermonitorTMonitoringDevice extends BaseBusinessEntity {
     /**
      * 设备名称
      */
-    @Excel(name = "设备名称")
     private String deviceName;
 
     /**
      * 品牌
      */
-    @Excel(name = "品牌")
     private String brand;
 
     /**
      * 设备编码
      */
-    @Excel(name = "设备编码")
     private String deviceCode;
 
     /**
      * 经度
      */
-    @Excel(name = "经度")
     private String longitude;
 
     /**
      * w纬度
      */
-    @Excel(name = "w纬度")
     private String latitude;
 
     /**
      * 所属部门ID
      */
-    @Excel(name = "所属部门ID")
     private String deptId;
 
     /**
      * 所属部门
      */
-    @Excel(name = "所属部门")
     private String deptName;
 
     /**
      * 工作状态
      */
-    @Excel(name = "工作状态")
     private String workingStatus;
 
     /**
      * 设备类型
      */
-    @Excel(name = "设备类型")
     private String deviceType;
 
     /**
      * 预警阈值
      */
-    @Excel(name = "预警阈值")
     private Integer warnLine;
 
     /**
      * 负责人
      */
-    @Excel(name = "负责人")
     private String charger;
 
     /**
      * 电话
      */
-    @Excel(name = "电话")
     private String chargerTel;
 
     /**
      * 备注
      */
-    @Excel(name = "备注")
     private String remark;
 
     /**
@@ -115,4 +102,5 @@ public class CentermonitorTMonitoringDevice extends BaseBusinessEntity {
 
     private String requestType = "other";
 
+
 }

+ 2 - 0
src/main/java/com/sooka/sponest/mobile/system/camera/domain/VisuForestMonitorCenterVO.java

@@ -24,4 +24,6 @@ public class VisuForestMonitorCenterVO extends BaseBusinessEntity {
     /** 摄像头用途 */
     private String cameraUse;
 
+    private String cameraName;
+
 }

+ 1 - 1
src/main/java/com/sooka/sponest/mobile/system/camera/service/AppCameraService.java

@@ -28,7 +28,7 @@ public interface AppCameraService {
 
     public List<LinkedHashMap> selectCameraByDeptId(VisuForestMonitorCenterVO vo) ;
 
-    public AjaxResult getDlblistBydeptId(Long deptId,String broadcastUse) ;
+    public AjaxResult getDlblistBydeptId(Long deptId,String broadcastUse, String name) ;
     public AjaxResult getSensorListByDeptId(Long deptId) ;
 
     AjaxResult selectCameraByIds(Map<String, Object> info);

+ 2 - 2
src/main/java/com/sooka/sponest/mobile/system/camera/service/impl/AppCameraServiceImpl.java

@@ -86,9 +86,9 @@ public class AppCameraServiceImpl implements AppCameraService {
     }
 
     @Override
-    public AjaxResult getDlblistBydeptId(Long deptId, String broadcastUse) {
+    public AjaxResult getDlblistBydeptId(Long deptId, String broadcastUse, String name) {
         String type = "1, 2, 3, 4, 5, 6, 7, 8";
-        return remoteMonitorBaseService.getDlblistBydeptId(deptId, broadcastUse, type);
+        return remoteMonitorBaseService.getDlblistBydeptId(deptId, broadcastUse, type, name);
     }
 
     @Override