space系统关联项目库设置
This commit is contained in:
+10
-4
@@ -9,6 +9,7 @@ import com.jero.common.system.base.controller.JeroController;
|
|||||||
import com.jero.common.system.query.QueryGenerator;
|
import com.jero.common.system.query.QueryGenerator;
|
||||||
import com.jero.modules.project.entity.ProjectNameInfoEO;
|
import com.jero.modules.project.entity.ProjectNameInfoEO;
|
||||||
import com.jero.modules.project.service.IProjectNameInfoEOService;
|
import com.jero.modules.project.service.IProjectNameInfoEOService;
|
||||||
|
import com.jero.modules.system.util.StringUtils;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -23,7 +24,7 @@ import java.util.Arrays;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 项目名信息表
|
* @Description: 项目名信息表
|
||||||
* @Author: jero-boot
|
* @Author: jero-boot
|
||||||
* @Date: 2022-04-18
|
* @Date: 2022-04-18
|
||||||
@@ -68,8 +69,13 @@ public class ProjectNameInfoEOController extends JeroController<ProjectNameInfoE
|
|||||||
@ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询")
|
@ApiOperation(value="项目名信息表-列表查询", notes="项目名信息表-列表查询")
|
||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/list")
|
||||||
public Result<List<ProjectNameInfoEO>> queryList() {
|
public Result<List<ProjectNameInfoEO>> queryList() {
|
||||||
List<ProjectNameInfoEO> list = projectNameInfoEOService.queryList();
|
List<ProjectNameInfoEO> list = projectNameInfoEOService.queryList();
|
||||||
return Result.OK(list);
|
for(ProjectNameInfoEO projectNameInfoEO : list){
|
||||||
|
if(StringUtils.isNotBlank(projectNameInfoEO.getYearName())){
|
||||||
|
projectNameInfoEO.setProjectName(projectNameInfoEO.getProjectName()+ "-" +projectNameInfoEO.getYearName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Result.OK(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -177,6 +183,6 @@ public class ProjectNameInfoEOController extends JeroController<ProjectNameInfoE
|
|||||||
@ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
|
@ApiOperation(value="项目名信息表-space", notes="项目名信息表-space")
|
||||||
@RequestMapping(value = "/getSign", method = RequestMethod.POST)
|
@RequestMapping(value = "/getSign", method = RequestMethod.POST)
|
||||||
public String getSign() {
|
public String getSign() {
|
||||||
return projectNameInfoEOService.getYapiInfo();
|
return projectNameInfoEOService.getSpaceInfo();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+170
@@ -0,0 +1,170 @@
|
|||||||
|
package com.jero.modules.project.controller;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import com.jero.common.api.vo.Result;
|
||||||
|
import com.jero.common.system.query.QueryGenerator;
|
||||||
|
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
|
||||||
|
import com.jero.modules.project.service.IProjectYearNameInfoEOService;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import com.jero.common.system.base.controller.JeroController;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.web.servlet.ModelAndView;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import com.jero.common.aspect.annotation.AutoLog;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 项目库-项目名年号表
|
||||||
|
* @Author: jero-boot
|
||||||
|
* @Date: 2022-05-20
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Api(tags="项目库-项目名年号表")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/project/projectYearNameInfoEO")
|
||||||
|
@Slf4j
|
||||||
|
public class ProjectYearNameInfoEOController extends JeroController<ProjectYearNameInfoEO, IProjectYearNameInfoEOService> {
|
||||||
|
@Autowired
|
||||||
|
private IProjectYearNameInfoEOService projectYearNameInfoEOService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页列表查询
|
||||||
|
*
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目库-项目名年号表-分页列表查询")
|
||||||
|
@ApiOperation(value="项目库-项目名年号表-分页列表查询", notes="项目库-项目名年号表-分页列表查询")
|
||||||
|
@GetMapping(value = "/page")
|
||||||
|
public Result<?> queryPageList(ProjectYearNameInfoEO projectYearNameInfoEO,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
QueryWrapper<ProjectYearNameInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(projectYearNameInfoEO, req.getParameterMap());
|
||||||
|
Page<ProjectYearNameInfoEO> page = new Page<ProjectYearNameInfoEO>(pageNo, pageSize);
|
||||||
|
IPage<ProjectYearNameInfoEO> pageList = projectYearNameInfoEOService.page(page, queryWrapper);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 列表查询
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目库-项目名年号表-列表查询")
|
||||||
|
@ApiOperation(value="项目库-项目名年号表-列表查询", notes="项目库-项目名年号表-列表查询")
|
||||||
|
@GetMapping(value = "/list")
|
||||||
|
public Result<List<ProjectYearNameInfoEO>> queryList() {
|
||||||
|
List<ProjectYearNameInfoEO> list = projectYearNameInfoEOService.queryList();
|
||||||
|
return Result.OK(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 添加
|
||||||
|
*
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目库-项目名年号表-添加")
|
||||||
|
@ApiOperation(value="项目库-项目名年号表-添加", notes="项目库-项目名年号表-添加")
|
||||||
|
@PostMapping(value = "/add")
|
||||||
|
public Result<?> add(@Validated @RequestBody ProjectYearNameInfoEO projectYearNameInfoEO) {
|
||||||
|
projectYearNameInfoEOService.add(projectYearNameInfoEO);
|
||||||
|
return Result.OK("添加成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 编辑
|
||||||
|
*
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目库-项目名年号表-编辑")
|
||||||
|
@ApiOperation(value="项目库-项目名年号表-编辑", notes="项目库-项目名年号表-编辑")
|
||||||
|
@PutMapping(value = "/edit")
|
||||||
|
public Result<?> edit(@Validated @RequestBody ProjectYearNameInfoEO projectYearNameInfoEO) {
|
||||||
|
projectYearNameInfoEOService.editById(projectYearNameInfoEO);
|
||||||
|
return Result.OK("编辑成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id删除
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目库-项目名年号表-通过id删除")
|
||||||
|
@ApiOperation(value="项目库-项目名年号表-通过id删除", notes="项目库-项目名年号表-通过id删除")
|
||||||
|
@DeleteMapping(value = "/delete")
|
||||||
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||||
|
projectYearNameInfoEOService.deleteById(id);
|
||||||
|
return Result.OK("删除成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除
|
||||||
|
*
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目库-项目名年号表-批量删除")
|
||||||
|
@ApiOperation(value="项目库-项目名年号表-批量删除", notes="项目库-项目名年号表-批量删除")
|
||||||
|
@DeleteMapping(value = "/deleteBatch")
|
||||||
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||||
|
this.projectYearNameInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||||
|
return Result.OK("批量删除成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id查询
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@AutoLog(value = "项目库-项目名年号表-通过id查询")
|
||||||
|
@ApiOperation(value="项目库-项目名年号表-通过id查询", notes="项目库-项目名年号表-通过id查询")
|
||||||
|
@GetMapping(value = "/queryById")
|
||||||
|
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||||
|
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOService.queryById(id);
|
||||||
|
if(projectYearNameInfoEO==null) {
|
||||||
|
return Result.error("未找到对应数据");
|
||||||
|
}
|
||||||
|
return Result.OK(projectYearNameInfoEO);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出excel
|
||||||
|
*
|
||||||
|
* @param request
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/exportXls")
|
||||||
|
public ModelAndView exportXls(HttpServletRequest request, ProjectYearNameInfoEO projectYearNameInfoEO) {
|
||||||
|
return super.exportXls(request, projectYearNameInfoEO, ProjectYearNameInfoEO.class, "项目库-项目名年号表");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过excel导入数据
|
||||||
|
*
|
||||||
|
* @param request
|
||||||
|
* @param response
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||||
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||||
|
return super.importExcel(request, response, ProjectYearNameInfoEO.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
-2
@@ -56,11 +56,9 @@ public class ProjectLibraryBase implements Serializable {
|
|||||||
private java.lang.String certificationEngineerName;
|
private java.lang.String certificationEngineerName;
|
||||||
|
|
||||||
/**车型平台*/
|
/**车型平台*/
|
||||||
@Dict(dicCode = "vehicle_platform")
|
|
||||||
private java.lang.String vehiclePlatform;
|
private java.lang.String vehiclePlatform;
|
||||||
|
|
||||||
/**数字平台*/
|
/**数字平台*/
|
||||||
@Dict(dicCode = "digital_platform")
|
|
||||||
private java.lang.String digitalPlatform;
|
private java.lang.String digitalPlatform;
|
||||||
|
|
||||||
/**IPD信息*/
|
/**IPD信息*/
|
||||||
|
|||||||
+11
-4
@@ -1,7 +1,6 @@
|
|||||||
package com.jero.modules.project.entity;
|
package com.jero.modules.project.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
@@ -30,7 +29,7 @@ public class ProjectNameInfoEO implements Serializable {
|
|||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/**主键*/
|
/**主键*/
|
||||||
@TableId(type = IdType.ASSIGN_ID)
|
// @TableId(type = IdType.ASSIGN_ID)
|
||||||
@ApiModelProperty(value = "主键")
|
@ApiModelProperty(value = "主键")
|
||||||
private java.lang.String id;
|
private java.lang.String id;
|
||||||
|
|
||||||
@@ -64,8 +63,16 @@ public class ProjectNameInfoEO implements Serializable {
|
|||||||
private java.lang.String projectName;
|
private java.lang.String projectName;
|
||||||
|
|
||||||
/**年款名称*/
|
/**年款名称*/
|
||||||
@Excel(name = "年款名称", width = 15)
|
|
||||||
@ApiModelProperty(value = "年款名称")
|
@ApiModelProperty(value = "年款名称")
|
||||||
|
@TableField(exist = false)
|
||||||
private java.lang.String yearName;
|
private java.lang.String yearName;
|
||||||
|
|
||||||
|
/**车型平台*/
|
||||||
|
@ApiModelProperty(value = "车型平台")
|
||||||
|
private java.lang.String vehiclePlatform;
|
||||||
|
|
||||||
|
/**数字平台*/
|
||||||
|
@ApiModelProperty(value = "车型平台")
|
||||||
|
private java.lang.String digitalPlatform;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+74
@@ -0,0 +1,74 @@
|
|||||||
|
package com.jero.modules.project.entity;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import lombok.Data;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||||
|
import com.jero.common.aspect.annotation.Dict;
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 项目库-项目名年号表
|
||||||
|
* @Author: jero-boot
|
||||||
|
* @Date: 2022-05-20
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@TableName("project_year_name_info")
|
||||||
|
@Accessors(chain = true)
|
||||||
|
@EqualsAndHashCode(callSuper = false)
|
||||||
|
@ApiModel(value="project_year_name_info对象", description="项目库-项目名年号表")
|
||||||
|
public class ProjectYearNameInfoEO implements Serializable {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**主键*/
|
||||||
|
@TableId(type = IdType.ASSIGN_ID)
|
||||||
|
@ApiModelProperty(value = "主键")
|
||||||
|
private String id;
|
||||||
|
|
||||||
|
/**创建人*/
|
||||||
|
@ApiModelProperty(value = "创建人")
|
||||||
|
private String createBy;
|
||||||
|
|
||||||
|
/**创建日期*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
|
@ApiModelProperty(value = "创建日期")
|
||||||
|
private java.util.Date createTime;
|
||||||
|
|
||||||
|
/**更新人*/
|
||||||
|
@ApiModelProperty(value = "更新人")
|
||||||
|
private String updateBy;
|
||||||
|
|
||||||
|
/**更新日期*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
|
@ApiModelProperty(value = "更新日期")
|
||||||
|
private java.util.Date updateTime;
|
||||||
|
|
||||||
|
/**所属部门*/
|
||||||
|
@ApiModelProperty(value = "所属部门")
|
||||||
|
private String sysOrgCode;
|
||||||
|
|
||||||
|
/**项目名id*/
|
||||||
|
@Excel(name = "项目名id", width = 15)
|
||||||
|
@ApiModelProperty(value = "项目名id")
|
||||||
|
private String projectNameId;
|
||||||
|
|
||||||
|
/**年款名称*/
|
||||||
|
@Excel(name = "年款名称", width = 15)
|
||||||
|
@ApiModelProperty(value = "年款名称")
|
||||||
|
private String yearName;
|
||||||
|
|
||||||
|
}
|
||||||
+8
-5
@@ -1,10 +1,10 @@
|
|||||||
package com.jero.modules.project.mapper;
|
package com.jero.modules.project.mapper;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
import com.jero.modules.project.entity.ProjectNameInfoEO;
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.jero.modules.project.entity.ProjectNameInfoEO;
|
||||||
|
import org.apache.ibatis.annotations.Select;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 项目名信息表
|
* @Description: 项目名信息表
|
||||||
@@ -13,5 +13,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface ProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
|
public interface ProjectNameInfoEOMapper extends BaseMapper<ProjectNameInfoEO> {
|
||||||
|
@Select("select pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" +
|
||||||
|
"from project_name_info as pni\n" +
|
||||||
|
"left join project_year_name_info as pyni on pni.id=pyni.project_name_id;")
|
||||||
|
List<ProjectNameInfoEO> selectProjectNameAndYear();
|
||||||
}
|
}
|
||||||
|
|||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
package com.jero.modules.project.mapper;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 项目库-项目名年号表
|
||||||
|
* @Author: jero-boot
|
||||||
|
* @Date: 2022-05-20
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
public interface ProjectYearNameInfoEOMapper extends BaseMapper<ProjectYearNameInfoEO> {
|
||||||
|
}
|
||||||
+2
@@ -9,5 +9,7 @@
|
|||||||
<result column="update_time" property="updateTime" />
|
<result column="update_time" property="updateTime" />
|
||||||
<result column="sys_org_code" property="sysOrgCode" />
|
<result column="sys_org_code" property="sysOrgCode" />
|
||||||
<result column="project_name" property="projectName" />
|
<result column="project_name" property="projectName" />
|
||||||
|
<result column="vehicle_platform" property="vehiclePlatform" />
|
||||||
|
<result column="digital_platform" property="digitalPlatform" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
</mapper>
|
</mapper>
|
||||||
+14
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper">
|
||||||
|
<resultMap id="ProjectYearNameInfoEOResultMap" type="com.jero.modules.project.entity.ProjectYearNameInfoEO">
|
||||||
|
<id column="id" property="id" />
|
||||||
|
<result column="create_by" property="createBy" />
|
||||||
|
<result column="create_time" property="createTime" />
|
||||||
|
<result column="update_by" property="updateBy" />
|
||||||
|
<result column="update_time" property="updateTime" />
|
||||||
|
<result column="sys_org_code" property="sysOrgCode" />
|
||||||
|
<result column="project_name_id" property="projectNameId" />
|
||||||
|
<result column="year_name" property="yearName" />
|
||||||
|
</resultMap>
|
||||||
|
</mapper>
|
||||||
+3
-1
@@ -59,5 +59,7 @@ public interface IProjectNameInfoEOService extends IService<ProjectNameInfoEO> {
|
|||||||
*/
|
*/
|
||||||
List<ProjectNameInfoEO> queryList();
|
List<ProjectNameInfoEO> queryList();
|
||||||
|
|
||||||
String getYapiInfo();
|
|
||||||
|
|
||||||
|
String getSpaceInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+61
@@ -0,0 +1,61 @@
|
|||||||
|
package com.jero.modules.project.service;
|
||||||
|
|
||||||
|
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 项目库-项目名年号表
|
||||||
|
* @Author: jero-boot
|
||||||
|
* @Date: 2022-05-20
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
public interface IProjectYearNameInfoEOService extends IService<ProjectYearNameInfoEO> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 保存
|
||||||
|
*
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void add(ProjectYearNameInfoEO projectYearNameInfoEO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新
|
||||||
|
*
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void editById(ProjectYearNameInfoEO projectYearNameInfoEO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id删除
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void deleteById(String id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除
|
||||||
|
*
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void deleteByIds(List<String> ids);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id查询
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
ProjectYearNameInfoEO queryById(String id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 列表查询
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<ProjectYearNameInfoEO> queryList();
|
||||||
|
}
|
||||||
+236
-189
@@ -1,7 +1,11 @@
|
|||||||
package com.jero.modules.project.service.impl;
|
package com.jero.modules.project.service.impl;
|
||||||
|
|
||||||
|
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
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.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;
|
||||||
@@ -10,6 +14,7 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 项目名信息表
|
* @Description: 项目名信息表
|
||||||
@@ -19,8 +24,14 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOMapper, ProjectNameInfoEO> implements IProjectNameInfoEOService {
|
public class ProjectNameInfoEOServiceImpl extends ServiceImpl<ProjectNameInfoEOMapper, ProjectNameInfoEO> implements IProjectNameInfoEOService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private SpaceServiceImpl spaceService;
|
private ProjectNameInfoEOMapper prjectNameMapper;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private SpaceServiceImpl spaceService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService;
|
||||||
/**
|
/**
|
||||||
* 保存
|
* 保存
|
||||||
*
|
*
|
||||||
@@ -28,12 +39,12 @@ private SpaceServiceImpl spaceService;
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void add(ProjectNameInfoEO projectNameInfoEO) {
|
public void add(ProjectNameInfoEO projectNameInfoEO) {
|
||||||
Date now = new Date();
|
Date now = new Date();
|
||||||
projectNameInfoEO.setCreateTime(now);
|
projectNameInfoEO.setCreateTime(now);
|
||||||
projectNameInfoEO.setUpdateTime(now);
|
projectNameInfoEO.setUpdateTime(now);
|
||||||
save(projectNameInfoEO);
|
save(projectNameInfoEO);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新
|
* 更新
|
||||||
@@ -42,11 +53,11 @@ private SpaceServiceImpl spaceService;
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void editById(ProjectNameInfoEO projectNameInfoEO) {
|
public void editById(ProjectNameInfoEO projectNameInfoEO) {
|
||||||
Date now = new Date();
|
Date now = new Date();
|
||||||
projectNameInfoEO.setUpdateTime(now);
|
projectNameInfoEO.setUpdateTime(now);
|
||||||
saveOrUpdate(projectNameInfoEO);
|
saveOrUpdate(projectNameInfoEO);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过id删除
|
* 通过id删除
|
||||||
@@ -55,9 +66,9 @@ private SpaceServiceImpl spaceService;
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void deleteById(String id) {
|
public void deleteById(String id) {
|
||||||
removeById(id);
|
removeById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除
|
* 批量删除
|
||||||
@@ -66,9 +77,9 @@ private SpaceServiceImpl spaceService;
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void deleteByIds(List<String> ids) {
|
public void deleteByIds(List<String> ids) {
|
||||||
removeByIds(ids);
|
removeByIds(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过id查询
|
* 通过id查询
|
||||||
@@ -77,188 +88,224 @@ private SpaceServiceImpl spaceService;
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ProjectNameInfoEO queryById(String id) {
|
public ProjectNameInfoEO queryById(String id) {
|
||||||
return getById(id);
|
return getById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 列表查询
|
* 列表查询
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<ProjectNameInfoEO> queryList() {
|
public List<ProjectNameInfoEO> queryList() {
|
||||||
return list();
|
List<ProjectNameInfoEO> projectNameAndYear = prjectNameMapper.selectProjectNameAndYear();
|
||||||
}
|
return projectNameAndYear;
|
||||||
@Override
|
}
|
||||||
public String getYapiInfo(){
|
|
||||||
|
@Override
|
||||||
|
public String getSpaceInfo(){
|
||||||
String sign ="";
|
String sign ="";
|
||||||
try {
|
try {
|
||||||
// sign = spaceService.getSign();
|
// sign = spaceService.getSign();
|
||||||
|
|
||||||
String resultData = "{\n" +
|
String jsonData = "{\n" +
|
||||||
" \"resultData\": [\n" +
|
" \"resultData\": [\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"modelCode\": \"ES8_00\",\n" +
|
" \"modelCode\": \"ES8_00\",\n" +
|
||||||
" \"modelName\": \"ES8\",\n" +
|
" \"modelName\": \"ES8\",\n" +
|
||||||
" \"hardwarePltCode\": \"mhp_npa\",\n" +
|
" \"hardwarePltCode\": \"mhp_npa\",\n" +
|
||||||
" \"hardwarePltName\": \"NPA\",\n" +
|
" \"hardwarePltName\": \"NPA\",\n" +
|
||||||
" \"softwarePltCode\": \"msp_nt1\",\n" +
|
" \"softwarePltCode\": \"msp_nt1\",\n" +
|
||||||
" \"softwarePltName\": \"NT1\",\n" +
|
" \"softwarePltName\": \"NT1\",\n" +
|
||||||
" \"modelYearInfoList\": [\n" +
|
" \"modelYearInfoList\": [\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1\",\n" +
|
" \"yearCode\": \"mp_g1.1\",\n" +
|
||||||
" \"yearName\": \"G1.1\"\n" +
|
" \"yearName\": \"G1.1\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.2\",\n" +
|
" \"yearCode\": \"mp_g1.2\",\n" +
|
||||||
" \"yearName\": \"G1.2\"\n" +
|
" \"yearName\": \"G1.2\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.3\",\n" +
|
" \"yearCode\": \"mp_g1.3\",\n" +
|
||||||
" \"yearName\": \"G1.3\"\n" +
|
" \"yearName\": \"G1.3\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.f\",\n" +
|
" \"yearCode\": \"mp_g1.f\",\n" +
|
||||||
" \"yearName\": \"G1.F\"\n" +
|
" \"yearName\": \"G1.F\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.f.e\",\n" +
|
" \"yearCode\": \"mp_g1.f.e\",\n" +
|
||||||
" \"yearName\": \"G1.F.E\"\n" +
|
" \"yearName\": \"G1.F.E\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_my2018\",\n" +
|
" \"yearCode\": \"mp_my2018\",\n" +
|
||||||
" \"yearName\": \"MY2018\"\n" +
|
" \"yearName\": \"MY2018\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.5\",\n" +
|
" \"yearCode\": \"mp_g1.5\",\n" +
|
||||||
" \"yearName\": \"G1.5\"\n" +
|
" \"yearName\": \"G1.5\"\n" +
|
||||||
" }\n" +
|
" }\n" +
|
||||||
" ]\n" +
|
" ]\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"modelCode\": \"FURY_00\",\n" +
|
" \"modelCode\": \"FURY_00\",\n" +
|
||||||
" \"modelName\": \"FURY\",\n" +
|
" \"modelName\": \"FURY\",\n" +
|
||||||
" \"hardwarePltCode\": \"mhp_npa\",\n" +
|
" \"hardwarePltCode\": \"mhp_npa\",\n" +
|
||||||
" \"hardwarePltName\": \"NPA\",\n" +
|
" \"hardwarePltName\": \"NPA\",\n" +
|
||||||
" \"softwarePltCode\": \"msp_nt1\",\n" +
|
" \"softwarePltCode\": \"msp_nt1\",\n" +
|
||||||
" \"softwarePltName\": \"NT1\",\n" +
|
" \"softwarePltName\": \"NT1\",\n" +
|
||||||
" \"modelYearInfoList\": [\n" +
|
" \"modelYearInfoList\": [\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1\",\n" +
|
" \"yearCode\": \"mp_g1.1\",\n" +
|
||||||
" \"yearName\": \"G1.1\"\n" +
|
" \"yearName\": \"G1.1\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.2\",\n" +
|
" \"yearCode\": \"mp_g1.2\",\n" +
|
||||||
" \"yearName\": \"G1.2\"\n" +
|
" \"yearName\": \"G1.2\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.3\",\n" +
|
" \"yearCode\": \"mp_g1.3\",\n" +
|
||||||
" \"yearName\": \"G1.3\"\n" +
|
" \"yearName\": \"G1.3\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.f\",\n" +
|
" \"yearCode\": \"mp_g1.f\",\n" +
|
||||||
" \"yearName\": \"G1.F\"\n" +
|
" \"yearName\": \"G1.F\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.6\",\n" +
|
" \"yearCode\": \"mp_g1.6\",\n" +
|
||||||
" \"yearName\": \"G1.6\"\n" +
|
" \"yearName\": \"G1.6\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.5\",\n" +
|
" \"yearCode\": \"mp_g1.5\",\n" +
|
||||||
" \"yearName\": \"G1.5\"\n" +
|
" \"yearName\": \"G1.5\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
||||||
" \"yearName\": \"G1.1.E\"\n" +
|
" \"yearName\": \"G1.1.E\"\n" +
|
||||||
" }\n" +
|
" }\n" +
|
||||||
" ]\n" +
|
" ]\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"modelCode\": \"FORCE_00\",\n" +
|
" \"modelCode\": \"FORCE_00\",\n" +
|
||||||
" \"modelName\": \"FORCE\",\n" +
|
" \"modelName\": \"FORCE\",\n" +
|
||||||
" \"hardwarePltCode\": \"mhp_npb\",\n" +
|
" \"hardwarePltCode\": \"mhp_npb\",\n" +
|
||||||
" \"hardwarePltName\": \"NPB\",\n" +
|
" \"hardwarePltName\": \"NPB\",\n" +
|
||||||
" \"softwarePltCode\": \"msp_nt2\",\n" +
|
" \"softwarePltCode\": \"msp_nt2\",\n" +
|
||||||
" \"softwarePltName\": \"NT2\",\n" +
|
" \"softwarePltName\": \"NT2\",\n" +
|
||||||
" \"modelYearInfoList\": [\n" +
|
" \"modelYearInfoList\": [\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1\",\n" +
|
" \"yearCode\": \"mp_g1.1\",\n" +
|
||||||
" \"yearName\": \"G1.1\"\n" +
|
" \"yearName\": \"G1.1\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
||||||
" \"yearName\": \"G1.1.E\"\n" +
|
" \"yearName\": \"G1.1.E\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.2\",\n" +
|
" \"yearCode\": \"mp_g1.2\",\n" +
|
||||||
" \"yearName\": \"G1.2\"\n" +
|
" \"yearName\": \"G1.2\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.3\",\n" +
|
" \"yearCode\": \"mp_g1.3\",\n" +
|
||||||
" \"yearName\": \"G1.3\"\n" +
|
" \"yearName\": \"G1.3\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.f\",\n" +
|
" \"yearCode\": \"mp_g1.f\",\n" +
|
||||||
" \"yearName\": \"G1.F\"\n" +
|
" \"yearName\": \"G1.F\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.6\",\n" +
|
" \"yearCode\": \"mp_g1.6\",\n" +
|
||||||
" \"yearName\": \"G1.6\"\n" +
|
" \"yearName\": \"G1.6\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.5\",\n" +
|
" \"yearCode\": \"mp_g1.5\",\n" +
|
||||||
" \"yearName\": \"G1.5\"\n" +
|
" \"yearName\": \"G1.5\"\n" +
|
||||||
" }\n" +
|
" }\n" +
|
||||||
" ]\n" +
|
" ]\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"modelCode\": \"Gemini_00\",\n" +
|
" \"modelCode\": \"Gemini_00\",\n" +
|
||||||
" \"modelName\": \"Gemini\",\n" +
|
" \"modelName\": \"Gemini\",\n" +
|
||||||
" \"hardwarePltCode\": \"mhp_npa\",\n" +
|
" \"hardwarePltCode\": \"mhp_npa\",\n" +
|
||||||
" \"hardwarePltName\": \"NPA\",\n" +
|
" \"hardwarePltName\": \"NPA\",\n" +
|
||||||
" \"softwarePltCode\": \"msp_nt2\",\n" +
|
" \"softwarePltCode\": \"msp_nt2\",\n" +
|
||||||
" \"softwarePltName\": \"NT2\",\n" +
|
" \"softwarePltName\": \"NT2\",\n" +
|
||||||
" \"modelYearInfoList\": [\n" +
|
" \"modelYearInfoList\": [\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1\",\n" +
|
" \"yearCode\": \"mp_g1.1\",\n" +
|
||||||
" \"yearName\": \"G1.1\"\n" +
|
" \"yearName\": \"G1.1\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
||||||
" \"yearName\": \"G1.1.E\"\n" +
|
" \"yearName\": \"G1.1.E\"\n" +
|
||||||
" }\n" +
|
" }\n" +
|
||||||
" ]\n" +
|
" ]\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"modelCode\": \"Pegasus_00\",\n" +
|
" \"modelCode\": \"Pegasus_00\",\n" +
|
||||||
" \"modelName\": \"Pegasus\",\n" +
|
" \"modelName\": \"Pegasus\",\n" +
|
||||||
" \"hardwarePltCode\": \"mhp_npc\",\n" +
|
" \"hardwarePltCode\": \"mhp_npc\",\n" +
|
||||||
" \"hardwarePltName\": \"NPC\",\n" +
|
" \"hardwarePltName\": \"NPC\",\n" +
|
||||||
" \"softwarePltCode\": \"msp_nt2\",\n" +
|
" \"softwarePltCode\": \"msp_nt2\",\n" +
|
||||||
" \"softwarePltName\": \"NT2\",\n" +
|
" \"softwarePltName\": \"NT2\",\n" +
|
||||||
" \"modelYearInfoList\": [\n" +
|
" \"modelYearInfoList\": [\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1\",\n" +
|
" \"yearCode\": \"mp_g1.1\",\n" +
|
||||||
" \"yearName\": \"G1.1\"\n" +
|
" \"yearName\": \"G1.1\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
" \"yearCode\": \"mp_g1.1.e\",\n" +
|
||||||
" \"yearName\": \"G1.1.E\"\n" +
|
" \"yearName\": \"G1.1.E\"\n" +
|
||||||
" },\n" +
|
" },\n" +
|
||||||
" {\n" +
|
" {\n" +
|
||||||
" \"yearCode\": \"mp_G1.1.RH\",\n" +
|
" \"yearCode\": \"mp_G1.1.RH\",\n" +
|
||||||
" \"yearName\": \"G1.1.RH\"\n" +
|
" \"yearName\": \"G1.1.RH\"\n" +
|
||||||
" }\n" +
|
" }\n" +
|
||||||
" ]\n" +
|
" ]\n" +
|
||||||
" }\n" +
|
" }\n" +
|
||||||
" ],\n" +
|
" ],\n" +
|
||||||
" \"resultCode\": \"WL-0000\",\n" +
|
" \"resultCode\": \"WL-0000\",\n" +
|
||||||
" \"resultDesc\": \"Success\"\n" +
|
" \"resultDesc\": \"Success\"\n" +
|
||||||
"}";
|
"}";
|
||||||
|
|
||||||
|
JSONObject result = (JSONObject) JSON.parse(jsonData);
|
||||||
|
JSONArray resultData = result.getJSONArray("resultData");
|
||||||
|
|
||||||
|
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("-", "");
|
||||||
|
|
||||||
|
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);
|
||||||
|
//保存
|
||||||
|
projectYearNameInfoEOService.save(projectYearNameInfoEO);
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}return sign;
|
}return sign;
|
||||||
|
|||||||
+90
@@ -0,0 +1,90 @@
|
|||||||
|
package com.jero.modules.project.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
|
||||||
|
import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
|
||||||
|
import com.jero.modules.project.service.IProjectYearNameInfoEOService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 项目库-项目名年号表
|
||||||
|
* @Author: jero-boot
|
||||||
|
* @Date: 2022-05-20
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class ProjectYearNameInfoEOServiceImpl extends ServiceImpl<ProjectYearNameInfoEOMapper, ProjectYearNameInfoEO> implements IProjectYearNameInfoEOService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 保存
|
||||||
|
*
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void add(ProjectYearNameInfoEO projectYearNameInfoEO) {
|
||||||
|
Date now = new Date();
|
||||||
|
projectYearNameInfoEO.setCreateTime(now);
|
||||||
|
projectYearNameInfoEO.setUpdateTime(now);
|
||||||
|
save(projectYearNameInfoEO);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新
|
||||||
|
*
|
||||||
|
* @param projectYearNameInfoEO
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void editById(ProjectYearNameInfoEO projectYearNameInfoEO) {
|
||||||
|
Date now = new Date();
|
||||||
|
projectYearNameInfoEO.setUpdateTime(now);
|
||||||
|
saveOrUpdate(projectYearNameInfoEO);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id删除
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void deleteById(String id) {
|
||||||
|
removeById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除
|
||||||
|
*
|
||||||
|
* @param ids
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void deleteByIds(List<String> ids) {
|
||||||
|
removeByIds(ids);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过id查询
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public ProjectYearNameInfoEO queryById(String id) {
|
||||||
|
return getById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 列表查询
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public List<ProjectYearNameInfoEO> queryList() {
|
||||||
|
return list();
|
||||||
|
}
|
||||||
|
}
|
||||||
+9
-1
@@ -70,12 +70,20 @@ public class SpaceServiceImpl implements ISpaceService {
|
|||||||
|
|
||||||
public String getSign() throws Exception {
|
public String getSign() throws Exception {
|
||||||
Map<String,Object> paramMap = new HashMap<String, Object>();
|
Map<String,Object> paramMap = new HashMap<String, Object>();
|
||||||
|
paramMap.put("appId", appId);//在Program Space中注册的appId
|
||||||
paramMap.put("bizData", "{\"module\":\"GRP\"}");//业务参数
|
paramMap.put("bizData", "{\"module\":\"GRP\"}");//业务参数
|
||||||
paramMap.put("timestamp", String.valueOf(System.currentTimeMillis()));//请求时间
|
paramMap.put("timestamp", String.valueOf(System.currentTimeMillis()));//请求时间
|
||||||
paramMap.put("appId", appId);//在Program Space中注册的appId
|
|
||||||
String sign = sign(paramMap,appSecret);//签名字符串
|
String sign = sign(paramMap,appSecret);//签名字符串
|
||||||
paramMap.put("sign",sign);//签名字符串
|
paramMap.put("sign",sign);//签名字符串
|
||||||
|
|
||||||
|
// paramMap.put("appId", appId);//在Program Space中注册的appId
|
||||||
|
// paramMap.put("bizData", "{\"module\":\"GRP\"}");//业务参数
|
||||||
|
// paramMap.put("timestamp", "1652965354000");//请求时间
|
||||||
|
//
|
||||||
|
//// String sign = sign(paramMap,appSecret);//签名字符串
|
||||||
|
// paramMap.put("sign","148EF05BAB45F6D1213DA506D1D04E1B");//签名字符串
|
||||||
|
|
||||||
// String response = HttpUtil.post(domainUrl, paramMap);
|
// String response = HttpUtil.post(domainUrl, paramMap);
|
||||||
String response = HttpRequest.post(domainUrl)
|
String response = HttpRequest.post(domainUrl)
|
||||||
.header("Content-Type", "application/x-www-form-urlencoded")
|
.header("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
|||||||
@@ -14,16 +14,16 @@ server:
|
|||||||
mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
|
mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
|
||||||
|
|
||||||
management:
|
management:
|
||||||
endpoints:
|
endpoints:
|
||||||
web:
|
web:
|
||||||
exposure:
|
exposure:
|
||||||
include: metrics,httptrace
|
include: metrics,httptrace
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 500MB
|
max-file-size: 500MB
|
||||||
max-request-size: 500MB
|
max-request-size: 500MB
|
||||||
mail:
|
mail:
|
||||||
host: smtp.163.com
|
host: smtp.163.com
|
||||||
username: test@163.com
|
username: test@163.com
|
||||||
@@ -131,19 +131,19 @@ spring:
|
|||||||
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
|
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
|
||||||
datasource:
|
datasource:
|
||||||
master:
|
master:
|
||||||
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
|
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
|
||||||
# username: root
|
# username: root
|
||||||
# password: hzwlsoft.com
|
# password: hzwlsoft.com
|
||||||
# driver-class-name: com.mysql.cj.jdbc.Driver
|
# driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
|
||||||
|
|
||||||
# url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
# url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||||
# url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
|
# url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
|
||||||
# username: root
|
# username: root
|
||||||
# password: 123456
|
# password: 123456
|
||||||
# driver-class-name: com.mysql.cj.jdbc.Driver
|
# driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
|
url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
|
||||||
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||||
username: root
|
username: root
|
||||||
password: hzwlsoft.com
|
password: hzwlsoft.com
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
@@ -252,7 +252,7 @@ jero :
|
|||||||
port: 30007
|
port: 30007
|
||||||
logPath: logs/jero/job/jobhandler/
|
logPath: logs/jero/job/jobhandler/
|
||||||
logRetentionDays: 30
|
logRetentionDays: 30
|
||||||
#自定义路由配置 yml nacos database
|
#自定义路由配置 yml nacos database
|
||||||
route:
|
route:
|
||||||
config:
|
config:
|
||||||
data-id: jero-gateway-router
|
data-id: jero-gateway-router
|
||||||
@@ -310,10 +310,10 @@ justauth:
|
|||||||
# 云端OCR识别集成配置参数
|
# 云端OCR识别集成配置参数
|
||||||
OCR:
|
OCR:
|
||||||
#请求OCR转换接口
|
#请求OCR转换接口
|
||||||
# handleFileUrl: https://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion
|
# handleFileUrl: https://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion
|
||||||
handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion
|
handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion
|
||||||
# OCR回调接口地址 配置客户本地的IP及端口号
|
# OCR回调接口地址 配置客户本地的IP及端口号
|
||||||
# callBackUrl: http://139.9.235.66:9110//api/ocr/OCRRestful/OcrHandleResult
|
# callBackUrl: http://139.9.235.66:9110//api/ocr/OCRRestful/OcrHandleResult
|
||||||
callBackUrl: http://139.9.235.66:9022/local-tool/ocr/ocrHandleResult
|
callBackUrl: http://139.9.235.66:9022/local-tool/ocr/ocrHandleResult
|
||||||
# OCR认证用户
|
# OCR认证用户
|
||||||
userId: dayuzhou1234
|
userId: dayuzhou1234
|
||||||
@@ -391,8 +391,8 @@ Feishu:
|
|||||||
appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe
|
appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe
|
||||||
|
|
||||||
# 正式
|
# 正式
|
||||||
# appId: cli_a2a1a6014679500d
|
# appId: cli_a2a1a6014679500d
|
||||||
# appSecret: AeHwisC82S0fhiREJg6bkdxhIZMevnZZ
|
# appSecret: AeHwisC82S0fhiREJg6bkdxhIZMevnZZ
|
||||||
getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal
|
getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal
|
||||||
batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/
|
batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/
|
||||||
local-tool:
|
local-tool:
|
||||||
@@ -407,25 +407,25 @@ opensso:
|
|||||||
|
|
||||||
|
|
||||||
---
|
---
|
||||||
## space系统
|
## space系统
|
||||||
Space:
|
Space:
|
||||||
# dev
|
# dev
|
||||||
# appId: PMP16517425636482D4A
|
# appId: PMP16517425636482D4A
|
||||||
# appSecret: 6a689580-bf3a-47ee-b3c5-a16d2312760d
|
# appSecret: 6a689580-bf3a-47ee-b3c5-a16d2312760d
|
||||||
# domainUrl: https://api-plm-portal-dev.nioint.com/api/v1/plm-portal-middle-integration
|
# domainUrl: https://api-plm-portal-dev.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule
|
||||||
|
|
||||||
# test
|
# test
|
||||||
appId: PMP16521484118670676
|
appId: PMP16521484118670676
|
||||||
appSecret: 4cf1b271-0c12-443d-964c-e61726b4ae0e
|
appSecret: 4cf1b271-0c12-443d-964c-e61726b4ae0e
|
||||||
domainUrl: https://api-plm-portal-test.nioint.com/api/v1/plm-portal-middle-integration
|
domainUrl: https://api-plm-portal-test.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule
|
||||||
|
|
||||||
# stg
|
# stg
|
||||||
# appId: PMP1652840272275F20C
|
# appId: PMP1652840272275F20C
|
||||||
# appSecret: fbf65763-a273-4df5-8a91-ef4db6d6e315
|
# appSecret: fbf65763-a273-4df5-8a91-ef4db6d6e315
|
||||||
# domainUrl: https://api-plm-portal-stg.nioint.com/api/v1/plm-portal-middle-integration
|
# domainUrl: https://api-plm-portal-stg.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule
|
||||||
|
|
||||||
# prod
|
# prod
|
||||||
# appId: PMP1652840319523B159
|
# appId: PMP1652840319523B159
|
||||||
# appSecret: d3bf6e69-0726-42ee-91bd-0441a8f6ccdf
|
# appSecret: d3bf6e69-0726-42ee-91bd-0441a8f6ccdf
|
||||||
# domainUrl: https://api-plm-portal.nioint.com/api/v1/plm-portal-middle-integration
|
# domainUrl: https://api-plm-portal.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user