Jelajahi Sumber

返回时间格式处理

2507040827 1 hari lalu
induk
melakukan
e7a4d52ed2

+ 5 - 4
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/controller/AitagTagLogController.java

@@ -2,6 +2,7 @@ package cn.com.yusys.yusp.controller;
 
 import cn.com.yusys.yusp.annotation.ApiOperationType;
 import cn.com.yusys.yusp.commons.module.adapter.web.rest.ResultDto;
+import cn.com.yusys.yusp.domain.dto.TagLogDto;
 import cn.com.yusys.yusp.domain.entity.AitagTagLogEntity;
 import cn.com.yusys.yusp.domain.vo.*;
 import cn.com.yusys.yusp.service.AitagTagLogService;
@@ -93,8 +94,8 @@ public class AitagTagLogController {
      */
     @ApiOperationType("打标明细")
     @PostMapping("/taggingTransaction")
-    public ResultDto<IPage<AitagTagLogEntity>> taggingTransaction(@RequestBody TaggingTransactionReqVo transactionReqVo) {
-        IPage<AitagTagLogEntity> page = aitagTagLogService.taggingDetails(transactionReqVo);
+    public ResultDto<IPage<TagLogDto>> taggingTransaction(@RequestBody TaggingTransactionReqVo transactionReqVo) {
+        IPage<TagLogDto> page = aitagTagLogService.taggingDetails(transactionReqVo);
         return ResultDto.success(page.getRecords()).total(page.getTotal());
     }
 
@@ -106,8 +107,8 @@ public class AitagTagLogController {
      */
     @ApiOperationType("打标结果详情")
     @GetMapping("/show/{id}")
-    public ResultDto<AitagTagLogEntity> show(@PathVariable("id") String id) {
-        AitagTagLogEntity taggingDetailsResDTO = aitagTagLogService.show(id);
+    public ResultDto<TagLogDto> show(@PathVariable("id") String id) {
+        TagLogDto taggingDetailsResDTO = aitagTagLogService.show(id);
         return ResultDto.success(taggingDetailsResDTO);
     }
 

+ 164 - 0
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/dto/TagLogDto.java

@@ -0,0 +1,164 @@
+package cn.com.yusys.yusp.domain.dto;
+
+import cn.com.yusys.yusp.commons.util.date.DateUtils;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+
+/**
+ *  打标日志实体类
+ * @author zky
+ *
+ */
+
+@Data
+public class TagLogDto {
+
+
+    /**
+     * id
+     **/
+    @ApiModelProperty(value="id")
+    @TableId(type= IdType.UUID)
+    private String id;
+
+    /**
+     * 应用ID
+     **/
+    @ApiModelProperty(value = "应用ID")
+    private String appId;
+
+    /**
+     * 发起时间
+     **/
+    @ApiModelProperty(value = "发起时间")
+    private LocalDateTime insertTime;
+
+    public String getInsertTime() {
+        return insertTime.format(DateTimeFormatter.ofPattern(DateUtils.PATTERN_DATETIME));
+    }
+
+    /**
+     * 业务属性,贷款编号
+     **/
+    @ApiModelProperty(value = "业务属性,贷款编号")
+    private String businessAttr;
+
+    /**
+     * 输入短语
+     **/
+    @ApiModelProperty(value = "输入短语")
+    private String phrase;
+
+    /**
+     * 附件名称
+     **/
+    @ApiModelProperty(value = "附件名称")
+    private String attachment;
+
+    /**
+     * 附件路径
+     **/
+    @ApiModelProperty(value = "附件路径")
+    private String attachmentUrl;
+
+    /**
+     * 打标结果,JSON
+     [{
+     label:xxx,
+     label_code:xxx,
+     desc:xxx
+     passr: true/false
+     }]
+     **/
+    @ApiModelProperty(value = "打标结果,JSON [{ label:xxx, label_code:xxx, desc:xxx passr: true/false }]")
+    private String result;
+
+    /**
+     * 反馈人ID
+     **/
+    @ApiModelProperty(value = "反馈人ID")
+    private String feedbackUserId;
+
+    /**
+     * 反馈人名字
+     **/
+    @ApiModelProperty(value = "反馈人名字")
+    private String feedbackUserNm;
+
+    /**
+     * 反馈时间
+     **/
+    @ApiModelProperty(value = "反馈时间")
+    private LocalDateTime feedbackTime;
+
+    /**
+     * 反馈,agree/reject
+     **/
+    @ApiModelProperty(value = "反馈,agree/reject")
+    private String feedback;
+
+    /**
+     * JSON
+     [
+     {
+     label:xxx,
+     label_code:xxx,
+     desc:xxx
+     passr: true/false
+     }
+     ]
+     **/
+    @ApiModelProperty(value = "JSON [ { label:xxx, label_code:xxx, desc:xxx passr: true/false } ]")
+    private String feedbackResult;
+
+    /**
+     * 0:打标执行中;1:打标完成; 2:客户经理已经确认;3,结果已推送
+     **/
+    @ApiModelProperty(value = "0:打标执行中;1:打标完成; 2:客户经理已经确认;3,结果已推送")
+    private Integer state;
+
+    /**
+     * 打标耗时,秒
+     **/
+    @ApiModelProperty(value = "打标耗时,秒")
+    private String consumingTime;
+
+
+    /**
+     * 合同编号
+     **/
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+
+
+
+    /**
+     * 正则过滤结果
+     **/
+    @ApiModelProperty(value = "正则过滤结果")
+    private String regResult;
+
+    /**
+     * 法人机构
+     **/
+    @ApiModelProperty(value = "法人机构")
+    private String feedbackUserOrg;
+
+    /**
+     * 网点
+     **/
+    @ApiModelProperty(value = "网点")
+    private String feedbackUserEndpoint;
+
+    /**
+     * 标签标识 0正常数据; 1测试数据
+     **/
+    @ApiModelProperty(value = "标签标识 0:正常数据; 1:测试数据")
+    private String tagScope;
+}

+ 3 - 2
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/AitagTagLogService.java

@@ -1,5 +1,6 @@
 package cn.com.yusys.yusp.service;
 
+import cn.com.yusys.yusp.domain.dto.TagLogDto;
 import cn.com.yusys.yusp.domain.entity.AitagTagLogEntity;
 import cn.com.yusys.yusp.domain.vo.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,9 +21,9 @@ public interface AitagTagLogService extends IService<AitagTagLogEntity> {
 
     List<IconResVo> taggingTrend(TaggingTrendReqVo TaggingTrendReqVo);
 
-    IPage<AitagTagLogEntity> taggingDetails(TaggingTransactionReqVo aitagTagLogEntity);
+    IPage<TagLogDto> taggingDetails(TaggingTransactionReqVo aitagTagLogEntity);
 
-    AitagTagLogEntity show(String id);
+    TagLogDto show(String id);
 
     List<IconResVo> tagDistStats(TagDistStatsReqVo resultDTO);
 

+ 12 - 5
server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/service/impl/AitagTagLogServiceImpl.java

@@ -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) {