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

开发OTA备案工具-车辆升级

Browse Source
This commit is contained in:
高嵩
2023-03-28 23:32:10 +08:00
parent 3775a08c23
commit 5843bd2a1e
7 changed files with 258 additions and 156 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/OtaBaSjJssjController.java
+15
View File
@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.ota.entity.OtaBaCxAqcs;
import com.jero.modules.ota.entity.OtaBaSjJssj; import com.jero.modules.ota.entity.OtaBaSjJssj;
import com.jero.modules.ota.service.IOtaBaSjJssjService; import com.jero.modules.ota.service.IOtaBaSjJssjService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -144,6 +145,20 @@ public class OtaBaSjJssjController extends JeroController<OtaBaSjJssj, IOtaBaSjJ
return Result.OK(otaBaSjJssj); return Result.OK(otaBaSjJssj);
} }
/**
* 通过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) {
OtaBaSjJssj otaBaSjJssj = otaBaSjJssjService.queryByOtaId(otaId);
return Result.OK(otaBaSjJssj);
}
/** /**
* 导出excel * 导出excel
* *
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssj.java
+60 -34
View File
@@ -1,94 +1,120 @@
package com.jero.modules.ota.entity; 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.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/** /**
* @Description: 升级备案-结束升级 * @Description: 升级备案-结束升级
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-28 * @Date: 2023-03-28
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("ota_ba_sj_jssj") @TableName("ota_ba_sj_jssj")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="ota_ba_sj_jssj对象", description="升级备案-结束升级") @ApiModel(value = "ota_ba_sj_jssj对象", description = "升级备案-结束升级")
public class OtaBaSjJssj implements Serializable { public class OtaBaSjJssj implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**主键*/ /**
@TableId(type = IdType.ASSIGN_ID) * 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
/**创建人*/ /**
* 创建人
*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;
/**创建日期*/ /**
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") * 创建日期
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private java.util.Date createTime; private java.util.Date createTime;
/**更新人*/ /**
* 更新人
*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updateBy; private String updateBy;
/**更新日期*/ /**
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") * 更新日期
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private java.util.Date updateTime; private java.util.Date updateTime;
/**所属部门*/ /**
* 所属部门
*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private String sysOrgCode;
/**otaId*/ /**
@Excel(name = "otaId", width = 15) * otaId
*/
@Excel(name = "otaId", width = 15)
@ApiModelProperty(value = "otaId") @ApiModelProperty(value = "otaId")
private String otaid; private String otaId;
/**实施的升级是否和备案一致*/ /**
@Excel(name = "实施的升级是否和备案一致", width = 15) * 实施的升级是否和备案一致
*/
@Excel(name = "实施的升级是否和备案一致", width = 15)
@ApiModelProperty(value = "实施的升级是否和备案一致") @ApiModelProperty(value = "实施的升级是否和备案一致")
private Integer sfyz; private Integer sfyz;
/**完成升级的车辆数*/ /**
@Excel(name = "完成升级的车辆数", width = 15) * 完成升级的车辆数
*/
@Excel(name = "完成升级的车辆数", width = 15)
@ApiModelProperty(value = "完成升级的车辆数") @ApiModelProperty(value = "完成升级的车辆数")
private String wccls; private String wccls;
/**VIN码清单*/ /**
@Excel(name = "VIN码清单", width = 15) * VIN码清单
*/
@Excel(name = "VIN码清单", width = 15)
@ApiModelProperty(value = "VIN码清单") @ApiModelProperty(value = "VIN码清单")
private String csv; private String csv;
/**故障处置措施和应急响应实施记录*/ /**
@Excel(name = "故障处置措施和应急响应实施记录", width = 15) * 故障处置措施和应急响应实施记录
*/
@Excel(name = "故障处置措施和应急响应实施记录", width = 15)
@ApiModelProperty(value = "故障处置措施和应急响应实施记录") @ApiModelProperty(value = "故障处置措施和应急响应实施记录")
private String ssjl; private String ssjl;
/**故障处置措施和应急响应实施记录附件*/ /**
@Excel(name = "故障处置措施和应急响应实施记录附件", width = 15) * 故障处置措施和应急响应实施记录附件
*/
@Excel(name = "故障处置措施和应急响应实施记录附件", width = 15)
@ApiModelProperty(value = "故障处置措施和应急响应实施记录附件") @ApiModelProperty(value = "故障处置措施和应急响应实施记录附件")
private String ssjlfj; private String ssjlfj;
@TableField(exist = false)
private List<OtaBaSjJssjyy> list;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjJssjyy.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class OtaBaSjJssjyy implements Serializable {
/**otaId*/ /**otaId*/
@Excel(name = "otaId", width = 15) @Excel(name = "otaId", width = 15)
@ApiModelProperty(value = "otaId") @ApiModelProperty(value = "otaId")
private String otaid; private String otaId;
/**未完成原因*/ /**未完成原因*/
@Excel(name = "未完成原因", width = 15) @Excel(name = "未完成原因", width = 15)
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjService.java
+2
View File
@@ -58,4 +58,6 @@ public interface IOtaBaSjJssjService extends IService<OtaBaSjJssj> {
* @return * @return
*/ */
List<OtaBaSjJssj> queryList(); List<OtaBaSjJssj> queryList();
OtaBaSjJssj queryByOtaId(String otaId);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjJssjyyService.java
+40 -35
View File
@@ -2,60 +2,65 @@ package com.jero.modules.ota.service;
import com.jero.modules.ota.entity.OtaBaSjJssjyy; import com.jero.modules.ota.entity.OtaBaSjJssjyy;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
/** /**
* @Description: 升级备案-结束升级原因 * @Description: 升级备案-结束升级原因
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-28 * @Date: 2023-03-28
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IOtaBaSjJssjyyService extends IService<OtaBaSjJssjyy> { public interface IOtaBaSjJssjyyService extends IService<OtaBaSjJssjyy> {
/** /**
* 保存 * 保存
* *
* @param otaBaSjJssjyy * @param otaBaSjJssjyy
* @return * @return
*/ */
void add(OtaBaSjJssjyy otaBaSjJssjyy); void add(OtaBaSjJssjyy otaBaSjJssjyy);
/** /**
* 更新 * 更新
* *
* @param otaBaSjJssjyy * @param otaBaSjJssjyy
* @return * @return
*/ */
void editById(OtaBaSjJssjyy otaBaSjJssjyy); void editById(OtaBaSjJssjyy otaBaSjJssjyy);
/** /**
* 通过id删除 * 通过id删除
* *
* @param id * @param id
* @return * @return
*/ */
void deleteById(String id); void deleteById(String id);
/** void deleteByOtaId(String otaId)
* 批量删除
* /**
* @param ids * 批量删除
* @return *
*/ * @param ids
* @return
*/
void deleteByIds(List<String> ids); void deleteByIds(List<String> ids);
/** /**
* 通过id查询 * 通过id查询
* *
* @param id * @param id
* @return * @return
*/ */
OtaBaSjJssjyy queryById(String id); OtaBaSjJssjyy queryById(String id);
/** /**
* 列表查询 * 列表查询
* *
* @return * @return
*/ */
List<OtaBaSjJssjyy> queryList(); List<OtaBaSjJssjyy> queryList();
List<OtaBaSjJssjyy> queryByOtaId(String otaId);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjServiceImpl.java
+74 -43
View File
@@ -1,89 +1,120 @@
package com.jero.modules.ota.service.impl; package com.jero.modules.ota.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.ota.entity.AttachmentEO;
import com.jero.modules.ota.entity.OtaBaCxAqcs;
import com.jero.modules.ota.entity.OtaBaSjJssj; import com.jero.modules.ota.entity.OtaBaSjJssj;
import com.jero.modules.ota.entity.OtaBaSjJssjyy;
import com.jero.modules.ota.mapper.OtaBaSjJssjMapper; import com.jero.modules.ota.mapper.OtaBaSjJssjMapper;
import com.jero.modules.ota.service.IOtaBaCxTxjlService;
import com.jero.modules.ota.service.IOtaBaSjJssjService; import com.jero.modules.ota.service.IOtaBaSjJssjService;
import com.jero.modules.ota.service.IOtaBaSjJssjyyService;
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 org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: 升级备案-结束升级 * @Description: 升级备案-结束升级
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-28 * @Date: 2023-03-28
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class OtaBaSjJssjServiceImpl extends ServiceImpl<OtaBaSjJssjMapper, OtaBaSjJssj> implements IOtaBaSjJssjService { public class OtaBaSjJssjServiceImpl extends ServiceImpl<OtaBaSjJssjMapper, OtaBaSjJssj> implements IOtaBaSjJssjService {
/** @Autowired
* 保存 private IOtaBaSjJssjyyService otaBaSjJssjyyService;
*
* @param otaBaSjJssj
* @return /**
*/ * 保存
@Override *
* @param otaBaSjJssj
* @return
*/
@Override
public void add(OtaBaSjJssj otaBaSjJssj) { public void add(OtaBaSjJssj otaBaSjJssj) {
Date now = new Date(); Date now = new Date();
otaBaSjJssj.setCreateTime(now); otaBaSjJssj.setCreateTime(now);
otaBaSjJssj.setUpdateTime(now); otaBaSjJssj.setUpdateTime(now);
save(otaBaSjJssj); save(otaBaSjJssj);
otaBaSjJssjyyService.saveBatch(otaBaSjJssj.getList());
} }
/** /**
* 更新 * 更新
* *
* @param otaBaSjJssj * @param otaBaSjJssj
* @return * @return
*/ */
@Override @Override
public void editById(OtaBaSjJssj otaBaSjJssj) { public void editById(OtaBaSjJssj otaBaSjJssj) {
Date now = new Date(); Date now = new Date();
otaBaSjJssj.setUpdateTime(now); otaBaSjJssj.setUpdateTime(now);
saveOrUpdate(otaBaSjJssj); saveOrUpdate(otaBaSjJssj);
otaBaSjJssjyyService.deleteByOtaId(otaBaSjJssj.getOtaId());
otaBaSjJssjyyService.saveBatch(otaBaSjJssj.getList());
} }
/** /**
* 通过id删除 * 通过id删除
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
removeById(id); removeById(id);
} }
/** /**
* 批量删除 * 批量删除
* *
* @param ids * @param ids
* @return * @return
*/ */
@Override @Override
public void deleteByIds(List<String> ids) { public void deleteByIds(List<String> ids) {
removeByIds(ids); removeByIds(ids);
} }
/** /**
* 通过id查询 * 通过id查询
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public OtaBaSjJssj queryById(String id) { public OtaBaSjJssj queryById(String id) {
return getById(id); return getById(id);
} }
/** /**
* 列表查询 * 列表查询
* *
* @return * @return
*/ */
@Override @Override
public List<OtaBaSjJssj> queryList() { public List<OtaBaSjJssj> queryList() {
return list(); return list();
} }
@Override
public OtaBaSjJssj queryByOtaId(String otaId) {
LambdaQueryWrapper<OtaBaSjJssj> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjJssj::getOtaId, otaId);
OtaBaSjJssj res = this.getOne(queryWrapper, false);
List<OtaBaSjJssjyy> list = otaBaSjJssjyyService.queryByOtaId(otaId);
res.setList(list);
return res;
}
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjJssjyyServiceImpl.java
+66 -43
View File
@@ -1,29 +1,34 @@
package com.jero.modules.ota.service.impl; package com.jero.modules.ota.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.ota.entity.OtaBaSjJssj;
import com.jero.modules.ota.entity.OtaBaSjJssjyy; import com.jero.modules.ota.entity.OtaBaSjJssjyy;
import com.jero.modules.ota.mapper.OtaBaSjJssjyyMapper; import com.jero.modules.ota.mapper.OtaBaSjJssjyyMapper;
import com.jero.modules.ota.service.IOtaBaSjJssjyyService; import com.jero.modules.ota.service.IOtaBaSjJssjyyService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: 升级备案-结束升级原因 * @Description: 升级备案-结束升级原因
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-28 * @Date: 2023-03-28
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class OtaBaSjJssjyyServiceImpl extends ServiceImpl<OtaBaSjJssjyyMapper, OtaBaSjJssjyy> implements IOtaBaSjJssjyyService { public class OtaBaSjJssjyyServiceImpl extends ServiceImpl<OtaBaSjJssjyyMapper, OtaBaSjJssjyy> implements IOtaBaSjJssjyyService {
/** /**
* 保存 * 保存
* *
* @param otaBaSjJssjyy * @param otaBaSjJssjyy
* @return * @return
*/ */
@Override @Override
public void add(OtaBaSjJssjyy otaBaSjJssjyy) { public void add(OtaBaSjJssjyy otaBaSjJssjyy) {
Date now = new Date(); Date now = new Date();
otaBaSjJssjyy.setCreateTime(now); otaBaSjJssjyy.setCreateTime(now);
@@ -31,59 +36,77 @@ public class OtaBaSjJssjyyServiceImpl extends ServiceImpl<OtaBaSjJssjyyMapper, O
save(otaBaSjJssjyy); save(otaBaSjJssjyy);
} }
/** /**
* 更新 * 更新
* *
* @param otaBaSjJssjyy * @param otaBaSjJssjyy
* @return * @return
*/ */
@Override @Override
public void editById(OtaBaSjJssjyy otaBaSjJssjyy) { public void editById(OtaBaSjJssjyy otaBaSjJssjyy) {
Date now = new Date(); Date now = new Date();
otaBaSjJssjyy.setUpdateTime(now); otaBaSjJssjyy.setUpdateTime(now);
saveOrUpdate(otaBaSjJssjyy); saveOrUpdate(otaBaSjJssjyy);
} }
/** /**
* 通过id删除 * 通过id删除
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
removeById(id); removeById(id);
} }
/**
* 批量删除 @Override
* public void deleteByOtaId(String otaId) {
* @param ids if(StringUtils.isNotEmpty(otaId)){
* @return LambdaQueryWrapper<OtaBaSjJssjyy> queryWrapper = new LambdaQueryWrapper<>();
*/ queryWrapper.eq(OtaBaSjJssjyy::getOtaId, otaId);
@Override remove(queryWrapper);
}
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) { public void deleteByIds(List<String> ids) {
removeByIds(ids); removeByIds(ids);
} }
/** /**
* 通过id查询 * 通过id查询
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public OtaBaSjJssjyy queryById(String id) { public OtaBaSjJssjyy queryById(String id) {
return getById(id); return getById(id);
} }
/** /**
* 列表查询 * 列表查询
* *
* @return * @return
*/ */
@Override @Override
public List<OtaBaSjJssjyy> queryList() { public List<OtaBaSjJssjyy> queryList() {
return list(); return list();
} }
@Override
public List<OtaBaSjJssjyy> queryByOtaId(String otaId) {
LambdaQueryWrapper<OtaBaSjJssjyy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OtaBaSjJssjyy::getOtaId, otaId);
return this.list(queryWrapper);
}
} }