Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

This commit is contained in:
zyx.net
2023-09-14 11:10:27 +08:00
7 changed files with 536 additions and 28 deletions
@@ -0,0 +1,192 @@
package com.jero.modules.platform.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @Description: 平台件合规认证计划
* @Author: jero-boot
* @Date: 2023-09-14
* @Version: V1.0
*/
@Api(tags="平台件合规认证计划")
@RestController
@RequestMapping("/platform/platformTaskPlanningEO")
@Slf4j
public class PlatformTaskPlanningEOController extends JeroController<PlatformTaskPlanningEO, IPlatformTaskPlanningEOService> {
@Autowired
private IPlatformTaskPlanningEOService platformTaskPlanningEOService;
/**
* 分页列表查询
*
* @param platformTaskPlanningEO
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "平台件合规认证计划-分页列表查询")
@ApiOperation(value="平台件合规认证计划-分页列表查询", notes="平台件合规认证计划-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(PlatformTaskPlanningEO platformTaskPlanningEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PlatformTaskPlanningEO> queryWrapper = QueryGenerator.initQueryWrapper(platformTaskPlanningEO, req.getParameterMap());
Page<PlatformTaskPlanningEO> page = new Page<PlatformTaskPlanningEO>(pageNo, pageSize);
IPage<PlatformTaskPlanningEO> pageList = platformTaskPlanningEOService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "平台件合规认证计划-列表查询")
@ApiOperation(value="平台件合规认证计划-列表查询", notes="平台件合规认证计划-列表查询")
@GetMapping(value = "/list")
public Result<List<PlatformTaskPlanningEO>> queryList() {
List<PlatformTaskPlanningEO> list = platformTaskPlanningEOService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param platformTaskPlanningEO
* @return
*/
@AutoLog(value = "平台件合规认证计划-添加")
@ApiOperation(value="平台件合规认证计划-添加", notes="平台件合规认证计划-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody PlatformTaskPlanningEO platformTaskPlanningEO) {
platformTaskPlanningEOService.add(platformTaskPlanningEO);
return Result.OK("添加成功!");
}
/**
* 添加
*
* @param platformTaskPlanningEOList
* @return
*/
@AutoLog(value = "平台件合规认证计划-批量添加")
@ApiOperation(value="平台件合规认证计划-批量添加", notes="平台件合规认证计划-批量添加")
@PostMapping(value = "/addBatch")
public Result<?> addBatch(@RequestBody List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
platformTaskPlanningEOService.addBatch(platformTaskPlanningEOList);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param platformTaskPlanningEO
* @return
*/
@AutoLog(value = "平台件合规认证计划-编辑")
@ApiOperation(value="平台件合规认证计划-编辑", notes="平台件合规认证计划-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody PlatformTaskPlanningEO platformTaskPlanningEO) {
platformTaskPlanningEOService.editById(platformTaskPlanningEO);
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) {
platformTaskPlanningEOService.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.platformTaskPlanningEOService.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) {
PlatformTaskPlanningEO platformTaskPlanningEO = platformTaskPlanningEOService.queryById(id);
if(platformTaskPlanningEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(platformTaskPlanningEO);
}
/**
* 导出excel
*
* @param request
* @param platformTaskPlanningEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PlatformTaskPlanningEO platformTaskPlanningEO) {
return super.exportXls(request, platformTaskPlanningEO, PlatformTaskPlanningEO.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, PlatformTaskPlanningEO.class);
}
}
@@ -0,0 +1,78 @@
package com.jero.modules.platform.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 平台件合规认证计划
* @Author: jero-boot
* @Date: 2023-09-14
* @Version: V1.0
*/
@Data
@TableName("platform_task_planning")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="platform_task_planning对象", description="平台件合规认证计划")
public class PlatformTaskPlanningEO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.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 java.lang.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 java.lang.String sysOrgCode;
/**节点名称*/
@Excel(name = "节点名称", width = 15)
@ApiModelProperty(value = "节点名称")
private java.lang.String nodeName;
/**节点时间*/
@Excel(name = "节点时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "节点时间")
private java.util.Date nodeTime;
/**项目id*/
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
private java.lang.String projectId;
}
@@ -0,0 +1,14 @@
package com.jero.modules.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
/**
* @Description: 平台件合规认证计划
* @Author: jero-boot
* @Date: 2023-09-14
* @Version: V1.0
*/
public interface PlatformTaskPlanningEOMapper extends BaseMapper<PlatformTaskPlanningEO> {
}
@@ -0,0 +1,15 @@
<?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.platform.mapper.PlatformTaskPlanningEOMapper">
<resultMap id="PlatformTaskPlanningEOResultMap" type="com.jero.modules.platform.entity.PlatformTaskPlanningEO">
<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="node_name" property="nodeName" />
<result column="node_time" property="nodeTime" />
<result column="project_id" property="projectId" />
</resultMap>
</mapper>
@@ -0,0 +1,67 @@
package com.jero.modules.platform.service;
import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 平台件合规认证计划
* @Author: jero-boot
* @Date: 2023-09-14
* @Version: V1.0
*/
public interface IPlatformTaskPlanningEOService extends IService<PlatformTaskPlanningEO> {
/**
* 保存
*
* @param platformTaskPlanningEO
* @return
*/
void add(PlatformTaskPlanningEO platformTaskPlanningEO);
/**
* 平台件合规认证计划-批量添加
* @param platformTaskPlanningEOList
*/
void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList);
/**
* 更新
*
* @param platformTaskPlanningEO
* @return
*/
void editById(PlatformTaskPlanningEO platformTaskPlanningEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
PlatformTaskPlanningEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<PlatformTaskPlanningEO> queryList();
}
@@ -1109,54 +1109,87 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
return result;
}
private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {
private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultList) {
if(ObjectUtils.isNotEmpty(params.get("orderByField"))){
Collator comparator = Collator.getInstance(Locale.CHINESE);
//项目名称,R&H Studio,车型平台,数字平台
if("projectName".equals(params.get("orderByField"))){
if("projectNameId".equals(params.get("orderByField"))){
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1, e2)->{
return comparator.compare(e1.getProjectName(),e2.getProjectName());
Collections.sort(resultList,(e1, e2)->{
String e1Field = StringUtils.isNotBlank(e1.getProjectNameId()) ? e1.getProjectNameId() : "";
String e2Field = StringUtils.isNotBlank(e2.getProjectNameId()) ? e2.getProjectNameId() : "";
return comparator.compare(e1Field,e2Field);
});
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1,e2)->{
return comparator.compare(e2.getProjectName(),e1.getProjectName());
Collections.sort(resultList,(e1,e2)->{
String e1Field = StringUtils.isNotBlank(e1.getProjectNameId()) ? e1.getProjectNameId() : "";
String e2Field = StringUtils.isNotBlank(e2.getProjectNameId()) ? e2.getProjectNameId() : "";
return comparator.compare(e2Field,e1Field);
});
}
}
//R&H Studio
if("studioEngineerName".equals(params.get("orderByField"))){
//法规工程师
if("createBy".equals(params.get("orderByField"))){
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1, e2)->{
return comparator.compare(e1.getStudioEngineerName(),e2.getStudioEngineerName());
Collections.sort(resultList,(e1, e2)->{
String e1Field = StringUtils.isNotBlank(e1.getCreateBy()) ? e1.getCreateBy() : "";
String e2Field = StringUtils.isNotBlank(e2.getCreateBy()) ? e2.getCreateBy() : "";
return comparator.compare(e1Field,e2Field);
});
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1,e2)->{
return comparator.compare(e2.getStudioEngineerName(),e1.getStudioEngineerName());
Collections.sort(resultList,(e1,e2)->{
String e1Field = StringUtils.isNotBlank(e1.getCreateBy()) ? e1.getCreateBy() : "";
String e2Field = StringUtils.isNotBlank(e2.getCreateBy()) ? e2.getCreateBy() : "";
return comparator.compare(e2Field,e1Field);
});
}
}
//车型平台
if("vehiclePlatform".equals(params.get("orderByField"))){
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1, e2)->{
return comparator.compare(e1.getVehiclePlatform(),e2.getVehiclePlatform());
//品牌
if ("brandText".equals(params.get("orderByField"))) {
if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
Collections.sort(resultList, (e1, e2) -> {
String e1Field = StringUtils.isNotBlank(e1.getBrandText()) ? e1.getBrandText() : "";
String e2Field = StringUtils.isNotBlank(e2.getBrandText()) ? e2.getBrandText() : "";
return comparator.compare(e1Field, e2Field);
});
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1,e2)->{
return comparator.compare(e2.getVehiclePlatform(),e1.getVehiclePlatform());
} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
Collections.sort(resultList, (e1, e2) -> {
String e1Field = StringUtils.isNotBlank(e1.getBrandText()) ? e1.getBrandText() : "";
String e2Field = StringUtils.isNotBlank(e2.getBrandText()) ? e2.getBrandText() : "";
return comparator.compare(e2Field, e1Field);
});
}
}
//数字平台
if("digitalPlatform".equals(params.get("orderByField"))){
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1, e2)->{
return comparator.compare(e1.getDigitalPlatform(),e2.getDigitalPlatform());
//配置项
if ("ipdInfo".equals(params.get("orderByField"))) {
if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
Collections.sort(resultList, (e1, e2) -> {
String e1Field = StringUtils.isNotBlank(e1.getIpdInfo()) ? e1.getIpdInfo() : "";
String e2Field = StringUtils.isNotBlank(e2.getIpdInfo()) ? e2.getIpdInfo() : "";
return comparator.compare(e1Field, e2Field);
});
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
Collections.sort(resultLast,(e1,e2)->{
return comparator.compare(e2.getDigitalPlatform(),e1.getDigitalPlatform());
} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
Collections.sort(resultList, (e1, e2) -> {
String e1Field = StringUtils.isNotBlank(e1.getIpdInfo()) ? e1.getIpdInfo() : "";
String e2Field = StringUtils.isNotBlank(e2.getIpdInfo()) ? e2.getIpdInfo() : "";
return comparator.compare(e2Field, e1Field);
});
}
}
//说明
if ("explanation".equals(params.get("orderByField"))) {
if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
Collections.sort(resultList, (e1, e2) -> {
String e1Field = StringUtils.isNotBlank(e1.getExplanation()) ? e1.getExplanation() : "";
String e2Field = StringUtils.isNotBlank(e2.getExplanation()) ? e2.getExplanation() : "";
return comparator.compare(e1Field, e2Field);
});
} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
Collections.sort(resultList, (e1, e2) -> {
String e1Field = StringUtils.isNotBlank(e1.getExplanation()) ? e1.getExplanation() : "";
String e2Field = StringUtils.isNotBlank(e2.getExplanation()) ? e2.getExplanation() : "";
return comparator.compare(e2Field, e1Field);
});
}
}
@@ -0,0 +1,109 @@
package com.jero.modules.platform.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.platform.entity.PlatformTaskPlanningEO;
import com.jero.modules.platform.mapper.PlatformTaskPlanningEOMapper;
import com.jero.modules.platform.service.IPlatformTaskPlanningEOService;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Description: 平台件合规认证计划
* @Author: jero-boot
* @Date: 2023-09-14
* @Version: V1.0
*/
@Service
public class PlatformTaskPlanningEOServiceImpl extends ServiceImpl<PlatformTaskPlanningEOMapper, PlatformTaskPlanningEO> implements IPlatformTaskPlanningEOService {
/**
* 保存
*
* @param platformTaskPlanningEO
* @return
*/
@Override
public void add(PlatformTaskPlanningEO platformTaskPlanningEO) {
Date now = new Date();
platformTaskPlanningEO.setCreateTime(now);
platformTaskPlanningEO.setUpdateTime(now);
save(platformTaskPlanningEO);
}
/**
* 平台件合规认证计划-批量添加
* @param platformTaskPlanningEOList
*/
@Override
public void addBatch(List<PlatformTaskPlanningEO> platformTaskPlanningEOList) {
if(!platformTaskPlanningEOList.isEmpty()){
for (PlatformTaskPlanningEO platformTaskPlanningEO : platformTaskPlanningEOList) {
Date now = new Date();
platformTaskPlanningEO.setCreateTime(now);
platformTaskPlanningEO.setUpdateTime(now);
}
saveOrUpdateBatch(platformTaskPlanningEOList);
}
}
/**
* 更新
*
* @param platformTaskPlanningEO
* @return
*/
@Override
public void editById(PlatformTaskPlanningEO platformTaskPlanningEO) {
Date now = new Date();
platformTaskPlanningEO.setUpdateTime(now);
saveOrUpdate(platformTaskPlanningEO);
}
/**
* 通过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 PlatformTaskPlanningEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<PlatformTaskPlanningEO> queryList() {
LambdaQueryWrapper<PlatformTaskPlanningEO> wrapper = new LambdaQueryWrapper<>();
wrapper.orderByAsc(PlatformTaskPlanningEO::getNodeTime);
return list(wrapper);
}
}