diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java index e5a8e4e..7e47a40 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ComponentSearchController.java @@ -77,19 +77,17 @@ public class ComponentSearchController { @Operation(summary = "器件搜索数据-添加") // @RequiresPermissions("database:document_favorites:add") @PostMapping(value = "/add") - public Result add(@RequestBody SearchRequest searchRequest, HttpServletRequest request) { + public Result add(@RequestBody SearchResult searchResult, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); SysUser userByName = userService.getUserByName(username); - SearchResult result = new SearchResult(); - result.setContent(searchRequest.getContent()); - result.setDataType(searchRequest.getType()); + Date currentDate = new Date(); - result.setCreateTime(currentDate); - result.setUpdateTime(currentDate); - result.setCreateBy(userByName.getId()); - result.setUpdateBy(userByName.getId()); + searchResult.setCreateTime(currentDate); + searchResult.setUpdateTime(currentDate); + searchResult.setCreateBy(userByName.getId()); + searchResult.setUpdateBy(userByName.getId()); try { - componentSearchService.saveComponentSearch(result); + componentSearchService.saveComponentSearch(searchResult); }catch (JeecgBootException e) { return Result.error(e.getMessage()); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java index 0bf13f9..e632864 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ComponentSearchServiceImpl.java @@ -83,11 +83,11 @@ public class ComponentSearchServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_BATCH_NO.getCode()); - queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getModelBatch().trim()); + queryWrapper.likeRight(SearchResult::getContent, sampleInfo.getSampleBatch().trim()); if (0L == this.count(queryWrapper)){ SearchResult modelBatchNoRecord = new SearchResult(); modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode()); - modelBatchNoRecord.setContent(sampleInfo.getModelBatch()); + modelBatchNoRecord.setContent(sampleInfo.getSampleBatch()); try { saveOrUpdate(modelBatchNoRecord); }catch (Exception e) { @@ -102,6 +102,8 @@ public class ComponentSearchServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SearchResult::getDataType, searchResult.getDataType()); queryWrapper.eq(SearchResult::getContent, searchResult.getContent());