WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2023-03-28 15:10:57 +08:00
parent 5575134a49 e2e1f35c8f
commit 08f1114099
61 changed files with 963 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
-1
View File
@@ -156,7 +156,6 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
@RequestParam(name = "otaIdT") String otaIdT) {
OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT);
otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT);
return Result.OK(otaBaCxJbxx);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
+13
View File
@@ -6,6 +6,7 @@ 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.OtaBaCxJbxx;
import com.jero.modules.ota.entity.OtaBaSjSjmbcl;
import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -144,6 +145,18 @@ public class OtaBaSjSjmbclController extends JeroController<OtaBaSjSjmbcl, IOtaB
return Result.OK(otaBaSjSjmbcl);
}
/**
* 通过OtaId查询
*/
@AutoLog(value = "升级备案-升级目标车辆-通过otaId查询")
@ApiOperation(value = "升级备案-升级目标车辆-通过otaId查询", notes = "升级备案-升级目标车辆-通过otaId查询")
@GetMapping(value = "/queryByOtaId")
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
@RequestParam(name = "otaIdT") String otaIdT) {
OtaBaSjSjmbcl otaBaSjSjmbcl = otaBaSjSjmbclService.queryByOtaId(otaId, otaIdT);
return Result.OK(otaBaSjSjmbcl);
}
/**
* 导出excel
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
+15 -2
View File
@@ -6,6 +6,7 @@ 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.OtaBaSjSjmbcl;
import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
import com.jero.modules.ota.service.IOtaBaSjSjmbcxService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -81,8 +82,8 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
@ApiOperation(value="升级备案-升级目标车型-添加", notes="升级备案-升级目标车型-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) {
otaBaSjSjmbcxService.add(otaBaSjSjmbcx);
return Result.OK("添加成功！");
OtaBaSjSjmbcx cx = otaBaSjSjmbcxService.add(otaBaSjSjmbcx);
return Result.OK(cx);
}
/**
@@ -144,6 +145,18 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
return Result.OK(otaBaSjSjmbcx);
}
/**
* 通过OtaId查询
*/
@AutoLog(value = "升级备案-升级目标车型-通过otaId查询")
@ApiOperation(value = "升级备案-升级目标车型-通过otaId查询", notes = "升级备案-升级目标车型-通过otaId查询")
@GetMapping(value = "/queryByOtaId")
public Result<?> queryByOtaId(@RequestParam(name = "otaId") String otaId,
@RequestParam(name = "otaIdT") String otaIdT) {
OtaBaSjSjmbcx otaBaSjSjmbcx = otaBaSjSjmbcxService.queryByOtaId(otaId, otaIdT);
return Result.OK(otaBaSjSjmbcx);
}
/**
* 导出excel
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
+19
View File
@@ -6,6 +6,7 @@ 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.OtaBaCxAqcs;
import com.jero.modules.ota.entity.OtaBaSjSjyxpg;
import com.jero.modules.ota.service.IOtaBaSjSjyxpgService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -144,6 +145,24 @@ public class OtaBaSjSjyxpgController extends JeroController<OtaBaSjSjyxpg, IOtaB
return Result.OK(otaBaSjSjyxpg);
}
/**
* 通过otaId查询
*
* @param otaId
* @return
*/
@AutoLog(value = "升级备案-升级影响评估-通过otaId查询")
@ApiOperation(value = "升级备案-升级影响评估-通过otaId查询", notes = "升级备案-升级影响评估-通过otaId查询")
@GetMapping(value = "/queryByOtaId")
public Result<?> queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId,
@RequestParam(name = "otaIdT", required = true) String otaIdT) {
OtaBaSjSjyxpg otaBaSjSjyxpg = otaBaSjSjyxpgService.queryByOtaId(otaId, otaIdT);
if (otaBaSjSjyxpg == null) {
return Result.error("未找到对应数据");
}
return Result.OK(otaBaSjSjyxpg);
}
/**
* 导出excel
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java
-170
View File
@@ -1,170 +0,0 @@
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.OtaBaSjTxjl;
import com.jero.modules.ota.service.IOtaBaSjTxjlService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
@Api(tags="车型升级-填写记录表")
@RestController
@RequestMapping("/ota/otaBaSjTxjl")
@Slf4j
public class OtaBaSjTxjlController extends JeroController<OtaBaSjTxjl, IOtaBaSjTxjlService> {
@Autowired
private IOtaBaSjTxjlService otaBaSjTxjlService;
/**
* 分页列表查询
*
* @param otaBaSjTxjl
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "车型升级-填写记录表-分页列表查询")
@ApiOperation(value="车型升级-填写记录表-分页列表查询", notes="车型升级-填写记录表-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(OtaBaSjTxjl otaBaSjTxjl,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<OtaBaSjTxjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjTxjl, req.getParameterMap());
Page<OtaBaSjTxjl> page = new Page<OtaBaSjTxjl>(pageNo, pageSize);
IPage<OtaBaSjTxjl> pageList = otaBaSjTxjlService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "车型升级-填写记录表-列表查询")
@ApiOperation(value="车型升级-填写记录表-列表查询", notes="车型升级-填写记录表-列表查询")
@GetMapping(value = "/list")
public Result<List<OtaBaSjTxjl>> queryList() {
List<OtaBaSjTxjl> list = otaBaSjTxjlService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param otaBaSjTxjl
* @return
*/
@AutoLog(value = "车型升级-填写记录表-添加")
@ApiOperation(value="车型升级-填写记录表-添加", notes="车型升级-填写记录表-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) {
otaBaSjTxjlService.add(otaBaSjTxjl);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param otaBaSjTxjl
* @return
*/
@AutoLog(value = "车型升级-填写记录表-编辑")
@ApiOperation(value="车型升级-填写记录表-编辑", notes="车型升级-填写记录表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody OtaBaSjTxjl otaBaSjTxjl) {
otaBaSjTxjlService.editById(otaBaSjTxjl);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "车型升级-填写记录表-通过id删除")
@ApiOperation(value="车型升级-填写记录表-通过id删除", notes="车型升级-填写记录表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
otaBaSjTxjlService.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.otaBaSjTxjlService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "车型升级-填写记录表-通过id查询")
@ApiOperation(value="车型升级-填写记录表-通过id查询", notes="车型升级-填写记录表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
OtaBaSjTxjl otaBaSjTxjl = otaBaSjTxjlService.queryById(id);
if(otaBaSjTxjl==null) {
return Result.error("未找到对应数据");
}
return Result.OK(otaBaSjTxjl);
}
/**
* 导出excel
*
* @param request
* @param otaBaSjTxjl
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, OtaBaSjTxjl otaBaSjTxjl) {
return super.exportXls(request, otaBaSjTxjl, OtaBaSjTxjl.class, "车型升级-填写记录表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, OtaBaSjTxjl.class);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java
+3 -3
View File
@@ -99,17 +99,17 @@ public class OtaBaSjGgnrfs implements Serializable {
/**告知用户升级成功或失败*/
@Excel(name = "告知用户升级成功或失败", width = 15)
@ApiModelProperty(value = "告知用户升级成功或失败")
private java.lang.String sjsfcg;
private java.lang.Integer sjsfcg;
/**告知实施的变更*/
@Excel(name = "告知实施的变更", width = 15)
@ApiModelProperty(value = "告知实施的变更")
private java.lang.String gzbg;
private java.lang.Integer gzbg;
/**告知了对用户手册的全部更新内容*/
@Excel(name = "告知了对用户手册的全部更新内容", width = 15)
@ApiModelProperty(value = "告知了对用户手册的全部更新内容")
private java.lang.String gzscnr;
private java.lang.Integer gzscnr;
/**告知用户方式（可多选）*/
@Excel(name = "告知用户方式（可多选）", width = 15)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java
+7
View File
@@ -115,4 +115,11 @@ public class OtaBaSjList implements Serializable {
@ApiModelProperty(value = "备注")
private java.lang.String bz;
public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) {
this.cpdjbh = otaBaSjSjmbcx.getBabh();
this.ggpc = otaBaSjSjmbcx.getBapc();
this.cpsb = otaBaSjSjmbcx.getCpsb();
this.cpmc = otaBaSjSjmbcx.getCpmc();
this.cpxh = otaBaSjSjmbcx.getCpxh();
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjmbcl.java
+5
View File
@@ -90,4 +90,9 @@ public class OtaBaSjSjmbcl implements Serializable {
@ApiModelProperty(value = "VIN码清单")
private java.lang.String vinList;
/**csv附件*/
@Excel(name = "csv附件", width = 15)
@ApiModelProperty(value = "csv附件")
private java.lang.String csv;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java
+13 -9
View File
@@ -69,62 +69,66 @@ public class OtaBaSjSjyxpg implements Serializable {
/**升级目的*/
@Excel(name = "升级目的", width = 15)
@ApiModelProperty(value = "升级目的")
@Dict(dicCode = "uipgrade_purpose")
private java.lang.String sjmd;
/**是否变更对应车型的《公告》技术参数*/
@Excel(name = "是否变更对应车型的《公告》技术参数", width = 15)
@ApiModelProperty(value = "是否变更对应车型的《公告》技术参数")
private java.lang.String sfbgcs;
private java.lang.Integer sfbgcs;
/**是否涉及性能变化*/
@Excel(name = "是否涉及性能变化", width = 15)
@ApiModelProperty(value = "是否涉及性能变化")
private java.lang.String sjxnbh;
private java.lang.Integer sjxnbh;
/**是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等*/
@Excel(name = "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", width = 15)
@ApiModelProperty(value = "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等")
private java.lang.String fhgd;
private java.lang.Integer fhgd;
/**是否涉及汽车自动驾驶功能相关升级*/
@Excel(name = "是否涉及汽车自动驾驶功能相关升级", width = 15)
@ApiModelProperty(value = "是否涉及汽车自动驾驶功能相关升级")
private java.lang.String zdjsxg;
private java.lang.Integer zdjsxg;
/**兼容性评估相关*/
@Excel(name = "兼容性评估相关", width = 15)
@ApiModelProperty(value = "兼容性评估相关")
private java.lang.String jrxxg;
private java.lang.Integer jrxxg;
/**如何执行升级*/
@Excel(name = "如何执行升级", width = 15)
@ApiModelProperty(value = "如何执行升级")
private java.lang.String zxsj;
@Dict(dicCode = "conditions_upgrades")
private java.lang.Integer zxsj;
/**升级失败或中断后，车辆采取的安全机制*/
@Excel(name = "升级失败或中断后，车辆采取的安全机制", width = 15)
@ApiModelProperty(value = "升级失败或中断后，车辆采取的安全机制")
@Dict(dicCode = "upgrade_failed")
private java.lang.String aqjz;
/**升级活动是否影响车辆安全*/
@Excel(name = "升级活动是否影响车辆安全", width = 15)
@ApiModelProperty(value = "升级活动是否影响车辆安全")
private java.lang.String sfyxaq;
private java.lang.Integer sfyxaq;
/**升级活动是否提供用户确认选项*/
@Excel(name = "升级活动是否提供用户确认选项", width = 15)
@ApiModelProperty(value = "升级活动是否提供用户确认选项")
private java.lang.String yhqr;
private java.lang.Integer yhqr;
/**升级包测试*/
@Excel(name = "升级包测试", width = 15)
@ApiModelProperty(value = "升级包测试")
@Dict(dicCode = "package_test")
private java.lang.String sjbcs;
/**是杏已验证确认在线升级活动的安全性和可靠性*/
@Excel(name = "是杏已验证确认在线升级活动的安全性和可靠性", width = 15)
@ApiModelProperty(value = "是杏已验证确认在线升级活动的安全性和可靠性")
private java.lang.String aqkkx;
private java.lang.Integer aqkkx;
/**提供变更或扩展后的《公告》批次及证明材料*/
@Excel(name = "提供变更或扩展后的《公告》批次及证明材料", width = 15)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java
-79
View File
@@ -1,79 +0,0 @@
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: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
@Data
@TableName("ota_ba_sj_txjl")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="ota_ba_sj_txjl对象", description="车型升级-填写记录表")
public class OtaBaSjTxjl 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;
/**ota_id*/
@Excel(name = "ota_id", width = 15)
@ApiModelProperty(value = "ota_id")
private String otaId;
/**模块*/
@Excel(name = "模块", width = 15)
@ApiModelProperty(value = "模块")
private String module;
/**填写内容*/
@Excel(name = "填写内容", width = 15)
@ApiModelProperty(value = "填写内容")
private String content;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaModuleEnum.java
+9 -1
View File
@@ -8,7 +8,15 @@ public enum OtaModuleEnum {
CX_KSJDXTMCYCS("可升级的系统名称与参数", "1","1"),
CX_KZXSJDJSFZGNMCYCS("可在线升级的驾驶辅助功能名称与参数", "1","1"),
CX_JSFZXTJCBACS("驾驶辅助系统基础备案参数", "1","1"),
CX_QT("其他", "1","1");
CX_QT("其他", "1","1"),
SJ_SJMBCX("升级目标车型", "1","1"),
SJ_SJMBCL("本次升级的目标车辆", "1","1"),
SJ_SJYXPG("升级影响评估", "1","1"),
SJ_SJXTMCBH("本次升级的系统名称与参数变化", "1","1"),
SJ_SJJSMCBH("本次升级的驾驶辅助功能名称与参数变化", "1","1"),
SJ_YHGZNRFS("用户告知内容及方式", "1","1"),
SJ_QT("其他升级任务信息", "1","1");
String name;
String nameEN;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+4 -4
View File
@@ -156,17 +156,17 @@ public enum OtaTitleEnum {
SCRQKS("scrqks", "生产日期开始", "0"),
SCRQJS("scrqjs", "生产日期结束", "0"),
VIN_LIST("vinList", "VIN码清单", "0"),
SJMD("sjmd", "升级目的", "0"),
SJMD("sjmd", "升级目的", "uipgrade_purpose"),
SFBGCS("sfbgcs", "是否变更对应车型的《公告》技术参数", "0"),
JSXNBH("jsxnbh", "是否涉及性能变化", "0"),
FHGD("fhgd", "是否符合国家法律、行政法规、规章规定，以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", "0"),
ZDJSXG("zdjsxg", "是否涉及汽车自动驾驶功能相关升级", "0"),
JRXXG("jrxxg", "兼容性评估相关", "0"),
ZXSJ("zxsj", "如何执行升级", "0"),
AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "0"),
ZXSJ("zxsj", "如何执行升级", "conditions_upgrades"),
AQJZ("aqjz", "升级失败或中断后，车辆采取的安全机制", "upgrade_failed"),
SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "0"),
YHQR("yhqr", "升级活动是否提供用户确认选项", "0"),
SJBCS("sjbcs", "升级包测试", "0"),
SJBCS("sjbcs", "升级包测试", "package_test"),
AQKKX("aqkkx", "是杏已验证确认在线升级活动的安全性和可靠性", "0"),
BGFJ("bgfj", "提供变更或扩展后的《公告》批次及证明材料", "0"),
CLFJ("clfj", "提供证明材料", "0"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java
-17
View File
@@ -1,17 +0,0 @@
package com.jero.modules.ota.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.jero.modules.ota.entity.OtaBaSjTxjl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
public interface OtaBaSjTxjlMapper extends BaseMapper<OtaBaSjTxjl> {
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml
-15
View File
@@ -1,15 +0,0 @@
<?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.OtaBaSjTxjlMapper">
<resultMap id="OtaBaSjTxjlResultMap" type="com.jero.modules.ota.entity.OtaBaSjTxjl">
<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="ota_id" property="otaId" />
<result column="module" property="module" />
<result column="content" property="content" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java
+2
View File
@@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbclService extends IService<OtaBaSjSjmbcl> {
* @return
*/
List<OtaBaSjSjmbcl> queryList();
OtaBaSjSjmbcl queryByOtaId(String otaId, String otaIdT);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java
+3 -1
View File
@@ -18,7 +18,7 @@ public interface IOtaBaSjSjmbcxService extends IService<OtaBaSjSjmbcx> {
* @param otaBaSjSjmbcx
* @return
*/
void add(OtaBaSjSjmbcx otaBaSjSjmbcx);
OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx);
/**
* 更新
@@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbcxService extends IService<OtaBaSjSjmbcx> {
* @return
*/
List<OtaBaSjSjmbcx> queryList();
OtaBaSjSjmbcx queryByOtaId(String otaId, String otaIdT);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjyxpgService.java
+2
View File
@@ -58,4 +58,6 @@ public interface IOtaBaSjSjyxpgService extends IService<OtaBaSjSjyxpg> {
* @return
*/
List<OtaBaSjSjyxpg> queryList();
OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java
-61
View File
@@ -1,61 +0,0 @@
package com.jero.modules.ota.service;
import com.jero.modules.ota.entity.OtaBaSjTxjl;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
public interface IOtaBaSjTxjlService extends IService<OtaBaSjTxjl> {
/**
* 保存
*
* @param otaBaSjTxjl
* @return
*/
void add(OtaBaSjTxjl otaBaSjTxjl);
/**
* 更新
*
* @param otaBaSjTxjl
* @return
*/
void editById(OtaBaSjTxjl otaBaSjTxjl);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
OtaBaSjTxjl queryById(String id);
/**
* 列表查询
*
* @return
*/
List<OtaBaSjTxjl> queryList();
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java
+3
View File
@@ -163,6 +163,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl<OtaBaCxAqcsMapper, OtaBa
}
private OtaBaCxAqcs getByOtaId(String otaId) {
if(StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaCxAqcs> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaCxAqcs::getOtaId, otaId);
return this.getOne(queryWrapper, false);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+6 -3
View File
@@ -64,7 +64,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
*/
public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) {
//对比填写记录用的
OtaBaCxJbxx OtaBaCxJbxxOld = new OtaBaCxJbxx();
OtaBaCxJbxx otaBaCxJbxxOld = new OtaBaCxJbxx();
Date now = new Date();
OtaBaCxList otaBaCxList;
if (StringUtils.isEmpty(otaBaCxJbxx.getOtaId())) {
@@ -76,7 +76,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
otaBaCxJbxx.setOtaId(otaBaCxList.getId());
otaBaCxJbxx.setCreateTime(now);
} else {
OtaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
otaBaCxJbxxOld = this.getByOtaId(otaBaCxJbxx.getOtaId());
otaBaCxList = otaBaCxListService.queryById(otaBaCxJbxx.getOtaId());
otaBaCxList.updateData(otaBaCxJbxx);
otaBaCxListService.editById(otaBaCxList);
@@ -84,7 +84,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
otaBaCxJbxx.setUpdateTime(now);
saveOrUpdate(otaBaCxJbxx);
ComparisonUtil cu = new ComparisonUtil();
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, OtaBaCxJbxxOld, otaBaCxJbxx, sysDictService);
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaCxJbxx.getOtaId(), OtaModuleEnum.CX_CXJBXX, otaBaCxJbxxOld, otaBaCxJbxx, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
return otaBaCxJbxx;
}
@@ -156,6 +156,9 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
}
private OtaBaCxJbxx getByOtaId(String otaId) {
if(StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaCxJbxx> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId);
return this.getOne(queryWrapper, false);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+8 -1
View File
@@ -131,7 +131,11 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
if (null != bjObj) {
try {
field.setAccessible(true);
field.set(otaBaCxJsfzbacs, bjObj.toString());
if (bjObj instanceof Integer) {
field.set(otaBaCxJsfzbacs, (Integer) bjObj);
} else {
field.set(otaBaCxJsfzbacs, bjObj.toString());
}
} catch (IllegalAccessException e) {
e.printStackTrace();
}
@@ -232,6 +236,9 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
}
private OtaBaCxJsfzbacs getByOtaId(String otaId) {
if(StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaCxJsfzbacs> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaCxJsfzbacs::getOtaId, otaId);
return this.getOne(queryWrapper, false);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java
+3
View File
@@ -195,6 +195,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl<OtaBaCxKsjjsmccsMap
}
private List<OtaBaCxKsjjsmccs> getByOtaId(String otaId) {
if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaCxKsjjsmccs> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId);
return this.list(queryWrapper);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java
+3
View File
@@ -193,6 +193,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl<OtaBaCxKsjxtmccsMap
}
private List<OtaBaCxKsjxtmccs> getByOtaId(String otaId) {
if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaCxKsjxtmccs> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaCxKsjxtmccs::getOtaId, otaId);
return this.list(queryWrapper);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java
+3
View File
@@ -127,6 +127,9 @@ public class OtaBaCxQtServiceImpl extends ServiceImpl<OtaBaCxQtMapper, OtaBaCxQt
}
public OtaBaCxQt getByOtaId(String otaId) {
if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaCxQt> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaCxQt::getOtaId, otaId);
return this.getOne(queryWrapper, false);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+99 -47
View File
@@ -1,89 +1,141 @@
package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjSjmbcl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.ota.entity.*;
import com.jero.modules.ota.enums.OtaModuleEnum;
import com.jero.modules.ota.mapper.OtaBaSjSjmbclMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjListService;
import com.jero.modules.ota.service.IOtaBaSjLsjlService;
import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
import com.jero.modules.ota.utils.ComparisonUtil;
import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Date;
import java.util.UUID;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 升级备案-升级目标车辆
* @Author: jero-boot
* @Date: 2023-03-17
* @Date: 2023-03-17
* @Version: V1.0
*/
@Service
public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, OtaBaSjSjmbcl> implements IOtaBaSjSjmbclService {
/**
* 保存
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
@Autowired
private ISysDictService sysDictService;
@Autowired
private IOtaBaCxTxjlService otaBaCxTxjlService;
/**
* 保存
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
public void add(OtaBaSjSjmbcl otaBaSjSjmbcl) {
Date now = new Date();
otaBaSjSjmbcl.setCreateTime(now);
otaBaSjSjmbcl.setUpdateTime(now);
save(otaBaSjSjmbcl);
if (null != otaBaSjSjmbcl) {
OtaBaSjSjmbcl otaBaSjSjmbclOld = this.getByOtaId(otaBaSjSjmbcl.getOtaId());
if (null != otaBaSjSjmbclOld) {
otaBaSjSjmbcl.setId(otaBaSjSjmbclOld.getId());
} else {
otaBaSjSjmbcl.setCreateTime(now);
}
otaBaSjSjmbcl.setUpdateTime(now);
saveOrUpdate(otaBaSjSjmbcl);
ComparisonUtil cu = new ComparisonUtil();
if (ObjectUtils.isEmpty(otaBaSjSjmbclOld)) {
otaBaSjSjmbclOld = new OtaBaSjSjmbcl();
}
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjmbcl.getOtaId(), OtaModuleEnum.CX_AQCS, otaBaSjSjmbclOld, otaBaSjSjmbcl, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
}
}
/**
* 更新
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
/**
* 更新
*
* @param otaBaSjSjmbcl
* @return
*/
@Override
public void editById(OtaBaSjSjmbcl otaBaSjSjmbcl) {
Date now = new Date();
Date now = new Date();
otaBaSjSjmbcl.setUpdateTime(now);
saveOrUpdate(otaBaSjSjmbcl);
saveOrUpdate(otaBaSjSjmbcl);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public OtaBaSjSjmbcl queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
* 列表查询
*
* @return
*/
@Override
public List<OtaBaSjSjmbcl> queryList() {
return list();
}
@Override
public OtaBaSjSjmbcl queryByOtaId(String otaId, String otaIdT) {
//判断是否保存过，否则查询模版数据回显
OtaBaSjSjmbcl res = getByOtaId(otaId);
if (ObjectUtils.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
return res;
}
private OtaBaSjSjmbcl getByOtaId(String otaId) {
if(StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaSjSjmbcl> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjSjmbcl::getOtaId, otaId);
return this.getOne(queryWrapper, false);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+107 -47
View File
@@ -1,89 +1,149 @@
package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.ota.entity.*;
import com.jero.modules.ota.enums.OtaModuleEnum;
import com.jero.modules.ota.mapper.OtaBaSjSjmbcxMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjListService;
import com.jero.modules.ota.service.IOtaBaSjSjmbcxService;
import com.jero.modules.ota.utils.ComparisonUtil;
import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Date;
import java.util.UUID;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 升级备案-升级目标车型
* @Author: jero-boot
* @Date: 2023-03-17
* @Date: 2023-03-17
* @Version: V1.0
*/
@Service
public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, OtaBaSjSjmbcx> implements IOtaBaSjSjmbcxService {
/**
* 保存
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
public void add(OtaBaSjSjmbcx otaBaSjSjmbcx) {
@Autowired
private IOtaBaSjListService otaBaSjListService;
@Autowired
private ISysDictService sysDictService;
@Autowired
private IOtaBaCxTxjlService otaBaCxTxjlService;
/**
* 保存
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
public OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx) {
//对比填写记录用的
OtaBaSjSjmbcx otaBaSjSjmbcxOld = new OtaBaSjSjmbcx();
Date now = new Date();
otaBaSjSjmbcx.setCreateTime(now);
OtaBaSjList otaBaSjList;
if (StringUtils.isEmpty(otaBaSjSjmbcx.getOtaId())) {
//在保存的时候设置一个id 并返回前端 下次保存的时候判断是否为更新
otaBaSjList = new OtaBaSjList();
otaBaSjList.setId(UUID.randomUUID().toString().replace("-", ""));
otaBaSjList.updateData(otaBaSjSjmbcx);
otaBaSjListService.add(otaBaSjList);
otaBaSjSjmbcx.setOtaId(otaBaSjList.getId());
otaBaSjSjmbcx.setCreateTime(now);
} else {
otaBaSjSjmbcxOld = this.getByOtaId(otaBaSjSjmbcx.getOtaId());
otaBaSjList = otaBaSjListService.queryById(otaBaSjSjmbcx.getOtaId());
otaBaSjList.updateData(otaBaSjSjmbcx);
otaBaSjListService.editById(otaBaSjList);
}
otaBaSjSjmbcx.setUpdateTime(now);
save(otaBaSjSjmbcx);
saveOrUpdate(otaBaSjSjmbcx);
ComparisonUtil cu = new ComparisonUtil();
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
return otaBaSjSjmbcx;
}
/**
* 更新
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
/**
* 更新
*
* @param otaBaSjSjmbcx
* @return
*/
@Override
public void editById(OtaBaSjSjmbcx otaBaSjSjmbcx) {
Date now = new Date();
Date now = new Date();
otaBaSjSjmbcx.setUpdateTime(now);
saveOrUpdate(otaBaSjSjmbcx);
saveOrUpdate(otaBaSjSjmbcx);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public OtaBaSjSjmbcx queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
* 列表查询
*
* @return
*/
@Override
public List<OtaBaSjSjmbcx> queryList() {
return list();
}
@Override
public OtaBaSjSjmbcx queryByOtaId(String otaId, String otaIdT) {
//判断是否保存过，否则查询模版数据回显
OtaBaSjSjmbcx res = getByOtaId(otaId);
if (ObjectUtils.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
return res;
}
private OtaBaSjSjmbcx getByOtaId(String otaId) {
if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaSjSjmbcx> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, otaId);
return this.getOne(queryWrapper, false);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
+96 -47
View File
@@ -1,89 +1,138 @@
package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjSjyxpg;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.ota.entity.*;
import com.jero.modules.ota.enums.OtaModuleEnum;
import com.jero.modules.ota.mapper.OtaBaSjSjyxpgMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjSjyxpgService;
import com.jero.modules.ota.utils.ComparisonUtil;
import com.jero.modules.system.service.ISysDictService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 升级备案-升级影响评估
* @Author: jero-boot
* @Date: 2023-03-17
* @Date: 2023-03-17
* @Version: V1.0
*/
@Service
public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, OtaBaSjSjyxpg> implements IOtaBaSjSjyxpgService {
/**
* 保存
*
* @param otaBaSjSjyxpg
* @return
*/
@Override
@Autowired
private ISysDictService sysDictService;
@Autowired
private IOtaBaCxTxjlService otaBaCxTxjlService;
/**
* 保存
*
* @param otaBaSjSjyxpg
* @return
*/
@Override
public void add(OtaBaSjSjyxpg otaBaSjSjyxpg) {
Date now = new Date();
otaBaSjSjyxpg.setCreateTime(now);
otaBaSjSjyxpg.setUpdateTime(now);
save(otaBaSjSjyxpg);
if (null != otaBaSjSjyxpg) {
OtaBaSjSjyxpg otaBaSjSjyxpgOld = this.getByOtaId(otaBaSjSjyxpg.getOtaId());
if (null != otaBaSjSjyxpgOld) {
otaBaSjSjyxpg.setId(otaBaSjSjyxpgOld.getId());
} else {
otaBaSjSjyxpg.setCreateTime(now);
}
otaBaSjSjyxpg.setUpdateTime(now);
saveOrUpdate(otaBaSjSjyxpg);
ComparisonUtil cu = new ComparisonUtil();
if (ObjectUtils.isEmpty(otaBaSjSjyxpgOld)) {
otaBaSjSjyxpgOld = new OtaBaSjSjyxpg();
}
List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService);
otaBaCxTxjlService.saveBatch(reList);
}
}
/**
* 更新
*
* @param otaBaSjSjyxpg
* @return
*/
@Override
/**
* 更新
*
* @param otaBaSjSjyxpg
* @return
*/
@Override
public void editById(OtaBaSjSjyxpg otaBaSjSjyxpg) {
Date now = new Date();
Date now = new Date();
otaBaSjSjyxpg.setUpdateTime(now);
saveOrUpdate(otaBaSjSjyxpg);
saveOrUpdate(otaBaSjSjyxpg);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public OtaBaSjSjyxpg queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
* 列表查询
*
* @return
*/
@Override
public List<OtaBaSjSjyxpg> queryList() {
return list();
}
@Override
public OtaBaSjSjyxpg queryByOtaId(String otaId, String otaIdT) {
OtaBaSjSjyxpg res = getByOtaId(otaId);
if (ObjectUtils.isEmpty(res)) {
res = getByOtaId(otaIdT);
}
return res;
}
private OtaBaSjSjyxpg getByOtaId(String otaId) {
if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){
return null;
}
LambdaQueryWrapper<OtaBaSjSjyxpg> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, otaId);
return this.getOne(queryWrapper, false);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java
-89
View File
@@ -1,89 +0,0 @@
package com.jero.modules.ota.service.impl;
import com.jero.modules.ota.entity.OtaBaSjTxjl;
import com.jero.modules.ota.mapper.OtaBaSjTxjlMapper;
import com.jero.modules.ota.service.IOtaBaSjTxjlService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 车型升级-填写记录表
* @Author: jero-boot
* @Date: 2023-03-25
* @Version: V1.0
*/
@Service
public class OtaBaSjTxjlServiceImpl extends ServiceImpl<OtaBaSjTxjlMapper, OtaBaSjTxjl> implements IOtaBaSjTxjlService {
/**
* 保存
*
* @param otaBaSjTxjl
* @return
*/
@Override
public void add(OtaBaSjTxjl otaBaSjTxjl) {
Date now = new Date();
otaBaSjTxjl.setCreateTime(now);
otaBaSjTxjl.setUpdateTime(now);
save(otaBaSjTxjl);
}
/**
* 更新
*
* @param otaBaSjTxjl
* @return
*/
@Override
public void editById(OtaBaSjTxjl otaBaSjTxjl) {
Date now = new Date();
otaBaSjTxjl.setUpdateTime(now);
saveOrUpdate(otaBaSjTxjl);
}
/**
* 通过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 OtaBaSjTxjl queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<OtaBaSjTxjl> queryList() {
return list();
}
}