|
|
@@ -3,6 +3,7 @@ package cn.com.yusys.yusp.service.impl;
|
|
|
import cn.com.yusys.yusp.commons.exception.BizException;
|
|
|
import cn.com.yusys.yusp.commons.util.date.DateUtils;
|
|
|
import cn.com.yusys.yusp.config.DataDictionary;
|
|
|
+import cn.com.yusys.yusp.domain.dto.TagLogDto;
|
|
|
import cn.com.yusys.yusp.domain.entity.AitagTagInfoEntity;
|
|
|
import cn.com.yusys.yusp.domain.vo.*;
|
|
|
import cn.com.yusys.yusp.mapper.AitagTagDailyAggDao;
|
|
|
@@ -14,6 +15,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
@@ -109,7 +111,7 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public IPage<AitagTagLogEntity> taggingDetails(TaggingTransactionReqVo transactionReqVo) {
|
|
|
+ public IPage<TagLogDto> taggingDetails(TaggingTransactionReqVo transactionReqVo) {
|
|
|
LambdaQueryWrapper<AitagTagLogEntity> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
if (StringUtils.isNotBlank(transactionReqVo.getCategoryId())) {
|
|
|
queryWrapper.apply("result @> '"+transactionReqVo.getCategoryExp()+"'");
|
|
|
@@ -125,12 +127,17 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
}
|
|
|
queryWrapper.eq(AitagTagLogEntity::getTagScope, PROD_DATA);
|
|
|
|
|
|
- return this.page(new Page<>(transactionReqVo.getPage() == null?0:transactionReqVo.getPage(),
|
|
|
- transactionReqVo.getSize() == null?10:transactionReqVo.getSize()),queryWrapper);
|
|
|
+ Page<AitagTagLogEntity> page = this.page(new Page<>(transactionReqVo.getPage() == null ? 0 : transactionReqVo.getPage(),
|
|
|
+ transactionReqVo.getSize() == null ? 10 : transactionReqVo.getSize()), queryWrapper);
|
|
|
+ List<AitagTagLogEntity> records = page.getRecords();
|
|
|
+ List<TagLogDto> tagLogDtos = JSONArray.parseArray(JSONArray.toJSONString(records), TagLogDto.class);
|
|
|
+ IPage<TagLogDto> iPage = new Page<TagLogDto>(page.getCurrent(),page.getSize(),page.getTotal());
|
|
|
+ iPage.setRecords(tagLogDtos);
|
|
|
+ return iPage;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public AitagTagLogEntity show(String id) {
|
|
|
+ public TagLogDto show(String id) {
|
|
|
AitagTagLogEntity aitagTagLog = this.baseMapper.selectById(id);
|
|
|
if(aitagTagLog !=null){
|
|
|
String result = "";
|
|
|
@@ -145,7 +152,7 @@ public class AitagTagLogServiceImpl extends ServiceImpl<AitagTagLogDao, AitagTag
|
|
|
aitagTagLog.setResult(result);
|
|
|
}
|
|
|
}
|
|
|
- return aitagTagLog;
|
|
|
+ return JSONObject.parseObject(JSONObject.toJSONString(aitagTagLog), TagLogDto.class);
|
|
|
}
|
|
|
|
|
|
private String getTagPath(String result) {
|