公司表查询、删除修改

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

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Companys;
+import com.gyee.backconfig.model.auto.Projectplan;
 import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.ICompanysService;
 import com.gyee.backconfig.vo.Companysvo;
+import com.gyee.backconfig.vo.Projectplanvo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,6 +33,8 @@ import java.util.List;
 public class CompanysController {
     @Resource
     private ICompanysService companysService;
+    @Resource
+    private BackConfigService backConfigService;
 
     /**
      * 查询
@@ -93,13 +97,16 @@ public class CompanysController {
      * @param ids
      * @return
      */
-    @DeleteMapping(value = "/companys/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    @DeleteMapping(value = "/remove-companys/{ids}")
+    public  R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
-        boolean b = companysService.removeByIds(Arrays.asList(strings));
-        if (b){
+
+        boolean  b = companysService.removeByIds(Arrays.asList(strings));
+
+
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
@@ -119,7 +126,39 @@ public class CompanysController {
         }
     }
 
-
-
+    //分页查询
+    @GetMapping("/listByPage")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R ListByPage(
+            @RequestParam(value = "pagenum",required = true) Integer pageNum,
+            @RequestParam(value = "pagesize",required = true) Integer pageSize,
+            @RequestParam(value = "id", required = false) String id,
+            @RequestParam(value = "rid", required = false) String rid,
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "version", required = false) Integer version){
+        Companysvo vo=new Companysvo();
+        setVOTemplate(pageNum, pageSize, id, rid, name,version, vo);
+
+        Page<Companys> CompanysPage = backConfigService.CompanysBypage(vo);
+        if (StringUtils.isNotNull(CompanysPage)) {
+            return R.ok().data(CompanysPage);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+    private void setVOTemplate(@RequestParam(value = "pagenum", required = true) Integer pageNum,
+                               @RequestParam(value = "pagesize", required = true) Integer pageSize,
+                               @RequestParam(value = "id", required = false) String id,
+                               @RequestParam(value = "rid", required = false) String rid,
+                               @RequestParam(value = "name", required = false) String name,
+                               @RequestParam(value = "version", required = false) Integer version, Companysvo vo) {
+        vo.setId(id);
+        vo.setRid(rid);
+        vo.setName(name);
+        vo.setVersion(version);
+        vo.setCurrent(pageNum);
+        vo.setPageSize(pageSize);
+    }
 
 }

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

@@ -7,11 +7,15 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Projectplan;
 import com.gyee.backconfig.model.auto.XrpProjectplan;
 import com.gyee.backconfig.service.BackConfigService;
+import com.gyee.backconfig.service.auto.IProjectService;
+import com.gyee.backconfig.service.auto.IProjectplanService;
 import com.gyee.backconfig.vo.Projectplanvo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.nio.file.FileAlreadyExistsException;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -26,6 +30,8 @@ import javax.annotation.Resource;
 public class ProjectplanController {
     @Resource
     private BackConfigService backConfigService;
+    @Resource
+    private IProjectplanService projectplanService;
     @GetMapping("/listByPage")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
@@ -76,17 +82,31 @@ public class ProjectplanController {
         }
     }
     //删除
-    @DeleteMapping("/remove-projectplan/{id}")
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    public R deleteProjectplan(
-            @PathVariable(value = "id", required = true) String id
-    ){
-        boolean removePP = backConfigService.removeWapperById(id);
-        if (removePP){
-            return R.ok().data(removePP);
-        }else {
-            return R.error().data("更新失败！");
+//    @DeleteMapping("/remove-projectplan/{id}")
+//    @CrossOrigin(origins = "*", maxAge = 3600)
+//    public R deleteProjectplan(
+//            @PathVariable(value = "id", required = true) String id
+//    ){
+//        boolean removePP = backConfigService.removeWapperById(id);
+//        if (removePP){
+//            return R.ok().data(removePP);
+//        }else {
+//            return R.error().data("更新失败！");
+//        }
+//    }
+
+
+    @DeleteMapping(value = "/remove-projectplans/{ids}")
+    public  R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+
+        boolean  b = projectplanService.removeByIds(Arrays.asList(strings));
+
+
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
         }
     }
-
 }

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

@@ -51,8 +51,8 @@ public class Projectplan extends Model {
     private String windpower;
 
     //删除逻辑删除
-    @TableLogic
-    private Integer isdeleted;
+//    @TableLogic
+//    private Integer isdeleted;
 //
 //    @Version
 //    @TableField("VERSION")

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

@@ -2,6 +2,7 @@ package com.gyee.backconfig.service;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.CacheContext;
 import com.gyee.backconfig.model.auto.*;
@@ -148,12 +149,16 @@ public class BackConfigService {
             queryWrapper.eq("windpower", windpower);
         }
     }
-
+    //单个删除
     public boolean removeWapperById(String id) {
         QueryWrapper<Projectplan> queryWrapper = new QueryWrapper<Projectplan>();
         queryWrapper.eq("id", id);
         return ProjectplanService.remove(queryWrapper);
     }
+    public boolean removeByIds(String ids) {
+        String[] strings = ids.split(",");
+        return ProjectplanService.removeByIds(Arrays.asList(strings));
+    }
 
     //windpowerstation表
     public Page<Windpowerstation> Bypage(Windpowerstationvo vo) {
@@ -369,13 +374,13 @@ public class BackConfigService {
         String name = vo.getName();
 
         if (StringUtils.isNotNull(id) && !id.equals("")) {
-            queryWrapper.eq("id", id);
+            queryWrapper.like("id", id);
         }
         if (StringUtils.isNotNull(rid) && !rid.equals("")) {
-            queryWrapper.eq("code", rid);
+            queryWrapper.like("code", rid);
         }
         if (StringUtils.isNotNull(name) && !name.equals("")) {
-            queryWrapper.eq("aname", name);
+            queryWrapper.like("name", name);
         }
 
         Page<Companys> page1 = companysService.page(page, queryWrapper);

web/backmanagerconfig/src/main/java/com/gyee/backconfig/vo/Companysvo.java

@@ -17,6 +17,7 @@ public class Companysvo {
     private String rid;
 
     private String name;
+    private Integer version;
     //分页
     private Integer current;