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

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

@@ -155,7 +155,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/OtaBaCxTxjlController.java

@@ -4,6 +4,7 @@ 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.OtaBaCxTxjl;
@@ -13,6 +14,8 @@ 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.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -52,9 +55,12 @@ public class OtaBaCxTxjlController extends JeroController<OtaBaCxTxjl, IOtaBaCxT
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
+        IPage<OtaBaCxTxjl> pageList = new Page<>();
+        if (ObjectUtils.isNotEmpty(otaBaCxTxjl) && StringUtils.isNotEmpty(otaBaCxTxjl.getOtaId())) {
             QueryWrapper<OtaBaCxTxjl> queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap());
             Page<OtaBaCxTxjl> page = new Page<OtaBaCxTxjl>(pageNo, pageSize);
-		IPage<OtaBaCxTxjl> pageList = otaBaCxTxjlService.page(page, queryWrapper);
+            pageList = otaBaCxTxjlService.page(page, queryWrapper);
+        }
         return Result.OK(pageList);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.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.OtaBaSjGnxtwh;
+import com.jero.modules.ota.service.IOtaBaSjGnxtwhService;
+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-26
+ * @Version: V1.0
+ */
+@Api(tags="车型备案-功能系统维护")
+@RestController
+@RequestMapping("/ota/otaBaSjGnxtwh")
+@Slf4j
+public class OtaBaSjGnxtwhController extends JeroController<OtaBaSjGnxtwh, IOtaBaSjGnxtwhService> {
+	@Autowired
+	private IOtaBaSjGnxtwhService otaBaSjGnxtwhService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param otaBaSjGnxtwh
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "车型备案-功能系统维护-分页列表查询")
+	@ApiOperation(value="车型备案-功能系统维护-分页列表查询", notes="车型备案-功能系统维护-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(OtaBaSjGnxtwh otaBaSjGnxtwh,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<OtaBaSjGnxtwh> queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap());
+		Page<OtaBaSjGnxtwh> page = new Page<OtaBaSjGnxtwh>(pageNo, pageSize);
+		IPage<OtaBaSjGnxtwh> pageList = otaBaSjGnxtwhService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "车型备案-功能系统维护-列表查询")
+    @ApiOperation(value="车型备案-功能系统维护-列表查询", notes="车型备案-功能系统维护-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<OtaBaSjGnxtwh>> queryList() {
+        List<OtaBaSjGnxtwh> list = otaBaSjGnxtwhService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param otaBaSjGnxtwh
+	 * @return
+	 */
+	@AutoLog(value = "车型备案-功能系统维护-添加")
+	@ApiOperation(value="车型备案-功能系统维护-添加", notes="车型备案-功能系统维护-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) {
+		otaBaSjGnxtwhService.add(otaBaSjGnxtwh);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param otaBaSjGnxtwh
+	 * @return
+	 */
+	@AutoLog(value = "车型备案-功能系统维护-编辑")
+	@ApiOperation(value="车型备案-功能系统维护-编辑", notes="车型备案-功能系统维护-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) {
+		otaBaSjGnxtwhService.editById(otaBaSjGnxtwh);
+		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) {
+		otaBaSjGnxtwhService.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.otaBaSjGnxtwhService.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) {
+		OtaBaSjGnxtwh otaBaSjGnxtwh = otaBaSjGnxtwhService.queryById(id);
+		if(otaBaSjGnxtwh==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(otaBaSjGnxtwh);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param otaBaSjGnxtwh
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, OtaBaSjGnxtwh otaBaSjGnxtwh) {
+        return super.exportXls(request, otaBaSjGnxtwh, OtaBaSjGnxtwh.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, OtaBaSjGnxtwh.class);
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.jero.modules.ota.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -175,11 +176,12 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
 	 @AutoLog(value = "升级备案-备案维护")
 	 @ApiOperation(value = "升级备案-备案维护", notes = "升级备案-备案维护")
 	 @PostMapping(value = "/batchRecord")
-	 public Result<?> batchRecord(@RequestParam(name = "ids", required = true) String ids,
+	 public Result<?> batchRecord(@RequestBody JSONObject json) {
-								  @RequestParam(name = "bazt", required = true) String bazt,
+		 String ids = json.getString("ids");
-								  @RequestParam(name = "batjsj", required = true) String batjsj,
+		 String bazt = json.getString("bazt");
-								  @RequestParam(name = "bz", required = true) String bz,
+		 String batjsj = json.getString("batjsj");
-								  @RequestParam(name = "cut") String cut) {
+		 String bz = json.getString("bz");
+		 String cut = json.getString("cut");
 		 otaBaSjListService.batchRecord(ids, bazt, batjsj, bz, cut);
 		 return Result.OK("备案维护成功!");
 	 }

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

@@ -1,25 +1,26 @@
 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.OtaBaSjSjmbcl;
-import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
 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.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.ota.entity.OtaBaSjSjmbcl;
+import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.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 javax.servlet.http.HttpServletRequest;
-import com.jero.common.aspect.annotation.AutoLog;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -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

@@ -4,8 +4,10 @@ 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.OtaBaCxJbxx;
 import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
 import com.jero.modules.ota.service.IOtaBaSjSjmbcxService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -81,8 +83,8 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
     @ApiOperation(value = "升级备案-升级目标车型-添加", notes = "升级备案-升级目标车型-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) {
-		otaBaSjSjmbcxService.add(otaBaSjSjmbcx);
+        OtaBaSjSjmbcx res = otaBaSjSjmbcxService.add(otaBaSjSjmbcx);
-		return Result.OK("添加成功！");
+        return Result.OK(res);
     }
 
     /**
@@ -144,6 +146,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
      *
@@ -167,4 +181,5 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
         return super.importExcel(request, response, OtaBaSjSjmbcx.class);
     }
 
+
 }

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

@@ -0,0 +1,74 @@
+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-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("ota_ba_sj_gnxtwh")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ota_ba_sj_gnxtwh对象", description="车型备案-功能系统维护")
+public class OtaBaSjGnxtwh 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 gnxt;
+
+	/**对应控制器*/
+	@Excel(name = "对应控制器", width = 15)
+    @ApiModelProperty(value = "对应控制器")
+    private String dykzq;
+
+}

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

@@ -3,6 +3,7 @@ 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;
@@ -32,87 +33,127 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 public class OtaBaSjList implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+    /**
+     * 主键
+     */
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
 
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 
-	/**创建日期*/
+    /**
+     * 创建日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 
-	/**更新日期*/
+    /**
+     * 更新日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
 
-	/**otaId*/
+    /**
+     * otaId
+     */
     @Excel(name = "otaId", width = 15)
     @ApiModelProperty(value = "otaId")
     private java.lang.String otaId;
 
-	/**产品登记编号*/
+    /**
+     * 产品登记编号
+     */
     @Excel(name = "产品登记编号", width = 15)
     @ApiModelProperty(value = "产品登记编号")
     private java.lang.String cpdjbh;
 
-	/**公告批次*/
+    /**
+     * 公告批次
+     */
     @Excel(name = "公告批次", width = 15)
     @ApiModelProperty(value = "公告批次")
     private java.lang.String ggpc;
 
-	/**产品商标*/
+    /**
+     * 产品商标
+     */
     @Excel(name = "产品商标", width = 15)
     @ApiModelProperty(value = "产品商标")
     private java.lang.String cpsb;
 
-	/**产品名称*/
+    /**
+     * 产品名称
+     */
     @Excel(name = "产品名称", width = 15)
     @ApiModelProperty(value = "产品名称")
     private java.lang.String cpmc;
 
-	/**产品型号*/
+    /**
+     * 产品型号
+     */
     @Excel(name = "产品型号", width = 15)
     @ApiModelProperty(value = "产品型号")
     private java.lang.String cpxh;
 
-	/**备案状态*/
+    /**
+     * 备案状态
+     */
     @Excel(name = "备案状态", width = 15)
     @ApiModelProperty(value = "备案状态")
+    @Dict(dicCode = "recordstatus")
     private java.lang.String bazt;
 
-	/**备案提交时间*/
+    /**
+     * 备案提交时间
+     */
     @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 batjsj;
 
-	/**创建时间*/
+    /**
+     * 创建时间
+     */
     @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 cjsj;
 
-	/**备注*/
+    /**
+     * 备注
+     */
     @Excel(name = "备注", width = 15)
     @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/mapper/OtaBaSjGnxtwhMapper.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.OtaBaSjGnxtwh;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 车型备案-功能系统维护
+ * @Author: jero-boot
+ * @Date:   2023-03-26
+ * @Version: V1.0
+ */
+public interface OtaBaSjGnxtwhMapper extends BaseMapper<OtaBaSjGnxtwh> {
+
+}

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

@@ -0,0 +1,14 @@
+<?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.OtaBaSjGnxtwhMapper">
+    <resultMap id="OtaBaSjGnxtwhResultMap" type="com.jero.modules.ota.entity.OtaBaSjGnxtwh">
+        <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="gnxt" property="gnxt" />
+        <result column="dykzq" property="dykzq" />
+    </resultMap>
+</mapper>

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

@@ -0,0 +1,61 @@
+package com.jero.modules.ota.service;
+
+import com.jero.modules.ota.entity.OtaBaSjGnxtwh;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 车型备案-功能系统维护
+ * @Author: jero-boot
+ * @Date:   2023-03-26
+ * @Version: V1.0
+ */
+public interface IOtaBaSjGnxtwhService extends IService<OtaBaSjGnxtwh> {
+
+	/**
+	 * 保存
+	 *
+	 * @param otaBaSjGnxtwh
+	 * @return
+	 */
+    void add(OtaBaSjGnxtwh otaBaSjGnxtwh);
+
+	/**
+	 * 更新
+	 *
+	 * @param otaBaSjGnxtwh
+	 * @return
+	 */
+    void editById(OtaBaSjGnxtwh otaBaSjGnxtwh);
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+    OtaBaSjGnxtwh queryById(String id);
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+    List<OtaBaSjGnxtwh> queryList();
+}

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

@@ -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

@@ -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/impl/OtaBaCxJsfzbacsServiceImpl.java

@@ -129,7 +129,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
             for (Object cdJson : cs) {
                 HashMap<String, Object> csMap = (HashMap<String, Object>) cdJson;
                 String csName = (String) csMap.get("key");
-                String csValue = (String) csMap.get("val");
+                String csValue = csMap.get("val").toString();
                 if (null != csName) {
                     try {
                         Field field = OtaBaCxJsfzbacs.class.getDeclaredField(csName);

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

@@ -0,0 +1,89 @@
+package com.jero.modules.ota.service.impl;
+
+import com.jero.modules.ota.entity.OtaBaSjGnxtwh;
+import com.jero.modules.ota.mapper.OtaBaSjGnxtwhMapper;
+import com.jero.modules.ota.service.IOtaBaSjGnxtwhService;
+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-26
+ * @Version: V1.0
+ */
+@Service
+public class OtaBaSjGnxtwhServiceImpl extends ServiceImpl<OtaBaSjGnxtwhMapper, OtaBaSjGnxtwh> implements IOtaBaSjGnxtwhService {
+
+	/**
+	 * 保存
+	 *
+	 * @param otaBaSjGnxtwh
+	 * @return
+	 */
+	@Override
+    public void add(OtaBaSjGnxtwh otaBaSjGnxtwh) {
+        Date now = new Date();
+        otaBaSjGnxtwh.setCreateTime(now);
+        otaBaSjGnxtwh.setUpdateTime(now);
+        save(otaBaSjGnxtwh);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param otaBaSjGnxtwh
+	 * @return
+	 */
+	@Override
+    public void editById(OtaBaSjGnxtwh otaBaSjGnxtwh) {
+    	Date now = new Date();
+        otaBaSjGnxtwh.setUpdateTime(now);
+    	saveOrUpdate(otaBaSjGnxtwh);
+    }
+
+	/**
+	 * 通过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 OtaBaSjGnxtwh queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<OtaBaSjGnxtwh> queryList() {
+        return list();
+    }
+}

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

@@ -40,7 +40,7 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
         Date now = new Date();
         otaBaSjList.setCreateTime(now);
         otaBaSjList.setUpdateTime(now);
-        save(otaBaSjList);
+        saveOrUpdate(otaBaSjList);
     }
 
     /**

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

@@ -1,11 +1,16 @@
 package com.jero.modules.ota.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.ota.entity.OtaBaSjSjmbcl;
+import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
 import com.jero.modules.ota.mapper.OtaBaSjSjmbclMapper;
 import com.jero.modules.ota.service.IOtaBaSjSjmbclService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 import java.util.Date;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -28,7 +33,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
         Date now = new Date();
         otaBaSjSjmbcl.setCreateTime(now);
         otaBaSjSjmbcl.setUpdateTime(now);
-        save(otaBaSjSjmbcl);
+        saveOrUpdate(otaBaSjSjmbcl);
     }
 
     /**
@@ -77,6 +82,22 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
         return getById(id);
     }
 
+    @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) {
+        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

@@ -1,11 +1,20 @@
 package com.jero.modules.ota.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.modules.ota.entity.OtaBaCxJbxx;
+import com.jero.modules.ota.entity.OtaBaSjList;
 import com.jero.modules.ota.entity.OtaBaSjSjmbcx;
 import com.jero.modules.ota.mapper.OtaBaSjSjmbcxMapper;
+import com.jero.modules.ota.service.IOtaBaSjListService;
 import com.jero.modules.ota.service.IOtaBaSjSjmbcxService;
+import com.jero.modules.system.util.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Date;
+import java.util.UUID;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
@@ -17,6 +26,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, OtaBaSjSjmbcx> implements IOtaBaSjSjmbcxService {
 
+	@Autowired
+	private IOtaBaSjListService otaBaSjListService;
 	/**
 	 * 保存
 	 *
@@ -24,11 +35,24 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
 	 * @return
 	 */
 	@Override
-    public void add(OtaBaSjSjmbcx otaBaSjSjmbcx) {
+    public OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx) {
 		Date now = new Date();
+		OtaBaSjList otaBaSjList = new OtaBaSjList();
+		if (StringUtils.isEmpty(otaBaSjSjmbcx.getOtaId())) {
+			//在保存的时候设置一个id  并返回前端  下次保存的时候判断是否为更新
+			otaBaSjList.setId(UUID.randomUUID().toString().replace("-", ""));
+			otaBaSjList.updateData(otaBaSjSjmbcx);
+			otaBaSjListService.add(otaBaSjList);
+			otaBaSjSjmbcx.setOtaId(otaBaSjList.getId());
 			otaBaSjSjmbcx.setCreateTime(now);
+		} else {
+			otaBaSjList = otaBaSjListService.queryById(otaBaSjSjmbcx.getOtaId());
+			otaBaSjList.updateData(otaBaSjSjmbcx);
+			otaBaSjListService.editById(otaBaSjList);
+		}
         otaBaSjSjmbcx.setUpdateTime(now);
-        save(otaBaSjSjmbcx);
+		saveOrUpdate(otaBaSjSjmbcx);
+		return otaBaSjSjmbcx;
     }
 
 	/**
@@ -86,4 +110,20 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
     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) {
+		LambdaQueryWrapper<OtaBaSjSjmbcx> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, otaId);
+		return this.getOne(queryWrapper, false);
+	}
 }