From 97ea1d0b6bb033980ffea4b73ac0b302fb30de95 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 10 Aug 2023 14:42:44 +0800 Subject: [PATCH 001/114] =?UTF-8?q?OTA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 131 ++++++++++++++ .../modules/ota/entity/OtaManageApplyEO.java | 168 ++++++++++++++++++ .../ota/mapper/OtaManageApplyEOMapper.java | 32 ++++ .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 81 +++++++++ .../ota/service/IOtaManageApplyEOService.java | 82 +++++++++ .../impl/OtaManageApplyEOServiceImpl.java | 128 +++++++++++++ .../com/jero/modules/ota/vo/VersionVO.java | 25 +++ 7 files changed, 647 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java new file mode 100644 index 000000000..60dfa8545 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -0,0 +1,131 @@ +package com.jero.modules.ota.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +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.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.service.IOtaManageApplyEOService; +import com.jero.modules.ota.vo.VersionVO; +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.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +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 java.util.Arrays; +import java.util.List; + + + /** + * @Description: 数据对接表 + * @Author: jero-boot + * @Date: 2023-08-09 + * @Version: V1.0 + */ +@Api(tags="数据对接表") +@RestController +@RequestMapping("/ota/otaManageApplyEO") +@Slf4j +public class OtaManageApplyEOController extends JeroController { + @Autowired + private IOtaManageApplyEOService otaManageApplyEOService; + + /** + * OTA管理列表和全车型列表-分页列表查询 + * + * @param otaManageApplyEO + * @param pageNo + * @param pageSize + * @return + */ + @AutoLog(value = "OTA管理列表和全车型列表-分页列表查询") + @ApiOperation(value="OTA管理列表和全车型列表-分页列表查询", notes="OTA管理列表和全车型列表-分页列表查询") + @GetMapping(value = "/getOtaPage") + public Result getOtaPage(OtaManageApplyEO otaManageApplyEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + + IPage pageList = otaManageApplyEOService.getOtaPage(otaManageApplyEO,pageNo,pageSize); + return Result.OK(pageList); + } + /** + * 分车型列表-分页列表查询 + * + * @param otaManageApplyEO + * @param pageNo + * @param pageSize + * @return + */ + @AutoLog(value = "分车型列表-分页列表查询") + @ApiOperation(value="分车型列表-分页列表查询", notes="分车型列表-分页列表查询") + @GetMapping(value = "/getOtaCarPage") + public Result getOtaCarPage(OtaManageApplyEO otaManageApplyEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + + IPage pageList = otaManageApplyEOService.getOtaCarPage(otaManageApplyEO,pageNo,pageSize); + return Result.OK(pageList); + } + + + /** + * 通过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) { + otaManageApplyEOService.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.otaManageApplyEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过适用车型查询 + * + * @param appliedVehicleProject + * @return + */ + @AutoLog(value = "通过适用车型查询") + @ApiOperation(value="通过适用车型查询", notes="通过适用车型查询") + @GetMapping(value = "/getByAppliedVehicleProject") + public Result getByAppliedVehicleProject(@RequestParam(name="appliedVehicleProject",required=true) String appliedVehicleProject) { + List byAppliedVehicleProject = otaManageApplyEOService.getByAppliedVehicleProject(appliedVehicleProject); + return Result.OK(byAppliedVehicleProject); + } + + /** + * 导出excel + * + * @param request + * @param otaManageApplyEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO) { + return super.exportXls(request, otaManageApplyEO, OtaManageApplyEO.class, "数据对接表"); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java new file mode 100644 index 000000000..8082de331 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -0,0 +1,168 @@ +package com.jero.modules.ota.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.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; +import java.util.Date; + + +/** + * @Description: 数据对接表 + * @Author: jero-boot + * @Date: 2023-08-09 + * @Version: V1.0 + */ +@Data +@TableName("ota_manage_apply") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ota_manage_apply对象", description="数据对接表") +public class OtaManageApplyEO 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; + + @ApiModelProperty(value = "VDR") + private java.lang.String issueKey; + + /**项目版本*/ + @Excel(name = "项目版本", width = 15) + @ApiModelProperty(value = "项目版本") + private java.lang.String projectVersion; + + /**认证进度*/ + @Excel(name = "认证进度", width = 15) + @ApiModelProperty(value = "认证进度") + private java.lang.String attestationSchedule; + + /**匹配状态*/ + @Excel(name = "匹配状态", width = 15) + @ApiModelProperty(value = "匹配状态") + private java.lang.String matchStatus; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + + + //-------------------------------------------------------- + /**软件版本*/ + @TableField(exist = false) + @ApiModelProperty(value = "软件版本") + private java.lang.String softwareVersion; + + @TableField(exist = false) + @ApiModelProperty(value = "平台") + private java.lang.String platform; + + @TableField(exist = false) + @ApiModelProperty(value = "适用车型") + private java.lang.String appliedVehicleProject; + + @TableField(exist = false) + @ApiModelProperty(value = "市场") + private java.lang.String market; + + @TableField(exist = false) + @ApiModelProperty(value = "软件发布时间") + private java.util.Date softwareIssueTime; + + @TableField(exist = false) + @ApiModelProperty(value = "软件发布时间-开始") + private java.util.Date softwareIssueTimeStart; + + @TableField(exist = false) + @ApiModelProperty(value = "软件发布时间-结束") + private java.util.Date softwareIssueTimeEnd; + + @TableField(exist = false) + @ApiModelProperty(value = "主题") + private java.lang.String summary; + + @TableField(exist = false) + @ApiModelProperty(value = "VDR状态") + private java.lang.String status; + + @TableField(exist = false) + @ApiModelProperty(value = "认证影响") + private java.lang.String homologationImpact; + + @TableField(exist = false) + @ApiModelProperty(value = "影响描述") + private java.lang.String homologation; + + @TableField(exist = false) + @ApiModelProperty(value = "影响法规-CN") + private java.lang.String impactCnHomo; + + @TableField(exist = false) + @ApiModelProperty(value = "影响法规-EU") + private java.lang.String impactEuHomo; + + @TableField(exist = false) + @ApiModelProperty(value = "影响法规-查询条件") + private java.lang.String impactHomo; + + @TableField(exist = false) + @ApiModelProperty(value = "责任部门") + private java.lang.String masterDomain; + + @TableField(exist = false) + @ApiModelProperty(value = "R&H Studio") + private java.lang.String studio; + + @TableField(exist = false) + @ApiModelProperty(value = "认证开始") + private Date attestationStartTime; + + @TableField(exist = false) + @ApiModelProperty(value = "认证申报") + private Date certificationSubmission; + + @TableField(exist = false) + @ApiModelProperty(value = "认证批准") + private Date attestationEndTime; + + + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java new file mode 100644 index 000000000..e1ac0414e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -0,0 +1,32 @@ +package com.jero.modules.ota.mapper; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.ota.vo.VersionVO; +import org.apache.ibatis.annotations.Param; +import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + * @Description: 数据对接表 + * @Author: jero-boot + * @Date: 2023-08-09 + * @Version: V1.0 + */ +public interface OtaManageApplyEOMapper extends BaseMapper { + + Page getOtaPage(Page page, @Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); + + /** + * 分车型列表-分页列表查询 + * @param page + * @param otaManageApplyEO + * @return + */ + Page getOtaCarPage(Page page, @Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); + + List getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject); + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml new file mode 100644 index 000000000..4fdd9dfa5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java new file mode 100644 index 000000000..df820a308 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -0,0 +1,82 @@ +package com.jero.modules.ota.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.vo.VersionVO; + +import java.util.List; + +/** + * @Description: 数据对接表 + * @Author: jero-boot + * @Date: 2023-08-09 + * @Version: V1.0 + */ +public interface IOtaManageApplyEOService extends IService { + + /** + * 保存 + * + * @param otaManageApplyEO + * @return + */ + void add(OtaManageApplyEO otaManageApplyEO); + + /** + * 更新 + * + * @param otaManageApplyEO + * @return + */ + void editById(OtaManageApplyEO otaManageApplyEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询通过适用车型查询 + * + * @param appliedVehicleProject + * @return + */ + List getByAppliedVehicleProject(String appliedVehicleProject); + + /** + * 列表查询 + * + * @return + */ + List queryList(); + + /** + * OTA管理列表和全车型列表-分页列表查询 + * @param otaManageApplyEO + * @param pageNo + * @param pageSize + * @return + */ + IPage getOtaPage(OtaManageApplyEO otaManageApplyEO,Integer pageNo,Integer pageSize); + + /** + * 分车型列表-分页列表查询 + * @param otaManageApplyEO + * @param pageNo + * @param pageSize + * @return + */ + IPage getOtaCarPage(OtaManageApplyEO otaManageApplyEO,Integer pageNo,Integer pageSize); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java new file mode 100644 index 000000000..f6862824c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -0,0 +1,128 @@ +package com.jero.modules.ota.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; +import com.jero.modules.ota.service.IOtaManageApplyEOService; +import com.jero.modules.ota.vo.VersionVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @Description: 数据对接表 + * @Author: jero-boot + * @Date: 2023-08-09 + * @Version: V1.0 + */ +@Service +public class OtaManageApplyEOServiceImpl extends ServiceImpl implements IOtaManageApplyEOService { + + @Autowired + private OtaManageApplyEOMapper otaManageApplyEOMapper; + /** + * 保存 + * + * @param otaManageApplyEO + * @return + */ + @Override + public void add(OtaManageApplyEO otaManageApplyEO) { + Date now = new Date(); + otaManageApplyEO.setCreateTime(now); + otaManageApplyEO.setUpdateTime(now); + save(otaManageApplyEO); + } + + /** + * 更新 + * + * @param otaManageApplyEO + * @return + */ + @Override + public void editById(OtaManageApplyEO otaManageApplyEO) { + Date now = new Date(); + otaManageApplyEO.setUpdateTime(now); + saveOrUpdate(otaManageApplyEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param appliedVehicleProject + * @return + */ + @Override + public List getByAppliedVehicleProject(String appliedVehicleProject) { + otaManageApplyEOMapper.getByAppliedVehicleProject(appliedVehicleProject); + + + return new ArrayList<>(); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + /** + * OTA管理列表和全车型列表-分页列表查询 + * @param otaManageApplyEO + * @param pageNo + * @param pageSize + * @return + */ + @Override + public IPage getOtaPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize) { + Page page = new Page(pageNo, pageSize); + return otaManageApplyEOMapper.getOtaPage(page, otaManageApplyEO); + } + + /** + * 分车型列表-分页列表查询 + * @param otaManageApplyEO + * @param pageNo + * @param pageSize + * @return + */ + @Override + public IPage getOtaCarPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize) { + Page page = new Page(pageNo, pageSize); + otaManageApplyEOMapper.getOtaCarPage(page, otaManageApplyEO); + + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java new file mode 100644 index 000000000..466de57cd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java @@ -0,0 +1,25 @@ +package com.jero.modules.ota.vo; + +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; + +/** + * @description + * @date 2023/8/9 11:28 + * @auth zhn + */ +public class VersionVO { + + @ApiModelProperty(value = "版本") + private String version; + + @ApiModelProperty(value = "认证开始") + private Date attestationStartTime; + + @ApiModelProperty(value = "认证申报") + private Date certificationSubmission; + + @ApiModelProperty(value = "认证批准") + private Date attestationEndTime; +} From 5a39a64b6d2a8fafa7c5cf6544c652f5097fcfbf Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 11 Aug 2023 17:43:39 +0800 Subject: [PATCH 002/114] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 14 + jero-web/src/common/lang/zh-cn.js | 13 + .../otaAuthentication/components/detil.vue | 624 ++++++++++++++++++ .../otamanagement/otaAuthentication/index.vue | 442 +++++++++++++ 4 files changed, 1093 insertions(+) create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b1b29c080..b69f3f62f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1925,4 +1925,18 @@ module.exports = { processInitiationOne:'Process Initiation', taskHandlingOne:'Task Handling', taskReview:'Task Review', + softwareversion:'Software version', + softwareplatform:'Software platform', + softwarereleasetime:'Software release time', + theme:'theme', + influencestatute:'Influence statute', + vdrste:'VDR status', + impactdescription:'Impact description', + authenticationimpact:'Authentication impact', + impactstatement:'Impact statement', + certificationdeclaration:'Certification declaration', + matchingstate:'Matching state', + issuenotice:'Issue notice', + applyforrematch:'Apply for rematch', + } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 8d1f65103..4462d9563 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3881,4 +3881,17 @@ module.exports = { processInitiationOne:'任务发起', taskHandlingOne:'任务办理', taskReview:'任务审查', + softwareversion:'软件版本', + softwareplatform:'软件平台', + softwarereleasetime:'软件发布时间', + theme:'主题', + influencestatute:'影响法规', + vdrste:'VDR状态', + impactdescription:'影响描述', + authenticationimpact:'认证影响', + impactstatement:'影响说明', + certificationdeclaration:'认证申报', + matchingstate:'匹配状态', + issuenotice:'下发通知', + applyforrematch:'申请重新匹配', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue new file mode 100644 index 000000000..978fcb7a5 --- /dev/null +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -0,0 +1,624 @@ + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/index.vue b/jero-web/src/views/otamanagement/otaAuthentication/index.vue new file mode 100644 index 000000000..dafac7c75 --- /dev/null +++ b/jero-web/src/views/otamanagement/otaAuthentication/index.vue @@ -0,0 +1,442 @@ + + + + + + + \ No newline at end of file From d0e11209f678cf424a7196239ba4d048522653cc Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 14 Aug 2023 16:40:26 +0800 Subject: [PATCH 003/114] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 1 + .../components/applyforrematch.vue | 233 ++++++++++ .../components/batSetting.vue | 266 +++++++++++ .../otaAuthentication/components/detil.vue | 415 +++++++++++++++++- .../components/historyTable.vue | 39 ++ .../components/rejectReason.vue | 223 ++++++++++ .../otaAuthentication/components/remark.vue | 222 ++++++++++ 8 files changed, 1386 insertions(+), 15 deletions(-) create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b69f3f62f..4c66fa8b5 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1938,5 +1938,5 @@ module.exports = { matchingstate:'Matching state', issuenotice:'Issue notice', applyforrematch:'Apply for rematch', - + notificationsent:'Is a notification sent?', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4462d9563..c40c93f4b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3894,4 +3894,5 @@ module.exports = { matchingstate:'匹配状态', issuenotice:'下发通知', applyforrematch:'申请重新匹配', + notificationsent:'是否下发通知？', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue new file mode 100644 index 000000000..152319db9 --- /dev/null +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue @@ -0,0 +1,233 @@ + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue new file mode 100644 index 000000000..b2ed17ab1 --- /dev/null +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue @@ -0,0 +1,266 @@ + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue index 978fcb7a5..49ac97222 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -33,7 +33,7 @@ v-model="queryParam.influencestatute"> - @@ -178,11 +304,21 @@ import { mapGetters } from 'vuex' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import ImportFile from '@/components/ImportFileData/index' import moment from 'moment' +import batSetting from './batSetting' +import applyforrematch from './applyforrematch' +import rejectReason from './rejectReason' +import historyTable from './historyTable.vue' +import remark from './remark.vue' export default { name: 'index', components: { - ImportFile + ImportFile, + batSetting, + applyforrematch, + rejectReason, + historyTable, + remark, }, mixins: [ResizeHeader, ResizeColumnProvide], data() { @@ -199,13 +335,19 @@ export default { visible: false, loading: false, toggleSearchStatus: false, + customizevisible: false, dataSource: [], selectedRowKeys: [], selectedRowKeysRecord: [], + // checkedList: ['nio_number', 'params_name', 'operation'], + checkedList: [], + customizeList:[], serialNumber: '', total: 0, pageSize: 10, pageNo: 1, + pageNohistory: 1, + pageSizehistory: 10, CategoryTreeList: [], softwareversionList: [], softwareplatform: [], @@ -213,6 +355,24 @@ export default { marketList: [], queryParam: {}, formInline: {}, + dataSourcehistory: [], + columnshistory: [ + { + title: this.$t('OperationDetails'), + dataIndex: 'logContent', + align: 'left', + width: 320, + ellipsis: true, + scopedSlots: { customRender: 'content' } + }, + { + title: this.$t('OperationTime'), + dataIndex: 'createTime', + align: 'left', + ellipsis: true, + width: 180 + } + ], rules: { whetherTobring: [ { @@ -398,7 +558,15 @@ export default { align: 'left', width: 170, ellipsis: true, - dataIndex: 'remarks' + dataIndex: 'remarks', + scopedSlots: { customRender: 'remarks' } + }, + { + title: this.$t('operation'), + align: 'left', + width: 170, + ellipsis: true, + scopedSlots: { customRender: 'operation' } }, ], userInfoQuery: {}, @@ -507,15 +675,88 @@ export default { }, // 下发通知 issuenotice(){ - + let _this = this + this.$confirm({ + content: _this.$t('notificationsent'), + onOk() { + // let query = { + // configDataList: configDataList, + // paramsManifestId: _this.paramsManifest.id + // } + // postAction(_this.url.add, query).then((res) => { + // if (res.success) { + // _this.$message.success(_this.$t('OperationSuccessful')) + // _this.GetgetTableList() + // } else { + // _this.$message.warning(_this.$t('operationFailed')) + // } + // }) + } + }) }, // 批量设置 BatchSetting(){ - + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + let content = [] + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, // 申请重新匹配 applyforrematch(){ - + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + let content = [] + this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, + // 历史记录 + UpdateLog(val) { + this.visible = true + this.paramsReportDetailId = val.id + this.bussLogList(val) + }, + onChangehistory(page, pageSize) { + this.pageNohistory = page + this.bussLogList() + }, + SizeChangehistory(page, pageSize) { + this.pageNohistory = 1 + this.pageSizehistory = pageSize + this.bussLogList() + }, + bussLogList(val) { + let query = { + pageNo: this.pageNohistory, + pageSize: this.pageSizehistory, + paramsManifestId: this.$route.query.id, + paramsCollectManifestId: this.paramsReportDetailId + } + this.loading = true + getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => { + if (res.success) { + this.dataSourcehistory = res.result.records + if (this.dataSourcehistory && this.dataSourcehistory.length > 0) { + this.dataSourcehistory.forEach(val => { + val.logContent = val.logContent.replace(/\"/g, '"') + }) + } + this.total = res.result.total + this.loading = false + } else { + this.loading = false + } + }) + }, + handleOk() { + this.pageNohistory = 1 + this.visible = false + }, + handleCancel() { + this.pageNohistory = 1 + this.visible = false }, // 保存 preservation(){ @@ -523,15 +764,155 @@ export default { }, // 提交 submit(){ - + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + // this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, // 确认 confirm(){ - + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + // this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, // 退回 sendBack(){ + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.$refs.rejectReasonRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, + // 备注编辑 + getremark(item){ + this.$refs.remarkRef.edit(JSON.parse(JSON.stringify(item))) + }, + remarkForm(data,val){ + console.log(data) + // 根据id匹配 + this.dataSource.forEach(item => { + if(item.id == val){ + item.remark = data + } + }) + }, + getcustomize() { + this.customizevisible = true + }, + cancel() { + this.customizevisible = false + }, + getcustomizeList(item){ + let params = { + paramsManifestId: this.$route.query.id, + flag: '8' + } + getAction('report/detail/getHeader', params).then((res) => { + if (res.success) { + let List = [] + let sList = [] + res.result.forEach((item,index) => { + if(!item.type){ + if(item.headFieldCn == '操作'){ + item.field = 'operation' + item.disabled = true + }else if(item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称'){ + item.disabled = true + } + List.push(item) + } + if(item.type) { + sList.push(item) + } + }) + this.customizeList = List + this.statuList = sList + } + }) + if(item){ + console.log(item) + this.checkedList = item + } + }, + Change() { + this.selectedValue = this.checkedList + }, + onCheckAllChange(e) { + let selectedValue = ['nio_number', 'params_name', 'operation'] + this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue + this.selectedValue = this.checkedList + this.indeterminate = false + }, + handleSubmitcustomize() { + let list = [] + let uniqueArray = this.selectedValue.filter((item, index, array) => { + return array.indexOf(item) === index + }) + uniqueArray.forEach(item => { + this.customizeList.forEach((val, index) => { + if (item == val.field) { + // val.sort = index + 1 + val.dbFieldName = val.db_field_name + val.dbFieldTxt = val.db_field_txt + list.push(val) + } + }) + }) + this.confirmLoading = true + let headCustomEOList = JSON.parse(JSON.stringify(list)).concat(this.statuList) + let query = { + headCustomEOList: headCustomEOList + } + postAction('head/headCustomEO/add', query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.customizevisible = false + this.getHeader() + } else { + this.$message.warning(this.$t('operationFailed')) + this.confirmLoading = false + this.customizevisible = false + } + }) + }, + getHeader() { + getAction('head/headCustomEO/list', { + moduleFlag: 'ota' + }).then((res) => { + if (res.success) { + if(res.result && res.result.length > 0){ + this.columnsAll = res.result + }else{ + this.columnsAll = this.columns + } + for (let j = 0; j < this.columnsAll.length; j++) { + for (let i = 0; i < this.column.length; i++) { + if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) { + this.columnsAll[j] = this.column[i] + } + } + } + if(this.vehicleType != 'all'){ + this.columnsAll.push({ + title: this.$t('operation'), + align: 'left', + fixed: 'right', + width: 120, + scopedSlots: { customRender: 'operation' } + }) + } + this.loading = false + this.JLoading = false + } else { + this.JLoading = false + this.loading = false + } + }) }, onChange(value, dateString) { if (this.queryParams.softwarereleasetime && this.queryParams.softwarereleasetime.length > 0) { @@ -621,4 +1002,10 @@ export default { ::v-deep .ant-table-placeholder { margin-top: 8px !important; } +::v-deep .popconfirmClassName .ant-popover-buttons{ + display: none !important; +} +::v-deep .popconfirmClassName .anticon-exclamation-circle { + display: none !important; +} \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue new file mode 100644 index 000000000..4c6a80a74 --- /dev/null +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/historyTable.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue new file mode 100644 index 000000000..c28ae29c5 --- /dev/null +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/rejectReason.vue @@ -0,0 +1,223 @@ + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue new file mode 100644 index 000000000..afb9d6452 --- /dev/null +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue @@ -0,0 +1,222 @@ + + + + + + + \ No newline at end of file From b9bfb89658242f066a29b56a03fe6c462d19a158 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 17 Aug 2023 16:28:57 +0800 Subject: [PATCH 004/114] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 14 ++++++ .../modules/ota/entity/OtaManageApplyEO.java | 6 +-- .../jero/modules/ota/enums/OtaCarEnum.java | 45 +++++++++++++++++++ .../ota/mapper/OtaManageApplyEOMapper.java | 2 + .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 22 +++++++++ .../ota/service/IOtaManageApplyEOService.java | 8 +++- .../impl/OtaManageApplyEOServiceImpl.java | 35 ++++++++++++++- 7 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 60dfa8545..93d8cfc75 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -73,6 +73,20 @@ public class OtaManageApplyEOController extends JeroController pageList = otaManageApplyEOService.getOtaCarPage(otaManageApplyEO,pageNo,pageSize); return Result.OK(pageList); } + /** + * OTA下拉数据 + * + * @param otaManageApplyEO + * @return + */ + @AutoLog(value = "OTA下拉数据") + @ApiOperation(value="OTA下拉数据", notes="OTA下拉数据") + @GetMapping(value = "/getOtaCarList") + public Result getOtaCarList(OtaManageApplyEO otaManageApplyEO) { + + List otaCarList = otaManageApplyEOService.getOtaCarList(otaManageApplyEO); + return Result.OK(otaCarList); + } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 8082de331..66d5adaf1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -88,11 +88,7 @@ public class OtaManageApplyEO implements Serializable { /**软件版本*/ @TableField(exist = false) @ApiModelProperty(value = "软件版本") - private java.lang.String softwareVersion; - - @TableField(exist = false) - @ApiModelProperty(value = "平台") - private java.lang.String platform; + private java.lang.String plannedBpLaunchBatch; @TableField(exist = false) @ApiModelProperty(value = "适用车型") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java new file mode 100644 index 000000000..d2dc092dc --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java @@ -0,0 +1,45 @@ +package com.jero.modules.ota.enums; + +public enum OtaCarEnum { + + + ALL("All", "All"), + CN_ALL("CN All", "EU All"), + EU_ALL("EU All", "EU All"); + + String name; + String value; + + OtaCarEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + + + public static OtaCarEnum getOtaTitleEnum(String name) { + for (OtaCarEnum e : values()) { + if (e.getName().equals(name)) { + return e; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java index e1ac0414e..b7ac2866a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -29,4 +29,6 @@ public interface OtaManageApplyEOMapper extends BaseMapper { List getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject); + List getOtaCarList(@Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 4fdd9dfa5..4f777a837 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -78,4 +78,26 @@ + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index df820a308..737d66a67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -48,7 +48,7 @@ public interface IOtaManageApplyEOService extends IService { void deleteByIds(List ids); /** - * 通过id查询通过适用车型查询 + * 通过适用车型查询 * * @param appliedVehicleProject * @return @@ -79,4 +79,10 @@ public interface IOtaManageApplyEOService extends IService { * @return */ IPage getOtaCarPage(OtaManageApplyEO otaManageApplyEO,Integer pageNo,Integer pageSize); + /** + * OTA下拉数据 + * @param otaManageApplyEO + * @return + */ + List getOtaCarList(OtaManageApplyEO otaManageApplyEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index f6862824c..fb7292e4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -7,12 +7,15 @@ import com.jero.modules.ota.entity.OtaManageApplyEO; import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.ota.vo.VersionVO; +import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 数据对接表 @@ -75,7 +78,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize) { Page page = new Page(pageNo, pageSize); - otaManageApplyEOMapper.getOtaCarPage(page, otaManageApplyEO); + Page otaCarPage = otaManageApplyEOMapper.getOtaCarPage(page, otaManageApplyEO); + List records = otaCarPage.getRecords(); + if(!records.isEmpty()){ + List appliedVehicleProjectList = records.stream().filter(e-> StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .map(OtaManageApplyEO::getAppliedVehicleProject).distinct() + .collect(Collectors.toList()); + + List list = new ArrayList<>(); + for (String appliedVehicleProject : appliedVehicleProjectList) { + list.addAll(Arrays.asList(appliedVehicleProject.split(","))); + } + + + } return null; } + + @Override + public List getOtaCarList(OtaManageApplyEO otaManageApplyEO) { + List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(otaManageApplyEO); + if(!otaManageApplyEOS.isEmpty()){ + List appliedVehicleProjectList = otaManageApplyEOS.stream() + .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList()); + List list = new ArrayList<>(); + for (String appliedVehicleProject : appliedVehicleProjectList) { + list.addAll(Arrays.asList(appliedVehicleProject.split(","))); + } + } + return null; + } } From 2a65a5e03565dcfe6301145519db8157ff059a0e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 17 Aug 2023 17:48:22 +0800 Subject: [PATCH 005/114] =?UTF-8?q?ota-=E8=BD=AF=E4=BB=B6=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 17 ++++--- .../jero/modules/ota/enums/OtaCarEnum.java | 12 +++-- .../ota/mapper/OtaManageApplyEOMapper.java | 2 +- .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 17 ------- .../ota/service/IOtaManageApplyEOService.java | 6 +-- .../impl/OtaManageApplyEOServiceImpl.java | 46 +++++++++++++++++-- 6 files changed, 60 insertions(+), 40 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 93d8cfc75..6d400d7ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -21,9 +21,10 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; - /** +/** * @Description: 数据对接表 * @Author: jero-boot * @Date: 2023-08-09 @@ -74,18 +75,16 @@ public class OtaManageApplyEOController extends JeroController getOtaCarList(OtaManageApplyEO otaManageApplyEO) { - - List otaCarList = otaManageApplyEOService.getOtaCarList(otaManageApplyEO); - return Result.OK(otaCarList); + public Result getOtaCarList() { + Map result = otaManageApplyEOService.getOtaCarList(); + return Result.OK(result); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java index d2dc092dc..58c3cb394 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaCarEnum.java @@ -1,5 +1,8 @@ package com.jero.modules.ota.enums; +import java.util.ArrayList; +import java.util.List; + public enum OtaCarEnum { @@ -34,12 +37,11 @@ public enum OtaCarEnum { - public static OtaCarEnum getOtaTitleEnum(String name) { + public static List getOtaNameList() { + List nameList = new ArrayList<>(); for (OtaCarEnum e : values()) { - if (e.getName().equals(name)) { - return e; - } + nameList.add(e.getName()); } - return null; + return nameList; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java index b7ac2866a..659fde5fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -29,6 +29,6 @@ public interface OtaManageApplyEOMapper extends BaseMapper { List getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject); - List getOtaCarList(@Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); + List getOtaCarList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 4f777a837..9cf91e2be 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -81,23 +81,6 @@ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index 737d66a67..5077c470f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -6,6 +6,7 @@ import com.jero.modules.ota.entity.OtaManageApplyEO; import com.jero.modules.ota.vo.VersionVO; import java.util.List; +import java.util.Map; /** * @Description: 数据对接表 @@ -80,9 +81,8 @@ public interface IOtaManageApplyEOService extends IService { */ IPage getOtaCarPage(OtaManageApplyEO otaManageApplyEO,Integer pageNo,Integer pageSize); /** - * OTA下拉数据 - * @param otaManageApplyEO + * 下拉数据-软件版本，适用车型，市场 * @return */ - List getOtaCarList(OtaManageApplyEO otaManageApplyEO); + Map getOtaCarList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index fb7292e4a..a44873f62 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.enums.OtaCarEnum; import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.ota.vo.VersionVO; @@ -14,7 +15,11 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** @@ -142,18 +147,49 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarList(OtaManageApplyEO otaManageApplyEO) { - List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(otaManageApplyEO); + public Map getOtaCarList() { + List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(); + Map result = new HashMap<>(); if(!otaManageApplyEOS.isEmpty()){ + //软件版本 planned_bp_launch_batch_ + List plannedBpLaunchBatchList = otaManageApplyEOS.stream() + .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch())) + .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList()); + + //适用车型 appliedVehicleProject List appliedVehicleProjectList = otaManageApplyEOS.stream() .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject())) .map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList()); - List list = new ArrayList<>(); + //过滤掉特殊的适用车型 + List otaNameList = OtaCarEnum.getOtaNameList(); + + Set carSet = new HashSet<>();//适用车型 + Set marketSet = new HashSet<>();//市场 for (String appliedVehicleProject : appliedVehicleProjectList) { - list.addAll(Arrays.asList(appliedVehicleProject.split(","))); + for (String s : appliedVehicleProject.split(",")) { + String[] split = s.split(" "); + if(split.length == 2){ + if (!otaNameList.contains(s)) { + carSet.add(split[0]); + marketSet.add(split[1]); + } + }else if(split.length == 3){ + if (!otaNameList.contains(s)) { + carSet.add(split[0]); + marketSet.add(split[2]); + } + } + } } + result.put("plannedBpLaunchBatchList",plannedBpLaunchBatchList); + result.put("carSet",carSet); + result.put("marketSet",marketSet); } - return null; + return result; } } From 3c1d347e74e52d3c407aefdce771974777ba2a6f Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 17 Aug 2023 20:07:54 +0800 Subject: [PATCH 006/114] =?UTF-8?q?OTA=E5=88=97=E8=A1=A8=E5=92=8C=E5=85=A8?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/util/PageUtil.java | 40 ++++++++++ .../modules/ota/entity/OtaManageApplyEO.java | 6 +- .../ota/entity/OtaManageReceiveNsdpEO.java | 17 +++++ .../ota/mapper/OtaManageApplyEOMapper.java | 7 +- .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 74 +++++++++++++------ .../impl/OtaManageApplyEOServiceImpl.java | 74 ++++++++++++++++++- 6 files changed, 190 insertions(+), 28 deletions(-) create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/PageUtil.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdpEO.java diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/PageUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/PageUtil.java new file mode 100644 index 000000000..fe62ec525 --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/PageUtil.java @@ -0,0 +1,40 @@ +package com.jero.common.util; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description + * @date 2022/12/7 14:02 + * @auth zhn + */ +public class PageUtil { + public static Page getPages(Integer currentPage, Integer pageSize, List entityList){ + Page page =new Page(); + if(entityList==null){ + return null; + } + int size = entityList.size(); + if(pageSize > size){ + pageSize = size; + } + if(pageSize!=0){ + //求出最⼤页数，防⽌currentPage越界 + int maxPage = size % pageSize ==0? size / pageSize : size / pageSize +1; + if(currentPage > maxPage){ + currentPage = maxPage; + } + } + //当前页第⼀条数据的下标 + int curIdx = currentPage >1?(currentPage -1)* pageSize :0; + List pageList =new ArrayList(); + //将当前页的数据放进pageList + for(int i =0; i < pageSize && curIdx + i < size; i++){ + pageList.add(entityList.get(curIdx + i)); + } + page.setCurrent(currentPage).setSize(pageSize).setTotal(entityList.size()).setRecords(pageList); + return page; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 66d5adaf1..0ec1e59e4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -100,7 +100,11 @@ public class OtaManageApplyEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "软件发布时间") - private java.util.Date softwareIssueTime; + private String releaseName; + + @TableField(exist = false) + @ApiModelProperty(value = "软件发布时间") + private java.util.Date releaseNameDate; @TableField(exist = false) @ApiModelProperty(value = "软件发布时间-开始") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdpEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdpEO.java new file mode 100644 index 000000000..264cd6d96 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdpEO.java @@ -0,0 +1,17 @@ +package com.jero.modules.ota.entity; + +import lombok.Data; + +/** + * @description + * @date 2023/8/17 18:38 + * @auth zhn + */ +@Data +public class OtaManageReceiveNsdpEO { + //软件版本 + private String releaseName; + + //发布时间 + private String releaseDate; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java index 659fde5fc..8ba7fdf94 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -2,10 +2,12 @@ package com.jero.modules.ota.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.ota.entity.OtaManageReceiveNsdpEO; import com.jero.modules.ota.vo.VersionVO; import org.apache.ibatis.annotations.Param; import com.jero.modules.ota.entity.OtaManageApplyEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.pptx4j.pml.STTLTriggerRuntimeNode; import java.util.List; @@ -17,7 +19,8 @@ import java.util.List; */ public interface OtaManageApplyEOMapper extends BaseMapper { - Page getOtaPage(Page page, @Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); +// Page getOtaPage(Page page, @Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); + List getOtaList(@Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); /** * 分车型列表-分页列表查询 @@ -31,4 +34,6 @@ public interface OtaManageApplyEOMapper extends BaseMapper { List getOtaCarList(); + List getReleaseDate(@Param("plannedBpLaunchBatchList") List plannedBpLaunchBatchList); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 9cf91e2be..91ee53ee9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -15,44 +15,62 @@ - select * from ota_manage_receive - 1=1 - - and trim( REPLACE ( software_version, ' ', '' ) ) LIKE trim( - REPLACE ( CONCAT( '%', #{otaManageApplyEO.softwareVersion}, '%' ), ' ', '' )) - - - and ts.platform LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.platform}),'%') - - - and ts.applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%') - - - and ts.market LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.market}),'%') - - - and ts.software_issue_time >=#{otaManageApplyEO.softwareIssueTimeStart} - - - and ts.software_issue_time <=#{otaManageApplyEO.softwareIssueTimeEnd} + + planned_bp_launch_batch_ =#{otaManageApplyEO.plannedBpLaunchBatch} + + and applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%') + + + + and applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.market}),'%') + - and ts.issue_key LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.issueKey}),'%') + and id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.issueKey}),'%') - and ts.summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%') + and summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%') - and (ts.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%') - or impact_eu_homo ts.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')) + and (impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%') + or impact_eu_homo impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')) order by create_time desc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index a44873f62..a38ec4f87 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -3,17 +3,24 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hankcs.hanlp.dependency.nnparser.util.Log; +import com.jero.common.util.PageUtil; import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.entity.OtaManageReceiveNsdpEO; import com.jero.modules.ota.enums.OtaCarEnum; import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.ota.vo.VersionVO; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -115,8 +122,71 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize) { - Page page = new Page(pageNo, pageSize); - return otaManageApplyEOMapper.getOtaPage(page, otaManageApplyEO); + List otaManageApplyEOList = otaManageApplyEOMapper.getOtaList(otaManageApplyEO); + if(!otaManageApplyEOList.isEmpty()){ + List otaNameList = OtaCarEnum.getOtaNameList(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + List plannedBpLaunchBatchList = otaManageApplyEOList.stream() + .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch())) + .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList()); + if(!plannedBpLaunchBatchList.isEmpty()){ + List manageReceiveNsdpEOList = otaManageApplyEOMapper.getReleaseDate(plannedBpLaunchBatchList); + for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) { + List collect = manageReceiveNsdpEOList.stream() + .filter(e -> StringUtils.isNotBlank(e.getReleaseName()) + && e.getReleaseName().equals(manageApplyEO.getPlannedBpLaunchBatch())).collect(Collectors.toList()); + if(!collect.isEmpty()){ + List releaseDateList = collect.stream().map(OtaManageReceiveNsdpEO::getReleaseDate).distinct().collect(Collectors.toList()); + List list = new ArrayList<>(); + for (String s : releaseDateList) { + list.add(Integer.parseInt(s.replaceAll("-",""))); + } + Integer max = Collections.max(list); + try { + //发布时间 + manageApplyEO.setReleaseName(sdf.format(dateFormat.parse(max.toString()))); + manageApplyEO.setReleaseNameDate(dateFormat.parse(max.toString())); + } catch (ParseException e) { + log.error(e.getMessage(), e); + } + } + //市场 + String appliedVehicleProject = manageApplyEO.getAppliedVehicleProject(); + if(StringUtils.isNotBlank(appliedVehicleProject)){ + Set marketSet = new HashSet<>(); + for (String s : appliedVehicleProject.split(",")) { + String[] split = s.split(" "); + if(split.length == 2){ + if (!otaNameList.contains(s)) { + marketSet.add(split[1]); + } + }else if(split.length == 3){ + if (!otaNameList.contains(s)) { + marketSet.add(split[2]); + } + } + } + if(!marketSet.isEmpty()){ + manageApplyEO.setMarket(StringUtils.join(marketSet, ",")); + } + } + } + } + } + if(ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeStart())){ + otaManageApplyEOList = otaManageApplyEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getReleaseName()) + && (e.getReleaseNameDate().after(otaManageApplyEO.getSoftwareIssueTimeStart()) + || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeStart()))).collect(Collectors.toList()); + } + if(ObjectUtils.isNotEmpty(otaManageApplyEO.getSoftwareIssueTimeEnd())){ + otaManageApplyEOList = otaManageApplyEOList.stream().filter(e-> StringUtils.isNotBlank(e.getReleaseName()) + && (e.getReleaseNameDate().before(otaManageApplyEO.getSoftwareIssueTimeEnd()) + || e.getReleaseNameDate().equals(otaManageApplyEO.getSoftwareIssueTimeEnd()))).collect(Collectors.toList()); + } + Page pages = PageUtil.getPages(pageNo, pageSize, otaManageApplyEOList); + return pages; } /** From 78dd252a78d61c022d6f8ab3f1087fab8c3e110e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 17 Aug 2023 20:55:34 +0800 Subject: [PATCH 007/114] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE-?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=92=8C=E5=88=86=E8=BD=A6=E5=9E=8B=EF=BC=88?= =?UTF-8?q?=E4=B8=8D=E5=90=AB=E5=B9=B4=E6=AC=BE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 14 +++++-- .../ota/service/IOtaManageApplyEOService.java | 8 +++- .../impl/OtaManageApplyEOServiceImpl.java | 38 ++++++++++++++++++- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 6d400d7ca..9ff31351d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -81,9 +81,9 @@ public class OtaManageApplyEOController extends JeroController getOtaCarList() { - Map result = otaManageApplyEOService.getOtaCarList(); + @GetMapping(value = "/getPullDownList") + public Result getPullDownList() { + Map result = otaManageApplyEOService.getPullDownList(); return Result.OK(result); } @@ -141,4 +141,12 @@ public class OtaManageApplyEOController extends JeroController getCarList() { + List result = otaManageApplyEOService.getCarList(); + return Result.OK(result); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index 5077c470f..b406cfc29 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -84,5 +84,11 @@ public interface IOtaManageApplyEOService extends IService { * 下拉数据-软件版本，适用车型，市场 * @return */ - Map getOtaCarList(); + Map getPullDownList(); + + /** + 下拉数据-全部和分车型（不含年款） + * @return + */ + List getCarList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index a38ec4f87..1f00730cc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -222,7 +223,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarList() { + public Map getPullDownList() { List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(); Map result = new HashMap<>(); if(!otaManageApplyEOS.isEmpty()){ @@ -262,4 +263,39 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getCarList() { + List otaManageApplyEOS = otaManageApplyEOMapper.getOtaCarList(); + List result = new LinkedList<>(); + result.add("全部"); + if(!otaManageApplyEOS.isEmpty()){ + + //适用车型 appliedVehicleProject + List appliedVehicleProjectList = otaManageApplyEOS.stream() + .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList()); + //过滤掉特殊的适用车型 +// List otaNameList = OtaCarEnum.getOtaNameList(); + + Set carSet = new HashSet<>();//适用车型 + Set marketSet = new HashSet<>();//市场 + for (String appliedVehicleProject : appliedVehicleProjectList) { + for (String s : appliedVehicleProject.split(",")) { + String[] split = s.split(" "); + if (split.length == 2) { + result.add(s); + } else if (split.length == 3) { + result.add(split[0]+" "+split[2]); + } + } + } + } + result = result.stream().distinct().collect(Collectors.toList()); + return result; + } } From 77f9b7a46045e8476019735bca5ff64aa766402a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 18 Aug 2023 11:44:41 +0800 Subject: [PATCH 008/114] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 8 +++ .../modules/ota/entity/OtaManageApplyEO.java | 6 ++ .../ota/mapper/OtaManageApplyEOMapper.java | 5 +- .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 17 +++++- .../ota/service/IOtaManageApplyEOService.java | 7 +++ .../impl/OtaManageApplyEOServiceImpl.java | 59 ++++++++++++++----- .../com/jero/modules/ota/vo/VersionVO.java | 26 +++++++- 7 files changed, 108 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 9ff31351d..6df4df01d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -149,4 +149,12 @@ public class OtaManageApplyEOController extends JeroController getProjectVersionList(String carMarket) { + List result = otaManageApplyEOService.getProjectVersionList(carMarket); + return Result.OK(result); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 0ec1e59e4..7a8297bcc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.modules.ota.vo.VersionVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,6 +16,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -162,6 +164,10 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "认证批准") private Date attestationEndTime; + @TableField(exist = false) + @ApiModelProperty(value = "项目版本下拉选项") + private List versionVOList; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java index 8ba7fdf94..1cd0a4751 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -24,11 +24,10 @@ public interface OtaManageApplyEOMapper extends BaseMapper { /** * 分车型列表-分页列表查询 - * @param page * @param otaManageApplyEO * @return */ - Page getOtaCarPage(Page page, @Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); + List getOtaCarPage(@Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); List getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject); @@ -36,4 +35,6 @@ public interface OtaManageApplyEOMapper extends BaseMapper { List getReleaseDate(@Param("plannedBpLaunchBatchList") List plannedBpLaunchBatchList); + List getProjectVersion(@Param("car") String car, @Param("market") String market); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 91ee53ee9..172c2dfe5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -73,9 +73,9 @@ + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index b406cfc29..06c766131 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -91,4 +91,11 @@ public interface IOtaManageApplyEOService extends IService { * @return */ List getCarList(); + + /** + * + * @param carMarket + * @return + */ + List getProjectVersionList(String carMarket); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 1f00730cc..12fb60300 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -199,23 +199,38 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize) { - Page page = new Page(pageNo, pageSize); - Page otaCarPage = otaManageApplyEOMapper.getOtaCarPage(page, otaManageApplyEO); - List records = otaCarPage.getRecords(); - if(!records.isEmpty()){ - List appliedVehicleProjectList = records.stream().filter(e-> StringUtils.isNotBlank(e.getAppliedVehicleProject())) - .map(OtaManageApplyEO::getAppliedVehicleProject).distinct() - .collect(Collectors.toList()); + List otaManageApplyEOList = otaManageApplyEOMapper.getOtaCarPage(otaManageApplyEO); + List list = new ArrayList<>(); + String carMarket = otaManageApplyEO.getAppliedVehicleProject(); + if(StringUtils.isNotBlank(carMarket) && !"全部".equals(carMarket) && !otaManageApplyEOList.isEmpty()){ - List list = new ArrayList<>(); - for (String appliedVehicleProject : appliedVehicleProjectList) { - list.addAll(Arrays.asList(appliedVehicleProject.split(","))); + String[] conditionSplit = carMarket.split(" "); + + for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) { + String appliedVehicleProject = manageApplyEO.getAppliedVehicleProject(); + if(StringUtils.isNotBlank(appliedVehicleProject)){ + String[] appliedVehicleProjectArr = appliedVehicleProject.split(","); + for (String appliedVehicleProjectTemp : appliedVehicleProjectArr) { + String[] split = appliedVehicleProjectTemp.split(" "); + if(split.length == 1){ + list.add(manageApplyEO); + }else if(split.length == 2){ + if(Arrays.equals(conditionSplit, split)){ + list.add(manageApplyEO); + } + }else if(split.length == 3){ + List listTemp = Arrays.asList(split); + List conditionList = Arrays.asList(conditionSplit); + if(listTemp.containsAll(conditionList)){ + list.add(manageApplyEO); + } + } + } + } } - - } - - return null; + Page pages = PageUtil.getPages(pageNo, pageSize, list); + return pages; } /** @@ -298,4 +313,20 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getProjectVersionList(String carMarket) { + List versionVOList = new LinkedList<>(); + if(StringUtils.isNotBlank(carMarket)){ + //根据适用车型查询项目版本 + String[] conditionSplit = carMarket.split(" "); + String car = conditionSplit[0]; + String market = conditionSplit[1]; + versionVOList = otaManageApplyEOMapper.getProjectVersion(car, market); + for (VersionVO versionVO : versionVOList) { + versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + versionVO.getMarket() + "-" +versionVO.getVersionNumber()); + } + } + return versionVOList; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java index 466de57cd..adf720d23 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java @@ -1,6 +1,7 @@ package com.jero.modules.ota.vo; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.Date; @@ -9,10 +10,11 @@ import java.util.Date; * @date 2023/8/9 11:28 * @auth zhn */ +@Data public class VersionVO { - @ApiModelProperty(value = "版本") - private String version; + @ApiModelProperty(value = "项目id") + private String projectId; @ApiModelProperty(value = "认证开始") private Date attestationStartTime; @@ -22,4 +24,24 @@ public class VersionVO { @ApiModelProperty(value = "认证批准") private Date attestationEndTime; + + + @ApiModelProperty(value = "车型") + private String car; + + @ApiModelProperty(value = "年款") + private String yearName; + + @ApiModelProperty(value = "市场") + private String market; + + @ApiModelProperty(value = "版本号") + private String versionNumber; + + @ApiModelProperty(value = "studio") + private String studio; + + @ApiModelProperty(value = "项目版本名称") + private String versionName; + } From ad46dbbb38360020688b62a2e53c7084302f2180 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 18 Aug 2023 14:04:58 +0800 Subject: [PATCH 009/114] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/entity/OtaManageApplyEO.java | 13 ++++++++++--- .../service/impl/OtaManageApplyEOServiceImpl.java | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 7a8297bcc..ebb69b79a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -62,12 +62,12 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - @ApiModelProperty(value = "VDR") + @ApiModelProperty(value = "外键") private java.lang.String issueKey; /**项目版本*/ @Excel(name = "项目版本", width = 15) - @ApiModelProperty(value = "项目版本") + @ApiModelProperty(value = "项目版本-id") private java.lang.String projectVersion; /**认证进度*/ @@ -87,7 +87,10 @@ public class OtaManageApplyEO implements Serializable { //-------------------------------------------------------- - /**软件版本*/ + @TableField(exist = false) + @ApiModelProperty(value = "VDR") + private java.lang.String vdr; + @TableField(exist = false) @ApiModelProperty(value = "软件版本") private java.lang.String plannedBpLaunchBatch; @@ -168,6 +171,10 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "项目版本下拉选项") private List versionVOList; + @ApiModelProperty(value = "项目版本-中文") + @TableField(exist = false) + private java.lang.String projectVersionName; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 12fb60300..98688b1f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -134,6 +134,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl manageReceiveNsdpEOList = otaManageApplyEOMapper.getReleaseDate(plannedBpLaunchBatchList); for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) { + manageApplyEO.setVdr(manageApplyEO.getId()); List collect = manageReceiveNsdpEOList.stream() .filter(e -> StringUtils.isNotBlank(e.getReleaseName()) && e.getReleaseName().equals(manageApplyEO.getPlannedBpLaunchBatch())).collect(Collectors.toList()); From eca7f6002e9138351ffdae61dc12eb364940165d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 18 Aug 2023 15:31:05 +0800 Subject: [PATCH 010/114] =?UTF-8?q?=E5=88=86=E8=BD=A6=E5=9E=8B=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/entity/OtaManageApplyEO.java | 6 ++- .../impl/OtaManageApplyEOServiceImpl.java | 49 ++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index ebb69b79a..09ae80cd7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -155,6 +155,10 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "R&H Studio") private java.lang.String studio; + @TableField(exist = false) + @ApiModelProperty(value = "R&H Studio中文名") + private java.lang.String studioText; + @TableField(exist = false) @ApiModelProperty(value = "认证开始") private Date attestationStartTime; @@ -173,7 +177,7 @@ public class OtaManageApplyEO implements Serializable { @ApiModelProperty(value = "项目版本-中文") @TableField(exist = false) - private java.lang.String projectVersionName; + private java.lang.String projectVersionText; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 98688b1f2..07b235ad3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -3,7 +3,7 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hankcs.hanlp.dependency.nnparser.util.Log; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; import com.jero.modules.ota.entity.OtaManageApplyEO; import com.jero.modules.ota.entity.OtaManageReceiveNsdpEO; @@ -11,6 +11,9 @@ import com.jero.modules.ota.enums.OtaCarEnum; import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.ota.vo.VersionVO; +import com.jero.modules.project.entity.ProjectTaskPlanning; +import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl; +import com.jero.modules.system.service.impl.SysBaseApiImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -41,6 +44,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl projectVersionList = list.stream() + .map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList()); + //studio + List userIdList = list.stream().map(OtaManageApplyEO::getStudio).distinct().collect(Collectors.toList()); + List loginUserList = new ArrayList<>(); + if(!userIdList.isEmpty()){ + loginUserList = sysBaseApi.queryAllUserByIds(userIdList.toArray(new String[userIdList.size()])); + } + + + List projectTaskPlanningList = projectTaskPlanningService.queryList(StringUtils.join(projectVersionList,",")); + for (OtaManageApplyEO manageApplyEO : list) { + if(StringUtils.isNotBlank(manageApplyEO.getProjectVersion())){ + List taskPlanningList = projectTaskPlanningList.stream() + .filter(e -> manageApplyEO.getProjectVersion().equals(e.getProjectId())).collect(Collectors.toList()); + //设置认证开始，认证批准，认证申报 + if(!taskPlanningList.isEmpty()){ + Date attestationStartTime = taskPlanningList.get(0).getAttestationStartTime();//认证开始 + Date attestationEndTime = taskPlanningList.get(0).getAttestationEndTime();//认证批准 + Date certificationSubmission = taskPlanningList.get(0).getCertificationSubmission();//认证申报 + manageApplyEO.setAttestationStartTime(attestationStartTime); + manageApplyEO.setAttestationEndTime(attestationEndTime); + manageApplyEO.setCertificationSubmission(certificationSubmission); + } + //设置studio + if(StringUtils.isNotBlank(manageApplyEO.getStudio())){ + List userList = loginUserList.stream() + .filter(e -> manageApplyEO.getStudio().equals(e.getId())).collect(Collectors.toList()); + if(!userList.isEmpty()){ + manageApplyEO.setStudioText(userList.get(0).getUsername()); + } + } + } + } + } + + + Page pages = PageUtil.getPages(pageNo, pageSize, list); return pages; } From 972baafd2664f5392d5b6cccb36ca259cbc36fa3 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 18 Aug 2023 15:31:43 +0800 Subject: [PATCH 011/114] =?UTF-8?q?OTA=E5=AF=B9=E6=8E=A5=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../src/components/dict/JDictSelectTag.vue | 1 + .../components/applyforrematch.vue | 5 + .../components/batSetting.vue | 5 + .../otaAuthentication/components/detil.vue | 645 +++++++++++++----- .../components/vdrDetial.vue | 268 ++++++++ .../otamanagement/otaAuthentication/index.vue | 196 +++--- 8 files changed, 855 insertions(+), 271 deletions(-) create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4c66fa8b5..0fe6b72b5 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1939,4 +1939,7 @@ module.exports = { issuenotice:'Issue notice', applyforrematch:'Apply for rematch', notificationsent:'Is a notification sent?', + VDRDetails:'VDR Details', + applicationprojectversion:'Application project version', + selectlocked:'You can select only the data whose matching status is locked', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c40c93f4b..469fdcf69 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3895,4 +3895,7 @@ module.exports = { issuenotice:'下发通知', applyforrematch:'申请重新匹配', notificationsent:'是否下发通知？', + VDRDetails:'VDR详情', + applicationprojectversion:'应用项目版本', + selectlocked:'只能选择匹配状态为锁定的数据', } \ No newline at end of file diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index 4386292d3..29fc1fc27 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -11,6 +11,7 @@ -