生成模块

huimv-admin/src/main/java/com/huimv/admin/controller/CameraFunctionAreaController.java

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.entity.CameraBase;
 import com.huimv.admin.entity.CameraFunctionArea;
+import com.huimv.admin.service.ICameraBaseService;
 import com.huimv.admin.service.ICameraFunctionAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -27,6 +30,8 @@ import java.util.Map;
 public class CameraFunctionAreaController {
     @Autowired
     private ICameraFunctionAreaService cameraFuntcionAreaService;
+    @Autowired
+    private ICameraBaseService cameraBaseService;
 
     @PostMapping("/list")
     public Result list(@RequestBody Map<String, Object> params) {
@@ -34,12 +39,22 @@ public class CameraFunctionAreaController {
     }
 
     @PostMapping("/add")
+    @Transactional
     public Result add(@RequestBody CameraFunctionArea cameraFunctionArea) {
         int brandName = cameraFuntcionAreaService.count(new QueryWrapper<CameraFunctionArea>().eq("function_name", cameraFunctionArea.getFunctionName()).eq("farm_id", cameraFunctionArea.getFarmId()));
         if (brandName > 0) {
             return new Result(100001, "区域名称重复", false);
         }
         cameraFuntcionAreaService.save(cameraFunctionArea);
+//        String camearIds = cameraFunctionArea.getCamearIds();
+//        if (StringUtils.isNotBlank(camearIds)){
+//            for (String s : camearIds.split(",")) {
+//                CameraBase cameraBase = new CameraBase();
+//                cameraBase.setId(Integer.parseInt(s));
+//                cameraBase.setFunctionId(cameraFunctionArea.getId());
+//                cameraBaseService.updateById(cameraBase);
+//            }
+//        }
         return new Result(10000, "添加成功", true);
     }
 
@@ -50,7 +65,6 @@ public class CameraFunctionAreaController {
         if (brandName > 1) {
             return new Result(100001, "区域名称重复", false);
         }
-
         return new Result(10000, "修改成功", true);
     }
 

huimv-admin/src/main/java/com/huimv/admin/entity/CameraFunctionArea.java

@@ -40,6 +40,9 @@ public class CameraFunctionArea implements Serializable {
     private Integer farmId;
 
     private String functionIds;
+    private Integer functionType;
+    private String camearIds;
+    private String parentId;
 
 
 }

huimv-admin/src/main/java/com/huimv/admin/entity/vo/TreeCameraFuntionArea.java

@@ -0,0 +1,30 @@
+package com.huimv.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TreeCameraFuntionArea {
+    private String id;
+
+    /**
+     * 区域(单元)名称
+     */
+    private String functionName;
+
+    /**
+     * 不用管
+     */
+    private String remark;
+
+    private Integer farmId;
+
+    private String functionIds;
+    private Integer functionType;
+    private String camearIds;
+    private String parentId;
+    private List<TreeCameraFuntionArea> childNode;
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/CameraBaseServiceImpl.java

@@ -52,10 +52,11 @@ public class CameraBaseServiceImpl extends ServiceImpl<CameraBaseMapper, CameraB
         Integer current = cameraListVo.getCurrent();
         String strchStr = cameraListVo.getStrchStr();
         Integer size = cameraListVo.getSize();
-        Integer areaId = cameraListVo.getAreaId();
+//        Integer areaId = cameraListVo.getAreaId();
         Integer sort = cameraListVo.getSort();
         Integer farmId = cameraListVo.getFarmId();
         Integer onLineStatus = cameraListVo.getOnLineStatus();
+        String regionUuuid = cameraListVo.getRegionUuuid();
         QueryWrapper<CameraBase> wrapper = new QueryWrapper<>();
         if (null == current ) {
             current =1;
@@ -66,11 +67,11 @@ public class CameraBaseServiceImpl extends ServiceImpl<CameraBaseMapper, CameraB
         if (farmId != null) {
             wrapper.eq("farm_id", farmId);
         }
-        if (areaId != null) {
-            wrapper.eq("area_id", areaId);
+        if (StringUtils.isNotBlank(regionUuuid)) {
+            wrapper.eq("area_id", regionUuuid);
         }
         if (onLineStatus != null) {
-            wrapper.eq("is_online", onLineStatus);
+            wrapper.eq("on_line_status", onLineStatus);
         }
         if (StringUtils.isNotBlank(strchStr)) {
             wrapper.and(i -> i.like("camera_name", strchStr));

huimv-admin/src/main/java/com/huimv/admin/service/impl/CameraFunctionAreaServiceImpl.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.CameraFunctionArea;
+import com.huimv.admin.entity.vo.TreeBasePigpen;
+import com.huimv.admin.entity.vo.TreeCameraFuntionArea;
 import com.huimv.admin.mapper.CameraFunctionAreaMapper;
 import com.huimv.admin.mapper.CameraFunctionMapper;
 import com.huimv.admin.service.ICameraFunctionAreaService;
@@ -15,8 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -36,13 +40,46 @@ public class CameraFunctionAreaServiceImpl extends ServiceImpl<CameraFunctionAre
 
     @Override
     public Result cameraList(Map<String, Object> params) {
-        Integer current = (Integer) params.get("current");
-        Integer size = (Integer) params.get("size");
         String functionaName = (String) params.get("functionaName");
         String farmId = (String) params.get("farmId");
+        QueryWrapper<CameraFunctionArea> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmId);
+        wrapper.like("function_name",functionaName);
+        List<CameraFunctionArea> list = this.list(wrapper);
+        //将结果List改为树
+        List<TreeCameraFuntionArea> treeBasePigpens = parseBizBaseArea(list);
+        return new Result(ResultCode.SUCCESS,treeBasePigpens);
+    }
 
-        IPage<CameraFunctionArea> list = page(new Page<>(current, size), new QueryWrapper<CameraFunctionArea>().like(StringUtils.isNotBlank(functionaName), "area_name", functionaName).eq("farm_id", farmId));
-        return new Result(ResultCode.SUCCESS, list);
+    private List<TreeCameraFuntionArea> parseBizBaseArea(List<CameraFunctionArea> list) {
+        //构建需要展示的树形节点结构
+        Map<String, TreeCameraFuntionArea> nodeMap = list.stream().map(cameraFunctionArea -> {
+            TreeCameraFuntionArea  baseVo = new TreeCameraFuntionArea();
+            baseVo.setId(cameraFunctionArea.getId()+"");
+            baseVo.setFarmId(cameraFunctionArea.getFarmId());
+            baseVo.setParentId(cameraFunctionArea.getParentId());
+            baseVo.setCamearIds(cameraFunctionArea.getCamearIds());
+            baseVo.setFunctionName(cameraFunctionArea.getFunctionName());
+            baseVo.setFunctionIds(cameraFunctionArea.getFunctionIds());
+            baseVo.setFunctionType(cameraFunctionArea.getFunctionType());
+            baseVo.setRemark(cameraFunctionArea.getRemark());
+            baseVo.setChildNode(new ArrayList<>());
+            return baseVo;
+        }).collect(Collectors.toMap(TreeCameraFuntionArea::getId, b -> b,(k1, k2)->k1));
+        //创建数组存父亲节点
+        ArrayList<TreeCameraFuntionArea> roots = new ArrayList<>();
+        //构建树形
+        nodeMap.values().forEach(item->{
+            String parentCode = item.getParentId()+"";
+            if (nodeMap.get(parentCode) == null){
+                //父节点为空，说明当前节点就已经是父节点了 将该节点存起来
+                roots.add(item);
+            }else {
+                //父节点 不为空，说明有父节点，拿到该节点的父节点的孩子节点（就是我自己),将该节点存起来
+                nodeMap.get(parentCode).getChildNode().add(item);
+            }
+        });
+        return roots;
     }
 
     @Override

huimv-admin/src/main/java/com/huimv/admin/timer/ShenChanTimer.java

@@ -49,10 +49,10 @@ public class ShenChanTimer {
     private static final String BASE_URL ="test.htpig.cn";
 
 
-    @Scheduled(cron = "0 0/11 * * * ? ")
-    private void getShenChan() throws Exception {
-
-    }
+//    @Scheduled(cron = "0 0/11 * * * ? ")
+//    private void getShenChan() throws Exception {
+//
+//    }
 
     private String loginOnly() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();