From 7c8edc7c7187288c5556c030c3358024cec45c50 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 20 May 2022 15:50:25 +0800
Subject: [PATCH] =?UTF-8?q?space=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectNameInfoEOController.java          |  6 +-
 .../project/entity/ProjectNameInfoEO.java     |  3 +
 .../service/IProjectNameInfoEOService.java    |  2 +-
 .../impl/ProjectNameInfoEOServiceImpl.java    | 89 +++++++++++--------
 4 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java
index ad8e36248..08b2bd7db 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java
@@ -181,8 +181,8 @@ public class ProjectNameInfoEOController extends JeroController<ProjectNameInfoE
 	  */
 	 @AutoLog(value = "项目名信息表-space")
 	 @ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
-	 @RequestMapping(value = "/getSign", method = RequestMethod.POST)
-	 public String getSign() {
-		 return projectNameInfoEOService.getSpaceInfo();
+	 @RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST)
+	 public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) {
+		 projectNameInfoEOService.getSpaceInfo(cut);
 	 }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java
index 75a9193b8..64a35c61c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java
@@ -75,4 +75,7 @@ public class ProjectNameInfoEO implements Serializable {
     @ApiModelProperty(value = "车型平台")
     private java.lang.String digitalPlatform;
 
+    @TableField(exist = false)
+    private String cut;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java
index 515b0554e..4a6f9033d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java
@@ -61,5 +61,5 @@ public interface IProjectNameInfoEOService extends IService<ProjectNameInfoEO> {
 
 
 
-	String getSpaceInfo();
+	void getSpaceInfo(String cut);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
index f93950a5a..6b31b777a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java
@@ -4,11 +4,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.modules.project.entity.ProjectNameInfoEO;
 import com.jero.modules.project.entity.ProjectYearNameInfoEO;
 import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
 import com.jero.modules.project.service.IProjectNameInfoEOService;
 import com.jero.modules.space.service.SpaceServiceImpl;
+import com.jero.modules.system.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -104,12 +107,13 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
 	}
 
 	@Override
-	public String getSpaceInfo(){
+	public void getSpaceInfo(String cut){
 		String jsonData ="";
 		try {
-		//	jsonData = spaceService.getSign();
-
-			String jsonData = "{\n" +
+			jsonData = spaceService.getSign();
+			if(StringUtils.isNotBlank(jsonData)) {
+				//静态测试数据
+		/*	jsonData = "{\n" +
 					"    \"resultData\": [\n" +
 					"        {\n" +
 					"            \"modelCode\": \"ES8_00\",\n" +
@@ -268,47 +272,60 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
 					"    ],\n" +
 					"    \"resultCode\": \"WL-0000\",\n" +
 					"    \"resultDesc\": \"Success\"\n" +
-					"}";
+					"}";*/
 
-			JSONObject result = (JSONObject) JSON.parse(jsonData);
-			JSONArray resultData = result.getJSONArray("resultData");
+				JSONObject result = (JSONObject) JSON.parse(jsonData);
+				JSONArray resultData = result.getJSONArray("resultData");
 
-			String modelName = "";//项目名称
-			String hardwarePltName = "";//车型平台
-			String softwarePltName= "";//数字平台
+				String modelName = "";//项目名称
+				String hardwarePltName = "";//车型平台
+				String softwarePltName = "";//数字平台
 
-			//获取resultData中所需的数据
-			for(int i=0 ; i < resultData.size() ; i++){
-				JSONObject jsonObject = resultData.getJSONObject(i);
-				modelName = jsonObject.getString("modelName");//项目名称
-				hardwarePltName = jsonObject.getString("hardwarePltName");//车型平台
-				softwarePltName= jsonObject.getString("softwarePltName");//数字平台
-				String nameInfoId = UUID.randomUUID().toString().replace("-", "");
+				//获取resultData中所需的数据
+				for (int i = 0; i < resultData.size(); i++) {
+					JSONObject jsonObject = resultData.getJSONObject(i);
+					modelName = jsonObject.getString("modelName");//项目名称
+					hardwarePltName = jsonObject.getString("hardwarePltName");//车型平台
+					softwarePltName = jsonObject.getString("softwarePltName");//数字平台
+					String nameInfoId = UUID.randomUUID().toString().replace("-", "");
 
-				ProjectNameInfoEO projectNameInfoEO = new ProjectNameInfoEO();
-				projectNameInfoEO.setId(nameInfoId);
-				projectNameInfoEO.setProjectName(modelName);
-				projectNameInfoEO.setVehiclePlatform(hardwarePltName);
-				projectNameInfoEO.setDigitalPlatform(softwarePltName);
-				//保存
-				save(projectNameInfoEO);
-
-				//设置年款名
-				JSONArray modelYearInfoJson = jsonObject.getJSONArray("modelYearInfoList");
-				for(int j=0 ; j < modelYearInfoJson.size() ; j++){
-					JSONObject modelYearInfo = modelYearInfoJson.getJSONObject(j);
-					String yearName = modelYearInfo.getString("yearName");
-
-					ProjectYearNameInfoEO projectYearNameInfoEO = new ProjectYearNameInfoEO();
-					projectYearNameInfoEO.setProjectNameId(nameInfoId);
-					projectYearNameInfoEO.setYearName(yearName);
+					ProjectNameInfoEO projectNameInfoEO = new ProjectNameInfoEO();
+					projectNameInfoEO.setId(nameInfoId);
+					projectNameInfoEO.setProjectName(modelName);
+					projectNameInfoEO.setVehiclePlatform(hardwarePltName);
+					projectNameInfoEO.setDigitalPlatform(softwarePltName);
 					//保存
-					projectYearNameInfoEOService.save(projectYearNameInfoEO);
+					save(projectNameInfoEO);
+
+					//设置年款名
+					JSONArray modelYearInfoJson = jsonObject.getJSONArray("modelYearInfoList");
+					for (int j = 0; j < modelYearInfoJson.size(); j++) {
+						JSONObject modelYearInfo = modelYearInfoJson.getJSONObject(j);
+						String yearName = modelYearInfo.getString("yearName");
+
+						ProjectYearNameInfoEO projectYearNameInfoEO = new ProjectYearNameInfoEO();
+						projectYearNameInfoEO.setProjectNameId(nameInfoId);
+						projectYearNameInfoEO.setYearName(yearName);
+						//保存
+						projectYearNameInfoEOService.save(projectYearNameInfoEO);
+
+					}
+					if(CutEnum.CN.getValue().equals(cut)) {
+						throw new JeroBootException("从Space获取项目名称相关数据,成功保存");
+					}else{
+						throw new JeroBootException("Get the data related to the project name from Space and save it successfully.");
+					}
+				}
+			}else{
+				if(CutEnum.CN.getValue().equals(cut)) {
+					throw new JeroBootException("从Space获取项目名称相关数据为空");
+				}else{
+					throw new JeroBootException("Data related to obtaining project name from Space is empty.");
 				}
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}return jsonData;
+		}
 	}
 
 }