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

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

@@ -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.OtaBaSjJssj;
 import com.jero.modules.ota.service.IOtaBaSjJssjService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -144,6 +145,20 @@ public class OtaBaSjJssjController extends JeroController<OtaBaSjJssj, IOtaBaSjJ
 		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
     *

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

@@ -1,94 +1,120 @@
 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.TableField;
 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.Data;
 import lombok.EqualsAndHashCode;
 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: 升级备案-结束升级
  * @Author: jero-boot
- * @Date:   2023-03-28
+ * @Date: 2023-03-28
  * @Version: V1.0
  */
 @Data
 @TableName("ota_ba_sj_jssj")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ota_ba_sj_jssj对象", description="升级备案-结束升级")
+@ApiModel(value = "ota_ba_sj_jssj对象", description = "升级备案-结束升级")
 public class OtaBaSjJssj implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @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")
+    /**
+     * 创建日期
+     */
+    @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")
+    /**
+     * 更新日期
+     */
+    @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;
 
-	/**otaId*/
-	@Excel(name = "otaId", width = 15)
+    /**
+     * otaId
+     */
+    @Excel(name = "otaId", width = 15)
     @ApiModelProperty(value = "otaId")
-    private String otaid;
+    private String otaId;
 
-	/**实施的升级是否和备案一致*/
-	@Excel(name = "实施的升级是否和备案一致", width = 15)
+    /**
+     * 实施的升级是否和备案一致
+     */
+    @Excel(name = "实施的升级是否和备案一致", width = 15)
     @ApiModelProperty(value = "实施的升级是否和备案一致")
     private Integer sfyz;
 
-	/**完成升级的车辆数*/
-	@Excel(name = "完成升级的车辆数", width = 15)
+    /**
+     * 完成升级的车辆数
+     */
+    @Excel(name = "完成升级的车辆数", width = 15)
     @ApiModelProperty(value = "完成升级的车辆数")
     private String wccls;
 
-	/**VIN码清单*/
-	@Excel(name = "VIN码清单", width = 15)
+    /**
+     * VIN码清单
+     */
+    @Excel(name = "VIN码清单", width = 15)
     @ApiModelProperty(value = "VIN码清单")
     private String csv;
 
-	/**故障处置措施和应急响应实施记录*/
-	@Excel(name = "故障处置措施和应急响应实施记录", width = 15)
+    /**
+     * 故障处置措施和应急响应实施记录
+     */
+    @Excel(name = "故障处置措施和应急响应实施记录", width = 15)
     @ApiModelProperty(value = "故障处置措施和应急响应实施记录")
     private String ssjl;
 
-	/**故障处置措施和应急响应实施记录附件*/
-	@Excel(name = "故障处置措施和应急响应实施记录附件", width = 15)
+    /**
+     * 故障处置措施和应急响应实施记录附件
+     */
+    @Excel(name = "故障处置措施和应急响应实施记录附件", width = 15)
     @ApiModelProperty(value = "故障处置措施和应急响应实施记录附件")
     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

