|
@@ -16,6 +16,7 @@ import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 人工录入Controller
|
|
|
+ *
|
|
|
* @date 2023-05-9
|
|
|
*/
|
|
|
@RequiredArgsConstructor(onConstructor_ = @Autowired)
|
|
@@ -27,50 +28,54 @@ public class ManualEntryController extends BaseController {
|
|
|
private final ProjectInfoService projectInfoService;
|
|
|
private final StationInfoService stationInfoService;
|
|
|
private final FanModelDataService fanModelDataService;
|
|
|
-
|
|
|
private final ProjectProgressService projectProgressService;
|
|
|
+
|
|
|
/*获取光伏站下拉框,风场站的下拉框*/
|
|
|
@GetMapping("/stationInfo")
|
|
|
public AjaxResult hauFuInfo() {
|
|
|
return AjaxResult.success(manualEntryService.getStationInfo());
|
|
|
}
|
|
|
+
|
|
|
//获取华电以及全省资源概况
|
|
|
@GetMapping("/getProvincialEnergyStations")
|
|
|
public AjaxResult getProvincialEnergyStations() {
|
|
|
return AjaxResult.success(manualEntryService.getProvincialEnergyStations());
|
|
|
}
|
|
|
+
|
|
|
//获取项目(场站)总体信息
|
|
|
@GetMapping("/getTotalityInfo")
|
|
|
public AjaxResult getTotalityInfo() {
|
|
|
return AjaxResult.success(totalityInfoService.selectTotalityInfoList());
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
- *项目进展获取项目名称+id
|
|
|
+ * 项目进展获取项目名称+id
|
|
|
*/
|
|
|
@GetMapping("/getProjectInfo")
|
|
|
- public AjaxResult getProjectInfo(){
|
|
|
- List<Map<String,String>> list = new ArrayList<>();
|
|
|
+ public AjaxResult getProjectInfo() {
|
|
|
+ List<Map<String, String>> list = new ArrayList<>();
|
|
|
List<ProjectInfo> projectInfoList = projectInfoService.getProjectInfoList();
|
|
|
- for(ProjectInfo projectInfo : projectInfoList){
|
|
|
- Map<String,String> map = new HashMap<>();
|
|
|
- map.put("id",projectInfo.getId());
|
|
|
- map.put("name",projectInfo.getProjectBasicInfo().getProjectName());
|
|
|
+ for (ProjectInfo projectInfo : projectInfoList) {
|
|
|
+ Map<String, String> map = new HashMap<>();
|
|
|
+ map.put("id", projectInfo.getId());
|
|
|
+ map.put("name", projectInfo.getProjectBasicInfo().getProjectName());
|
|
|
list.add(map);
|
|
|
}
|
|
|
return AjaxResult.success(list);
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
- *获取场站信息
|
|
|
+ * 获取场站信息
|
|
|
*/
|
|
|
@GetMapping("/getStationInfo")
|
|
|
- public AjaxResult getStationInfo(){
|
|
|
- List<Map<String,String>> list = new ArrayList<>();
|
|
|
+ public AjaxResult getStationInfo() {
|
|
|
+ List<Map<String, String>> list = new ArrayList<>();
|
|
|
List<StationInfo> stationInfos = stationInfoService.selectStationInfo();
|
|
|
- for(StationInfo stationInfo : stationInfos){
|
|
|
- Map<String,String> map = new HashMap<>();
|
|
|
- map.put("id",stationInfo.getId());
|
|
|
- map.put("name",stationInfo.getStationBasicInfo().getStationName());
|
|
|
- map.put("easyName",stationInfo.getStationBasicInfo().getAbbreviation());
|
|
|
+ for (StationInfo stationInfo : stationInfos) {
|
|
|
+ Map<String, String> map = new HashMap<>();
|
|
|
+ map.put("id", stationInfo.getId());
|
|
|
+ map.put("name", stationInfo.getStationBasicInfo().getStationName());
|
|
|
+ map.put("easyName", stationInfo.getStationBasicInfo().getAbbreviation());
|
|
|
list.add(map);
|
|
|
}
|
|
|
return AjaxResult.success(list);
|
|
@@ -78,10 +83,11 @@ public class ManualEntryController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 资源概况(更新)
|
|
|
+ *
|
|
|
* @param provincialEnergyStations 资源概况
|
|
|
*/
|
|
|
@PostMapping("/updateProvincialEnergyStations")
|
|
|
- public void update(@RequestBody ProvincialEnergyStations provincialEnergyStations){
|
|
|
+ public void update(@RequestBody ProvincialEnergyStations provincialEnergyStations) {
|
|
|
manualEntryService.updateProvincialEnergyStations(provincialEnergyStations);
|
|
|
}
|
|
|
|
|
@@ -90,10 +96,16 @@ public class ManualEntryController extends BaseController {
|
|
|
public AjaxResult getFanModelDataList(String id) {
|
|
|
return AjaxResult.success(fanModelDataService.queryFanModelDataList(id));
|
|
|
}
|
|
|
-
|
|
|
- @PostMapping("/saveFanModelData")
|
|
|
- public AjaxResult updateFanModelData(@RequestBody FanModelData fanModelData) {
|
|
|
- fanModelDataService.updateFanModelData(fanModelData);
|
|
|
+ // 修改项目的总体信息
|
|
|
+ @PostMapping("/updateProjectTotalityInfoList")
|
|
|
+ public AjaxResult updateStationTotalityInfoList(@RequestBody TotalityInfo totalityInfo) {
|
|
|
+// totalityInfoService.updateProjectTotalityInfoList(totalityInfo.getId(), totalityInfo.getPInfo());
|
|
|
+ return AjaxResult.success("200");
|
|
|
+ }
|
|
|
+ // 修改场站的总体信息
|
|
|
+ @PostMapping("/updateStationTotalityInfoList")
|
|
|
+ public AjaxResult updateStationTotalityInfoList(@RequestBody String id, @RequestBody FInfo fInfo,@RequestBody GInfo gInfo) {
|
|
|
+ totalityInfoService.updateStationTotalityInfoList(id, fInfo,gInfo);
|
|
|
return AjaxResult.success("200");
|
|
|
}
|
|
|
|
|
@@ -103,11 +115,17 @@ public class ManualEntryController extends BaseController {
|
|
|
return AjaxResult.success("200");
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("/saveFanModelData")
|
|
|
+ public AjaxResult updateFanModelData(@RequestBody FanModelData fanModelData) {
|
|
|
+ fanModelDataService.updateFanModelData(fanModelData);
|
|
|
+ return AjaxResult.success("200");
|
|
|
+ }
|
|
|
+
|
|
|
//项目进展解析
|
|
|
@PostMapping("/projectProgressParse")
|
|
|
- public void projectProgressParse(@RequestBody MultipartFile multipartFile, @RequestBody String eqId){
|
|
|
+ public void projectProgressParse(@RequestBody MultipartFile multipartFile, @RequestBody String eqId) {
|
|
|
|
|
|
- projectProgressService.projectProgressParse(multipartFile,eqId);
|
|
|
+ projectProgressService.projectProgressParse(multipartFile, eqId);
|
|
|
|
|
|
}
|
|
|
|