From 58aa8598afc0e77dc16f3fb4647f7af796387179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 17:25:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaCxListController.java | 2 +- .../controller/OtaBaSjGnxtwhController.java | 251 +++++++++--------- .../ota/service/IOtaBaSjGnxtwhService.java | 4 +- .../impl/OtaBaSjGnxtwhServiceImpl.java | 59 +++- 4 files changed, 190 insertions(+), 126 deletions(-) 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) { From 3606f0fd9ebd37d966d6d6c3ac7ef47c1f75dbfb Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 30 Mar 2023 17:30:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5=E5=BF=85=E5=A1=AB=E9=A1=B9?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=92=8C=E7=BC=96=E5=8F=B7=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOServiceImpl.java | 109 +++++------ ...ctCertificationInventoryEOServiceImpl.java | 175 +++++++++--------- 2 files changed, 141 insertions(+), 143 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index b0475e591..b72277131 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -658,6 +658,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl 1) { dataList.add(rowList); } @@ -797,86 +834,54 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl 100){ + if(wvtaId.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能超过100个字符, "; + message = errorMsg + "WVTA ID不能超过300个字符, "; }else{ - message = errorMsg + " The WVTA ID cannot contain more than 100 characters, "; + message = errorMsg + " The WVTA ID cannot contain more than 300 characters, "; } msgList.add(message); } - } else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "WVTA ID不能为空, "; - }else{ - message = errorMsg + " The WVTA ID cannot null, "; - } - msgList.add(message); } //类别 if(StringUtils.isNotBlank(category)){ - if(category.length() > 100){ + if(category.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "类别不能超过100个字符, "; + message = errorMsg + "类别不能超过300个字符, "; }else{ - message = errorMsg + " The Category cannot contain more than 100 characters, "; + message = errorMsg + " The Category cannot contain more than 300 characters, "; } msgList.add(message); } - }else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "类别不能为空, "; - }else{ - message = errorMsg + " The Category cannot null, "; - } - msgList.add(message); } //检验项目 if(StringUtils.isNotBlank(inspectionItem)){ - if(inspectionItem.length() > 100){ + if(inspectionItem.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "检验项目不能超过100个字符, "; + message = errorMsg + "检验项目不能超过300个字符, "; }else{ - message = errorMsg + " The InspectionItem cannot contain more than 100 characters, "; + message = errorMsg + " The InspectionItem cannot contain more than 300 characters, "; } msgList.add(message); } - }else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "检验项目不能为空, "; - }else{ - message = errorMsg + " The InspectionItem cannot null, "; - } - msgList.add(message); } //配置项 if(StringUtils.isNotBlank(configItem)){ - if(configItem.length() > 100){ + if(configItem.length() > 300){ String message = ""; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "配置项不能超过100个字符, "; + message = errorMsg + "配置项不能超过300个字符, "; }else{ - message = errorMsg + " The ConfigItem cannot contain more than 100 characters, "; + message = errorMsg + " The ConfigItem cannot contain more than 300 characters, "; } msgList.add(message); } - }else { - String message = ""; - if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "配置项不能为空, "; - }else{ - message = errorMsg + " The ConfigItem cannot null, "; - } - msgList.add(message); } //责任领域 if(StringUtils.isNotBlank(dutyTerritory)){ @@ -884,14 +889,6 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl objectMap = iProjectRelatedPersonnelService.queryPersonByProjectId(projectCertificationInventoryEOTemp.getProjectLibraryId(), value); @@ -3209,30 +3214,32 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpllongdate){ flag = false; if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ - errorMsg += nameCn + "不能导入今天之前的日期"; + errorMsg += nameCn + "不能导入今天之前的日期, "; }else{ - errorMsg += nameEn + " Cannot import dates before today "; + errorMsg += nameEn + " Cannot import dates before today, "; } msgList.add(errorMsg); } @@ -3476,9 +3485,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 17:45:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java | 2 ++ .../jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java | 2 +- .../modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) 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 aa786c249..849cc8289 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 @@ -90,6 +90,8 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl aeoList = JSONArray.parseArray(otaBaCxAqcsOld.getZmcl(), AttachmentEO.class); otaBaCxAqcsOld.setZmclList(aeoList); } + deleteById(otaBaCxAqcs.getId()); + deleteById(otaBaCxAqcsOld.getId()); saveOrUpdate(otaBaCxAqcs); ComparisonUtil cu = new ComparisonUtil(); if (ObjectUtils.isEmpty(otaBaCxAqcsOld)) { 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 b09e65bcf..a8dc2d4c2 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 @@ -286,7 +286,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); int startRow = 63; for (OtaBaCxSjmk sjmk : sjmkList) { - row = s.getRow(startRow); + row = s.createRow(startRow); cell = row.createCell(0); cell.setCellValue(sjmk.getBjmc()); cell = row.createCell(1);