冲突解决

web/backmanagerconfig/src/main/java/com/gyee/backconfig/config/MyPage.java

@@ -1,6 +1,5 @@
 package com.gyee.backconfig.config;
 
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
@@ -33,8 +32,8 @@ public class MyPage<T>  extends Page<T> {
     }
 
 
-    public MyPage(){
-        
+    public MyPage() {
+
     }
 
     //构造
@@ -53,20 +52,4 @@ public class MyPage<T>  extends Page<T> {
     public MyPage(long current, long size, long total, boolean isSearchCount) {
         super(current, size, total, isSearchCount);
     }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
+}

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

@@ -77,4 +77,16 @@ public class LineController {
         vo.setVersion(version);
 
     }
+
+    //新增或者更新
+    @PostMapping("/add-Linevo")
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R addModifyProjectPlan(@RequestBody Line Line){
+        boolean saveOrUpdate = backConfigService.saveOrUpdate(Line);
+        if (saveOrUpdate) {
+            return R.ok().data("保存或更新成功");
+        }else{
+            return R.error().message("保存失败");
+        }
+    }
 }

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

@@ -3,7 +3,6 @@ package com.gyee.backconfig.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.Companys;
 import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.service.auto.IRegionService;
 import com.gyee.common.model.StringUtils;

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

@@ -1,21 +1,16 @@
 package com.gyee.backconfig.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.MyPage;
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
 import com.gyee.backconfig.vo.Windpowerstationvo;
 import com.gyee.common.model.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -32,8 +27,6 @@ public class WindpowerstationController {
     @Resource
     private BackConfigService backConfigService;
 
-
-    @Autowired
     private IWindpowerstationService windpowerstationService;
 
     @GetMapping("/listByPage")
@@ -123,8 +116,6 @@ public class WindpowerstationController {
 
 
 
-
-
     /**
      * 查询
      * @param id

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

@@ -106,7 +106,7 @@ public class BackConfigService {
         return page1;
     }
 
-
+//期次新增
     public boolean saveOrUpdate(Projectplan Projectplan) {
         return ProjectplanService.saveOrUpdate(Projectplan);
     }
@@ -334,36 +334,38 @@ public class BackConfigService {
         Integer quantity = vo.getQuantity();
 
         if (StringUtils.isNotNull(id) && !id.equals("")) {
-            queryWrapper.eq("id", id);
+            queryWrapper.like("id", id);
         }
         if (StringUtils.isNotNull(code) && !code.equals("")) {
-            queryWrapper.eq("code", code);
+            queryWrapper.like("code", code);
         }
         if (StringUtils.isNotNull(aname) && !aname.equals("")) {
-            queryWrapper.eq("aname", aname);
+            queryWrapper.like("aname", aname);
         }
         if (StringUtils.isNotNull(name) && !name.equals("")) {
-            queryWrapper.eq("name", name);
+            queryWrapper.like("name", name);
         }
         if (StringUtils.isNotNull(capacityunit) && !capacityunit.equals("")) {
-            queryWrapper.eq("capacityunit", capacityunit);
+            queryWrapper.like("capacityunit", capacityunit);
         }
         if (StringUtils.isNotNull(capacity) && !capacity.equals("")) {
-            queryWrapper.eq("capacity", capacity);
+            queryWrapper.like("capacity", capacity);
         }
         if (StringUtils.isNotNull(projectid) && !projectid.equals("")) {
-            queryWrapper.eq("projectid", projectid);
+            queryWrapper.like("projectid", projectid);
         }
         if (StringUtils.isNotNull(ordernum) && !ordernum.equals("")) {
-            queryWrapper.eq("ordernum", ordernum);
+            queryWrapper.like("ordernum", ordernum);
         }
         if (StringUtils.isNotNull(quantity) && !quantity.equals("")) {
-            queryWrapper.eq("quantity", quantity);
+            queryWrapper.like("quantity", quantity);
         }
         Page<Line> page1 = lineService.page(page, queryWrapper);
         return page1;
     }
-
+    public boolean saveOrUpdate(Line Line) {
+        return lineService.saveOrUpdate(Line);
+    }
     //Companys
     public Page<Companys> CompanysBypage(Companysvo vo) {
         Page<Companys> page = new Page<Companys>(vo.getCurrent(), vo.getPageSize());

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IRegionService.java

@@ -18,5 +18,4 @@ public interface IRegionService extends IService<Region> {
 
     List<Region> list(String id, String name, String code, String pageNum, String pageSize);
 
-
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/CompanysServiceImpl.java

@@ -6,7 +6,6 @@ import com.gyee.backconfig.model.auto.Companys;
 import com.gyee.backconfig.mapper.auto.CompanysMapper;
 import com.gyee.backconfig.service.auto.ICompanysService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.common.model.Healthconfig;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/RegionServiceImpl.java

@@ -3,11 +3,10 @@ package com.gyee.backconfig.service.auto.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.model.auto.Companys;
-import com.gyee.backconfig.model.auto.Region;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.backconfig.mapper.auto.RegionMapper;
+import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.service.auto.IRegionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +23,7 @@ import java.util.List;
 @Service
 public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService {
 
+
     @Override
     public List<Region> list(String id, String name, String code, String pageNum, String pageSize) {
         QueryWrapper<Region> qw = new QueryWrapper<>();
@@ -46,4 +46,5 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         List<Region> list = pageData.getRecords();
         return list;
     }
+
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -1,10 +1,7 @@
 package com.gyee.backconfig.service.auto.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.MyPage;
-import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.mapper.auto.WindpowerstationMapper;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
@@ -13,7 +10,6 @@ import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * <p>
@@ -26,6 +22,7 @@ import java.util.List;
 @Service
 public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMapper, Windpowerstation> implements IWindpowerstationService {
 
+
     @Override
     public MyPage<Windpowerstation> getList(String id, String name, String code, String companyid, String pageNum, String pageSize) {
 
@@ -75,5 +72,4 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
 
     }
 
-
 }