diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java index 991aaf4ec..1d5e9e894 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java @@ -144,6 +144,23 @@ public class OtaBaCxAqcsController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + OtaBaCxAqcs otaBaCxAqcs = otaBaCxAqcsService.queryByOtaId(otaId); + if(otaBaCxAqcs==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxAqcs); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java index 3b2ca5a98..0d9642bb9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java @@ -81,8 +81,8 @@ public class OtaBaCxJbxxController extends JeroController add(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) { - otaBaCxJbxxService.add(otaBaCxJbxx); - return Result.OK("添加成功！"); + OtaBaCxJbxx res = otaBaCxJbxxService.add(otaBaCxJbxx); + return Result.OK(res); } /** @@ -144,6 +144,21 @@ public class OtaBaCxJbxxController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId); + if(otaBaCxJbxx==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxJbxx); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java index ebb038cfe..f6c58ac8c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; @@ -74,14 +76,12 @@ public class OtaBaCxJsfzbacsController extends JeroController add(@Validated @RequestBody OtaBaCxJsfzbacs otaBaCxJsfzbacs) { - otaBaCxJsfzbacsService.add(otaBaCxJsfzbacs); + public Result add(@RequestBody JSONObject json) { + otaBaCxJsfzbacsService.add(json); return Result.OK("添加成功！"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java index e1cdd216f..50479b08a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java @@ -144,6 +144,23 @@ public class OtaBaCxKsjjsmccsController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + List otaBaCxKsjjsmccsList = otaBaCxKsjjsmccsService.queryByOtaId(otaId); + if(otaBaCxKsjjsmccsList==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxKsjjsmccsList); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java index ef467d4be..d4bee2ecf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java @@ -144,6 +144,23 @@ public class OtaBaCxKsjxtmccsController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + List otaBaCxKsjxtmccsList = otaBaCxKsjxtmccsService.queryByOtaId(otaId); + if(otaBaCxKsjxtmccsList==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxKsjxtmccsList); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index 8ba1c6df6..fda20dfa9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.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; @@ -176,11 +177,12 @@ public class OtaBaCxListController extends JeroController batchRecord(@RequestParam(name = "ids", required = true) String ids, - @RequestParam(name = "bazt", required = true) String bazt, - @RequestParam(name = "batjsj", required = true) String batjsj, - @RequestParam(name = "bz", required = true) String bz, - @RequestParam(name = "cut") String cut) { + public Result batchRecord(@RequestBody JSONObject json) { + String ids = json.getString("ids"); + String bazt = json.getString("bazt"); + String batjsj = json.getString("batjsj"); + String bz = json.getString("bz"); + String cut = json.getString("cut"); otaBaCxListService.batchRecord(ids, bazt, batjsj, bz, cut); return Result.OK("备案维护成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java index a134be099..3ea1ea7aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxLsjlController.java @@ -144,6 +144,23 @@ public class OtaBaCxLsjlController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + List otaBaCxLsjlList = otaBaCxLsjlService.queryByOtaId(otaId); + if(otaBaCxLsjlList==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxLsjlList); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxQtController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxQtController.java index 67991683d..e2275af08 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxQtController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxQtController.java @@ -144,6 +144,23 @@ public class OtaBaCxQtController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + OtaBaCxQt otaBaCxQt = otaBaCxQtService.queryByOtaId(otaId); + if(otaBaCxQt==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxQt); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.java new file mode 100644 index 000000000..83a8c36bf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxTxjlController.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.OtaBaCxTxjl; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +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/otaBaCxTxjl") +@Slf4j +public class OtaBaCxTxjlController extends JeroController { + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; + + /** + * 分页列表查询 + * + * @param otaBaCxTxjl + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-填写记录表-分页列表查询") + @ApiOperation(value="车型备案-填写记录表-分页列表查询", notes="车型备案-填写记录表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxTxjl otaBaCxTxjl, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxTxjlService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-填写记录表-列表查询") + @ApiOperation(value="车型备案-填写记录表-列表查询", notes="车型备案-填写记录表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = otaBaCxTxjlService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param otaBaCxTxjl + * @return + */ + @AutoLog(value = "车型备案-填写记录表-添加") + @ApiOperation(value="车型备案-填写记录表-添加", notes="车型备案-填写记录表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) { + otaBaCxTxjlService.add(otaBaCxTxjl); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxTxjl + * @return + */ + @AutoLog(value = "车型备案-填写记录表-编辑") + @ApiOperation(value="车型备案-填写记录表-编辑", notes="车型备案-填写记录表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxTxjl otaBaCxTxjl) { + otaBaCxTxjlService.editById(otaBaCxTxjl); + 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) { + otaBaCxTxjlService.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.otaBaCxTxjlService.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) { + OtaBaCxTxjl otaBaCxTxjl = otaBaCxTxjlService.queryById(id); + if(otaBaCxTxjl==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxTxjl); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxTxjl + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, OtaBaCxTxjl otaBaCxTxjl) { + return super.exportXls(request, otaBaCxTxjl, OtaBaCxTxjl.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, OtaBaCxTxjl.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java index bf04a235a..83ef09d61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java @@ -144,6 +144,23 @@ public class OtaBaCxZxsjyqController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + OtaBaCxZxsjyq otaBaCxZxsjyq = otaBaCxZxsjyqService.queryByOtaId(otaId); + if(otaBaCxZxsjyq==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxZxsjyq); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.java new file mode 100644 index 000000000..787caa402 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjTxjlController.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.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 { + @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 queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjTxjl, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjTxjlService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型升级-填写记录表-列表查询") + @ApiOperation(value="车型升级-填写记录表-列表查询", notes="车型升级-填写记录表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List 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); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJsfzbacs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJsfzbacs.java index ac10b2359..dc8cbdfe3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJsfzbacs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxJsfzbacs.java @@ -3,6 +3,8 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.Date; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -451,4 +453,94 @@ public class OtaBaCxJsfzbacs implements Serializable { @ApiModelProperty(value = "事件数据记录系统生产企业") private java.lang.String edrScqy; + public OtaBaCxJsfzbacs(){ + + } + + public OtaBaCxJsfzbacs(String id, String createBy, Date createTime, String updateBy, Date updateTime, String sysOrgCode, String otaId, String wlaqyqPz, String wlaqyqSl, String wlaqyqBzwz, String wlaqyqGgxh, String wlaqyqScqy, String hmbldPz, String hmbldSl, String hmbldBzwz, String hmbldGgxh, String hmbldScqy, String csbldPz, String csbldSl, String csbldBzwz, String csbldGgxh, String csbldScqy, String sxthsPz, String sxthsSl, String sxthsBzwz, String sxthsGgxh, String sxthsScqy, String sxtdsdPz, String sxtdsdSl, String sxtdsdBzwz, String sxtdsdGgxh, String sxtdsdScqy, String jsyjkPz, String jsyjkSl, String jsyjkBzwz, String jsyjkGgxh, String jsyjkScqy, String jsyhwPz, String jsyhwSl, String jsyhwBzwz, String jsyhwGgxh, String jsyhwScqy, String czwxdwPz, String czwxdwGgxh, String czwxdwScqy, String gxdhPz, String gxdhGgxh, String gxdhScqy, String lsjPz, String lsjGgxh, String lsjScqy, String gjddtPz, String gjddtGgxh, String gjddtScqy, String dzwlPz, String dzwlDxxgcs, String cztxPz, String cztxXtmc, String cztxGgxh, String cztxScqy, String cztxBbh, String cztxKfqy, String jsfzczjPz, String jsfzczjMc, String jsfzczjYjxh, String jsfzczjScqy, String jsfzzsqPz, String jsfzzsqMc, String jsfzzsqYjxh, String jsfzzsqScqy, String fxptstsPz, String fxptstsMc, String fxptstsYjxh, String fxptstsScqy, String jsyzyltsPz, String jsyzyltsMc, String jsyzyltsYjxh, String jsyzyltsScqy, String dssadPz, String dssadGgxh, String dssadScqy, String edrPz, String edrGgxh, String edrScqy) { + this.id = id; + this.createBy = createBy; + this.createTime = createTime; + this.updateBy = updateBy; + this.updateTime = updateTime; + this.sysOrgCode = sysOrgCode; + this.otaId = otaId; + this.wlaqyqPz = wlaqyqPz; + this.wlaqyqSl = wlaqyqSl; + this.wlaqyqBzwz = wlaqyqBzwz; + this.wlaqyqGgxh = wlaqyqGgxh; + this.wlaqyqScqy = wlaqyqScqy; + this.hmbldPz = hmbldPz; + this.hmbldSl = hmbldSl; + this.hmbldBzwz = hmbldBzwz; + this.hmbldGgxh = hmbldGgxh; + this.hmbldScqy = hmbldScqy; + this.csbldPz = csbldPz; + this.csbldSl = csbldSl; + this.csbldBzwz = csbldBzwz; + this.csbldGgxh = csbldGgxh; + this.csbldScqy = csbldScqy; + this.sxthsPz = sxthsPz; + this.sxthsSl = sxthsSl; + this.sxthsBzwz = sxthsBzwz; + this.sxthsGgxh = sxthsGgxh; + this.sxthsScqy = sxthsScqy; + this.sxtdsdPz = sxtdsdPz; + this.sxtdsdSl = sxtdsdSl; + this.sxtdsdBzwz = sxtdsdBzwz; + this.sxtdsdGgxh = sxtdsdGgxh; + this.sxtdsdScqy = sxtdsdScqy; + this.jsyjkPz = jsyjkPz; + this.jsyjkSl = jsyjkSl; + this.jsyjkBzwz = jsyjkBzwz; + this.jsyjkGgxh = jsyjkGgxh; + this.jsyjkScqy = jsyjkScqy; + this.jsyhwPz = jsyhwPz; + this.jsyhwSl = jsyhwSl; + this.jsyhwBzwz = jsyhwBzwz; + this.jsyhwGgxh = jsyhwGgxh; + this.jsyhwScqy = jsyhwScqy; + this.czwxdwPz = czwxdwPz; + this.czwxdwGgxh = czwxdwGgxh; + this.czwxdwScqy = czwxdwScqy; + this.gxdhPz = gxdhPz; + this.gxdhGgxh = gxdhGgxh; + this.gxdhScqy = gxdhScqy; + this.lsjPz = lsjPz; + this.lsjGgxh = lsjGgxh; + this.lsjScqy = lsjScqy; + this.gjddtPz = gjddtPz; + this.gjddtGgxh = gjddtGgxh; + this.gjddtScqy = gjddtScqy; + this.dzwlPz = dzwlPz; + this.dzwlDxxgcs = dzwlDxxgcs; + this.cztxPz = cztxPz; + this.cztxXtmc = cztxXtmc; + this.cztxGgxh = cztxGgxh; + this.cztxScqy = cztxScqy; + this.cztxBbh = cztxBbh; + this.cztxKfqy = cztxKfqy; + this.jsfzczjPz = jsfzczjPz; + this.jsfzczjMc = jsfzczjMc; + this.jsfzczjYjxh = jsfzczjYjxh; + this.jsfzczjScqy = jsfzczjScqy; + this.jsfzzsqPz = jsfzzsqPz; + this.jsfzzsqMc = jsfzzsqMc; + this.jsfzzsqYjxh = jsfzzsqYjxh; + this.jsfzzsqScqy = jsfzzsqScqy; + this.fxptstsPz = fxptstsPz; + this.fxptstsMc = fxptstsMc; + this.fxptstsYjxh = fxptstsYjxh; + this.fxptstsScqy = fxptstsScqy; + this.jsyzyltsPz = jsyzyltsPz; + this.jsyzyltsMc = jsyzyltsMc; + this.jsyzyltsYjxh = jsyzyltsYjxh; + this.jsyzyltsScqy = jsyzyltsScqy; + this.dssadPz = dssadPz; + this.dssadGgxh = dssadGgxh; + this.dssadScqy = dssadScqy; + this.edrPz = edrPz; + this.edrGgxh = edrGgxh; + this.edrScqy = edrScqy; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java index a54113c23..7a811c958 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxList.java @@ -115,4 +115,11 @@ public class OtaBaCxList implements Serializable { @ApiModelProperty(value = "备注") private java.lang.String bz; + public void upadteData(OtaBaCxJbxx otaBaCxJbxx){ + this.cpdjbh = otaBaCxJbxx.getDjbh(); + this.ggpc = otaBaCxJbxx.getGgpc(); + this.cpsb = otaBaCxJbxx.getCpsb(); + this.cpmc = otaBaCxJbxx.getCpmc(); + this.cpxh = otaBaCxJbxx.getCpxh(); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxTxjl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxTxjl.java new file mode 100644 index 000000000..28daea52e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxTxjl.java @@ -0,0 +1,79 @@ +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_cx_txjl") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ota_ba_cx_txjl对象", description="车型备案-填写记录表") +public class OtaBaCxTxjl 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; + + /**otaId*/ + @Excel(name = "otaId", width = 15) + @ApiModelProperty(value = "otaId") + private String otaId; + + /**模块*/ + @Excel(name = "模块", width = 15) + @ApiModelProperty(value = "模块") + private String module; + + /**填写内容*/ + @Excel(name = "填写内容", width = 15) + @ApiModelProperty(value = "填写内容") + private String content; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java new file mode 100644 index 000000000..95e5a0b0f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjTxjl.java @@ -0,0 +1,79 @@ +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; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaCxTxjlMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaCxTxjlMapper.java new file mode 100644 index 000000000..d1a36e31d --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaCxTxjlMapper.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.OtaBaCxTxjl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 车型备案-填写记录表 + * @Author: jero-boot + * @Date: 2023-03-25 + * @Version: V1.0 + */ +public interface OtaBaCxTxjlMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.java new file mode 100644 index 000000000..2b7389246 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjTxjlMapper.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.OtaBaSjTxjl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 车型升级-填写记录表 + * @Author: jero-boot + * @Date: 2023-03-25 + * @Version: V1.0 + */ +public interface OtaBaSjTxjlMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaCxTxjlMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaCxTxjlMapper.xml new file mode 100644 index 000000000..990b974aa --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaCxTxjlMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml new file mode 100644 index 000000000..d242861d6 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjTxjlMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java index 800fc2dfe..9270db381 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxAqcsService.java @@ -58,4 +58,6 @@ public interface IOtaBaCxAqcsService extends IService { * @return */ List queryList(); + + OtaBaCxAqcs queryByOtaId(String otaId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java index ea7b7d549..16bfdfac7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJbxxService.java @@ -18,7 +18,7 @@ public interface IOtaBaCxJbxxService extends IService { * @param otaBaCxJbxx * @return */ - void add(OtaBaCxJbxx otaBaCxJbxx); + OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx); /** * 更新 @@ -58,4 +58,6 @@ public interface IOtaBaCxJbxxService extends IService { * @return */ List queryList(); + + OtaBaCxJbxx queryByOtaId(String otaId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java index 05baaee3f..6ff82cd8a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxJsfzbacsService.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -15,10 +16,9 @@ public interface IOtaBaCxJsfzbacsService extends IService { /** * 保存 * - * @param otaBaCxJsfzbacs * @return */ - void add(OtaBaCxJsfzbacs otaBaCxJsfzbacs); + void add(JSONObject json); /** * 更新 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index 6af7422ff..7e54fb19f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java @@ -58,4 +58,6 @@ public interface IOtaBaCxKsjjsmccsService extends IService { * @return */ List queryList(); + + List queryByOtaId(String otaId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java index 464b3c7f4..4aafb2ab6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjxtmccsService.java @@ -58,4 +58,6 @@ public interface IOtaBaCxKsjxtmccsService extends IService { * @return */ List queryList(); + + List queryByOtaId(String otaId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxLsjlService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxLsjlService.java index b60896535..da933bb77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxLsjlService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxLsjlService.java @@ -58,4 +58,6 @@ public interface IOtaBaCxLsjlService extends IService { * @return */ List queryList(); + + List queryByOtaId(String otaId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java index 0ed6e84c2..6754ab5cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxQtService.java @@ -58,4 +58,6 @@ public interface IOtaBaCxQtService extends IService { * @return */ List queryList(); + + OtaBaCxQt queryByOtaId(String otaId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java index 0d02ba570..0fb43b158 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxSjmkService.java @@ -52,6 +52,10 @@ public interface IOtaBaCxSjmkService extends IService { */ OtaBaCxSjmk queryById(String id); + + List queryByOtaId(String otaId); + + void deleteByOtaId(String otaId); /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxTxjlService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxTxjlService.java new file mode 100644 index 000000000..b26b288f2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxTxjlService.java @@ -0,0 +1,61 @@ +package com.jero.modules.ota.service; + +import com.jero.modules.ota.entity.OtaBaCxTxjl; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 车型备案-填写记录表 + * @Author: jero-boot + * @Date: 2023-03-25 + * @Version: V1.0 + */ +public interface IOtaBaCxTxjlService extends IService { + + /** + * 保存 + * + * @param otaBaCxTxjl + * @return + */ + void add(OtaBaCxTxjl otaBaCxTxjl); + + /** + * 更新 + * + * @param otaBaCxTxjl + * @return + */ + void editById(OtaBaCxTxjl otaBaCxTxjl); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaBaCxTxjl queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java index 04f1b367b..3106924c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java @@ -58,4 +58,6 @@ public interface IOtaBaCxZxsjyqService extends IService { * @return */ List queryList(); + + OtaBaCxZxsjyq queryByOtaId(String otaId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java new file mode 100644 index 000000000..a06ff9d39 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjTxjlService.java @@ -0,0 +1,61 @@ +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 { + + /** + * 保存 + * + * @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 ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaBaSjTxjl queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 7c12efbc2..90dc62174 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -1,6 +1,8 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxAqcs; +import com.jero.modules.ota.entity.OtaBaCxJbxx; import com.jero.modules.ota.mapper.OtaBaCxAqcsMapper; import com.jero.modules.ota.service.IOtaBaCxAqcsService; import org.springframework.stereotype.Service; @@ -86,4 +88,12 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public OtaBaCxAqcs queryByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxAqcs::getOtaId, otaId); + OtaBaCxAqcs res = this.getOne(queryWrapper); + return res; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 7d7333d5e..cb6434621 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -1,12 +1,19 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.ota.entity.OtaBaCxJbxx; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.mapper.OtaBaCxJbxxMapper; import com.jero.modules.ota.service.IOtaBaCxJbxxService; +import com.jero.modules.ota.service.IOtaBaCxListService; +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; +import java.util.List; +import java.util.UUID; /** * @Description: 车型备案-车型基本信息 @@ -17,18 +24,33 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class OtaBaCxJbxxServiceImpl extends ServiceImpl implements IOtaBaCxJbxxService { + @Autowired + private IOtaBaCxListService otaBaCxListService; /** * 保存 * * @param otaBaCxJbxx * @return */ - @Override - public void add(OtaBaCxJbxx otaBaCxJbxx) { - Date now = new Date(); - otaBaCxJbxx.setCreateTime(now); + public OtaBaCxJbxx add(OtaBaCxJbxx otaBaCxJbxx) { + Date now = new Date(); + OtaBaCxList otaBaCxList; + if(StringUtils.isEmpty(otaBaCxJbxx.getOtaId())){ + //在保存的时候设置一个id 并返回前端 下次保存的时候判断是否为更新 + otaBaCxList = new OtaBaCxList(); + otaBaCxList.setId(UUID.randomUUID().toString().replace("-", "")); + otaBaCxList.upadteData(otaBaCxJbxx); + otaBaCxListService.add(otaBaCxList); + otaBaCxJbxx.setOtaId(otaBaCxList.getId()); + otaBaCxJbxx.setCreateTime(now); + }else{ + otaBaCxList = otaBaCxListService.queryById(otaBaCxJbxx.getOtaId()); + otaBaCxList.upadteData(otaBaCxJbxx); + otaBaCxListService.editById(otaBaCxList); + } otaBaCxJbxx.setUpdateTime(now); - save(otaBaCxJbxx); + saveOrUpdate(otaBaCxJbxx); + return otaBaCxJbxx; } /** @@ -86,4 +108,12 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public OtaBaCxJbxx queryByOtaId(String otaId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); + OtaBaCxJbxx res = this.getOne(queryWrapper); + return res; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index cabf4913b..6f76dccc1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -1,89 +1,171 @@ package com.jero.modules.ota.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; +import com.jero.modules.ota.entity.OtaBaCxSjmk; import com.jero.modules.ota.mapper.OtaBaCxJsfzbacsMapper; import com.jero.modules.ota.service.IOtaBaCxJsfzbacsService; +import com.jero.modules.ota.service.IOtaBaCxLsjlService; +import com.jero.modules.ota.service.IOtaBaCxSjmkService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; + +import java.lang.reflect.Field; +import java.util.*; + 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 OtaBaCxJsfzbacsServiceImpl extends ServiceImpl implements IOtaBaCxJsfzbacsService { - /** - * 保存 - * - * @param otaBaCxJsfzbacs - * @return - */ - @Override - public void add(OtaBaCxJsfzbacs otaBaCxJsfzbacs) { + + @Autowired + private IOtaBaCxSjmkService OtaBaCxSjmkService; + + /** + * 保存 + */ + @Override + public void add(JSONObject json) { + OtaBaCxJsfzbacs otaBaCxJsfzbacs = new OtaBaCxJsfzbacs(); + String otaId = json.getString("otaId"); + otaBaCxJsfzbacs.setOtaId(otaId); + parseBjData(json, otaBaCxJsfzbacs); Date now = new Date(); otaBaCxJsfzbacs.setCreateTime(now); otaBaCxJsfzbacs.setUpdateTime(now); - save(otaBaCxJsfzbacs); + saveOrUpdate(otaBaCxJsfzbacs); + //处理控制器列表,先删除，后添加 + OtaBaCxSjmkService.deleteByOtaId(otaId); + JSONArray kzq = json.getJSONArray("kzq"); + List sjmkList = parseKzqData(kzq,otaId); + OtaBaCxSjmkService.saveBatch(sjmkList); } - /** - * 更新 - * - * @param otaBaCxJsfzbacs - * @return - */ - @Override - public void editById(OtaBaCxJsfzbacs otaBaCxJsfzbacs) { - Date now = new Date(); - otaBaCxJsfzbacs.setUpdateTime(now); - saveOrUpdate(otaBaCxJsfzbacs); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override - public void deleteById(String id) { - removeById(id); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override - public OtaBaCxJsfzbacs queryById(String id) { - return getById(id); - } /** - * 列表查询 - * - * @return - */ - @Override - public List queryList() { - return list(); + * 解析控制器数据 + */ + private List parseKzqData(JSONArray kzq,String otaId) { + List sjmkList = new ArrayList<>(); + for (Object kzqJson : kzq) { + HashMap kzqMap = (HashMap) kzqJson; + Field[] fields = OtaBaCxSjmk.class.getDeclaredFields(); + OtaBaCxSjmk sjmk = new OtaBaCxSjmk(); + sjmk.setOtaId(otaId); + for (Field field : fields) { + Object kzqObj = kzqMap.get(field.getName()); + if (null != kzqObj) { + try { + field.setAccessible(true); + field.set(sjmk, kzqObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + sjmkList.add(sjmk); + } + return sjmkList; + } + /** + * 解析部件数据 + */ + private void parseBjData (JSONObject json, OtaBaCxJsfzbacs otaBaCxJsfzbacs){ + JSONObject bj = json.getJSONObject("bj"); + Map bjMap = bj.getInnerMap(); + Field[] fields = OtaBaCxJsfzbacs.class.getDeclaredFields(); + for (Field field : fields) { + Object bjObj = bjMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaCxJsfzbacs, bjObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + JSONArray cs = json.getJSONArray("cs"); + for (Object cdJson : cs) { + HashMap csMap = (HashMap) cdJson; + String csName = (String) csMap.get("key"); + String csValue = (String) csMap.get("val"); + if (null != csName) { + try { + Field field = OtaBaCxJsfzbacs.class.getDeclaredField(csName); + field.setAccessible(true); + field.set(otaBaCxJsfzbacs, csValue); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + } + } + + /** + * 更新 + * + * @param otaBaCxJsfzbacs + * @return + */ + @Override + public void editById (OtaBaCxJsfzbacs otaBaCxJsfzbacs){ + Date now = new Date(); + otaBaCxJsfzbacs.setUpdateTime(now); + saveOrUpdate(otaBaCxJsfzbacs); + } + + /** + * 通过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 OtaBaCxJsfzbacs queryById (String id){ + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList () { + return list(); + } } -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 1f710422b..097f4a743 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -1,29 +1,33 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; +import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; import com.jero.modules.ota.mapper.OtaBaCxKsjjsmccsMapper; import com.jero.modules.ota.service.IOtaBaCxKsjjsmccsService; 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 OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl implements IOtaBaCxKsjjsmccsService { - /** - * 保存 - * - * @param otaBaCxKsjjsmccs - * @return - */ - @Override + /** + * 保存 + * + * @param otaBaCxKsjjsmccs + * @return + */ + @Override public void add(OtaBaCxKsjjsmccs otaBaCxKsjjsmccs) { Date now = new Date(); otaBaCxKsjjsmccs.setCreateTime(now); @@ -31,59 +35,67 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaCxKsjjsmccs queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public List queryByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId); + List res = this.list(queryWrapper); + return res; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 972ae2fb8..91ba256c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -1,5 +1,7 @@ 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.OtaBaCxKsjxtmccs; import com.jero.modules.ota.mapper.OtaBaCxKsjxtmccsMapper; import com.jero.modules.ota.service.IOtaBaCxKsjxtmccsService; @@ -86,4 +88,12 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public List queryByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxKsjxtmccs::getOtaId, otaId); + List res = this.list(queryWrapper); + return res; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index ec6a70bad..e45ad75c7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; @Service public class OtaBaCxListServiceImpl extends ServiceImpl implements IOtaBaCxListService { - private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @Autowired private IOtaBaCxLsjlService otaBaCxLsjlService; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java index 0d11fe48d..779b51a39 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxLsjlServiceImpl.java @@ -1,5 +1,7 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.mapper.OtaBaCxLsjlMapper; import com.jero.modules.ota.service.IOtaBaCxLsjlService; @@ -86,4 +88,12 @@ public class OtaBaCxLsjlServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public List queryByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxLsjl::getOtaId, otaId); + List res = this.list(queryWrapper); + return res; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java index 8a82a7183..cccb890b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java @@ -1,5 +1,7 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.jero.modules.ota.entity.OtaBaCxQt; import com.jero.modules.ota.mapper.OtaBaCxQtMapper; import com.jero.modules.ota.service.IOtaBaCxQtService; @@ -86,4 +88,11 @@ public class OtaBaCxQtServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public OtaBaCxQt queryByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxQt::getOtaId, otaId); + OtaBaCxQt res = this.getOne(queryWrapper); + return res; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java index f39961bc2..83a48550d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java @@ -1,12 +1,15 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.ota.entity.OtaBaCxSjmk; import com.jero.modules.ota.mapper.OtaBaCxSjmkMapper; import com.jero.modules.ota.service.IOtaBaCxSjmkService; import org.springframework.stereotype.Service; -import java.util.List; + +import java.util.ArrayList; import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 车型备案-车端OTA升级功能模块 @@ -77,6 +80,24 @@ public class OtaBaCxSjmkServiceImpl extends ServiceImpl queryByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxSjmk::getOtaId, otaId); + List list = this.list(queryWrapper); + return list; + } + + @Override + public void deleteByOtaId(String otaId) { + List list = this.queryByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaCxSjmk sjmk: list) { + ids.add(sjmk.getId()); + } + this.deleteByIds(ids); + } + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxTxjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxTxjlServiceImpl.java new file mode 100644 index 000000000..034507808 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxTxjlServiceImpl.java @@ -0,0 +1,89 @@ +package com.jero.modules.ota.service.impl; + +import com.jero.modules.ota.entity.OtaBaCxTxjl; +import com.jero.modules.ota.mapper.OtaBaCxTxjlMapper; +import com.jero.modules.ota.service.IOtaBaCxTxjlService; +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 OtaBaCxTxjlServiceImpl extends ServiceImpl implements IOtaBaCxTxjlService { + + /** + * 保存 + * + * @param otaBaCxTxjl + * @return + */ + @Override + public void add(OtaBaCxTxjl otaBaCxTxjl) { + Date now = new Date(); + otaBaCxTxjl.setCreateTime(now); + otaBaCxTxjl.setUpdateTime(now); + save(otaBaCxTxjl); + } + + /** + * 更新 + * + * @param otaBaCxTxjl + * @return + */ + @Override + public void editById(OtaBaCxTxjl otaBaCxTxjl) { + Date now = new Date(); + otaBaCxTxjl.setUpdateTime(now); + saveOrUpdate(otaBaCxTxjl); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OtaBaCxTxjl queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index 618aadf31..ea00d03c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java @@ -1,5 +1,7 @@ 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.OtaBaCxZxsjyq; import com.jero.modules.ota.mapper.OtaBaCxZxsjyqMapper; import com.jero.modules.ota.service.IOtaBaCxZxsjyqService; @@ -86,4 +88,12 @@ public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public OtaBaCxZxsjyq queryByOtaId(String otaId){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxZxsjyq::getOtaId, otaId); + OtaBaCxZxsjyq res = this.getOne(queryWrapper); + return res; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 879f67e95..96f67b750 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -2,8 +2,6 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; -import com.jero.modules.ota.entity.OtaBaCxList; -import com.jero.modules.ota.entity.OtaBaCxLsjl; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.entity.OtaBaSjLsjl; import com.jero.modules.ota.mapper.OtaBaSjListMapper; @@ -26,7 +24,7 @@ import java.util.List; @Service public class OtaBaSjListServiceImpl extends ServiceImpl implements IOtaBaSjListService { - private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @Autowired private IOtaBaSjLsjlService otaBaSjLsjlService; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java new file mode 100644 index 000000000..9dff31734 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjTxjlServiceImpl.java @@ -0,0 +1,89 @@ +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 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 ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OtaBaSjTxjl queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +}