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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java

@@ -3,9 +3,11 @@ package com.jero.modules.ota.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 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.util.PageUtil;
 import com.jero.modules.ota.entity.OtaManageApplyEO;
 import com.jero.modules.ota.service.IOtaManageApplyEOService;
 import com.jero.modules.ota.vo.VersionVO;
@@ -50,8 +52,9 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
 
-		IPage<OtaManageApplyEO> pageList = otaManageApplyEOService.getOtaPage(otaManageApplyEO,pageNo,pageSize);
-		return Result.OK(pageList);
+		List<OtaManageApplyEO> list = otaManageApplyEOService.getOtaPage(otaManageApplyEO);
+		Page pages = PageUtil.getPages(pageNo, pageSize, list);
+		return Result.OK(pages);
 	}
 	/**
 	 * 分车型列表-分页列表查询
@@ -280,4 +283,17 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 	}
 
 
+	/**
+	 * OTA管理导出excel
+	 *
+	 * @param request
+	 * @param otaManageApplyEO
+	 */
+	@RequestMapping(value = "/otaExportXls")
+	@ApiOperation(value = "OTA管理导出excel", notes = "OTA管理导出excel")
+	public ModelAndView otaExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO) {
+		return otaManageApplyEOService.otaExportXls(request, otaManageApplyEO);
+	}
+
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageReceiveController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.ota.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.ota.entity.OtaManageReceive;
+import com.jero.modules.ota.service.IOtaManageReceiveService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: OTA管理
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+@Api(tags="OTA管理")
+@RestController
+@RequestMapping("/ota/otaManageReceive")
+@Slf4j
+public class OtaManageReceiveController extends JeroController<OtaManageReceive, IOtaManageReceiveService> {
+	@Autowired
+	private IOtaManageReceiveService otaManageReceiveService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param otaManageReceive
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理-分页列表查询")
+	@ApiOperation(value="OTA管理-分页列表查询", notes="OTA管理-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(OtaManageReceive otaManageReceive,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<OtaManageReceive> queryWrapper = QueryGenerator.initQueryWrapper(otaManageReceive, req.getParameterMap());
+		Page<OtaManageReceive> page = new Page<OtaManageReceive>(pageNo, pageSize);
+		IPage<OtaManageReceive> pageList = otaManageReceiveService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理-列表查询")
+    @ApiOperation(value="OTA管理-列表查询", notes="OTA管理-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<OtaManageReceive>> queryList() {
+        List<OtaManageReceive> list = otaManageReceiveService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param otaManageReceive
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理-添加")
+	@ApiOperation(value="OTA管理-添加", notes="OTA管理-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody OtaManageReceive otaManageReceive) {
+		otaManageReceiveService.add(otaManageReceive);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param otaManageReceive
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理-编辑")
+	@ApiOperation(value="OTA管理-编辑", notes="OTA管理-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody OtaManageReceive otaManageReceive) {
+		otaManageReceiveService.editById(otaManageReceive);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理-通过id删除")
+	@ApiOperation(value="OTA管理-通过id删除", notes="OTA管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		otaManageReceiveService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理-批量删除")
+	@ApiOperation(value="OTA管理-批量删除", notes="OTA管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.otaManageReceiveService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理-通过id查询")
+	@ApiOperation(value="OTA管理-通过id查询", notes="OTA管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		OtaManageReceive otaManageReceive = otaManageReceiveService.queryById(id);
+		if(otaManageReceive==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(otaManageReceive);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param otaManageReceive
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, OtaManageReceive otaManageReceive) {
+        return super.exportXls(request, otaManageReceive, OtaManageReceive.class, "OTA管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, OtaManageReceive.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageReceiveNsdpController.java

@@ -0,0 +1,170 @@
+package com.jero.modules.ota.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
+import com.jero.modules.ota.service.IOtaManageReceiveNsdpService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: OTA管理NSDP同步表
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+@Api(tags="OTA管理NSDP同步表")
+@RestController
+@RequestMapping("/ota/otaManageReceiveNsdp")
+@Slf4j
+public class OtaManageReceiveNsdpController extends JeroController<OtaManageReceiveNsdp, IOtaManageReceiveNsdpService> {
+	@Autowired
+	private IOtaManageReceiveNsdpService otaManageReceiveNsdpService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param otaManageReceiveNsdp
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理NSDP同步表-分页列表查询")
+	@ApiOperation(value="OTA管理NSDP同步表-分页列表查询", notes="OTA管理NSDP同步表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(OtaManageReceiveNsdp otaManageReceiveNsdp,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<OtaManageReceiveNsdp> queryWrapper = QueryGenerator.initQueryWrapper(otaManageReceiveNsdp, req.getParameterMap());
+		Page<OtaManageReceiveNsdp> page = new Page<OtaManageReceiveNsdp>(pageNo, pageSize);
+		IPage<OtaManageReceiveNsdp> pageList = otaManageReceiveNsdpService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理NSDP同步表-列表查询")
+    @ApiOperation(value="OTA管理NSDP同步表-列表查询", notes="OTA管理NSDP同步表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<OtaManageReceiveNsdp>> queryList() {
+        List<OtaManageReceiveNsdp> list = otaManageReceiveNsdpService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param otaManageReceiveNsdp
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理NSDP同步表-添加")
+	@ApiOperation(value="OTA管理NSDP同步表-添加", notes="OTA管理NSDP同步表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody OtaManageReceiveNsdp otaManageReceiveNsdp) {
+		otaManageReceiveNsdpService.add(otaManageReceiveNsdp);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param otaManageReceiveNsdp
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理NSDP同步表-编辑")
+	@ApiOperation(value="OTA管理NSDP同步表-编辑", notes="OTA管理NSDP同步表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody OtaManageReceiveNsdp otaManageReceiveNsdp) {
+		otaManageReceiveNsdpService.editById(otaManageReceiveNsdp);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理NSDP同步表-通过id删除")
+	@ApiOperation(value="OTA管理NSDP同步表-通过id删除", notes="OTA管理NSDP同步表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		otaManageReceiveNsdpService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理NSDP同步表-批量删除")
+	@ApiOperation(value="OTA管理NSDP同步表-批量删除", notes="OTA管理NSDP同步表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.otaManageReceiveNsdpService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "OTA管理NSDP同步表-通过id查询")
+	@ApiOperation(value="OTA管理NSDP同步表-通过id查询", notes="OTA管理NSDP同步表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		OtaManageReceiveNsdp otaManageReceiveNsdp = otaManageReceiveNsdpService.queryById(id);
+		if(otaManageReceiveNsdp==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(otaManageReceiveNsdp);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param otaManageReceiveNsdp
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, OtaManageReceiveNsdp otaManageReceiveNsdp) {
+        return super.exportXls(request, otaManageReceiveNsdp, OtaManageReceiveNsdp.class, "OTA管理NSDP同步表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, OtaManageReceiveNsdp.class);
+    }
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java

@@ -0,0 +1,114 @@
+package com.jero.modules.ota.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: OTA管理
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("ota_manage_receive")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ota_manage_receive对象", description="OTA管理")
+public class OtaManageReceive implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**软件版本*/
+	@Excel(name = "软件版本", width = 15)
+    @ApiModelProperty(value = "软件版本")
+    private String plannedBpLaunchBatch;
+
+	/**更新时间（yyyyMMdd）*/
+	@Excel(name = "更新时间（yyyyMMdd）", width = 15)
+    @ApiModelProperty(value = "更新时间（yyyyMMdd）")
+    private String updateDate;
+
+	/**主题*/
+	@Excel(name = "主题", width = 15)
+    @ApiModelProperty(value = "主题")
+    private String summary;
+
+	/**VDR状态*/
+	@Excel(name = "VDR状态", width = 15)
+    @ApiModelProperty(value = "VDR状态")
+    private String status;
+
+	/**认证影响*/
+	@Excel(name = "认证影响", width = 15)
+    @ApiModelProperty(value = "认证影响")
+    private String homologationImpact;
+
+	/**影响描述*/
+	@Excel(name = "影响描述", width = 15)
+    @ApiModelProperty(value = "影响描述")
+    private String homologation;
+
+	/**影响法规-CN*/
+	@Excel(name = "影响法规-CN", width = 15)
+    @ApiModelProperty(value = "影响法规-CN")
+    private String impactCnHomo;
+
+	/**影响法规-EU*/
+	@Excel(name = "影响法规-EU", width = 15)
+    @ApiModelProperty(value = "影响法规-EU")
+    private String impactEuHomo;
+
+	/**责任部门*/
+	@Excel(name = "责任部门", width = 15)
+    @ApiModelProperty(value = "责任部门")
+    private String masterDomain;
+
+	/**适用车型*/
+	@Excel(name = "适用车型", width = 15)
+    @ApiModelProperty(value = "适用车型")
+    private String appliedVehicleProject;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java

@@ -0,0 +1,96 @@
+package com.jero.modules.ota.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+
+/**
+ * @Description: OTA管理NSDP同步表
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("ota_manage_receive_nsdp")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ota_manage_receive_nsdp对象", description="OTA管理NSDP同步表")
+public class OtaManageReceiveNsdp implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+	/**平台*/
+	@Excel(name = "平台", width = 15)
+    @ApiModelProperty(value = "平台")
+    private String platformName;
+
+	/**发布版本*/
+	@Excel(name = "发布版本", width = 15)
+    @ApiModelProperty(value = "发布版本")
+    private String releaseName;
+
+	/**发布类型*/
+	@Excel(name = "发布类型", width = 15)
+    @ApiModelProperty(value = "发布类型")
+    private String releaseType;
+
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String dateName;
+
+	/**发布时间*/
+	@Excel(name = "发布时间", width = 15)
+    @ApiModelProperty(value = "发布时间")
+    private String releaseDate;
+
+	/**创建时间*/
+	@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 createdAt;
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.ota.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.ota.entity.OtaManageReceive;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: OTA管理
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+public interface OtaManageReceiveMapper extends BaseMapper<OtaManageReceive> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveNsdpMapper.java

@@ -0,0 +1,17 @@
+package com.jero.modules.ota.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: OTA管理NSDP同步表
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+public interface OtaManageReceiveNsdpMapper extends BaseMapper<OtaManageReceiveNsdp> {
+
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageReceiveMapper.xml

@@ -0,0 +1,22 @@
+<?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.ota.mapper.OtaManageReceiveMapper">
+    <resultMap id="OtaManageReceiveResultMap" type="com.jero.modules.ota.entity.OtaManageReceive">
+        <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="planned_bp_launch_batch_" property="plannedBpLaunchBatch" />
+        <result column="update_date" property="updateDate" />
+        <result column="summary" property="summary" />
+        <result column="status" property="status" />
+        <result column="homologation_impact" property="homologationImpact" />
+        <result column="homologation" property="homologation" />
+        <result column="impact_cn_homo" property="impactCnHomo" />
+        <result column="impact_eu_homo" property="impactEuHomo" />
+        <result column="master_domain" property="masterDomain" />
+        <result column="applied_vehicle_project" property="appliedVehicleProject" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageReceiveNsdpMapper.xml

@@ -0,0 +1,18 @@
+<?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.ota.mapper.OtaManageReceiveNsdpMapper">
+    <resultMap id="OtaManageReceiveNsdpResultMap" type="com.jero.modules.ota.entity.OtaManageReceiveNsdp">
+        <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="platform_name" property="platformName" />
+        <result column="release_name" property="releaseName" />
+        <result column="release_type" property="releaseType" />
+        <result column="date_name" property="dateName" />
+        <result column="release_date" property="releaseDate" />
+        <result column="created_at" property="createdAt" />
+    </resultMap>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java

@@ -4,7 +4,9 @@ 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 org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -66,11 +68,9 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
 	/**
 	 * OTA管理列表和全车型列表-分页列表查询
 	 * @param otaManageApplyEO
-	 * @param pageNo
-	 * @param pageSize
 	 * @return
 	 */
-	IPage<OtaManageApplyEO> getOtaPage(OtaManageApplyEO otaManageApplyEO,Integer pageNo,Integer pageSize);
+	List<OtaManageApplyEO> getOtaPage(OtaManageApplyEO otaManageApplyEO);
 
 	/**
 	 * 分车型列表-分页列表查询
@@ -123,4 +123,6 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
     List<OtaManageApplyEO> getVdrListByProject(String projectId, String cut);
 
 	List<OtaManageApplyEO> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut);
+
+	ModelAndView otaExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveNsdpService.java

@@ -0,0 +1,61 @@
+package com.jero.modules.ota.service;
+
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: OTA管理NSDP同步表
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+public interface IOtaManageReceiveNsdpService extends IService<OtaManageReceiveNsdp> {
+
+	/**
+	 * 保存
+	 *
+	 * @param otaManageReceiveNsdp
+	 * @return
+	 */
+    void add(OtaManageReceiveNsdp otaManageReceiveNsdp);
+
+	/**
+	 * 更新
+	 *
+	 * @param otaManageReceiveNsdp
+	 * @return
+	 */
+    void editById(OtaManageReceiveNsdp otaManageReceiveNsdp);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    OtaManageReceiveNsdp queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<OtaManageReceiveNsdp> queryList();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java

@@ -0,0 +1,61 @@
+package com.jero.modules.ota.service;
+
+import com.jero.modules.ota.entity.OtaManageReceive;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: OTA管理
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+public interface IOtaManageReceiveService extends IService<OtaManageReceive> {
+
+	/**
+	 * 保存
+	 *
+	 * @param otaManageReceive
+	 * @return
+	 */
+    void add(OtaManageReceive otaManageReceive);
+
+	/**
+	 * 更新
+	 *
+	 * @param otaManageReceive
+	 * @return
+	 */
+    void editById(OtaManageReceive otaManageReceive);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    OtaManageReceive queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<OtaManageReceive> queryList();
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java

@@ -8,6 +8,7 @@ import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.PageUtil;
+import com.jero.common.util.oConvertUtils;
 import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.ota.entity.OtaManageApplyEO;
 import com.jero.modules.ota.entity.OtaManageReceiveNsdpEO;
@@ -17,6 +18,7 @@ import com.jero.modules.ota.enums.OtaStatusEnum;
 import com.jero.modules.ota.mapper.OtaManageApplyEOMapper;
 import com.jero.modules.ota.service.IOtaManageApplyEOService;
 import com.jero.modules.ota.service.IOtaManageHistoryService;
+import com.jero.modules.ota.vo.OtaExportVO;
 import com.jero.modules.ota.vo.VersionVO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
@@ -34,13 +36,32 @@ import com.jero.modules.system.util.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.Collator;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -69,6 +90,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 	@Autowired
 	private IOtaManageHistoryService otaManageHistoryService;
 
+	@Value(value = "${jero.path.upload}")
+	private String upLoadPath;
+
 
 	private static SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 	private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -151,12 +175,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 	/**
 	 * OTA管理列表和全车型列表-分页列表查询
 	 * @param otaManageApplyEO
-	 * @param pageNo
-	 * @param pageSize
 	 * @return
 	 */
 	@Override
-	public IPage<OtaManageApplyEO> getOtaPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize) {
+	public List<OtaManageApplyEO> getOtaPage(OtaManageApplyEO otaManageApplyEO) {
 		List<OtaManageApplyEO> otaManageApplyEOList = otaManageApplyEOMapper.getOtaList(otaManageApplyEO);
 		if(!otaManageApplyEOList.isEmpty()){
 			List<String> otaNameList = OtaCarEnum.getOtaNameList();
@@ -223,8 +245,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 			//表头排序
 			heartSort(otaManageApplyEO, otaManageApplyEOList);
 		}
-		Page pages = PageUtil.getPages(pageNo, pageSize, otaManageApplyEOList);
-		return pages;
+		return otaManageApplyEOList;
 	}
 
 	private void heartSort(OtaManageApplyEO otaManageApplyEO, List<OtaManageApplyEO> otaManageApplyEOList) {
@@ -1060,5 +1081,40 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 		return this.list(queryWrapper);
 	}
 
+	@Override
+	public ModelAndView otaExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		// Step.2 获取导出数据
+		List<OtaManageApplyEO> pageList = getOtaPage(otaManageApplyEO);
+		List<OtaManageApplyEO> exportList = null;
+
+		// 过滤选中数据
+		String selections = request.getParameter("selections");
+		if (oConvertUtils.isNotEmpty(selections)) {
+			List<String> selectionList = Arrays.asList(selections.split(","));
+			exportList = pageList.stream().filter(e -> selectionList.contains(e.getId())).collect(Collectors.toList());
+		} else {
+			exportList = pageList;
+		}
+
+		List<OtaExportVO> dataList = new ArrayList<>();
+		for (OtaManageApplyEO manageApplyEO : exportList) {
+			OtaExportVO otaExportVO = new OtaExportVO();
+			BeanUtils.copyProperties(manageApplyEO, otaExportVO);
+			dataList.add(otaExportVO);
+		}
+
+		// Step.3 AutoPoi 导出Excel
+		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		mv.addObject(NormalExcelConstants.FILE_NAME, "OTA列表"); //此处设置的filename无效 ,前端会重更新设置一下
+		mv.addObject(NormalExcelConstants.CLASS, OtaExportVO.class);
+		ExportParams exportParams=new ExportParams("OTA软件版本", null, "OTA软件版本");
+		mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+		mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
+		return mv;
+
+	}
+
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveNsdpServiceImpl.java

@@ -0,0 +1,89 @@
+package com.jero.modules.ota.service.impl;
+
+import com.jero.modules.ota.entity.OtaManageReceiveNsdp;
+import com.jero.modules.ota.mapper.OtaManageReceiveNsdpMapper;
+import com.jero.modules.ota.service.IOtaManageReceiveNsdpService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: OTA管理NSDP同步表
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+@Service
+public class OtaManageReceiveNsdpServiceImpl extends ServiceImpl<OtaManageReceiveNsdpMapper, OtaManageReceiveNsdp> implements IOtaManageReceiveNsdpService {
+
+	/**
+	 * 保存
+	 *
+	 * @param otaManageReceiveNsdp
+	 * @return
+	 */
+	@Override
+    public void add(OtaManageReceiveNsdp otaManageReceiveNsdp) {
+        Date now = new Date();
+        otaManageReceiveNsdp.setCreateTime(now);
+        otaManageReceiveNsdp.setUpdateTime(now);
+        save(otaManageReceiveNsdp);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param otaManageReceiveNsdp
+	 * @return
+	 */
+	@Override
+    public void editById(OtaManageReceiveNsdp otaManageReceiveNsdp) {
+    	Date now = new Date();
+        otaManageReceiveNsdp.setUpdateTime(now);
+    	saveOrUpdate(otaManageReceiveNsdp);
+    }
+
+	/**
+	 * 通过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 OtaManageReceiveNsdp queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<OtaManageReceiveNsdp> queryList() {
+        return list();
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java

@@ -0,0 +1,89 @@
+package com.jero.modules.ota.service.impl;
+
+import com.jero.modules.ota.entity.OtaManageReceive;
+import com.jero.modules.ota.mapper.OtaManageReceiveMapper;
+import com.jero.modules.ota.service.IOtaManageReceiveService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Date;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: OTA管理
+ * @Author: jero-boot
+ * @Date:   2023-08-21
+ * @Version: V1.0
+ */
+@Service
+public class OtaManageReceiveServiceImpl extends ServiceImpl<OtaManageReceiveMapper, OtaManageReceive> implements IOtaManageReceiveService {
+
+	/**
+	 * 保存
+	 *
+	 * @param otaManageReceive
+	 * @return
+	 */
+	@Override
+    public void add(OtaManageReceive otaManageReceive) {
+        Date now = new Date();
+        otaManageReceive.setCreateTime(now);
+        otaManageReceive.setUpdateTime(now);
+        save(otaManageReceive);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param otaManageReceive
+	 * @return
+	 */
+	@Override
+    public void editById(OtaManageReceive otaManageReceive) {
+    	Date now = new Date();
+        otaManageReceive.setUpdateTime(now);
+    	saveOrUpdate(otaManageReceive);
+    }
+
+	/**
+	 * 通过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 OtaManageReceive queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<OtaManageReceive> queryList() {
+        return list();
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportVO.java

@@ -0,0 +1,34 @@
+package com.jero.modules.ota.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * @description
+ * @date 2023/8/9 11:28
+ * @auth zhn
+ */
+@Data
+public class OtaExportVO {
+
+    @Excel(name = "软件版本", width = 15)
+    @ApiModelProperty(value = "软件版本")
+    private java.lang.String plannedBpLaunchBatch;
+
+    @Excel(name = "市场", width = 15)
+    @ApiModelProperty(value = "市场")
+    private java.lang.String market;
+
+    @Excel(name = "适用车型", width = 50)
+    @ApiModelProperty(value = "适用车型")
+    private java.lang.String appliedVehicleProject;
+
+    @Excel(name = "软件发布时间", width = 15)
+    @ApiModelProperty(value = "软件发布时间")
+    private String releaseName;
+
+}