Merge remote-tracking branch 'origin/master'

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysCameraAreaController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.SysCamera;
 import com.huimv.guowei.admin.entity.SysCameraArea;
 import com.huimv.guowei.admin.service.ISysCameraAreaService;
@@ -72,6 +73,15 @@ public class SysCameraAreaController {
         return new Result(10000, "修改成功", true);
     }
 
+    @PostMapping("/updateStatus")
+    public Result updateStatus(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        SysCameraArea sysCameraArea = cameraAreaService.getById(id);
+        sysCameraArea.setRunStatus(Math.abs(1-sysCameraArea.getRunStatus()));
+        cameraAreaService.updateById(sysCameraArea);
+        return new Result(10000, "修改成功", true);
+    }
+
     @GetMapping("/remove")
     public Result remove(@RequestParam(value = "ids") List<Integer> ids, @RequestParam(value = "farmId") String farmId) {
 
@@ -82,11 +92,25 @@ public class SysCameraAreaController {
 
     @GetMapping("/lsitAndCamera")
     public Result lsitAndCamera(@RequestParam(value = "farmId") Integer farmId) {
-
         return cameraAreaService.lsitAndCamera(farmId);
 
     }
 
+    @PostMapping("/listCameraByArea")
+    public Result listCameraByArea(@RequestBody Map<String, String> paramsMap) {
+        String areaId = paramsMap.get("areaId");
+        List<SysCamera> list = cameraService.list(new QueryWrapper<SysCamera>().lambda().eq(SysCamera::getAreaId, areaId).eq(SysCamera::getRunStatus, 1).orderByAsc(SysCamera::getSort));
+        return new Result(ResultCode.SUCCESS,list);
+
+    }
+
+    @GetMapping("/listScreenCamera")
+    public Result listScreenCamera(@RequestParam(value = "farmId") Integer farmId) {
+        return cameraAreaService.listScreenCamera(farmId);
+
+    }
+
+
     @GetMapping("/getUrl")
     public void getUrl(HttpServletRequest request, @RequestParam(value = "farmId") Integer farmId) {
         String ipAddr = IpUtil.getIpAddr(request);

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/SysCameraController.java

@@ -5,6 +5,7 @@ import com.huimv.guowei.admin.common.token.TokenSign;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.SysCamera;
+import com.huimv.guowei.admin.entity.SysCameraArea;
 import com.huimv.guowei.admin.entity.vo.CameraListVo;
 import com.huimv.guowei.admin.entity.vo.CameraListsVo;
 import com.huimv.guowei.admin.service.ISysCameraService;
@@ -51,6 +52,15 @@ public class SysCameraController {
 
     }
 
+    @PostMapping("/updateStatus")
+    public Result updateStatus(@RequestBody Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        SysCamera sysCamera = cameraService.getById(id);
+        sysCamera.setRunStatus(Math.abs(1-sysCamera.getRunStatus()));
+        cameraService.updateById(sysCamera);
+        return new Result(10000, "修改成功", true);
+    }
+
     @GetMapping("/remove")
     public Result remove(@RequestParam(value = "ids") List<Integer> ids) {
         cameraService.removeByIds(ids);

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/SysCamera.java

@@ -75,7 +75,7 @@ public class SysCamera implements Serializable {
     /**
      * 1正常   0停用
      */
-    private Boolean runStatus;
+    private Integer runStatus;
 
     private Integer sort;
 

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/SysCameraArea.java

@@ -32,6 +32,10 @@ public class SysCameraArea implements Serializable {
      */
     private String areaName;
 
+    private Integer sort;
+
+    private Integer runStatus;
+
     /**
      * 不用管
      */

huimv-admin/src/main/java/com/huimv/guowei/admin/service/ISysCameraAreaService.java

@@ -23,6 +23,8 @@ public interface ISysCameraAreaService extends IService<SysCameraArea> {
     Result removeIds(List<Integer> ids,String farmId);
 
     Result lsitAndCamera(Integer farmId);
+
+    Result listScreenCamera(Integer farmId);
 /*
     void sync(Map<String, Integer> params,List<UnitDto1> list);
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/SysCameraAreaServiceImpl.java

@@ -48,7 +48,7 @@ public class SysCameraAreaServiceImpl extends ServiceImpl<SysCameraAreaMapper, S
         String areaName = (String) params.get("areaName");
         String  farmId = (String) params.get("farmId");
 
-        IPage<SysCameraArea> list = page(new Page<>(current, size), new QueryWrapper<SysCameraArea>().like(StringUtils.isNotBlank(areaName), "area_name", areaName).eq("farm_id", farmId));
+        IPage<SysCameraArea> list = page(new Page<>(current, size), new QueryWrapper<SysCameraArea>().like(StringUtils.isNotBlank(areaName), "area_name", areaName).eq("farm_id", farmId).orderByAsc("sort"));
         return new Result(ResultCode.SUCCESS, list);
     }
 
@@ -70,17 +70,30 @@ public class SysCameraAreaServiceImpl extends ServiceImpl<SysCameraAreaMapper, S
     public Result lsitAndCamera(Integer farmId) {
         List endList = new ArrayList();
 
-        List<SysCameraArea> cameraAreaList = this.list(new QueryWrapper<SysCameraArea>().eq("farm_id", farmId));
+        List<SysCameraArea> cameraAreaList = this.list(new QueryWrapper<SysCameraArea>().eq("farm_id", farmId).orderByAsc("sort"));
 
         for (SysCameraArea cameraArea : cameraAreaList) {
             Map map = new HashMap();
             map.put("cameraName", cameraArea.getAreaName());
             map.put("id", cameraArea.getId());
-            map.put("cameraList", cameraMapper.selectList(new QueryWrapper<SysCamera>().eq("area_id", cameraArea.getId())));
+            map.put("cameraList", cameraMapper.selectList(new QueryWrapper<SysCamera>().eq("area_id", cameraArea.getId()).orderByAsc("sort")));
             endList.add(map);
         }
+        return new Result(ResultCode.SUCCESS, endList);
+    }
 
+    @Override
+    public Result listScreenCamera(Integer farmId) {
+        List endList = new ArrayList();
+        List<SysCameraArea> cameraAreaList = this.list(new QueryWrapper<SysCameraArea>().eq("farm_id", farmId).eq("run_status",1).orderByAsc("sort"));
 
+        for (SysCameraArea cameraArea : cameraAreaList) {
+            Map map = new HashMap();
+            map.put("cameraName", cameraArea.getAreaName());
+            map.put("id", cameraArea.getId());
+            map.put("cameraList", cameraMapper.selectList(new QueryWrapper<SysCamera>().eq("area_id", cameraArea.getId()).eq("run_status",1).orderByAsc("sort")));
+            endList.add(map);
+        }
         return new Result(ResultCode.SUCCESS, endList);
     }
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/SysCameraServiceImpl.java

@@ -216,7 +216,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
 
 
         SysCamera camera = this.getById(cameraId);
-        if (!camera.getRunStatus()) {
+        if (camera.getRunStatus() == 0) {
             return new Result(10001, "该摄像头已经被禁用", false);
         }