space系统关联项目库修改
This commit is contained in:
+3
-3
@@ -181,8 +181,8 @@ public class ProjectNameInfoEOController extends JeroController<ProjectNameInfoE
|
|||||||
*/
|
*/
|
||||||
@AutoLog(value = "项目名信息表-space")
|
@AutoLog(value = "项目名信息表-space")
|
||||||
@ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
|
@ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
|
||||||
@RequestMapping(value = "/getSign", method = RequestMethod.POST)
|
@RequestMapping(value = "/getSpaceInfo", method = RequestMethod.POST)
|
||||||
public String getSign() {
|
public void getSpaceInfo(@RequestParam(name="cut",required=true) String cut) {
|
||||||
return projectNameInfoEOService.getSpaceInfo();
|
projectNameInfoEOService.getSpaceInfo(cut);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -75,4 +75,7 @@ public class ProjectNameInfoEO implements Serializable {
|
|||||||
@ApiModelProperty(value = "车型平台")
|
@ApiModelProperty(value = "车型平台")
|
||||||
private java.lang.String digitalPlatform;
|
private java.lang.String digitalPlatform;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String cut;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -61,5 +61,5 @@ public interface IProjectNameInfoEOService extends IService<ProjectNameInfoEO> {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
String getSpaceInfo();
|
void getSpaceInfo(String cut);
|
||||||
}
|
}
|
||||||
|
|||||||
+23
-6
@@ -4,11 +4,14 @@ import com.alibaba.fastjson.JSON;
|
|||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
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.ProjectNameInfoEO;
|
||||||
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
|
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
|
||||||
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
|
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
|
||||||
import com.jero.modules.project.service.IProjectNameInfoEOService;
|
import com.jero.modules.project.service.IProjectNameInfoEOService;
|
||||||
import com.jero.modules.space.service.SpaceServiceImpl;
|
import com.jero.modules.space.service.SpaceServiceImpl;
|
||||||
|
import com.jero.modules.system.util.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@@ -104,12 +107,13 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSpaceInfo(){
|
public void getSpaceInfo(String cut){
|
||||||
String jsonData ="";
|
String jsonData ="";
|
||||||
try {
|
try {
|
||||||
// jsonData = spaceService.getSign();
|
jsonData = spaceService.getSign();
|
||||||
|
if(StringUtils.isNotBlank(jsonData)) {
|
||||||
String jsonData = "{\n" +
|
//静态测试数据
|
||||||
|
/* jsonData = "{\n" +
|
||||||
" \"resultData\": [\n" +
|
" \"resultData\": [\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"modelCode\": \"ES8_00\",\n" +
|
" \"modelCode\": \"ES8_00\",\n" +
|
||||||
@@ -268,7 +272,7 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
|
|||||||
" ],\n" +
|
" ],\n" +
|
||||||
" \"resultCode\": \"WL-0000\",\n" +
|
" \"resultCode\": \"WL-0000\",\n" +
|
||||||
" \"resultDesc\": \"Success\"\n" +
|
" \"resultDesc\": \"Success\"\n" +
|
||||||
"}";
|
"}";*/
|
||||||
|
|
||||||
JSONObject result = (JSONObject) JSON.parse(jsonData);
|
JSONObject result = (JSONObject) JSON.parse(jsonData);
|
||||||
JSONArray resultData = result.getJSONArray("resultData");
|
JSONArray resultData = result.getJSONArray("resultData");
|
||||||
@@ -304,11 +308,24 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOM
|
|||||||
projectYearNameInfoEO.setYearName(yearName);
|
projectYearNameInfoEO.setYearName(yearName);
|
||||||
//保存
|
//保存
|
||||||
projectYearNameInfoEOService.save(projectYearNameInfoEO);
|
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) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}return jsonData;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user