瀏覽代碼

人工录入总体信息

zy 2 年之前
父節點
當前提交
7598ed697a

+ 41 - 23
neim-biz/src/main/java/com/jiayue/biz/controller/ManualEntryController.java

@@ -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);
 
     }
 

+ 2 - 0
neim-biz/src/main/java/com/jiayue/biz/domain/FInfo.java

@@ -2,12 +2,14 @@ package com.jiayue.biz.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 风电
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class FInfo {
 
     private String num;

+ 2 - 0
neim-biz/src/main/java/com/jiayue/biz/domain/GInfo.java

@@ -2,12 +2,14 @@ package com.jiayue.biz.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 光伏
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class GInfo {
     private String num;
     private String capacity;

+ 2 - 0
neim-biz/src/main/java/com/jiayue/biz/domain/PInfo.java

@@ -2,12 +2,14 @@ package com.jiayue.biz.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 前期项目信息
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class PInfo {
     //已发起项目数目
     private String initiatedNum;

+ 2 - 0
neim-biz/src/main/java/com/jiayue/biz/domain/TotalityInfo.java

@@ -2,6 +2,7 @@ package com.jiayue.biz.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
@@ -9,6 +10,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 @Document("totality_info")
 public class TotalityInfo {
     private String id;

+ 7 - 1
neim-biz/src/main/java/com/jiayue/biz/service/TotalityInfoService.java

@@ -1,5 +1,8 @@
 package com.jiayue.biz.service;
 
+import com.jiayue.biz.domain.FInfo;
+import com.jiayue.biz.domain.GInfo;
+import com.jiayue.biz.domain.PInfo;
 import com.jiayue.biz.domain.TotalityInfo;
 
 import java.util.List;
@@ -8,5 +11,8 @@ public interface TotalityInfoService {
 
     //查询所有总体信息
     List<TotalityInfo> selectTotalityInfoList();
-
+    // 修改项目的总体信息
+    void updateProjectTotalityInfoList(String id, PInfo pInfo);
+    // 修改场站的总体信息
+    void updateStationTotalityInfoList(String id, FInfo fInfo, GInfo gInfo);
 }

+ 17 - 1
neim-biz/src/main/java/com/jiayue/biz/service/impl/TotalityInfoServiceImpl.java

@@ -1,9 +1,13 @@
 package com.jiayue.biz.service.impl;
 
+import com.jiayue.biz.domain.FInfo;
+import com.jiayue.biz.domain.GInfo;
+import com.jiayue.biz.domain.PInfo;
 import com.jiayue.biz.domain.TotalityInfo;
 import com.jiayue.biz.service.TotalityInfoService;
 import lombok.AllArgsConstructor;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +23,18 @@ public class TotalityInfoServiceImpl implements TotalityInfoService {
     public List<TotalityInfo> selectTotalityInfoList(){
       return  mongoTemplate.find(new Query(),TotalityInfo.class,"totality_info");
     }
-
+    // 修改项目的总体信息
+    public void updateProjectTotalityInfoList(String id, PInfo pInfo){
+        TotalityInfo totalityInfos = mongoTemplate.findOne(new Query(Criteria.where("_id").is(id)), TotalityInfo.class, "totality_info");
+        totalityInfos.setPInfo(pInfo);
+       // mongoTemplate.save(totalityInfos);
+    }
+    // 修改场站的总体信息
+   public void updateStationTotalityInfoList(String id, FInfo fInfo, GInfo gInfo){
+        TotalityInfo totalityInfos = mongoTemplate.findOne(new Query(Criteria.where("_id").is(id)), TotalityInfo.class, "totality_info");
+        totalityInfos.setFInfo(fInfo);
+        totalityInfos.setGInfo(gInfo);
+        mongoTemplate.save(totalityInfos);
+    }
 
 }

+ 19 - 2
neim-ui/src/views/manualEntry/projectAndStationInfoEntry/index.vue

@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import {getTotalityInfo} from "@/api/biz/manualEntry/projectAndStationInfoEntry";
+import {getTotalityInfo,updateProjectTotalityInfoList,updateStationTotalityInfoList} from "@/api/biz/manualEntry/projectAndStationInfoEntry";
 
 export default {
   //项目或场站信息录入
@@ -175,8 +175,19 @@ export default {
     projectSave() {
       let saveData = {
         id: this.id,
-        pinfo: this.form
+        pInfo: this.form,
+        // fInfo: null,
+        // gInfo: null
       }
+      // let id = this.id
+      // let pInfo= this.form
+      console.log(saveData)
+      updateProjectTotalityInfoList(saveData).then(res=>{
+        this.$message.success('保存项目总体信息成功')
+      }).catch(err=>{
+        this.$message.warning('保存项目总体信息异常')
+        console.log('保存项目总体信息异常:'+err)
+      })
     },
     stationSave() {
       let saveData = {
@@ -184,6 +195,12 @@ export default {
         fInfo: this.fInfo,
         gInfo: this.gInfo
       }
+      updateStationTotalityInfoList(saveData).then(res=>{
+        this.$message.success('保存场站总体信息成功')
+      }).catch(err=>{
+        this.$message.success('保存场站总体信息异常')
+        console.log('保存场站总体信息异常:'+err)
+      })
     }
   }
 }