|
@@ -2,24 +2,20 @@ package com.gyee.backconfig.controller;
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
-import com.gyee.backconfig.common.requst.vo.ProjectPlanQueryVo;
|
|
|
|
import com.gyee.backconfig.config.R;
|
|
import com.gyee.backconfig.config.R;
|
|
import com.gyee.backconfig.model.auto.Projectplan;
|
|
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.BackConfigService;
|
|
-import com.gyee.backconfig.service.auto.IProjectService;
|
|
|
|
import com.gyee.backconfig.service.auto.IProjectplanService;
|
|
import com.gyee.backconfig.service.auto.IProjectplanService;
|
|
import com.gyee.backconfig.vo.Projectplanvo;
|
|
import com.gyee.backconfig.vo.Projectplanvo;
|
|
import com.gyee.common.model.StringUtils;
|
|
import com.gyee.common.model.StringUtils;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import java.nio.file.FileAlreadyExistsException;
|
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
- * 前端控制器
|
|
|
|
|
|
+ * 前端控制器
|
|
* </p>
|
|
* </p>
|
|
*
|
|
*
|
|
* @author wang
|
|
* @author wang
|
|
@@ -32,12 +28,13 @@ public class ProjectplanController {
|
|
private BackConfigService backConfigService;
|
|
private BackConfigService backConfigService;
|
|
@Resource
|
|
@Resource
|
|
private IProjectplanService projectplanService;
|
|
private IProjectplanService projectplanService;
|
|
|
|
+
|
|
@GetMapping("/listByPage")
|
|
@GetMapping("/listByPage")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@CrossOrigin(origins = "*", maxAge = 3600)
|
|
@CrossOrigin(origins = "*", maxAge = 3600)
|
|
public R ListByPage(
|
|
public R ListByPage(
|
|
- @RequestParam(value = "pagenum",required = true) Integer pageNum,
|
|
|
|
- @RequestParam(value = "pagesize",required = true) Integer pageSize,
|
|
|
|
|
|
+ @RequestParam(value = "pagenum", required = true) Integer pageNum,
|
|
|
|
+ @RequestParam(value = "pagesize", required = true) Integer pageSize,
|
|
@RequestParam(value = "id", required = false) String id,
|
|
@RequestParam(value = "id", required = false) String id,
|
|
@RequestParam(value = "projectid", required = false) String projectid,
|
|
@RequestParam(value = "projectid", required = false) String projectid,
|
|
@RequestParam(value = "generatingcapacity", required = false) String generatingcapacity,
|
|
@RequestParam(value = "generatingcapacity", required = false) String generatingcapacity,
|
|
@@ -45,15 +42,15 @@ public class ProjectplanController {
|
|
@RequestParam(value = "year", required = false) String year,
|
|
@RequestParam(value = "year", required = false) String year,
|
|
@RequestParam(value = "month", required = false) String month,
|
|
@RequestParam(value = "month", required = false) String month,
|
|
@RequestParam(value = "windpower", required = false) String windpower,
|
|
@RequestParam(value = "windpower", required = false) String windpower,
|
|
- @RequestParam(value = "version", required = false) Integer version){
|
|
|
|
|
|
+ @RequestParam(value = "version", required = false) Integer version) {
|
|
|
|
|
|
- Projectplanvo vo=new Projectplanvo();
|
|
|
|
|
|
+ Projectplanvo vo = new Projectplanvo();
|
|
setVOTemplate(pageNum, pageSize, id, projectid, generatingcapacity, outagehours, year, month, windpower, version, vo);
|
|
setVOTemplate(pageNum, pageSize, id, projectid, generatingcapacity, outagehours, year, month, windpower, version, vo);
|
|
|
|
|
|
Page<Projectplan> ProjectplanPage = backConfigService.listBypage(vo);
|
|
Page<Projectplan> ProjectplanPage = backConfigService.listBypage(vo);
|
|
if (StringUtils.isNotNull(ProjectplanPage)) {
|
|
if (StringUtils.isNotNull(ProjectplanPage)) {
|
|
return R.ok().data(ProjectplanPage);
|
|
return R.ok().data(ProjectplanPage);
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
return R.error().message("访问失败");
|
|
return R.error().message("访问失败");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -70,14 +67,15 @@ public class ProjectplanController {
|
|
vo.setCurrent(pageNum);
|
|
vo.setCurrent(pageNum);
|
|
vo.setPageSize(pageSize);
|
|
vo.setPageSize(pageSize);
|
|
}
|
|
}
|
|
|
|
+
|
|
//新增或者更新
|
|
//新增或者更新
|
|
@PostMapping("/add-modify-projectplan")
|
|
@PostMapping("/add-modify-projectplan")
|
|
@CrossOrigin(origins = "*", maxAge = 3600)
|
|
@CrossOrigin(origins = "*", maxAge = 3600)
|
|
- public R addModifyProjectPlan(@RequestBody Projectplan Projectplan){
|
|
|
|
|
|
+ public R addModifyProjectPlan(@RequestBody Projectplan Projectplan) {
|
|
boolean saveOrUpdate = backConfigService.saveOrUpdate(Projectplan);
|
|
boolean saveOrUpdate = backConfigService.saveOrUpdate(Projectplan);
|
|
if (saveOrUpdate) {
|
|
if (saveOrUpdate) {
|
|
return R.ok().data("保存或更新成功");
|
|
return R.ok().data("保存或更新成功");
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
return R.error().message("保存失败");
|
|
return R.error().message("保存失败");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -97,10 +95,10 @@ public class ProjectplanController {
|
|
|
|
|
|
|
|
|
|
@DeleteMapping(value = "/remove-projectplans/{ids}")
|
|
@DeleteMapping(value = "/remove-projectplans/{ids}")
|
|
- public R deleteAll(@PathVariable("ids") String ids) {
|
|
|
|
|
|
+ public R deleteAll(@PathVariable("ids") String ids) {
|
|
String[] strings = ids.split(",");
|
|
String[] strings = ids.split(",");
|
|
|
|
|
|
- boolean b = projectplanService.removeByIds(Arrays.asList(strings));
|
|
|
|
|
|
+ boolean b = projectplanService.removeByIds(Arrays.asList(strings));
|
|
|
|
|
|
if (b) {
|
|
if (b) {
|
|
return R.ok().data(b);
|
|
return R.ok().data(b);
|