From 3614a734b71236c8ba207e726333a9a47e194445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 26 Mar 2023 15:12:21 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxJbxxController.java | 1 - .../ota/controller/OtaBaCxTxjlController.java | 280 +++++++++--------- .../controller/OtaBaSjGnxtwhController.java | 170 +++++++++++ .../ota/controller/OtaBaSjListController.java | 12 +- .../controller/OtaBaSjSjmbclController.java | 277 ++++++++--------- .../controller/OtaBaSjSjmbcxController.java | 255 ++++++++-------- .../modules/ota/entity/OtaBaSjGnxtwh.java | 74 +++++ .../jero/modules/ota/entity/OtaBaSjList.java | 115 ++++--- .../ota/mapper/OtaBaSjGnxtwhMapper.java | 17 ++ .../ota/mapper/xml/OtaBaSjGnxtwhMapper.xml | 14 + .../ota/service/IOtaBaSjGnxtwhService.java | 61 ++++ .../ota/service/IOtaBaSjSjmbclService.java | 2 + .../ota/service/IOtaBaSjSjmbcxService.java | 4 +- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 2 +- .../impl/OtaBaSjGnxtwhServiceImpl.java | 89 ++++++ .../service/impl/OtaBaSjListServiceImpl.java | 2 +- .../impl/OtaBaSjSjmbclServiceImpl.java | 109 ++++--- .../impl/OtaBaSjSjmbcxServiceImpl.java | 48 ++- 18 files changed, 1049 insertions(+), 483 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGnxtwh.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjGnxtwhMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java 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 ee7e0292b..0f33cd7f6 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 @@ -155,7 +155,6 @@ public class OtaBaCxJbxxController extends JeroController 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); } 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 index 39a914252..54866efeb 100644 --- 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 @@ -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.*; @@ -22,163 +25,166 @@ import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** +/** * @Description: 车型备案-填写记录表 * @Author: jero-boot - * @Date: 2023-03-25 + * @Date: 2023-03-25 * @Version: V1.0 */ -@Api(tags="车型备案-填写记录表") +@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); - } + @Autowired + private IOtaBaCxTxjlService otaBaCxTxjlService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-填写记录表-列表查询") - @ApiOperation(value="车型备案-填写记录表-列表查询", notes="车型备案-填写记录表-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @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) { + IPage pageList = new Page<>(); + if (ObjectUtils.isNotEmpty(otaBaCxTxjl) && StringUtils.isNotEmpty(otaBaCxTxjl.getOtaId())) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxTxjl, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + 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); - } - - /** - * 通过otaId查询 - * - * @param otaId - * @return - */ - @AutoLog(value = "车型备案-填写记录表-通过otaId查询") - @ApiOperation(value="车型备案-填写记录表-通过otaId查询", notes="车型备案-填写记录表-通过otaId查询") - @GetMapping(value = "/queryByOtaId") - public Result queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { - List otaBaCxTxjlList = otaBaCxTxjlService.queryByOtaId(otaId); - if(otaBaCxTxjlList==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxTxjlList); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxTxjl - */ + * 添加 + * + * @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); + } + + /** + * 通过otaId查询 + * + * @param otaId + * @return + */ + @AutoLog(value = "车型备案-填写记录表-通过otaId查询") + @ApiOperation(value = "车型备案-填写记录表-通过otaId查询", notes = "车型备案-填写记录表-通过otaId查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId) { + List otaBaCxTxjlList = otaBaCxTxjlService.queryByOtaId(otaId); + if (otaBaCxTxjlList == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxTxjlList); + } + + /** + * 导出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 - */ + * 通过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/OtaBaSjGnxtwhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java new file mode 100644 index 000000000..e865cf1ce --- /dev/null +++ b/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 { + @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 queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-列表查询") + @ApiOperation(value="车型备案-功能系统维护-列表查询", notes="车型备案-功能系统维护-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List 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); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index b46297dca..4e4429091 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/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 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"); otaBaSjListService.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/OtaBaSjSjmbclController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java index 7b598f04e..9424b5486 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java @@ -1,167 +1,180 @@ 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 com.jero.common.aspect.annotation.AutoLog; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 升级备案-升级目标车辆 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ -@Api(tags="升级备案-升级目标车辆") +@Api(tags = "升级备案-升级目标车辆") @RestController @RequestMapping("/ota/otaBaSjSjmbcl") @Slf4j public class OtaBaSjSjmbclController extends JeroController { - @Autowired - private IOtaBaSjSjmbclService otaBaSjSjmbclService; - - /** - * 分页列表查询 - * - * @param otaBaSjSjmbcl - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "升级备案-升级目标车辆-分页列表查询") - @ApiOperation(value="升级备案-升级目标车辆-分页列表查询", notes="升级备案-升级目标车辆-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaSjSjmbcl otaBaSjSjmbcl, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjmbcl, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaSjSjmbclService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaSjSjmbclService otaBaSjSjmbclService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "升级备案-升级目标车辆-列表查询") - @ApiOperation(value="升级备案-升级目标车辆-列表查询", notes="升级备案-升级目标车辆-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaSjSjmbcl + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "升级备案-升级目标车辆-分页列表查询") + @ApiOperation(value = "升级备案-升级目标车辆-分页列表查询", notes = "升级备案-升级目标车辆-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjSjmbcl otaBaSjSjmbcl, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjmbcl, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjSjmbclService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "升级备案-升级目标车辆-列表查询") + @ApiOperation(value = "升级备案-升级目标车辆-列表查询", notes = "升级备案-升级目标车辆-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaSjSjmbclService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaSjSjmbcl - * @return - */ - @AutoLog(value = "升级备案-升级目标车辆-添加") - @ApiOperation(value="升级备案-升级目标车辆-添加", notes="升级备案-升级目标车辆-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaSjSjmbcl otaBaSjSjmbcl) { - otaBaSjSjmbclService.add(otaBaSjSjmbcl); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaSjSjmbcl - * @return - */ - @AutoLog(value = "升级备案-升级目标车辆-编辑") - @ApiOperation(value="升级备案-升级目标车辆-编辑", notes="升级备案-升级目标车辆-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaSjSjmbcl otaBaSjSjmbcl) { - otaBaSjSjmbclService.editById(otaBaSjSjmbcl); - 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) { - otaBaSjSjmbclService.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.otaBaSjSjmbclService.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) { - OtaBaSjSjmbcl otaBaSjSjmbcl = otaBaSjSjmbclService.queryById(id); - if(otaBaSjSjmbcl==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaSjSjmbcl); - } + } /** - * 导出excel - * - * @param request - * @param otaBaSjSjmbcl - */ + * 添加 + * + * @param otaBaSjSjmbcl + * @return + */ + @AutoLog(value = "升级备案-升级目标车辆-添加") + @ApiOperation(value = "升级备案-升级目标车辆-添加", notes = "升级备案-升级目标车辆-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaSjSjmbcl otaBaSjSjmbcl) { + otaBaSjSjmbclService.add(otaBaSjSjmbcl); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaSjSjmbcl + * @return + */ + @AutoLog(value = "升级备案-升级目标车辆-编辑") + @ApiOperation(value = "升级备案-升级目标车辆-编辑", notes = "升级备案-升级目标车辆-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjSjmbcl otaBaSjSjmbcl) { + otaBaSjSjmbclService.editById(otaBaSjSjmbcl); + 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) { + otaBaSjSjmbclService.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.otaBaSjSjmbclService.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) { + OtaBaSjSjmbcl otaBaSjSjmbcl = otaBaSjSjmbclService.queryById(id); + if (otaBaSjSjmbcl == null) { + return Result.error("未找到对应数据"); + } + 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 + * + * @param request + * @param otaBaSjSjmbcl + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaSjSjmbcl otaBaSjSjmbcl) { return super.exportXls(request, otaBaSjSjmbcl, OtaBaSjSjmbcl.class, "升级备案-升级目标车辆"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OtaBaSjSjmbcl.class); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java index 72eebbbed..f27f90f29 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java +++ b/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; @@ -22,149 +24,162 @@ import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** +/** * @Description: 升级备案-升级目标车型 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ -@Api(tags="升级备案-升级目标车型") +@Api(tags = "升级备案-升级目标车型") @RestController @RequestMapping("/ota/otaBaSjSjmbcx") @Slf4j public class OtaBaSjSjmbcxController extends JeroController { - @Autowired - private IOtaBaSjSjmbcxService otaBaSjSjmbcxService; - - /** - * 分页列表查询 - * - * @param otaBaSjSjmbcx - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "升级备案-升级目标车型-分页列表查询") - @ApiOperation(value="升级备案-升级目标车型-分页列表查询", notes="升级备案-升级目标车型-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaSjSjmbcx otaBaSjSjmbcx, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjmbcx, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaSjSjmbcxService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaSjSjmbcxService otaBaSjSjmbcxService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "升级备案-升级目标车型-列表查询") - @ApiOperation(value="升级备案-升级目标车型-列表查询", notes="升级备案-升级目标车型-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaSjSjmbcx + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "升级备案-升级目标车型-分页列表查询") + @ApiOperation(value = "升级备案-升级目标车型-分页列表查询", notes = "升级备案-升级目标车型-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjSjmbcx otaBaSjSjmbcx, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjSjmbcx, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaSjSjmbcxService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "升级备案-升级目标车型-列表查询") + @ApiOperation(value = "升级备案-升级目标车型-列表查询", notes = "升级备案-升级目标车型-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaSjSjmbcxService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaSjSjmbcx - * @return - */ - @AutoLog(value = "升级备案-升级目标车型-添加") - @ApiOperation(value="升级备案-升级目标车型-添加", notes="升级备案-升级目标车型-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) { - otaBaSjSjmbcxService.add(otaBaSjSjmbcx); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaSjSjmbcx - * @return - */ - @AutoLog(value = "升级备案-升级目标车型-编辑") - @ApiOperation(value="升级备案-升级目标车型-编辑", notes="升级备案-升级目标车型-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) { - otaBaSjSjmbcxService.editById(otaBaSjSjmbcx); - 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) { - otaBaSjSjmbcxService.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.otaBaSjSjmbcxService.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) { - OtaBaSjSjmbcx otaBaSjSjmbcx = otaBaSjSjmbcxService.queryById(id); - if(otaBaSjSjmbcx==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaSjSjmbcx); - } + } /** - * 导出excel - * - * @param request - * @param otaBaSjSjmbcx - */ + * 添加 + * + * @param otaBaSjSjmbcx + * @return + */ + @AutoLog(value = "升级备案-升级目标车型-添加") + @ApiOperation(value = "升级备案-升级目标车型-添加", notes = "升级备案-升级目标车型-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) { + OtaBaSjSjmbcx res = otaBaSjSjmbcxService.add(otaBaSjSjmbcx); + return Result.OK(res); + } + + /** + * 编辑 + * + * @param otaBaSjSjmbcx + * @return + */ + @AutoLog(value = "升级备案-升级目标车型-编辑") + @ApiOperation(value = "升级备案-升级目标车型-编辑", notes = "升级备案-升级目标车型-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjSjmbcx otaBaSjSjmbcx) { + otaBaSjSjmbcxService.editById(otaBaSjSjmbcx); + 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) { + otaBaSjSjmbcxService.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.otaBaSjSjmbcxService.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) { + OtaBaSjSjmbcx otaBaSjSjmbcx = otaBaSjSjmbcxService.queryById(id); + if (otaBaSjSjmbcx == null) { + return Result.error("未找到对应数据"); + } + 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 + * + * @param request + * @param otaBaSjSjmbcx + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaSjSjmbcx otaBaSjSjmbcx) { return super.exportXls(request, otaBaSjSjmbcx, OtaBaSjSjmbcx.class, "升级备案-升级目标车型"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OtaBaSjSjmbcx.class); } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGnxtwh.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGnxtwh.java new file mode 100644 index 000000000..d5515c473 --- /dev/null +++ b/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; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java index c2bb79658..54d096d47 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java +++ b/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; @@ -21,98 +22,138 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 升级备案-升级活动备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_sj_list") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_list对象", description="升级备案-升级活动备案列表") +@ApiModel(value = "ota_ba_sj_list对象", description = "升级备案-升级活动备案列表") public class OtaBaSjList implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @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") + /** + * 创建日期 + */ + @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") + /** + * 更新日期 + */ + @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*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**产品登记编号*/ - @Excel(name = "产品登记编号", width = 15) + /** + * 产品登记编号 + */ + @Excel(name = "产品登记编号", width = 15) @ApiModelProperty(value = "产品登记编号") private java.lang.String cpdjbh; - /**公告批次*/ - @Excel(name = "公告批次", width = 15) + /** + * 公告批次 + */ + @Excel(name = "公告批次", width = 15) @ApiModelProperty(value = "公告批次") private java.lang.String ggpc; - /**产品商标*/ - @Excel(name = "产品商标", width = 15) + /** + * 产品商标 + */ + @Excel(name = "产品商标", width = 15) @ApiModelProperty(value = "产品商标") private java.lang.String cpsb; - /**产品名称*/ - @Excel(name = "产品名称", width = 15) + /** + * 产品名称 + */ + @Excel(name = "产品名称", width = 15) @ApiModelProperty(value = "产品名称") private java.lang.String cpmc; - /**产品型号*/ - @Excel(name = "产品型号", width = 15) + /** + * 产品型号 + */ + @Excel(name = "产品型号", width = 15) @ApiModelProperty(value = "产品型号") private java.lang.String cpxh; - /**备案状态*/ - @Excel(name = "备案状态", width = 15) + /** + * 备案状态 + */ + @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") + /** + * 备案提交时间 + */ + @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") + /** + * 创建时间 + */ + @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) + /** + * 备注 + */ + @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(); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjGnxtwhMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaBaSjGnxtwhMapper.java new file mode 100644 index 000000000..9e6ea1854 --- /dev/null +++ b/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 { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml new file mode 100644 index 000000000..a4262c5e3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaBaSjGnxtwhMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java new file mode 100644 index 000000000..bd8a9cdb7 --- /dev/null +++ b/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 { + + /** + * 保存 + * + * @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 ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + OtaBaSjGnxtwh queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java index 45a0e5e8e..73e7e44da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbclService.java @@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbclService extends IService { * @return */ List queryList(); + + OtaBaSjSjmbcl queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java index 27e4d944d..62d0d4229 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjmbcxService.java @@ -18,7 +18,7 @@ public interface IOtaBaSjSjmbcxService extends IService { * @param otaBaSjSjmbcx * @return */ - void add(OtaBaSjSjmbcx otaBaSjSjmbcx); + OtaBaSjSjmbcx add(OtaBaSjSjmbcx otaBaSjSjmbcx); /** * 更新 @@ -58,4 +58,6 @@ public interface IOtaBaSjSjmbcxService extends IService { * @return */ List queryList(); + + OtaBaSjSjmbcx queryByOtaId(String otaId, String otaIdT); } 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 b3ed65347..d06f5e788 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 @@ -129,7 +129,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl csMap = (HashMap) 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); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java new file mode 100644 index 000000000..9ed614a81 --- /dev/null +++ b/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 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 ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OtaBaSjGnxtwh 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/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index 96f67b750..7d4798503 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 @@ -40,7 +40,7 @@ public class OtaBaSjListServiceImpl extends ServiceImpl implements IOtaBaSjSjmbclService { - /** - * 保存 - * - * @param otaBaSjSjmbcl - * @return - */ - @Override + /** + * 保存 + * + * @param otaBaSjSjmbcl + * @return + */ + @Override public void add(OtaBaSjSjmbcl otaBaSjSjmbcl) { Date now = new Date(); otaBaSjSjmbcl.setCreateTime(now); otaBaSjSjmbcl.setUpdateTime(now); - save(otaBaSjSjmbcl); + saveOrUpdate(otaBaSjSjmbcl); } - /** - * 更新 - * - * @param otaBaSjSjmbcl - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjmbcl + * @return + */ + @Override public void editById(OtaBaSjSjmbcl otaBaSjSjmbcl) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjmbcl.setUpdateTime(now); - saveOrUpdate(otaBaSjSjmbcl); + saveOrUpdate(otaBaSjSjmbcl); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjmbcl queryById(String id) { 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 queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjmbcl::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } + /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index a6f8597a2..3a9bc2e2c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/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 implements IOtaBaSjSjmbcxService { + @Autowired + private IOtaBaSjListService otaBaSjListService; /** * 保存 * @@ -24,11 +35,24 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl 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 queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } From 1300fe2f751a5bb6b48fa47b07de1c952d46d103 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 26 Mar 2023 15:29:12 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=91=8A=E7=9F=A5?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/zh-cn.js | 2 +- .../components/usernotification.vue | 196 +++++++++++++----- .../upgradeactivityrecord/index.vue | 11 +- 3 files changed, 151 insertions(+), 58 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 1632822d9..adc60ce7a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1762,7 +1762,7 @@ module.exports = { notifiestheuseroftheupgradesuccessorfailure:'告知用户升级成功或失败', informimplementationchanges:'告知实施的变更', allupdatestotheusermanualareinformed:'告知了对用户手册的全部更新内容', - usernotificationmode:'告知用户方式', + usernotificationmode:'告知用户方式(可多选)', userinformstherelevantfile:'用户告知相关文件', taskname:'任务名称', updatereleasetime:'升级发布时间', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index ee65f5406..3e4680d34 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -12,71 +12,150 @@ +

{{$t('beforetheupgrade')}}

- {{$t('totalquantity')}} + {{$t('pgradepurpose')}}
- + + v-model='formInline.sjmd' + :placeholder="$t('pleaseEnter')">
- - - {{$t('dateofproduction')}} + {{$t('vehiclefunctionalityasaresultofsoftwareupgradeactivities')}}
- - + +
- - - {{$t('VINcodelist')}} + {{$t('estimatedupgradeexecutionTime')}}
- - + + - - - - - - - -
- - + {{$t('upgradeexecutionperiodasksifthevehicleisusable')}}
- - - {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || - formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') + + + +
+ + +
+
+ {{$t('vehiclefeaturesthatarenotavailableduringupgradeexecution')}} +
+ + + +
+ + +
+
+ {{$t('vehicleusersafelyperformtheupgrade')}} +
+ + + +
+ +

{{$t('aftertheupgrade')}}

+ +
+
+ {{$t('notifiestheuseroftheupgradesuccessorfailure')}} +
+ + + {{ $t('yes') }} + {{ $t('not') }} + + +
+ + +
+
+ {{$t('informimplementationchanges')}} +
+ + + {{ $t('yes') }} + {{ $t('not') }} + + +
+ + +
+
+ {{$t('allupdatestotheusermanualareinformed')}} +
+ + + {{ $t('yes') }} + {{ $t('not') }} + + +
+ + +
+
+ {{$t('usernotificationmode')}} +
+ + + +
+ + +
+
+ {{$t('allupdatestotheusermanualareinformed')}} +
+ + + {{ (formInline.xgwj === 'null' || formInline.xgwj === '' || + formInline.xgwj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') }} @@ -90,18 +169,21 @@ {{$t('last')}} {{$t('next')}}
+ @@ -150,7 +244,7 @@ export default { \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index ce070a87f..5121c9a8e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -484,4 +484,8 @@ import uploadFileOta from '@/components/uploadFileOta/file' ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title { white-space: pre-wrap!important; } + ::v-deep .ant-table-row:first-child { + background: #fff !important; + opacity: 3.9 !important; + } \ No newline at end of file From a0d14af1f357fd159b7154d211f7e1b4d8ad377e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 26 Mar 2023 17:17:44 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OtaBaSjSjxtbhController.java | 18 +++ .../ota/service/IOtaBaSjSjxtbhService.java | 2 + .../impl/OtaBaSjSjxtbhServiceImpl.java | 140 +++++++++++------- 3 files changed, 106 insertions(+), 54 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java index 9bff89950..b1c0a0d5f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java @@ -143,6 +143,24 @@ public class OtaBaSjSjxtbhController extends JeroController queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + JSONObject json = otaBaSjSjxtbhService.queryByOtaId(otaId, otaIdT); + if (json == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(json); + } + /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java index 025659468..8814bb255 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjSjxtbhService.java @@ -57,4 +57,6 @@ public interface IOtaBaSjSjxtbhService extends IService { * @return */ List queryList(); + + JSONObject queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 002c5ddb7..4cbfc0f6c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -1,102 +1,134 @@ package com.jero.modules.ota.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; +import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaSjSjxtbh; import com.jero.modules.ota.mapper.OtaBaSjSjxtbhMapper; import com.jero.modules.ota.service.IOtaBaSjSjxtbhService; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; 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 OtaBaSjSjxtbhServiceImpl extends ServiceImpl implements IOtaBaSjSjxtbhService { - /** - * 保存 - */ - @Override + /** + * 保存 + */ + @Override public void add(JSONObject json) { - Date now = new Date(); - String otaId = (String) json.get("otaId"); - List newList = new ArrayList<>(); - if (StringUtils.isNotEmpty(otaId)) { - JSONArray list = json.getJSONArray("list"); - for (Object obj : list) { - OtaBaSjSjxtbh bh = JSONObject.parseObject(obj.toString(),OtaBaSjSjxtbh.class); - bh.setOtaId(otaId); - bh.setCreateTime(now); - bh.setUpdateTime(now); - newList.add(bh); - } - } - saveOrUpdateBatch(newList); + Date now = new Date(); + String otaId = (String) json.get("otaId"); + List newList = new ArrayList<>(); + if (StringUtils.isNotEmpty(otaId)) { + deleteByOtaId(otaId); + JSONArray list = json.getJSONArray("list"); + for (Object obj : list) { + OtaBaSjSjxtbh bh = JSONObject.parseObject(obj.toString(), OtaBaSjSjxtbh.class); + bh.setOtaId(otaId); + bh.setCreateTime(now); + bh.setUpdateTime(now); + newList.add(bh); + } + } + saveOrUpdateBatch(newList); } - /** - * 更新 - * - * @param otaBaSjSjxtbh - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaSjSjxtbh + * @return + */ + @Override public void editById(OtaBaSjSjxtbh otaBaSjSjxtbh) { - Date now = new Date(); + Date now = new Date(); otaBaSjSjxtbh.setUpdateTime(now); - saveOrUpdate(otaBaSjSjxtbh); + saveOrUpdate(otaBaSjSjxtbh); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public OtaBaSjSjxtbh queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public JSONObject queryByOtaId(String otaId, String otaIdT) { + List res = this.getByOtaId(otaId); + if (ObjectUtil.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + JSONObject json = new JSONObject(); + json.put("list", res); + return json; + } + + private List getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaSjSjxtbh::getOtaId, otaId); + return this.list(queryWrapper); + } + + public void deleteByOtaId(String otaId) { + List list = this.getByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaSjSjxtbh bh : list) { + ids.add(bh.getId()); + } + this.deleteByIds(ids); + } } From d07f1ed3208709ddccb422e6a39f7ae48b239c01 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 26 Mar 2023 17:26:56 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B967218?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/other.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index 4f0a91e18..0002405fb 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -39,6 +39,7 @@ export default { confirmLoading: false, disabled: false, queryParam:{}, + flag:'', rules:{ sjbbhcs:[ { max: 500,message:'最多只能添加500个字符',trigger:'blur'} @@ -67,6 +68,7 @@ export default { save(){ this.$refs.ruleForm.validate( valid =>{ if (valid) { + this.flag = 1 postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{ console.log(res); this.$message.success(this.$t('SavedSuccessfully')) @@ -82,10 +84,13 @@ export default { }, submit(){ this.save() - this.$router.push({ - path: '/vehicleregistration', - query: {} - }) + if(this.flag == 1){ + this.$router.push({ + path: '/vehicleregistration', + query: {} + }) + } + }, },