diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 9e33fac5b..a6ac38f13 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5703,7 +5703,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { - @Autowired - private IOtaBaCxAqcsService otaBaCxAqcsService; - - /** - * 分页列表查询 - * - * @param otaBaCxAqcs - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-安全措施-分页列表查询") - @ApiOperation(value="车型备案-安全措施-分页列表查询", notes="车型备案-安全措施-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxAqcs otaBaCxAqcs, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxAqcs, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxAqcsService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxAqcsService otaBaCxAqcsService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-安全措施-列表查询") - @ApiOperation(value="车型备案-安全措施-列表查询", notes="车型备案-安全措施-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxAqcs + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-安全措施-分页列表查询") + @ApiOperation(value = "车型备案-安全措施-分页列表查询", notes = "车型备案-安全措施-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxAqcs otaBaCxAqcs, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxAqcs, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxAqcsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-安全措施-列表查询") + @ApiOperation(value = "车型备案-安全措施-列表查询", notes = "车型备案-安全措施-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxAqcsService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxAqcs - * @return - */ - @AutoLog(value = "车型备案-安全措施-添加") - @ApiOperation(value="车型备案-安全措施-添加", notes="车型备案-安全措施-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxAqcs otaBaCxAqcs) { - otaBaCxAqcsService.add(otaBaCxAqcs); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxAqcs - * @return - */ - @AutoLog(value = "车型备案-安全措施-编辑") - @ApiOperation(value="车型备案-安全措施-编辑", notes="车型备案-安全措施-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxAqcs otaBaCxAqcs) { - otaBaCxAqcsService.editById(otaBaCxAqcs); - 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) { - otaBaCxAqcsService.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.otaBaCxAqcsService.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) { - OtaBaCxAqcs otaBaCxAqcs = otaBaCxAqcsService.queryById(id); - if(otaBaCxAqcs==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxAqcs); - } - - /** - * 通过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) { - OtaBaCxAqcs otaBaCxAqcs = otaBaCxAqcsService.queryByOtaId(otaId); - if(otaBaCxAqcs==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxAqcs); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxAqcs - */ + * 添加 + * + * @param otaBaCxAqcs + * @return + */ + @AutoLog(value = "车型备案-安全措施-添加") + @ApiOperation(value = "车型备案-安全措施-添加", notes = "车型备案-安全措施-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxAqcs otaBaCxAqcs) { + otaBaCxAqcsService.add(otaBaCxAqcs); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxAqcs + * @return + */ + @AutoLog(value = "车型备案-安全措施-编辑") + @ApiOperation(value = "车型备案-安全措施-编辑", notes = "车型备案-安全措施-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxAqcs otaBaCxAqcs) { + otaBaCxAqcsService.editById(otaBaCxAqcs); + 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) { + otaBaCxAqcsService.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.otaBaCxAqcsService.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) { + OtaBaCxAqcs otaBaCxAqcs = otaBaCxAqcsService.queryById(id); + if (otaBaCxAqcs == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxAqcs); + } + + /** + * 通过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, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + OtaBaCxAqcs otaBaCxAqcs = otaBaCxAqcsService.queryByOtaId(otaId, otaIdT); + if (otaBaCxAqcs == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxAqcs); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxAqcs + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxAqcs otaBaCxAqcs) { return super.exportXls(request, otaBaCxAqcs, OtaBaCxAqcs.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, OtaBaCxAqcs.class); 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 0d9642bb9..ee7e0292b 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 @@ -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.OtaBaCxJbxx; @@ -11,6 +12,7 @@ import com.jero.modules.ota.service.IOtaBaCxJbxxService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.system.util.StringUtils; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -22,161 +24,159 @@ 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/otaBaCxJbxx") @Slf4j public class OtaBaCxJbxxController extends JeroController { - @Autowired - private IOtaBaCxJbxxService otaBaCxJbxxService; - - /** - * 分页列表查询 - * - * @param otaBaCxJbxx - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-车型基本信息-分页列表查询") - @ApiOperation(value="车型备案-车型基本信息-分页列表查询", notes="车型备案-车型基本信息-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxJbxx otaBaCxJbxx, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxJbxx, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxJbxxService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxJbxxService otaBaCxJbxxService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-车型基本信息-列表查询") - @ApiOperation(value="车型备案-车型基本信息-列表查询", notes="车型备案-车型基本信息-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxJbxx + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-车型基本信息-分页列表查询") + @ApiOperation(value = "车型备案-车型基本信息-分页列表查询", notes = "车型备案-车型基本信息-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxJbxx otaBaCxJbxx, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxJbxx, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxJbxxService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-车型基本信息-列表查询") + @ApiOperation(value = "车型备案-车型基本信息-列表查询", notes = "车型备案-车型基本信息-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxJbxxService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxJbxx - * @return - */ - @AutoLog(value = "车型备案-车型基本信息-添加") - @ApiOperation(value="车型备案-车型基本信息-添加", notes="车型备案-车型基本信息-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) { - OtaBaCxJbxx res = otaBaCxJbxxService.add(otaBaCxJbxx); - return Result.OK(res); - } - - /** - * 编辑 - * - * @param otaBaCxJbxx - * @return - */ - @AutoLog(value = "车型备案-车型基本信息-编辑") - @ApiOperation(value="车型备案-车型基本信息-编辑", notes="车型备案-车型基本信息-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) { - otaBaCxJbxxService.editById(otaBaCxJbxx); - 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) { - otaBaCxJbxxService.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.otaBaCxJbxxService.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) { - OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryById(id); - if(otaBaCxJbxx==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxJbxx); - } - - /** - * 通过OtaId查询 - * - */ - @AutoLog(value = "车型备案-车型基本信息-通过otaId查询") - @ApiOperation(value="车型备案-车型基本信息-通过otaId查询", notes="车型备案-车型基本信息-通过otaId查询") - @GetMapping(value = "/queryByOtaId") - public Result queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { - OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId); - if(otaBaCxJbxx==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxJbxx); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxJbxx - */ + * 添加 + * + * @param otaBaCxJbxx + * @return + */ + @AutoLog(value = "车型备案-车型基本信息-添加") + @ApiOperation(value = "车型备案-车型基本信息-添加", notes = "车型备案-车型基本信息-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) { + OtaBaCxJbxx res = otaBaCxJbxxService.add(otaBaCxJbxx); + return Result.OK(res); + } + + /** + * 编辑 + * + * @param otaBaCxJbxx + * @return + */ + @AutoLog(value = "车型备案-车型基本信息-编辑") + @ApiOperation(value = "车型备案-车型基本信息-编辑", notes = "车型备案-车型基本信息-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxJbxx otaBaCxJbxx) { + otaBaCxJbxxService.editById(otaBaCxJbxx); + 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) { + otaBaCxJbxxService.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.otaBaCxJbxxService.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) { + OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryById(id); + if (otaBaCxJbxx == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxJbxx); + } + + /** + * 通过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) { + OtaBaCxJbxx otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT); + otaBaCxJbxx = otaBaCxJbxxService.queryByOtaId(otaId, otaIdT); + return Result.OK(otaBaCxJbxx); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxJbxx + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxJbxx otaBaCxJbxx) { return super.exportXls(request, otaBaCxJbxx, OtaBaCxJbxx.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, OtaBaCxJbxx.class); 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 f6c58ac8c..e47925a95 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 @@ -24,144 +24,161 @@ 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/otaBaCxJsfzbacs") @Slf4j public class OtaBaCxJsfzbacsController extends JeroController { - @Autowired - private IOtaBaCxJsfzbacsService otaBaCxJsfzbacsService; - - /** - * 分页列表查询 - * - * @param otaBaCxJsfzbacs - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-分页列表查询") - @ApiOperation(value="车型备案-驾驶辅助系统基础备案参数-分页列表查询", notes="车型备案-驾驶辅助系统基础备案参数-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxJsfzbacs otaBaCxJsfzbacs, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxJsfzbacs, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxJsfzbacsService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxJsfzbacsService otaBaCxJsfzbacsService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-列表查询") - @ApiOperation(value="车型备案-驾驶辅助系统基础备案参数-列表查询", notes="车型备案-驾驶辅助系统基础备案参数-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxJsfzbacs + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-分页列表查询") + @ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-分页列表查询", notes = "车型备案-驾驶辅助系统基础备案参数-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxJsfzbacs otaBaCxJsfzbacs, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxJsfzbacs, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxJsfzbacsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-列表查询") + @ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-列表查询", notes = "车型备案-驾驶辅助系统基础备案参数-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxJsfzbacsService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - */ - @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-添加") - @ApiOperation(value="车型备案-驾驶辅助系统基础备案参数-添加", notes="车型备案-驾驶辅助系统基础备案参数-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody JSONObject json) { - otaBaCxJsfzbacsService.add(json); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxJsfzbacs - * @return - */ - @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-编辑") - @ApiOperation(value="车型备案-驾驶辅助系统基础备案参数-编辑", notes="车型备案-驾驶辅助系统基础备案参数-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxJsfzbacs otaBaCxJsfzbacs) { - otaBaCxJsfzbacsService.editById(otaBaCxJsfzbacs); - 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) { - otaBaCxJsfzbacsService.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.otaBaCxJsfzbacsService.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) { - OtaBaCxJsfzbacs otaBaCxJsfzbacs = otaBaCxJsfzbacsService.queryById(id); - if(otaBaCxJsfzbacs==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxJsfzbacs); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxJsfzbacs - */ + * 添加 + */ + @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-添加") + @ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-添加", notes = "车型备案-驾驶辅助系统基础备案参数-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody JSONObject json) { + otaBaCxJsfzbacsService.add(json); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxJsfzbacs + * @return + */ + @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-编辑") + @ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-编辑", notes = "车型备案-驾驶辅助系统基础备案参数-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxJsfzbacs otaBaCxJsfzbacs) { + otaBaCxJsfzbacsService.editById(otaBaCxJsfzbacs); + 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) { + otaBaCxJsfzbacsService.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.otaBaCxJsfzbacsService.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) { + OtaBaCxJsfzbacs otaBaCxJsfzbacs = otaBaCxJsfzbacsService.queryById(id); + if (otaBaCxJsfzbacs == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxJsfzbacs); + } + + /** + * 通过otaId查询 + * + * @param otaId + * @return + */ + @AutoLog(value = "车型备案-驾驶辅助系统基础备案参数-通过id查询") + @ApiOperation(value = "车型备案-驾驶辅助系统基础备案参数-通过id查询", notes = "车型备案-驾驶辅助系统基础备案参数-通过id查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + JSONObject res = otaBaCxJsfzbacsService.queryByOtaId(otaId, otaIdT); + if (res == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(res); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxJsfzbacs + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxJsfzbacs otaBaCxJsfzbacs) { return super.exportXls(request, otaBaCxJsfzbacs, OtaBaCxJsfzbacs.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, OtaBaCxJsfzbacs.class); 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 50479b08a..ec41727b9 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 @@ -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.OtaBaCxKsjjsmccs; @@ -22,163 +24,163 @@ 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/otaBaCxKsjjsmccs") @Slf4j public class OtaBaCxKsjjsmccsController extends JeroController { - @Autowired - private IOtaBaCxKsjjsmccsService otaBaCxKsjjsmccsService; - - /** - * 分页列表查询 - * - * @param otaBaCxKsjjsmccs - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询") - @ApiOperation(value="车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询", notes="车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxKsjjsmccs otaBaCxKsjjsmccs, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxKsjjsmccs, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxKsjjsmccsService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxKsjjsmccsService otaBaCxKsjjsmccsService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询") - @ApiOperation(value="车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询", notes="车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxKsjjsmccs + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询") + @ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxKsjjsmccs otaBaCxKsjjsmccs, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxKsjjsmccs, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxKsjjsmccsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询") + @ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxKsjjsmccsService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxKsjjsmccs - * @return - */ - @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-添加") - @ApiOperation(value="车型备案-可在线升级的驾驶辅助功能名称与参数-添加", notes="车型备案-可在线升级的驾驶辅助功能名称与参数-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxKsjjsmccs otaBaCxKsjjsmccs) { - otaBaCxKsjjsmccsService.add(otaBaCxKsjjsmccs); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxKsjjsmccs - * @return - */ - @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-编辑") - @ApiOperation(value="车型备案-可在线升级的驾驶辅助功能名称与参数-编辑", notes="车型备案-可在线升级的驾驶辅助功能名称与参数-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxKsjjsmccs otaBaCxKsjjsmccs) { - otaBaCxKsjjsmccsService.editById(otaBaCxKsjjsmccs); - 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) { - otaBaCxKsjjsmccsService.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.otaBaCxKsjjsmccsService.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) { - OtaBaCxKsjjsmccs otaBaCxKsjjsmccs = otaBaCxKsjjsmccsService.queryById(id); - if(otaBaCxKsjjsmccs==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxKsjjsmccs); - } - - /** - * 通过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 otaBaCxKsjjsmccsList = otaBaCxKsjjsmccsService.queryByOtaId(otaId); - if(otaBaCxKsjjsmccsList==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxKsjjsmccsList); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxKsjjsmccs - */ + * 添加 + * + * @return + */ + @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-添加") + @ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-添加", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody JSONObject json) { + otaBaCxKsjjsmccsService.add(json); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxKsjjsmccs + * @return + */ + @AutoLog(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-编辑") + @ApiOperation(value = "车型备案-可在线升级的驾驶辅助功能名称与参数-编辑", notes = "车型备案-可在线升级的驾驶辅助功能名称与参数-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxKsjjsmccs otaBaCxKsjjsmccs) { + otaBaCxKsjjsmccsService.editById(otaBaCxKsjjsmccs); + 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) { + otaBaCxKsjjsmccsService.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.otaBaCxKsjjsmccsService.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) { + OtaBaCxKsjjsmccs otaBaCxKsjjsmccs = otaBaCxKsjjsmccsService.queryById(id); + if (otaBaCxKsjjsmccs == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxKsjjsmccs); + } + + /** + * 通过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, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + List otaBaCxKsjjsmccsList = otaBaCxKsjjsmccsService.queryByOtaId(otaId, otaIdT); + if (otaBaCxKsjjsmccsList == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxKsjjsmccsList); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxKsjjsmccs + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxKsjjsmccs otaBaCxKsjjsmccs) { return super.exportXls(request, otaBaCxKsjjsmccs, OtaBaCxKsjjsmccs.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, OtaBaCxKsjjsmccs.class); 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 d4bee2ecf..30f92d7b7 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 @@ -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.OtaBaCxKsjxtmccs; @@ -22,163 +24,163 @@ 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/otaBaCxKsjxtmccs") @Slf4j public class OtaBaCxKsjxtmccsController extends JeroController { - @Autowired - private IOtaBaCxKsjxtmccsService otaBaCxKsjxtmccsService; - - /** - * 分页列表查询 - * - * @param otaBaCxKsjxtmccs - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-可升级的系统名称参数-分页列表查询") - @ApiOperation(value="车型备案-可升级的系统名称参数-分页列表查询", notes="车型备案-可升级的系统名称参数-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxKsjxtmccs otaBaCxKsjxtmccs, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxKsjxtmccs, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxKsjxtmccsService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxKsjxtmccsService otaBaCxKsjxtmccsService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-可升级的系统名称参数-列表查询") - @ApiOperation(value="车型备案-可升级的系统名称参数-列表查询", notes="车型备案-可升级的系统名称参数-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxKsjxtmccs + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-可升级的系统名称参数-分页列表查询") + @ApiOperation(value = "车型备案-可升级的系统名称参数-分页列表查询", notes = "车型备案-可升级的系统名称参数-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxKsjxtmccs otaBaCxKsjxtmccs, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxKsjxtmccs, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxKsjxtmccsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-可升级的系统名称参数-列表查询") + @ApiOperation(value = "车型备案-可升级的系统名称参数-列表查询", notes = "车型备案-可升级的系统名称参数-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxKsjxtmccsService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxKsjxtmccs - * @return - */ - @AutoLog(value = "车型备案-可升级的系统名称参数-添加") - @ApiOperation(value="车型备案-可升级的系统名称参数-添加", notes="车型备案-可升级的系统名称参数-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) { - otaBaCxKsjxtmccsService.add(otaBaCxKsjxtmccs); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxKsjxtmccs - * @return - */ - @AutoLog(value = "车型备案-可升级的系统名称参数-编辑") - @ApiOperation(value="车型备案-可升级的系统名称参数-编辑", notes="车型备案-可升级的系统名称参数-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) { - otaBaCxKsjxtmccsService.editById(otaBaCxKsjxtmccs); - 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) { - otaBaCxKsjxtmccsService.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.otaBaCxKsjxtmccsService.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) { - OtaBaCxKsjxtmccs otaBaCxKsjxtmccs = otaBaCxKsjxtmccsService.queryById(id); - if(otaBaCxKsjxtmccs==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxKsjxtmccs); - } - - /** - * 通过otaId查询 - * - * @param otaId - * @return - */ - @AutoLog(value = "车型备案-可升级的系统名称参数-通过iotaId查询") - @ApiOperation(value="车型备案-可升级的系统名称参数-通过otaId查询", notes="车型备案-可升级的系统名称参数-通过otaId查询") - @GetMapping(value = "/queryByOtaId") - public Result queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { - List otaBaCxKsjxtmccsList = otaBaCxKsjxtmccsService.queryByOtaId(otaId); - if(otaBaCxKsjxtmccsList==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxKsjxtmccsList); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxKsjxtmccs - */ + * 添加 + * + * @return + */ + @AutoLog(value = "车型备案-可升级的系统名称参数-添加") + @ApiOperation(value = "车型备案-可升级的系统名称参数-添加", notes = "车型备案-可升级的系统名称参数-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody JSONObject json) { + otaBaCxKsjxtmccsService.add(json); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxKsjxtmccs + * @return + */ + @AutoLog(value = "车型备案-可升级的系统名称参数-编辑") + @ApiOperation(value = "车型备案-可升级的系统名称参数-编辑", notes = "车型备案-可升级的系统名称参数-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) { + otaBaCxKsjxtmccsService.editById(otaBaCxKsjxtmccs); + 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) { + otaBaCxKsjxtmccsService.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.otaBaCxKsjxtmccsService.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) { + OtaBaCxKsjxtmccs otaBaCxKsjxtmccs = otaBaCxKsjxtmccsService.queryById(id); + if (otaBaCxKsjxtmccs == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxKsjxtmccs); + } + + /** + * 通过otaId查询 + * + * @param otaId + * @return + */ + @AutoLog(value = "车型备案-可升级的系统名称参数-通过iotaId查询") + @ApiOperation(value = "车型备案-可升级的系统名称参数-通过otaId查询", notes = "车型备案-可升级的系统名称参数-通过otaId查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + List otaBaCxKsjxtmccsList = otaBaCxKsjxtmccsService.queryByOtaId(otaId, otaIdT); + if (otaBaCxKsjxtmccsList == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxKsjxtmccsList); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxKsjxtmccs + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) { return super.exportXls(request, otaBaCxKsjxtmccs, OtaBaCxKsjxtmccs.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, OtaBaCxKsjxtmccs.class); 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 fda20dfa9..299c6a205 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 @@ -13,178 +13,211 @@ import com.jero.modules.ota.service.IOtaBaCxListService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; /** * @Description: 车型及功能备案列表 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ -@Api(tags="车型及功能备案列表") +@Api(tags = "车型及功能备案列表") @RestController @RequestMapping("/ota/otaBaCxList") @Slf4j public class OtaBaCxListController extends JeroController { - @Autowired - private IOtaBaCxListService otaBaCxListService; - - /** - * 分页列表查询 - * - * @param otaBaCxList - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型及功能备案列表-分页列表查询") - @ApiOperation(value="车型及功能备案列表-分页列表查询", notes="车型及功能备案列表-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxList otaBaCxList, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxList, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxListService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxListService otaBaCxListService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型及功能备案列表-列表查询") - @ApiOperation(value="车型及功能备案列表-列表查询", notes="车型及功能备案列表-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxList + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型及功能备案列表-分页列表查询") + @ApiOperation(value = "车型及功能备案列表-分页列表查询", notes = "车型及功能备案列表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxList otaBaCxList, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxList, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxListService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型及功能备案列表-列表查询") + @ApiOperation(value = "车型及功能备案列表-列表查询", notes = "车型及功能备案列表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxListService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxList - * @return - */ - @AutoLog(value = "车型及功能备案列表-添加") - @ApiOperation(value="车型及功能备案列表-添加", notes="车型及功能备案列表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxList otaBaCxList) { - otaBaCxListService.add(otaBaCxList); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxList - * @return - */ - @AutoLog(value = "车型及功能备案列表-编辑") - @ApiOperation(value="车型及功能备案列表-编辑", notes="车型及功能备案列表-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxList otaBaCxList) { - otaBaCxListService.editById(otaBaCxList); - 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) { - otaBaCxListService.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.otaBaCxListService.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) { - OtaBaCxList otaBaCxList = otaBaCxListService.queryById(id); - if(otaBaCxList==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxList); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxList - */ + * 添加 + * + * @param otaBaCxList + * @return + */ + @AutoLog(value = "车型及功能备案列表-添加") + @ApiOperation(value = "车型及功能备案列表-添加", notes = "车型及功能备案列表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxList otaBaCxList) { + otaBaCxListService.add(otaBaCxList); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxList + * @return + */ + @AutoLog(value = "车型及功能备案列表-编辑") + @ApiOperation(value = "车型及功能备案列表-编辑", notes = "车型及功能备案列表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxList otaBaCxList) { + otaBaCxListService.editById(otaBaCxList); + 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) { + otaBaCxListService.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.otaBaCxListService.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) { + OtaBaCxList otaBaCxList = otaBaCxListService.queryById(id); + if (otaBaCxList == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxList); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxList + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxList otaBaCxList) { return super.exportXls(request, otaBaCxList, OtaBaCxList.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, OtaBaCxList.class); } - /** - * 备案维护 - * - */ - @AutoLog(value = "车型及功能备案列表-备案维护") - @ApiOperation(value = "车型及功能备案列表-备案维护", notes = "车型及功能备案列表-备案维护") - @PostMapping(value = "/batchRecord") - 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("备案维护成功!"); - } + /** + * 备案维护 + */ + @AutoLog(value = "车型及功能备案列表-备案维护") + @ApiOperation(value = "车型及功能备案列表-备案维护", notes = "车型及功能备案列表-备案维护") + @PostMapping(value = "/batchRecord") + 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("备案维护成功!"); + } - } + @AutoLog(value = "车型及功能备案列表-模板下载") + @ApiOperation(value = "车型及功能备案列表-模板下载") + @GetMapping(value = "/exportTemplate") +// @RequiresPermissions("otaBaCx:exportTemplate") + public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception { + this.otaBaCxListService.exportTemplate(response, request); + } + + @AutoLog(value = "车型及功能备案列表-数据导入") + @ApiOperation(value = "车型及功能备案列表-数据导入") + @PostMapping(value = "/importData") +// @RequiresPermissions("otaBaCx:importData") + public Result importData(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut", required = false) String cut) throws Exception { + try { + this.otaBaCxListService.importData(file, cut); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.getMessage()); + } + return Result.OK("导入成功"); + } + + @AutoLog(value = "车型及功能备案列表-数据导出") + @ApiOperation(value = "车型及功能备案列表-数据导出") + @GetMapping(value = "/exportData") +// @RequiresPermissions("otaBaCx:exportTemplate") + public void exportData(@RequestParam(value = "otaId", required = false) String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception { + this.otaBaCxListService.exportData(otaId, response, request); + } + +} 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 e2275af08..aeebf3194 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 @@ -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.OtaBaCxQt; @@ -22,163 +23,161 @@ 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/otaBaCxQt") @Slf4j public class OtaBaCxQtController extends JeroController { - @Autowired - private IOtaBaCxQtService otaBaCxQtService; - - /** - * 分页列表查询 - * - * @param otaBaCxQt - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-其他升级信息-分页列表查询") - @ApiOperation(value="车型备案-其他升级信息-分页列表查询", notes="车型备案-其他升级信息-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxQt otaBaCxQt, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxQt, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxQtService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxQtService otaBaCxQtService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-其他升级信息-列表查询") - @ApiOperation(value="车型备案-其他升级信息-列表查询", notes="车型备案-其他升级信息-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxQt + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-其他升级信息-分页列表查询") + @ApiOperation(value = "车型备案-其他升级信息-分页列表查询", notes = "车型备案-其他升级信息-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxQt otaBaCxQt, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxQt, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxQtService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-其他升级信息-列表查询") + @ApiOperation(value = "车型备案-其他升级信息-列表查询", notes = "车型备案-其他升级信息-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxQtService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxQt - * @return - */ - @AutoLog(value = "车型备案-其他升级信息-添加") - @ApiOperation(value="车型备案-其他升级信息-添加", notes="车型备案-其他升级信息-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxQt otaBaCxQt) { - otaBaCxQtService.add(otaBaCxQt); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxQt - * @return - */ - @AutoLog(value = "车型备案-其他升级信息-编辑") - @ApiOperation(value="车型备案-其他升级信息-编辑", notes="车型备案-其他升级信息-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxQt otaBaCxQt) { - otaBaCxQtService.editById(otaBaCxQt); - 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) { - otaBaCxQtService.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.otaBaCxQtService.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) { - OtaBaCxQt otaBaCxQt = otaBaCxQtService.queryById(id); - if(otaBaCxQt==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxQt); - } - - /** - * 通过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) { - OtaBaCxQt otaBaCxQt = otaBaCxQtService.queryByOtaId(otaId); - if(otaBaCxQt==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxQt); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxQt - */ + * 添加 + * + * @param otaBaCxQt + * @return + */ + @AutoLog(value = "车型备案-其他升级信息-添加") + @ApiOperation(value = "车型备案-其他升级信息-添加", notes = "车型备案-其他升级信息-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxQt otaBaCxQt) { + otaBaCxQtService.add(otaBaCxQt); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxQt + * @return + */ + @AutoLog(value = "车型备案-其他升级信息-编辑") + @ApiOperation(value = "车型备案-其他升级信息-编辑", notes = "车型备案-其他升级信息-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxQt otaBaCxQt) { + otaBaCxQtService.editById(otaBaCxQt); + 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) { + otaBaCxQtService.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.otaBaCxQtService.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) { + OtaBaCxQt otaBaCxQt = otaBaCxQtService.queryById(id); + if (otaBaCxQt == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxQt); + } + + /** + * 通过otaId查询 + */ + @AutoLog(value = "车型备案-其他升级信息-通过otaId查询") + @ApiOperation(value = "车型备案-其他升级信息-通过otaId查询", notes = "车型备案-其他升级信息-通过otaId查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + OtaBaCxQt otaBaCxQt = otaBaCxQtService.queryByOtaId(otaId, otaIdT); + if (otaBaCxQt == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxQt); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxQt + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxQt otaBaCxQt) { return super.exportXls(request, otaBaCxQt, OtaBaCxQt.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, OtaBaCxQt.class); 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 83a8c36bf..39a914252 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 @@ -144,6 +144,23 @@ public class OtaBaCxTxjlController extends JeroController queryByOtaId(@RequestParam(name="otaId",required=true) String otaId) { + List otaBaCxTxjlList = otaBaCxTxjlService.queryByOtaId(otaId); + if(otaBaCxTxjlList==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxTxjlList); + } + /** * 导出excel * 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 83ef09d61..35ed36890 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 @@ -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.OtaBaCxZxsjyq; @@ -22,163 +23,161 @@ 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/otaBaCxZxsjyq") @Slf4j public class OtaBaCxZxsjyqController extends JeroController { - @Autowired - private IOtaBaCxZxsjyqService otaBaCxZxsjyqService; - - /** - * 分页列表查询 - * - * @param otaBaCxZxsjyq - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-在线升级要求-分页列表查询") - @ApiOperation(value="车型备案-在线升级要求-分页列表查询", notes="车型备案-在线升级要求-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaCxZxsjyq otaBaCxZxsjyq, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxZxsjyq, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = otaBaCxZxsjyqService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaCxZxsjyqService otaBaCxZxsjyqService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-在线升级要求-列表查询") - @ApiOperation(value="车型备案-在线升级要求-列表查询", notes="车型备案-在线升级要求-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaCxZxsjyq + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-在线升级要求-分页列表查询") + @ApiOperation(value = "车型备案-在线升级要求-分页列表查询", notes = "车型备案-在线升级要求-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaCxZxsjyq otaBaCxZxsjyq, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaCxZxsjyq, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = otaBaCxZxsjyqService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-在线升级要求-列表查询") + @ApiOperation(value = "车型备案-在线升级要求-列表查询", notes = "车型备案-在线升级要求-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaCxZxsjyqService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaCxZxsjyq - * @return - */ - @AutoLog(value = "车型备案-在线升级要求-添加") - @ApiOperation(value="车型备案-在线升级要求-添加", notes="车型备案-在线升级要求-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaCxZxsjyq otaBaCxZxsjyq) { - otaBaCxZxsjyqService.add(otaBaCxZxsjyq); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param otaBaCxZxsjyq - * @return - */ - @AutoLog(value = "车型备案-在线升级要求-编辑") - @ApiOperation(value="车型备案-在线升级要求-编辑", notes="车型备案-在线升级要求-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaCxZxsjyq otaBaCxZxsjyq) { - otaBaCxZxsjyqService.editById(otaBaCxZxsjyq); - 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) { - otaBaCxZxsjyqService.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.otaBaCxZxsjyqService.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) { - OtaBaCxZxsjyq otaBaCxZxsjyq = otaBaCxZxsjyqService.queryById(id); - if(otaBaCxZxsjyq==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxZxsjyq); - } - - /** - * 通过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) { - OtaBaCxZxsjyq otaBaCxZxsjyq = otaBaCxZxsjyqService.queryByOtaId(otaId); - if(otaBaCxZxsjyq==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaCxZxsjyq); - } + } /** - * 导出excel - * - * @param request - * @param otaBaCxZxsjyq - */ + * 添加 + * + * @param otaBaCxZxsjyq + * @return + */ + @AutoLog(value = "车型备案-在线升级要求-添加") + @ApiOperation(value = "车型备案-在线升级要求-添加", notes = "车型备案-在线升级要求-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaCxZxsjyq otaBaCxZxsjyq) { + otaBaCxZxsjyqService.add(otaBaCxZxsjyq); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param otaBaCxZxsjyq + * @return + */ + @AutoLog(value = "车型备案-在线升级要求-编辑") + @ApiOperation(value = "车型备案-在线升级要求-编辑", notes = "车型备案-在线升级要求-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaCxZxsjyq otaBaCxZxsjyq) { + otaBaCxZxsjyqService.editById(otaBaCxZxsjyq); + 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) { + otaBaCxZxsjyqService.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.otaBaCxZxsjyqService.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) { + OtaBaCxZxsjyq otaBaCxZxsjyq = otaBaCxZxsjyqService.queryById(id); + if (otaBaCxZxsjyq == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxZxsjyq); + } + + /** + * 通过OtaId查询 + */ + @AutoLog(value = "车型备案-在线升级要求-通过otaId查询") + @ApiOperation(value = "车型备案-在线升级要求-通过otaId查询", notes = "车型备案-在线升级要求-通过otaId查询") + @GetMapping(value = "/queryByOtaId") + public Result queryByOtaId(@RequestParam(name = "otaId", required = true) String otaId, + @RequestParam(name = "otaIdT", required = true) String otaIdT) { + OtaBaCxZxsjyq otaBaCxZxsjyq = otaBaCxZxsjyqService.queryByOtaId(otaId, otaIdT); + if (otaBaCxZxsjyq == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaCxZxsjyq); + } + + /** + * 导出excel + * + * @param request + * @param otaBaCxZxsjyq + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaCxZxsjyq otaBaCxZxsjyq) { return super.exportXls(request, otaBaCxZxsjyq, OtaBaCxZxsjyq.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, OtaBaCxZxsjyq.class); 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 7a811c958..33f78145a 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 @@ -94,6 +94,7 @@ public class OtaBaCxList implements Serializable { /**备案状态*/ @Excel(name = "备案状态", width = 15) @ApiModelProperty(value = "备案状态") + @Dict(dicCode = "recordstatus") private java.lang.String bazt; /**备案提交时间*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxLsjl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxLsjl.java index d8bc16441..1eb15f9a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxLsjl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaCxLsjl.java @@ -68,6 +68,7 @@ public class OtaBaCxLsjl implements Serializable { /**数据状态*/ @Excel(name = "数据状态", width = 15) + @Dict(dicCode = "recordstatus") @ApiModelProperty(value = "数据状态") private java.lang.String sjzt; 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 9270db381..48e66e4f2 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 @@ -2,62 +2,63 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxAqcs; import com.baomidou.mybatisplus.extension.service.IService; + import java.util.List; /** * @Description: 车型备案-安全措施 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxAqcsService extends IService { - /** - * 保存 - * - * @param otaBaCxAqcs - * @return - */ + /** + * 保存 + * + * @param otaBaCxAqcs + * @return + */ void add(OtaBaCxAqcs otaBaCxAqcs); - /** - * 更新 - * - * @param otaBaCxAqcs - * @return - */ + /** + * 更新 + * + * @param otaBaCxAqcs + * @return + */ void editById(OtaBaCxAqcs otaBaCxAqcs); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxAqcs queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); - OtaBaCxAqcs queryByOtaId(String otaId); + OtaBaCxAqcs queryByOtaId(String otaId, String otaIdT); } 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 16bfdfac7..3dfe77d18 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 @@ -59,5 +59,5 @@ public interface IOtaBaCxJbxxService extends IService { */ List queryList(); - OtaBaCxJbxx queryByOtaId(String otaId); + OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT); } 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 6ff82cd8a..fffadf575 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 @@ -3,59 +3,62 @@ 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; /** * @Description: 车型备案-驾驶辅助系统基础备案参数 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxJsfzbacsService extends IService { - /** - * 保存 - * - * @return - */ + /** + * 保存 + * + * @return + */ void add(JSONObject json); - /** - * 更新 - * - * @param otaBaCxJsfzbacs - * @return - */ + /** + * 更新 + * + * @param otaBaCxJsfzbacs + * @return + */ void editById(OtaBaCxJsfzbacs otaBaCxJsfzbacs); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxJsfzbacs queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @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/IOtaBaCxKsjjsmccsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxKsjjsmccsService.java index 7e54fb19f..cc60c8c9f 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 @@ -1,63 +1,64 @@ package com.jero.modules.ota.service; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; import com.baomidou.mybatisplus.extension.service.IService; + import java.util.List; /** * @Description: 车型备案-可在线升级的驾驶辅助功能名称与参数 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxKsjjsmccsService extends IService { - /** - * 保存 - * - * @param otaBaCxKsjjsmccs - * @return - */ - void add(OtaBaCxKsjjsmccs otaBaCxKsjjsmccs); + /** + * 保存 + * + * @return + */ + void add(JSONObject json); - /** - * 更新 - * - * @param otaBaCxKsjjsmccs - * @return - */ + /** + * 更新 + * + * @param otaBaCxKsjjsmccs + * @return + */ void editById(OtaBaCxKsjjsmccs otaBaCxKsjjsmccs); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxKsjjsmccs queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); - List queryByOtaId(String otaId); + List queryByOtaId(String otaId, String otaIdT); } 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 4aafb2ab6..54e9178be 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 @@ -1,63 +1,64 @@ package com.jero.modules.ota.service; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; import com.baomidou.mybatisplus.extension.service.IService; + import java.util.List; /** * @Description: 车型备案-可升级的系统名称参数 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxKsjxtmccsService extends IService { - /** - * 保存 - * - * @param otaBaCxKsjxtmccs - * @return - */ - void add(OtaBaCxKsjxtmccs otaBaCxKsjxtmccs); + /** + * 保存 + * + * @return + */ + void add(JSONObject json); - /** - * 更新 - * - * @param otaBaCxKsjxtmccs - * @return - */ + /** + * 更新 + * + * @param otaBaCxKsjxtmccs + * @return + */ void editById(OtaBaCxKsjxtmccs otaBaCxKsjxtmccs); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxKsjxtmccs queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); - List queryByOtaId(String otaId); + List queryByOtaId(String otaId, String otaIdT); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java index 4ada7932b..4e094f309 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java @@ -2,7 +2,10 @@ package com.jero.modules.ota.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.ota.entity.OtaBaCxList; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -65,4 +68,10 @@ public interface IOtaBaCxListService extends IService { * */ void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); + + void exportTemplate(HttpServletResponse response, HttpServletRequest request); + + void importData(MultipartFile file, String cut); + + void exportData(String otaId, HttpServletResponse response, HttpServletRequest request); } 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 6754ab5cd..87c533712 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 @@ -2,62 +2,63 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxQt; import com.baomidou.mybatisplus.extension.service.IService; + import java.util.List; /** * @Description: 车型备案-其他升级信息 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxQtService extends IService { - /** - * 保存 - * - * @param otaBaCxQt - * @return - */ + /** + * 保存 + * + * @param otaBaCxQt + * @return + */ void add(OtaBaCxQt otaBaCxQt); - /** - * 更新 - * - * @param otaBaCxQt - * @return - */ + /** + * 更新 + * + * @param otaBaCxQt + * @return + */ void editById(OtaBaCxQt otaBaCxQt); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxQt queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); - OtaBaCxQt queryByOtaId(String otaId); + OtaBaCxQt queryByOtaId(String otaId, String otaIdT); } 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 index b26b288f2..7af1c2060 100644 --- 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 @@ -58,4 +58,6 @@ public interface IOtaBaCxTxjlService 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/IOtaBaCxZxsjyqService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxZxsjyqService.java index 3106924c9..ad8232b57 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 @@ -2,62 +2,63 @@ package com.jero.modules.ota.service; import com.jero.modules.ota.entity.OtaBaCxZxsjyq; import com.baomidou.mybatisplus.extension.service.IService; + import java.util.List; /** * @Description: 车型备案-在线升级要求 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ public interface IOtaBaCxZxsjyqService extends IService { - /** - * 保存 - * - * @param otaBaCxZxsjyq - * @return - */ + /** + * 保存 + * + * @param otaBaCxZxsjyq + * @return + */ void add(OtaBaCxZxsjyq otaBaCxZxsjyq); - /** - * 更新 - * - * @param otaBaCxZxsjyq - * @return - */ + /** + * 更新 + * + * @param otaBaCxZxsjyq + * @return + */ void editById(OtaBaCxZxsjyq otaBaCxZxsjyq); - /** - * 通过id删除 - * - * @param id - * @return - */ + /** + * 通过id删除 + * + * @param id + * @return + */ void deleteById(String id); - /** - * 批量删除 - * - * @param ids - * @return - */ + /** + * 批量删除 + * + * @param ids + * @return + */ void deleteByIds(List ids); - /** - * 通过id查询 - * - * @param id - * @return - */ + /** + * 通过id查询 + * + * @param id + * @return + */ OtaBaCxZxsjyq queryById(String id); /** - * 列表查询 - * - * @return - */ + * 列表查询 + * + * @return + */ List queryList(); - OtaBaCxZxsjyq queryByOtaId(String otaId); + OtaBaCxZxsjyq queryByOtaId(String otaId, String otaIdT); } 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 90dc62174..c5ab78650 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 @@ -5,95 +5,112 @@ 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.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 车型备案-安全措施 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaCxAqcsServiceImpl extends ServiceImpl implements IOtaBaCxAqcsService { - /** - * 保存 - * - * @param otaBaCxAqcs - * @return - */ - @Override + /** + * 保存 + * + * @param otaBaCxAqcs + * @return + */ + @Override public void add(OtaBaCxAqcs otaBaCxAqcs) { Date now = new Date(); - otaBaCxAqcs.setCreateTime(now); - otaBaCxAqcs.setUpdateTime(now); - save(otaBaCxAqcs); + if (null != otaBaCxAqcs) { + OtaBaCxAqcs otaBaCxAqcsOld = this.getByOtaId(otaBaCxAqcs.getOtaId()); + if (null != otaBaCxAqcsOld) { + otaBaCxAqcs.setId(otaBaCxAqcsOld.getId()); + } else { + otaBaCxAqcs.setCreateTime(now); + } + otaBaCxAqcs.setUpdateTime(now); + saveOrUpdate(otaBaCxAqcs); + } } - /** - * 更新 - * - * @param otaBaCxAqcs - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaCxAqcs + * @return + */ + @Override public void editById(OtaBaCxAqcs otaBaCxAqcs) { - Date now = new Date(); + Date now = new Date(); otaBaCxAqcs.setUpdateTime(now); - saveOrUpdate(otaBaCxAqcs); + saveOrUpdate(otaBaCxAqcs); } - /** - * 通过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 OtaBaCxAqcs queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List 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; - } + @Override + public OtaBaCxAqcs queryByOtaId(String otaId, String otaIdT) { + OtaBaCxAqcs res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private OtaBaCxAqcs getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxAqcs::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } 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 cb6434621..3135280a4 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 @@ -7,6 +7,7 @@ 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.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -110,10 +111,18 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); - OtaBaCxJbxx res = this.getOne(queryWrapper); + public OtaBaCxJbxx queryByOtaId(String otaId, String otaIdT){ + //判断是否保存过，否则查询模版数据回显 + OtaBaCxJbxx res = getByOtaId(otaId); + if(ObjectUtils.isEmpty(res)){ + res = getByOtaId(otaIdT); + } return res; } + + private OtaBaCxJbxx getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); + return this.getOne(queryWrapper,false); + } } 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 6f76dccc1..54f3b6d80 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 @@ -3,12 +3,16 @@ package com.jero.modules.ota.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.ota.entity.OtaBaCxJsfzbacs; +import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; +import com.jero.modules.ota.entity.OtaBaCxLsjl; 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.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,7 +50,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl sjmkList = parseKzqData(kzq,otaId); + List sjmkList = parseKzqData(kzq, otaId); OtaBaCxSjmkService.saveBatch(sjmkList); } @@ -54,7 +58,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl parseKzqData(JSONArray kzq,String otaId) { + private List parseKzqData(JSONArray kzq, String otaId) { List sjmkList = new ArrayList<>(); for (Object kzqJson : kzq) { HashMap kzqMap = (HashMap) kzqJson; @@ -76,96 +80,120 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl 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(); - } + + /** + * 解析部件数据 + */ + 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(); } } } - - /** - * 更新 - * - * @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(); + 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 ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public OtaBaCxJsfzbacs queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public JSONObject queryByOtaId(String otaId, String otaIdT) { + JSONObject res = new JSONObject(); + res.put("otaId", otaId); + OtaBaCxJsfzbacs otaBaCxJsfzbacs = getByOtaId(otaId); + List kzqList = OtaBaCxSjmkService.queryByOtaId(otaId); + if (ObjectUtils.isEmpty(otaBaCxJsfzbacs)) { + otaBaCxJsfzbacs = getByOtaId(otaIdT); + kzqList = OtaBaCxSjmkService.queryByOtaId(otaIdT); + } + res.put("bj", otaBaCxJsfzbacs); + res.put("kzq", kzqList); + return res; + } + + private OtaBaCxJsfzbacs getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxJsfzbacs::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } + + +} 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 097f4a743..1359e5eec 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,14 +1,20 @@ 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.OtaBaCxJsfzbacs; import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; +import com.jero.modules.ota.entity.OtaBaCxSjmk; import com.jero.modules.ota.mapper.OtaBaCxKsjjsmccsMapper; import com.jero.modules.ota.service.IOtaBaCxKsjjsmccsService; +import com.jero.modules.system.util.StringUtils; 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; @@ -24,15 +30,36 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl objMap = (HashMap) obj; + OtaBaCxKsjjsmccs otaBaCxJsfzbacs = new OtaBaCxKsjjsmccs(); + Field[] fields = OtaBaCxKsjjsmccs.class.getDeclaredFields(); + for (Field field : fields) { + Object bjObj = objMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaCxJsfzbacs, bjObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + otaBaCxJsfzbacs.setOtaId(otaId); + otaBaCxJsfzbacs.setCreateTime(now); + otaBaCxJsfzbacs.setUpdateTime(now); + save(otaBaCxJsfzbacs); + } + } } /** @@ -92,10 +119,26 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl queryByOtaId(String otaId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId); - List res = this.list(queryWrapper); + public List queryByOtaId(String otaId, String otaIdT) { + List res = this.getByOtaId(otaId); + if (ObjectUtil.isEmpty(res)) { + res = getByOtaId(otaIdT); + } return res; } + + private List getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId); + return this.list(queryWrapper); + } + + public void deleteByOtaId(String otaId) { + List list = this.getByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaCxKsjjsmccs mccs : list) { + ids.add(mccs.getId()); + } + this.deleteByIds(ids); + } } 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 91ba256c9..d642ec014 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,99 +1,143 @@ 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.OtaBaCxJbxx; +import com.jero.modules.ota.entity.OtaBaCxKsjjsmccs; import com.jero.modules.ota.entity.OtaBaCxKsjxtmccs; import com.jero.modules.ota.mapper.OtaBaCxKsjxtmccsMapper; import com.jero.modules.ota.service.IOtaBaCxKsjxtmccsService; +import com.jero.modules.system.util.StringUtils; 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 OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl implements IOtaBaCxKsjxtmccsService { - /** - * 保存 - * - * @param otaBaCxKsjxtmccs - * @return - */ - @Override - public void add(OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) { + /** + * 保存 + * + * @return + */ + @Override + public void add(JSONObject json) { Date now = new Date(); - otaBaCxKsjxtmccs.setCreateTime(now); - otaBaCxKsjxtmccs.setUpdateTime(now); - save(otaBaCxKsjxtmccs); + String otaId = (String) json.get("otaId"); + if (StringUtils.isNotEmpty(otaId)) { + deleteByOtaId(otaId); + JSONArray list = json.getJSONArray("list"); + for (Object obj : list) { + Map objMap = (HashMap) obj; + OtaBaCxKsjxtmccs otaBaCxKsjxtmccs = new OtaBaCxKsjxtmccs(); + Field[] fields = OtaBaCxKsjxtmccs.class.getDeclaredFields(); + for (Field field : fields) { + Object bjObj = objMap.get(field.getName()); + if (null != bjObj) { + try { + field.setAccessible(true); + field.set(otaBaCxKsjxtmccs, bjObj.toString()); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + otaBaCxKsjxtmccs.setOtaId(otaId); + otaBaCxKsjxtmccs.setCreateTime(now); + otaBaCxKsjxtmccs.setUpdateTime(now); + save(otaBaCxKsjxtmccs); + } + } } - /** - * 更新 - * - * @param otaBaCxKsjxtmccs - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaCxKsjxtmccs + * @return + */ + @Override public void editById(OtaBaCxKsjxtmccs otaBaCxKsjxtmccs) { - Date now = new Date(); + Date now = new Date(); otaBaCxKsjxtmccs.setUpdateTime(now); - saveOrUpdate(otaBaCxKsjxtmccs); + saveOrUpdate(otaBaCxKsjxtmccs); } - /** - * 通过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 OtaBaCxKsjxtmccs 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(OtaBaCxKsjxtmccs::getOtaId, otaId); - List res = this.list(queryWrapper); - return res; - } + @Override + public List queryByOtaId(String otaId, String otaIdT) { + List res = getByOtaId(otaId); + if (ObjectUtil.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private List getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxKsjxtmccs::getOtaId, otaId); + return this.list(queryWrapper); + } + + public void deleteByOtaId(String otaId) { + List list = this.getByOtaId(otaId); + List ids = new ArrayList<>(); + for (OtaBaCxKsjxtmccs mccs : list) { + ids.add(mccs.getId()); + } + this.deleteByIds(ids); + } } 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 e45ad75c7..82df62d98 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 @@ -1,17 +1,29 @@ package com.jero.modules.ota.service.impl; +import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; 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.mapper.OtaBaCxListMapper; import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.ota.service.IOtaBaCxLsjlService; +import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.io.FileUtils; +import org.apache.ibatis.logging.Log; +import org.apache.ibatis.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,11 +36,17 @@ import java.util.List; @Service public class OtaBaCxListServiceImpl extends ServiceImpl implements IOtaBaCxListService { + protected Log log = LogFactory.getLog(this.getClass()); + private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @Autowired private IOtaBaCxLsjlService otaBaCxLsjlService; + + @Value(value = "${jero.path.upload}") + private String uploadpath; + /** * 保存 * @@ -40,7 +58,7 @@ public class OtaBaCxListServiceImpl extends ServiceImpl 2) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); + } else { + throw new JeroBootException("There must be only one folder in the compressed package Please upload it again"); + } + + } + File fileNew = new File(zipEntryName); + List fileList = new ArrayList<>(); + for (File file1 : fileNew.listFiles()) { + log.error("压缩包中的文件：" + file1.getName()); + if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) { + fileList.add(file1); + } + } + if (fileList.size() == 0) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传"); + } else { + throw new JeroBootException("Excel does not exist in the root directory of the compressed package Please upload it again"); + } + } else if (fileList.size() > 1) { + //删除原上传文件 + FileUnZip.deleteDir(saveDirectory); + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); + } else { + throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again"); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void exportData(String otaId, HttpServletResponse response, HttpServletRequest request) { + log.error("otaId：" + otaId); + File template = new File("D://opt//ota//车型及功能备案.zip"); + BufferedOutputStream os = null; + InputStream in = null; + try { + in = new FileInputStream(template); + response.setHeader("Content-disposition", "attachment;filename=" + template.getName()); + response.setContentType("application/octet-stream;charset=UTF-8"); + os = new BufferedOutputStream(response.getOutputStream()); + int len; + while ((len = in.read()) != -1) { + os.write(len); + os.flush(); + } + in.close(); + os.close(); + } catch (Exception e) { + throw new JeroBootException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(in); + IOUtils.closeQuietly(os); + } + } } 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 779b51a39..66a7184ed 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 @@ -30,7 +30,7 @@ public class OtaBaCxLsjlServiceImpl extends ServiceImpl implements IOtaBaCxQtService { - /** - * 保存 - * - * @param otaBaCxQt - * @return - */ - @Override + /** + * 保存 + * + * @param otaBaCxQt + * @return + */ + @Override public void add(OtaBaCxQt otaBaCxQt) { Date now = new Date(); - otaBaCxQt.setCreateTime(now); - otaBaCxQt.setUpdateTime(now); - save(otaBaCxQt); + if (null != otaBaCxQt) { + OtaBaCxQt otaBaCxQtOld = this.getByOtaId(otaBaCxQt.getOtaId()); + if (null != otaBaCxQtOld) { + otaBaCxQt.setId(otaBaCxQtOld.getId()); + } else { + otaBaCxQt.setCreateTime(now); + } + otaBaCxQt.setUpdateTime(now); + saveOrUpdate(otaBaCxQt); + } } - /** - * 更新 - * - * @param otaBaCxQt - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaCxQt + * @return + */ + @Override public void editById(OtaBaCxQt otaBaCxQt) { - Date now = new Date(); + Date now = new Date(); otaBaCxQt.setUpdateTime(now); - saveOrUpdate(otaBaCxQt); + saveOrUpdate(otaBaCxQt); } - /** - * 通过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 OtaBaCxQt queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List 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; } + @Override + public OtaBaCxQt queryByOtaId(String otaId, String otaIdT) { + OtaBaCxQt res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + public OtaBaCxQt getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxQt::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } + } 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 83a48550d..904dbb49f 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 @@ -31,7 +31,7 @@ public class OtaBaCxSjmkServiceImpl extends ServiceImpl implements IOtaBaCxTxjlService { - /** - * 保存 - * - * @param otaBaCxTxjl - * @return - */ - @Override + /** + * 保存 + * + * @param otaBaCxTxjl + * @return + */ + @Override public void add(OtaBaCxTxjl otaBaCxTxjl) { Date now = new Date(); otaBaCxTxjl.setCreateTime(now); otaBaCxTxjl.setUpdateTime(now); - save(otaBaCxTxjl); + saveOrUpdate(otaBaCxTxjl); } - /** - * 更新 - * - * @param otaBaCxTxjl - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaCxTxjl + * @return + */ + @Override public void editById(OtaBaCxTxjl otaBaCxTxjl) { - Date now = new Date(); + Date now = new Date(); otaBaCxTxjl.setUpdateTime(now); - saveOrUpdate(otaBaCxTxjl); + saveOrUpdate(otaBaCxTxjl); } - /** - * 通过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 OtaBaCxTxjl 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(OtaBaCxTxjl::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/OtaBaCxZxsjyqServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxZxsjyqServiceImpl.java index ea00d03c8..99d60484c 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 @@ -5,95 +5,113 @@ 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; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; + import java.util.List; import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 车型备案-在线升级要求 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Service public class OtaBaCxZxsjyqServiceImpl extends ServiceImpl implements IOtaBaCxZxsjyqService { - /** - * 保存 - * - * @param otaBaCxZxsjyq - * @return - */ - @Override + /** + * 保存 + * + * @param otaBaCxZxsjyq + * @return + */ + @Override public void add(OtaBaCxZxsjyq otaBaCxZxsjyq) { Date now = new Date(); - otaBaCxZxsjyq.setCreateTime(now); + if (otaBaCxZxsjyq.getOtaId() != null) { + OtaBaCxZxsjyq otaBaCxZxsjyqOld = getByOtaId(otaBaCxZxsjyq.getOtaId()); + if (otaBaCxZxsjyqOld != null) { + otaBaCxZxsjyq.setId(otaBaCxZxsjyqOld.getId()); + } else { + otaBaCxZxsjyq.setCreateTime(now); + } + } otaBaCxZxsjyq.setUpdateTime(now); - save(otaBaCxZxsjyq); + saveOrUpdate(otaBaCxZxsjyq); } - /** - * 更新 - * - * @param otaBaCxZxsjyq - * @return - */ - @Override + /** + * 更新 + * + * @param otaBaCxZxsjyq + * @return + */ + @Override public void editById(OtaBaCxZxsjyq otaBaCxZxsjyq) { - Date now = new Date(); + Date now = new Date(); otaBaCxZxsjyq.setUpdateTime(now); - saveOrUpdate(otaBaCxZxsjyq); + saveOrUpdate(otaBaCxZxsjyq); } - /** - * 通过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 OtaBaCxZxsjyq queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List 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; - } + @Override + public OtaBaCxZxsjyq queryByOtaId(String otaId, String otaIdT) { + //判断是否保存过，否则查询模版数据回显 + OtaBaCxZxsjyq res = getByOtaId(otaId); + if (ObjectUtils.isEmpty(res)) { + res = getByOtaId(otaIdT); + } + return res; + } + + private OtaBaCxZxsjyq getByOtaId(String otaId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OtaBaCxZxsjyq::getOtaId, otaId); + return this.getOne(queryWrapper, false); + } } diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 9a3b0adc9..c8d40b80f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -871,13 +871,12 @@ export default { otaIdT='' } getAction('/ota/otaBaCxJsfzbacs/queryByOtaId',{otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ - if(res == 200 ) { if(res.code==200){ if(res.result.kzq.length == 0){ this.dataSourceList=[ - { - bjmc:'车端OTA升级功能模块' - } + { + bjmc:'车端OTA升级功能模块' + } ] }else{ res.result.kzq.forEach(item=>{ @@ -885,20 +884,24 @@ export default { }) this.dataSourceList=res.result.kzq } - - this.dataSource.forEach(item=>{ for(let key in res.result.bj){ - if(item.val==key){ + if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0){ + res.result.bj[key]=Number(res.result.bj[key]) + } + if(item.key==key){ item.val=res.result.bj[key] } } }) - } - res.result.bj.forEach(item=>{ - item=Number(item) - }) + + + // res.result.bj.forEach(item=>{ + // if(Number(item) !=NaN){ + // item=Number(item) + // } + // }) this.query=res.result.bj } })