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 5e080b288..b7a9c3405 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 @@ -87,7 +87,7 @@ public class OtaBaCxListController extends JeroController { - @Autowired - private IOtaBaSjGnxtwhService otaBaSjGnxtwhService; - - /** - * 分页列表查询 - * - * @param otaBaSjGnxtwh - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-分页列表查询") - @ApiOperation(value="车型备案-功能系统维护-分页列表查询", notes="车型备案-功能系统维护-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(OtaBaSjGnxtwh otaBaSjGnxtwh, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - queryWrapper.orderByDesc("create_time"); - IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); - return Result.OK(pageList); - } + @Autowired + private IOtaBaSjGnxtwhService otaBaSjGnxtwhService; /** - * 列表查询 - * - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-列表查询") - @ApiOperation(value="车型备案-功能系统维护-列表查询", notes="车型备案-功能系统维护-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + * + * @param otaBaSjGnxtwh + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-分页列表查询") + @ApiOperation(value = "车型备案-功能系统维护-分页列表查询", notes = "车型备案-功能系统维护-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(OtaBaSjGnxtwh otaBaSjGnxtwh, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time"); + IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-列表查询") + @ApiOperation(value = "车型备案-功能系统维护-列表查询", notes = "车型备案-功能系统维护-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = otaBaSjGnxtwhService.queryList(); return Result.OK(list); - } - - /** - * 添加 - * - * @param otaBaSjGnxtwh - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-添加") - @ApiOperation(value="车型备案-功能系统维护-添加", notes="车型备案-功能系统维护-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { - otaBaSjGnxtwhService.add(otaBaSjGnxtwh); - return Result.OK("添加成功!"); - } - - /** - * 编辑 - * - * @param otaBaSjGnxtwh - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-编辑") - @ApiOperation(value="车型备案-功能系统维护-编辑", notes="车型备案-功能系统维护-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { - otaBaSjGnxtwhService.editById(otaBaSjGnxtwh); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-通过id删除") - @ApiOperation(value="车型备案-功能系统维护-通过id删除", notes="车型备案-功能系统维护-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - otaBaSjGnxtwhService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-批量删除") - @ApiOperation(value="车型备案-功能系统维护-批量删除", notes="车型备案-功能系统维护-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.otaBaSjGnxtwhService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "车型备案-功能系统维护-通过id查询") - @ApiOperation(value="车型备案-功能系统维护-通过id查询", notes="车型备案-功能系统维护-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - OtaBaSjGnxtwh otaBaSjGnxtwh = otaBaSjGnxtwhService.queryById(id); - if(otaBaSjGnxtwh==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(otaBaSjGnxtwh); - } + } /** - * 导出excel - * - * @param request - * @param otaBaSjGnxtwh - */ + * 添加 + * + * @param otaBaSjGnxtwh + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-添加") + @ApiOperation(value = "车型备案-功能系统维护-添加", notes = "车型备案-功能系统维护-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { + try { + otaBaSjGnxtwhService.add(otaBaSjGnxtwh); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + return Result.OK("添加成功!"); + } + + /** + * 编辑 + * + * @param otaBaSjGnxtwh + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-编辑") + @ApiOperation(value = "车型备案-功能系统维护-编辑", notes = "车型备案-功能系统维护-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody OtaBaSjGnxtwh otaBaSjGnxtwh) { + try { + otaBaSjGnxtwhService.editById(otaBaSjGnxtwh); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-通过id删除") + @ApiOperation(value = "车型备案-功能系统维护-通过id删除", notes = "车型备案-功能系统维护-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + otaBaSjGnxtwhService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-批量删除") + @ApiOperation(value = "车型备案-功能系统维护-批量删除", notes = "车型备案-功能系统维护-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.otaBaSjGnxtwhService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "车型备案-功能系统维护-通过id查询") + @ApiOperation(value = "车型备案-功能系统维护-通过id查询", notes = "车型备案-功能系统维护-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + OtaBaSjGnxtwh otaBaSjGnxtwh = otaBaSjGnxtwhService.queryById(id); + if (otaBaSjGnxtwh == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(otaBaSjGnxtwh); + } + + /** + * 导出excel + * + * @param request + * @param otaBaSjGnxtwh + */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, OtaBaSjGnxtwh otaBaSjGnxtwh) { return super.exportXls(request, otaBaSjGnxtwh, OtaBaSjGnxtwh.class, "车型备案-功能系统维护"); } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, OtaBaSjGnxtwh.class); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java index 557d2f6ff..904083e4b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjGnxtwhService.java @@ -19,7 +19,7 @@ public interface IOtaBaSjGnxtwhService extends IService { * @param otaBaSjGnxtwh * @return */ - void add(OtaBaSjGnxtwh otaBaSjGnxtwh); + void add(OtaBaSjGnxtwh otaBaSjGnxtwh) throws Exception; /** * 更新 @@ -27,7 +27,7 @@ public interface IOtaBaSjGnxtwhService extends IService { * @param otaBaSjGnxtwh * @return */ - void editById(OtaBaSjGnxtwh otaBaSjGnxtwh); + void editById(OtaBaSjGnxtwh otaBaSjGnxtwh) throws Exception; /** * 通过id删除 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java index 50f834b56..8dc9643e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGnxtwhServiceImpl.java @@ -1,8 +1,10 @@ package com.jero.modules.ota.service.impl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaSjGnxtwh; import com.jero.modules.ota.mapper.OtaBaSjGnxtwhMapper; import com.jero.modules.ota.service.IOtaBaSjGnxtwhService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -26,10 +28,28 @@ public class OtaBaSjGnxtwhServiceImpl extends ServiceImpl list = list(); + for (OtaBaSjGnxtwh wh : list) { + if (kzq.getId().equals(wh.getId())) { + continue; + } + String[] strs = wh.getDykzq().split(","); + String[] strs1 = kzq.getDykzq().split(","); + for (String str : strs) { + for (String str1 : strs1) { + if (str.equals(str1)) { + return str; + } + } + } + } + return null; + } @Override public String queryGnxtByKzq(String kzq) {