计划发电量接口开发

src/main/java/com/gyee/frame/service/ProjectPlanService.java

@@ -100,7 +100,7 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 
     public List<ProjectPlanVo> getProjectPlanVo(String wpId, String pjId, String year) {
 
-
+		List<ProjectPlanVo> result=new ArrayList<>();
 		List<ProjectPlanVo> list = new ArrayList<>();
 
 
@@ -142,148 +142,150 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 				list.add(event);
 			}
 
-		}
-
-		String currentWindpowerStation="",currentProject="";
-		Map<String,ProjectPlanVo> retValue=new TreeMap<String,ProjectPlanVo>();
-		double[] totalGc=new double[13];
-		double[] windpowerGc=new double[13];
-		for(int i=0;i<list.size();i++){
-			ProjectPlanVo vo=list.get(i);
-			if(StringUtils.empty(currentWindpowerStation)){
-				currentWindpowerStation=vo.getWindpowerName();
-			}
-			if(!currentWindpowerStation.equals(vo.getWindpowerName())){
-				ProjectPlanVo wpGc=new ProjectPlanVo();
-				wpGc.setGc01(String.valueOf(windpowerGc[0]));
-				wpGc.setGc02(String.valueOf(windpowerGc[1]));
-				wpGc.setGc03(String.valueOf(windpowerGc[2]));
-				wpGc.setGc04(String.valueOf(windpowerGc[3]));
-				wpGc.setGc05(String.valueOf(windpowerGc[4]));
-				wpGc.setGc06(String.valueOf(windpowerGc[5]));
-				wpGc.setGc07(String.valueOf(windpowerGc[6]));
-				wpGc.setGc08(String.valueOf(windpowerGc[7]));
-				wpGc.setGc09(String.valueOf(windpowerGc[8]));
-				wpGc.setGc10(String.valueOf(windpowerGc[9]));
-				wpGc.setGc11(String.valueOf(windpowerGc[10]));
-				wpGc.setGc12(String.valueOf(windpowerGc[11]));
-				wpGc.setGeneratingcapacity(String.valueOf(windpowerGc[12]));
-				wpGc.setProjectName(currentWindpowerStation);
-
-				wpGc.setYear(year);
-				retValue.put(currentWindpowerStation, wpGc);
-				currentWindpowerStation=vo.getWindpowerName();
-				for(int j=0;j<13;j++){
-					totalGc[j]+=windpowerGc[j];
-					windpowerGc[j]=0;
+			String currentWindpowerStation="",currentProject="";
+			Map<String,ProjectPlanVo> retValue=new TreeMap<String,ProjectPlanVo>();
+			double[] totalGc=new double[13];
+			double[] windpowerGc=new double[13];
+			for(int i=0;i<list.size();i++){
+				ProjectPlanVo vo=list.get(i);
+				if(StringUtils.empty(currentWindpowerStation)){
+					currentWindpowerStation=vo.getWindpowerName();
 				}
-			}{
-				ProjectPlanVo item=null;
-				if(retValue.containsKey(vo.getProjectName())){
-					item=retValue.get(vo.getProjectName());
-				}
-				else{
-					item=new ProjectPlanVo();
-					item.setProjectName(vo.getProjectName());
-					item.setProjectid(vo.getProjectid());
-					item.setId(vo.getProjectid());
-					item.setYear(vo.getYear());
-					retValue.put(vo.getProjectName(), item);
-				}
-				if(StringUtils.empty(vo.getMonth())){
-					windpowerGc[12]+=Double.parseDouble(vo.getGeneratingcapacity());
-					item.setGeneratingcapacity(vo.getGeneratingcapacity());
-				}
-				else{
-					int index=Integer.parseInt(vo.getMonth());
-					if(!StringUtils.empty(vo.getGeneratingcapacity())){
-						switch(index){
-							case 1:
-								item.setGc01(vo.getGeneratingcapacity());
-								break;
-							case 2:
-								item.setGc02(vo.getGeneratingcapacity());
-								break;
-							case 3:
-								item.setGc03(vo.getGeneratingcapacity());
-								break;
-							case 4:
-								item.setGc04(vo.getGeneratingcapacity());
-								break;
-							case 5:
-								item.setGc05(vo.getGeneratingcapacity());
-								break;
-							case 6:
-								item.setGc06(vo.getGeneratingcapacity());
-								break;
-							case 7:
-								item.setGc07(vo.getGeneratingcapacity());
-								break;
-							case 8:
-								item.setGc08(vo.getGeneratingcapacity());
-								break;
-							case 9:
-								item.setGc09(vo.getGeneratingcapacity());
-								break;
-							case 10:
-								item.setGc10(vo.getGeneratingcapacity());
-								break;
-							case 11:
-								item.setGc11(vo.getGeneratingcapacity());
-								break;
-							case 12:
-								item.setGc12(vo.getGeneratingcapacity());
-								break;
-						}
-						windpowerGc[index-1]+=Double.parseDouble(vo.getGeneratingcapacity());
+				if(!currentWindpowerStation.equals(vo.getWindpowerName())){
+					ProjectPlanVo wpGc=new ProjectPlanVo();
+					wpGc.setGc01(String.valueOf(windpowerGc[0]));
+					wpGc.setGc02(String.valueOf(windpowerGc[1]));
+					wpGc.setGc03(String.valueOf(windpowerGc[2]));
+					wpGc.setGc04(String.valueOf(windpowerGc[3]));
+					wpGc.setGc05(String.valueOf(windpowerGc[4]));
+					wpGc.setGc06(String.valueOf(windpowerGc[5]));
+					wpGc.setGc07(String.valueOf(windpowerGc[6]));
+					wpGc.setGc08(String.valueOf(windpowerGc[7]));
+					wpGc.setGc09(String.valueOf(windpowerGc[8]));
+					wpGc.setGc10(String.valueOf(windpowerGc[9]));
+					wpGc.setGc11(String.valueOf(windpowerGc[10]));
+					wpGc.setGc12(String.valueOf(windpowerGc[11]));
+					wpGc.setGeneratingcapacity(String.valueOf(windpowerGc[12]));
+					wpGc.setProjectName(currentWindpowerStation);
+
+					wpGc.setYear(year);
+					retValue.put(currentWindpowerStation, wpGc);
+					currentWindpowerStation=vo.getWindpowerName();
+					for(int j=0;j<13;j++){
+						totalGc[j]+=windpowerGc[j];
+						windpowerGc[j]=0;
+					}
+				}{
+					ProjectPlanVo item=null;
+					if(retValue.containsKey(vo.getProjectName())){
+						item=retValue.get(vo.getProjectName());
+					}
+					else{
+						item=new ProjectPlanVo();
+						item.setProjectName(vo.getProjectName());
+						item.setProjectid(vo.getProjectid());
+						item.setId(vo.getProjectid());
+						item.setYear(vo.getYear());
+						retValue.put(vo.getProjectName(), item);
 					}
+					if(StringUtils.empty(vo.getMonth())){
+						windpowerGc[12]+=Double.parseDouble(vo.getGeneratingcapacity());
+						item.setGeneratingcapacity(vo.getGeneratingcapacity());
+					}
+					else{
+						int index=Integer.parseInt(vo.getMonth());
+						if(!StringUtils.empty(vo.getGeneratingcapacity())){
+							switch(index){
+								case 1:
+									item.setGc01(vo.getGeneratingcapacity());
+									break;
+								case 2:
+									item.setGc02(vo.getGeneratingcapacity());
+									break;
+								case 3:
+									item.setGc03(vo.getGeneratingcapacity());
+									break;
+								case 4:
+									item.setGc04(vo.getGeneratingcapacity());
+									break;
+								case 5:
+									item.setGc05(vo.getGeneratingcapacity());
+									break;
+								case 6:
+									item.setGc06(vo.getGeneratingcapacity());
+									break;
+								case 7:
+									item.setGc07(vo.getGeneratingcapacity());
+									break;
+								case 8:
+									item.setGc08(vo.getGeneratingcapacity());
+									break;
+								case 9:
+									item.setGc09(vo.getGeneratingcapacity());
+									break;
+								case 10:
+									item.setGc10(vo.getGeneratingcapacity());
+									break;
+								case 11:
+									item.setGc11(vo.getGeneratingcapacity());
+									break;
+								case 12:
+									item.setGc12(vo.getGeneratingcapacity());
+									break;
+							}
+							windpowerGc[index-1]+=Double.parseDouble(vo.getGeneratingcapacity());
+						}
 
+					}
 				}
 			}
-		}
 
-		ProjectPlanVo vo=list.get(list.size()-1);
-		ProjectPlanVo wpGc=new ProjectPlanVo();
-		wpGc.setGc01(String.valueOf(windpowerGc[0]));
-		wpGc.setGc02(String.valueOf(windpowerGc[1]));
-		wpGc.setGc03(String.valueOf(windpowerGc[2]));
-		wpGc.setGc04(String.valueOf(windpowerGc[3]));
-		wpGc.setGc05(String.valueOf(windpowerGc[4]));
-		wpGc.setGc06(String.valueOf(windpowerGc[5]));
-		wpGc.setGc07(String.valueOf(windpowerGc[6]));
-		wpGc.setGc08(String.valueOf(windpowerGc[7]));
-		wpGc.setGc09(String.valueOf(windpowerGc[8]));
-		wpGc.setGc10(String.valueOf(windpowerGc[9]));
-		wpGc.setGc11(String.valueOf(windpowerGc[10]));
-		wpGc.setGc12(String.valueOf(windpowerGc[11]));
-		wpGc.setGeneratingcapacity(String.valueOf(windpowerGc[12]));
-		wpGc.setProjectName(currentWindpowerStation);
-
-		wpGc.setYear(year);
-		retValue.put(currentWindpowerStation, wpGc);
-		for(int j=0;j<13;j++){
-			totalGc[j]+=windpowerGc[j];
-			windpowerGc[j]=0;
+
+			ProjectPlanVo wpGc=new ProjectPlanVo();
+			wpGc.setGc01(String.valueOf(windpowerGc[0]));
+			wpGc.setGc02(String.valueOf(windpowerGc[1]));
+			wpGc.setGc03(String.valueOf(windpowerGc[2]));
+			wpGc.setGc04(String.valueOf(windpowerGc[3]));
+			wpGc.setGc05(String.valueOf(windpowerGc[4]));
+			wpGc.setGc06(String.valueOf(windpowerGc[5]));
+			wpGc.setGc07(String.valueOf(windpowerGc[6]));
+			wpGc.setGc08(String.valueOf(windpowerGc[7]));
+			wpGc.setGc09(String.valueOf(windpowerGc[8]));
+			wpGc.setGc10(String.valueOf(windpowerGc[9]));
+			wpGc.setGc11(String.valueOf(windpowerGc[10]));
+			wpGc.setGc12(String.valueOf(windpowerGc[11]));
+			wpGc.setGeneratingcapacity(String.valueOf(windpowerGc[12]));
+			wpGc.setProjectName(currentWindpowerStation);
+
+			wpGc.setYear(year);
+			retValue.put(currentWindpowerStation, wpGc);
+			for(int j=0;j<13;j++){
+				totalGc[j]+=windpowerGc[j];
+				windpowerGc[j]=0;
+			}
+			ProjectPlanVo totalVo=new ProjectPlanVo();
+			totalVo.setProjectName("合计");
+			totalVo.setYear(year);
+			totalVo.setGc01(String.valueOf(totalGc[0]));
+			totalVo.setGc02(String.valueOf(totalGc[1]));
+			totalVo.setGc03(String.valueOf(totalGc[2]));
+			totalVo.setGc04(String.valueOf(totalGc[3]));
+			totalVo.setGc05(String.valueOf(totalGc[4]));
+			totalVo.setGc06(String.valueOf(totalGc[5]));
+			totalVo.setGc07(String.valueOf(totalGc[6]));
+			totalVo.setGc08(String.valueOf(totalGc[7]));
+			totalVo.setGc09(String.valueOf(totalGc[8]));
+			totalVo.setGc10(String.valueOf(totalGc[9]));
+			totalVo.setGc11(String.valueOf(totalGc[10]));
+			totalVo.setGc12(String.valueOf(totalGc[11]));
+			totalVo.setGeneratingcapacity(String.valueOf(totalGc[12]));
+
+			result=new ArrayList<ProjectPlanVo>(retValue.values());
+			result.add(totalVo);
+
 		}
-		ProjectPlanVo totalVo=new ProjectPlanVo();
-		totalVo.setProjectName("合计");
-		totalVo.setYear(year);
-		totalVo.setGc01(String.valueOf(totalGc[0]));
-		totalVo.setGc02(String.valueOf(totalGc[1]));
-		totalVo.setGc03(String.valueOf(totalGc[2]));
-		totalVo.setGc04(String.valueOf(totalGc[3]));
-		totalVo.setGc05(String.valueOf(totalGc[4]));
-		totalVo.setGc06(String.valueOf(totalGc[5]));
-		totalVo.setGc07(String.valueOf(totalGc[6]));
-		totalVo.setGc08(String.valueOf(totalGc[7]));
-		totalVo.setGc09(String.valueOf(totalGc[8]));
-		totalVo.setGc10(String.valueOf(totalGc[9]));
-		totalVo.setGc11(String.valueOf(totalGc[10]));
-		totalVo.setGc12(String.valueOf(totalGc[11]));
-		totalVo.setGeneratingcapacity(String.valueOf(totalGc[12]));
-
-		List<ProjectPlanVo> result=new ArrayList<ProjectPlanVo>(retValue.values());
-		result.add(totalVo);
+
+
 
     	return result;
 	}
@@ -386,93 +388,98 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 
 	public int saveData(ProjectPlanVo vo)  {
 
-		ProjectPlanExample example = new ProjectPlanExample();
-		example.setOrderByClause("month asc");
+		List<ProjectPlan> list=new ArrayList<ProjectPlan>();
+    	if(StringUtils.notEmp(vo.getProjectid()) && StringUtils.notEmp(vo.getWindpower()) && StringUtils.notEmp(vo.getYear()))
+		{
+			ProjectPlanExample example = new ProjectPlanExample();
+			example.setOrderByClause("month asc");
 
-		ProjectPlanExample.Criteria criteria = example.createCriteria();
-		if (StringUtils.notEmp(vo.getProjectid())) {
-			criteria.andProjectidEqualTo(vo.getProjectid());
-		}
+			ProjectPlanExample.Criteria criteria = example.createCriteria();
+			if (StringUtils.notEmp(vo.getProjectid())) {
+				criteria.andProjectidEqualTo(vo.getProjectid());
+			}
 
-		if (StringUtils.notEmp(vo.getYear())) {
-			criteria.andYearEqualTo(vo.getYear());
-		}
+			if (StringUtils.notEmp(vo.getYear())) {
+				criteria.andYearEqualTo(vo.getYear());
+			}
 
-		List<ProjectPlan> ls = projectPlanMapper.selectByExample(example);
-		if(!ls.isEmpty())
-		{
-			for(ProjectPlan pp:ls)
+			List<ProjectPlan> ls = projectPlanMapper.selectByExample(example);
+			if(!ls.isEmpty())
 			{
-				deleteByPrimaryKey(pp.getId());
+				for(ProjectPlan pp:ls)
+				{
+					deleteByPrimaryKey(pp.getId());
+				}
 			}
-		}
 
-		List<ProjectPlan> list=new ArrayList<ProjectPlan>();
 
-		for(int i=1;i<13;i++)
-		{
+
+			for(int i=1;i<13;i++)
+			{
+				ProjectPlan po=new ProjectPlan();
+				po.setProjectid(vo.getProjectid());
+				po.setWindpowerid(vo.getWindpower());
+				po.setYear(vo.getYear());
+				po.setMonth(String.valueOf(i));
+				list.add(po);
+			}
+
 			ProjectPlan po=new ProjectPlan();
 			po.setProjectid(vo.getProjectid());
 			po.setWindpowerid(vo.getWindpower());
 			po.setYear(vo.getYear());
-			po.setMonth(String.valueOf(i));
 			list.add(po);
-		}
 
-		ProjectPlan po=new ProjectPlan();
-		po.setProjectid(vo.getProjectid());
-		po.setWindpowerid(vo.getWindpower());
-		po.setYear(vo.getYear());
-		list.add(po);
-
-		for(ProjectPlan pp:list)
-		{
-			if(StringUtils.empty(pp.getMonth())){
-				pp.setGeneratingcapacity(vo.getGeneratingcapacity());
-			}
-			else{
-				int index=Integer.parseInt(pp.getMonth());
-				switch(index){
-					case 1:
-						pp.setGeneratingcapacity(vo.getGc01());
-						break;
-					case 2:
-						pp.setGeneratingcapacity(vo.getGc02());
-						break;
-					case 3:
-						pp.setGeneratingcapacity(vo.getGc03());
-						break;
-					case 4:
-						pp.setGeneratingcapacity(vo.getGc04());
-						break;
-					case 5:
-						pp.setGeneratingcapacity(vo.getGc05());
-						break;
-					case 6:
-						pp.setGeneratingcapacity(vo.getGc06());
-						break;
-					case 7:
-						pp.setGeneratingcapacity(vo.getGc07());
-						break;
-					case 8:
-						pp.setGeneratingcapacity(vo.getGc08());
-						break;
-					case 9:
-						pp.setGeneratingcapacity(vo.getGc09());
-						break;
-					case 10:
-						pp.setGeneratingcapacity(vo.getGc10());
-						break;
-					case 11:
-						pp.setGeneratingcapacity(vo.getGc11());
-						break;
-					case 12:
-						pp.setGeneratingcapacity(vo.getGc12());
-						break;
+			for(ProjectPlan pp:list)
+			{
+				if(StringUtils.empty(pp.getMonth())){
+					pp.setGeneratingcapacity(vo.getGeneratingcapacity());
+				}
+				else{
+					int index=Integer.parseInt(pp.getMonth());
+					switch(index){
+						case 1:
+							pp.setGeneratingcapacity(vo.getGc01());
+							break;
+						case 2:
+							pp.setGeneratingcapacity(vo.getGc02());
+							break;
+						case 3:
+							pp.setGeneratingcapacity(vo.getGc03());
+							break;
+						case 4:
+							pp.setGeneratingcapacity(vo.getGc04());
+							break;
+						case 5:
+							pp.setGeneratingcapacity(vo.getGc05());
+							break;
+						case 6:
+							pp.setGeneratingcapacity(vo.getGc06());
+							break;
+						case 7:
+							pp.setGeneratingcapacity(vo.getGc07());
+							break;
+						case 8:
+							pp.setGeneratingcapacity(vo.getGc08());
+							break;
+						case 9:
+							pp.setGeneratingcapacity(vo.getGc09());
+							break;
+						case 10:
+							pp.setGeneratingcapacity(vo.getGc10());
+							break;
+						case 11:
+							pp.setGeneratingcapacity(vo.getGc11());
+							break;
+						case 12:
+							pp.setGeneratingcapacity(vo.getGc12());
+							break;
+					}
 				}
 			}
 		}
 
+
 		int value=0;
 		for(ProjectPlan pp:list)
 		{

src/main/resources/application-dev.yml

@@ -7,10 +7,10 @@ spring:
     druid:
      #主库数据源
      master:
-        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+        url: jdbc:mysql://49.4.78.143:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
         username: root
         password: 123456
-#        url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
+#        url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd  49.4.78.143
 #        username: nxfdprod
 #        password: gdnxfd123
 #        driver-class-name: oracle.jdbc.driver.OracleDriver

src/test/java/test/ProjectPlanTest.java

@@ -11,6 +11,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
+import java.util.List;
+
 @SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
 public class ProjectPlanTest {
 
@@ -29,32 +31,32 @@ public class ProjectPlanTest {
 
 
 
-//        AjaxResult ajaxResult =projectPlanController.getProjectPlanVo(null,null,"2021");
+        AjaxResult ajaxResult =projectPlanController.getProjectPlanVo(null,null,"2021");
+
+        List<ProjectPlanVo> test=(List<ProjectPlanVo>)ajaxResult.get("data");
+        for(ProjectPlanVo wtd:test)
+        {
+            System.out.println(wtd.getGc01()+ wtd.getGc02()+ wtd.getGc03()+ wtd.getGc04()+wtd.getGc05()+wtd.getGc06()+
+                    wtd.getGc07()+wtd.getGc08()+wtd.getGc09()+wtd.getGc10()+wtd.getGc11()+wtd.getGc12()+wtd.getGeneratingcapacity()+
+                    wtd.getWindpower()+wtd.getProjectid()
+                    );
+        }
+
+//        AjaxResult ajaxResult =projectPlanController.getSingleProjectPlan(pjId,year);
+//
+//        ProjectPlanVo wtd=(ProjectPlanVo)ajaxResult.get("data");
+//        System.out.println(wtd.getGc01()+ wtd.getGc02()+ wtd.getGc03()+ wtd.getGc04()+wtd.getGc05()+wtd.getGc06()+
+//                wtd.getGc07()+wtd.getGc08()+wtd.getGc09()+wtd.getGc10()+wtd.getGc11()+wtd.getGc12()+wtd.getGeneratingcapacity()+
+//                wtd.getWindpower()+wtd.getProjectid()
+//        );
+//
+//        wtd.setGc01("111");
+//        wtd.setGc02("222");
+//
+//        AjaxResult valeu=projectPlanController.saveData(wtd);
 //
-//        List<ProjectPlanVo> test=(List<ProjectPlanVo>)ajaxResult.get("data");
-//        for(ProjectPlanVo wtd:test)
-//        {
-//            System.out.println(wtd.getGc01()+ wtd.getGc02()+ wtd.getGc03()+ wtd.getGc04()+wtd.getGc05()+wtd.getGc06()+
-//                    wtd.getGc07()+wtd.getGc08()+wtd.getGc09()+wtd.getGc10()+wtd.getGc11()+wtd.getGc12()+wtd.getGeneratingcapacity()+
-//                    wtd.getWindpower()+wtd.getProjectid()
-//                    );
-//        }
-
-        AjaxResult ajaxResult =projectPlanController.getSingleProjectPlan(pjId,year);
-
-        ProjectPlanVo wtd=(ProjectPlanVo)ajaxResult.get("data");
-        System.out.println(wtd.getGc01()+ wtd.getGc02()+ wtd.getGc03()+ wtd.getGc04()+wtd.getGc05()+wtd.getGc06()+
-                wtd.getGc07()+wtd.getGc08()+wtd.getGc09()+wtd.getGc10()+wtd.getGc11()+wtd.getGc12()+wtd.getGeneratingcapacity()+
-                wtd.getWindpower()+wtd.getProjectid()
-        );
-
-        wtd.setGc01("111");
-        wtd.setGc02("222");
-
-        AjaxResult valeu=projectPlanController.saveData(wtd);
-
-       int temp=(Integer)valeu.get("data");
-       System.out.println(temp);
+//       int temp=(Integer)valeu.get("data");
+//       System.out.println(temp);
     }