场站

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/EquipmentmodelController.java

@@ -1,20 +1,19 @@
 package com.gyee.backconfig.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Equipmentmodel;
 import com.gyee.backconfig.model.auto.Manufacturer;
 import com.gyee.backconfig.service.auto.IEquipmentmodelService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 
-/**
+/** 设备型号
  * <p>
  *  前端控制器
  * </p>
@@ -51,4 +50,53 @@ public class EquipmentmodelController {
         }
     }
 
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/manufacturer/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<Equipmentmodel> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        Equipmentmodel Square = equipmentmodelService.getOne(qw);
+        if (StringUtils.isNotNull(Square)) {
+            return R.ok().data(Square);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 批量插入
+     *
+     * @param equipmentmodel
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody Equipmentmodel equipmentmodel) {
+        boolean b = equipmentmodelService.saveOrUpdate(equipmentmodel);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-manufacturer/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = equipmentmodelService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/JunctionboxController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.Arrays;
 
-/**
+/**汇流箱
  * <p>
  *  前端控制器
  * </p>

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/ManufacturerController.java

@@ -49,6 +49,12 @@ public class ManufacturerController {
             return R.error().data("查询失败！");
         }
     }
+
+    /**
+     * 根据id查询
+     * @param id
+     * @return
+     */
     @GetMapping(value = "/meterpoint/{id}")
     public R findOne(@PathVariable("id") String id) {
         QueryWrapper<Manufacturer> qw = new QueryWrapper<>();

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Companys.java

@@ -70,6 +70,6 @@ public class Companys extends Model {
 
     @TableField(exist = false)
     private List<Region> Children = new ArrayList<>();
-    @TableField(exist = false)
-    private List<Windpowerstation> Children1 = new ArrayList<>();
+//    @TableField(exist = false)
+//    private List<Windpowerstation> Children1 = new ArrayList<>();
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Windpowerstation.java

@@ -67,7 +67,7 @@ public class Windpowerstation extends Model {
 
     @TableField(exist = false)
     private List<Project> Children = new ArrayList<>();
-
-    @TableField(exist = false)
-    private List<Project> Children1= new ArrayList<>();
+//
+//    @TableField(exist = false)
+//    private List<Project> Children1= new ArrayList<>();
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java

@@ -392,23 +392,23 @@ public class BackConfigService {
     //计划电量树
     public List<Companys> wtls() {
 
-        List<Companys> cpls = CacheContext.cpls;
-
-        if(cpls.get(0).getChildren1().size()>0) return cpls;
-
-        List<Windpowerstation> wpls = CacheContext.wpls;
-        List<Project> prols= CacheContext.prols;
-
-            cpls.forEach(cpl -> {
-                List<Windpowerstation> collect = wpls.stream().filter(w -> w.getCompanyid().equals(cpl.getId())).collect(Collectors.toList());
-                cpl.getChildren1().addAll(collect);
-            });
-
-            wpls.forEach(wpl -> {
-                List<Project> projects = prols.stream().filter(l -> l.getWindpowerstationid().equals(wpl.getId())).collect(Collectors.toList());
-                wpl.getChildren1().addAll(projects);
-            });
-        return cpls;
+//        List<Companys> cpls = CacheContext.cpls;
+//
+//        if(cpls.get(0).getChildren1().size()>0) return cpls;
+//
+//        List<Windpowerstation> wpls = CacheContext.wpls;
+//        List<Project> prols= CacheContext.prols;
+//
+//            cpls.forEach(cpl -> {
+//                List<Windpowerstation> collect = wpls.stream().filter(w -> w.getCompanyid().equals(cpl.getId())).collect(Collectors.toList());
+//                cpl.getChildren1().addAll(collect);
+//            });
+//
+//            wpls.forEach(wpl -> {
+//                List<Project> projects = prols.stream().filter(l -> l.getWindpowerstationid().equals(wpl.getId())).collect(Collectors.toList());
+//                wpl.getChildren1().addAll(projects);
+//            });
+        return null;
     }