修改新增,编辑的接口,并打印日志
This commit is contained in:
@@ -77,19 +77,17 @@ public class ComponentSearchController {
|
|||||||
@Operation(summary = "器件搜索数据-添加")
|
@Operation(summary = "器件搜索数据-添加")
|
||||||
// @RequiresPermissions("database:document_favorites:add")
|
// @RequiresPermissions("database:document_favorites:add")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<String> add(@RequestBody SearchRequest searchRequest, HttpServletRequest request) {
|
public Result<String> add(@RequestBody SearchResult searchResult, HttpServletRequest request) {
|
||||||
String username = JwtUtil.getUserNameByToken(request);
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
SysUser userByName = userService.getUserByName(username);
|
SysUser userByName = userService.getUserByName(username);
|
||||||
SearchResult result = new SearchResult();
|
|
||||||
result.setContent(searchRequest.getContent());
|
|
||||||
result.setDataType(searchRequest.getType());
|
|
||||||
Date currentDate = new Date();
|
Date currentDate = new Date();
|
||||||
result.setCreateTime(currentDate);
|
searchResult.setCreateTime(currentDate);
|
||||||
result.setUpdateTime(currentDate);
|
searchResult.setUpdateTime(currentDate);
|
||||||
result.setCreateBy(userByName.getId());
|
searchResult.setCreateBy(userByName.getId());
|
||||||
result.setUpdateBy(userByName.getId());
|
searchResult.setUpdateBy(userByName.getId());
|
||||||
try {
|
try {
|
||||||
componentSearchService.saveComponentSearch(result);
|
componentSearchService.saveComponentSearch(searchResult);
|
||||||
}catch (JeecgBootException e) {
|
}catch (JeecgBootException e) {
|
||||||
return Result.error(e.getMessage());
|
return Result.error(e.getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,11 +83,11 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
|
|||||||
if (StringUtil.isNotEmpty(sampleInfo.getSampleBatch())){
|
if (StringUtil.isNotEmpty(sampleInfo.getSampleBatch())){
|
||||||
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(SearchResult::getDataType, ComponentSearchType.MODEL_BATCH_NO.getCode());
|
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)){
|
if (0L == this.count(queryWrapper)){
|
||||||
SearchResult modelBatchNoRecord = new SearchResult();
|
SearchResult modelBatchNoRecord = new SearchResult();
|
||||||
modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode());
|
modelBatchNoRecord.setDataType(ComponentSearchType.MODEL_BATCH_NO.getCode());
|
||||||
modelBatchNoRecord.setContent(sampleInfo.getModelBatch());
|
modelBatchNoRecord.setContent(sampleInfo.getSampleBatch());
|
||||||
try {
|
try {
|
||||||
saveOrUpdate(modelBatchNoRecord);
|
saveOrUpdate(modelBatchNoRecord);
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
@@ -102,6 +102,8 @@ public class ComponentSearchServiceImpl extends ServiceImpl<ComponentSearchMappe
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean saveComponentSearch(SearchResult searchResult) {
|
public boolean saveComponentSearch(SearchResult searchResult) {
|
||||||
|
logger.info(searchResult.toString());
|
||||||
|
|
||||||
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SearchResult> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(SearchResult::getDataType, searchResult.getDataType());
|
queryWrapper.eq(SearchResult::getDataType, searchResult.getDataType());
|
||||||
queryWrapper.eq(SearchResult::getContent, searchResult.getContent());
|
queryWrapper.eq(SearchResult::getContent, searchResult.getContent());
|
||||||
|
|||||||
Reference in New Issue
Block a user