@@ -64,7 +64,7 @@ public class OtaBaSjJssjyy implements Serializable {
 	/**otaId*/
 	@Excel(name = "otaId", width = 15)
     @ApiModelProperty(value = "otaId")
-    private String otaid;
+    private String otaId;
 
 	/**未完成原因*/
 	@Excel(name = "未完成原因", width = 15)

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

@@ -58,4 +58,6 @@ public interface IOtaBaSjJssjService extends IService<OtaBaSjJssj> {
 	 * @return
 	 */
     List<OtaBaSjJssj> queryList();
+
+    OtaBaSjJssj queryByOtaId(String otaId);
 }

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

@@ -2,60 +2,65 @@ package com.jero.modules.ota.service;
 
 import com.jero.modules.ota.entity.OtaBaSjJssjyy;
 import com.baomidou.mybatisplus.extension.service.IService;
+
 import java.util.List;
 
 /**
  * @Description: 升级备案-结束升级原因
  * @Author: jero-boot
- * @Date:   2023-03-28
+ * @Date: 2023-03-28
  * @Version: V1.0
  */
 public interface IOtaBaSjJssjyyService extends IService<OtaBaSjJssjyy> {
 
-	/**
-	 * 保存
-	 *
-	 * @param otaBaSjJssjyy
-	 * @return
-	 */
+    /**
+     * 保存
+     *
+     * @param otaBaSjJssjyy
+     * @return
+     */
     void add(OtaBaSjJssjyy otaBaSjJssjyy);
 
-	/**
-	 * 更新
-	 *
-	 * @param otaBaSjJssjyy
-	 * @return
-	 */
+    /**
+     * 更新
+     *
+     * @param otaBaSjJssjyy
+     * @return
+     */
     void editById(OtaBaSjJssjyy otaBaSjJssjyy);
 
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
     void deleteById(String id);
 
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
+    void deleteByOtaId(String otaId)
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
     void deleteByIds(List<String> ids);
 
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
     OtaBaSjJssjyy queryById(String id);
 
     /**
-	 * 列表查询
-	 *
-	 * @return
-	 */
+     * 列表查询
+     *
+     * @return
+     */
     List<OtaBaSjJssjyy> queryList();
+
+    List<OtaBaSjJssjyy> queryByOtaId(String otaId);
 }

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

@@ -1,89 +1,120 @@
 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.OtaBaSjJssjyy;
 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.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 java.util.List;
 import java.util.Date;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * @Description: 升级备案-结束升级
  * @Author: jero-boot
- * @Date:   2023-03-28
+ * @Date: 2023-03-28
  * @Version: V1.0
  */
 @Service
 public class OtaBaSjJssjServiceImpl extends ServiceImpl<OtaBaSjJssjMapper, OtaBaSjJssj> implements IOtaBaSjJssjService {
 
-	/**
-	 * 保存
-	 *
-	 * @param otaBaSjJssj
-	 * @return
-	 */
-	@Override
+    @Autowired
+    private IOtaBaSjJssjyyService otaBaSjJssjyyService;
+
+
+    /**
+     * 保存
+     *
+     * @param otaBaSjJssj
+     * @return
+     */
+    @Override
     public void add(OtaBaSjJssj otaBaSjJssj) {
         Date now = new Date();
         otaBaSjJssj.setCreateTime(now);
         otaBaSjJssj.setUpdateTime(now);
         save(otaBaSjJssj);
+        otaBaSjJssjyyService.saveBatch(otaBaSjJssj.getList());
     }
 
-	/**
-	 * 更新
-	 *
-	 * @param otaBaSjJssj
-	 * @return
-	 */
-	@Override
+    /**
+     * 更新
+     *
+     * @param otaBaSjJssj
+     * @return
+     */
+    @Override
     public void editById(OtaBaSjJssj otaBaSjJssj) {
-    	Date now = new Date();
+        Date now = new Date();
         otaBaSjJssj.setUpdateTime(now);
-    	saveOrUpdate(otaBaSjJssj);
+        saveOrUpdate(otaBaSjJssj);
+        otaBaSjJssjyyService.deleteByOtaId(otaBaSjJssj.getOtaId());
+        otaBaSjJssjyyService.saveBatch(otaBaSjJssj.getList());
     }
 
-	/**
-	 * 通过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 OtaBaSjJssj queryById(String id) {
         return getById(id);
     }
 
     /**
-	 * 列表查询
-	 *
-	 * @return
-	 */
-	@Override
+     * 列表查询
+     *
+     * @return
+     */
+    @Override
     public List<OtaBaSjJssj> queryList() {
         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

@@ -1,29 +1,34 @@
 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.mapper.OtaBaSjJssjyyMapper;
 import com.jero.modules.ota.service.IOtaBaSjJssjyyService;
+import org.apache.commons.lang3.StringUtils;
 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-28
+ * @Date: 2023-03-28
  * @Version: V1.0
  */
 @Service
 public class OtaBaSjJssjyyServiceImpl extends ServiceImpl<OtaBaSjJssjyyMapper, OtaBaSjJssjyy> implements IOtaBaSjJssjyyService {
 
-	/**
-	 * 保存
-	 *
-	 * @param otaBaSjJssjyy
-	 * @return
-	 */
-	@Override
+    /**
+     * 保存
+     *
+     * @param otaBaSjJssjyy
+     * @return
+     */
+    @Override
     public void add(OtaBaSjJssjyy otaBaSjJssjyy) {
         Date now = new Date();
         otaBaSjJssjyy.setCreateTime(now);
@@ -31,59 +36,77 @@ public class OtaBaSjJssjyyServiceImpl extends ServiceImpl<OtaBaSjJssjyyMapper, O
         save(otaBaSjJssjyy);
     }
 
-	/**
-	 * 更新
-	 *
-	 * @param otaBaSjJssjyy
-	 * @return
-	 */
-	@Override
+    /**
+     * 更新
+     *
+     * @param otaBaSjJssjyy
+     * @return
+     */
+    @Override
     public void editById(OtaBaSjJssjyy otaBaSjJssjyy) {
-    	Date now = new Date();
+        Date now = new Date();
         otaBaSjJssjyy.setUpdateTime(now);
-    	saveOrUpdate(otaBaSjJssjyy);
+        saveOrUpdate(otaBaSjJssjyy);
     }
 
-	/**
-	 * 通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @Override
     public void deleteById(String id) {
         removeById(id);
     }
 
-	/**
-	 * 批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@Override
+
+    @Override
+    public void deleteByOtaId(String otaId) {
+        if(StringUtils.isNotEmpty(otaId)){
+            LambdaQueryWrapper<OtaBaSjJssjyy> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(OtaBaSjJssjyy::getOtaId, otaId);
+            remove(queryWrapper);
+        }
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @Override
     public void deleteByIds(List<String> ids) {
         removeByIds(ids);
     }
 
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @Override
     public OtaBaSjJssjyy queryById(String id) {
         return getById(id);
     }
 
     /**
-	 * 列表查询
-	 *
-	 * @return
-	 */
-	@Override
+     * 列表查询
+     *
+     * @return
+     */
+    @Override
     public List<OtaBaSjJssjyy> queryList() {
         return list();
     }
+
+    @Override
+    public List<OtaBaSjJssjyy> queryByOtaId(String otaId) {
+        LambdaQueryWrapper<OtaBaSjJssjyy> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(OtaBaSjJssjyy::getOtaId, otaId);
+        return this.list(queryWrapper);
+    }
+
 }