feat(storage): 新增映射错误管理功能

- 添加 MappingErrorApi 控制器，提供分页查询和重试接口 - 实现 MappingErrorService 的分页及消息重发逻辑 - 引入 MappingErrorCO 和 MappingErrorVO 数据传输对象 - 更新生产字段配置中的固定值参数 - 集成 RabbitMQ 消息队列用于重新推送失败的消息 - 使用 MyBatis Plus 进行数据库操作和分页处理 - 添加事务注解确保数据一致性

feat(storage): 新增映射错误管理功能
- 添加 MappingErrorApi 控制器，提供分页查询和重试接口 - 实现 MappingErrorService 的分页及消息重发逻辑 - 引入 MappingErrorCO 和 MappingErrorVO 数据传输对象 - 更新生产字段配置中的固定值参数 - 集成 RabbitMQ 消息队列用于重新推送失败的消息 - 使用 MyBatis Plus 进行数据库操作和分页处理 - 添加事务注解确保数据一致性
zhangmeiyang
1 parent d134d9e6
Showing 5 changed files with 192 additions and 2 deletions
doc/生产字段配置.md
tax-storage/src/main/java/com/diligrp/tax/storage/controller/MappingErrorApi.java
tax-storage/src/main/java/com/diligrp/tax/storage/model/co/MappingErrorCO.java
tax-storage/src/main/java/com/diligrp/tax/storage/model/vo/MappingErrorVO.java
tax-storage/src/main/java/com/diligrp/tax/storage/service/MappingErrorService.java
@@ -1704,7 +1704,7 @@ PLAT_WITHDRAW(11, &quot;平台提现&quot;);
   "documentType": "AR_RECEIVEBILL",
   "configKey": "bankCardNumber",
   "settingFieldType": 0,
-  "fixedValue": "000002"
+  "fixedValue": "000001"
 }
 ```
  
@@ -1943,7 +1943,7 @@ PLAT_WITHDRAW(11, &quot;平台提现&quot;);
   "documentType": "AR_REFUNDBILL",
   "configKey": "bankCardNumber",
   "settingFieldType": 0,
-  "fixedValue": "000002"
+  "fixedValue": "000001"
 }
 ```
  
+package com.diligrp.tax.storage.controller;
+
+import com.diligrp.tax.central.message.Message;
+import com.diligrp.tax.central.message.Valid;
+import com.diligrp.tax.storage.model.co.MappingErrorCO;
+import com.diligrp.tax.storage.service.MappingErrorService;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-12-11 15:38
+ * @Version: todo
+ */
+@RestController
+@RequestMapping("/tax/tenant/mappingError")
+public class MappingErrorApi {
+
+    @Resource
+    private MappingErrorService mappingErrorService;
+
+    /**
+     * 分页
+     *
+     * @param co 科罗拉多
+     * @return {@link Message }<{@link ? }>
+     */
+    @RequestMapping("/page")
+    public Message<?> page(@RequestBody @Validated(value = {Valid.Read.class}) MappingErrorCO co) {
+        return Message.success(mappingErrorService.page(co));
+    }
+
+    /**
+     * 重试
+     *
+     * @param id 身份证
+     * @return {@link Message }<{@link ? }>
+     */
+    @RequestMapping("/retry/{id}")
+    public Message<?> retry(@PathVariable("id") Long id) {
+        mappingErrorService.retry(id);
+        return Message.success();
+    }
+}
+package com.diligrp.tax.storage.model.co;
+
+import com.diligrp.tax.central.message.PageQuery;
+import com.diligrp.tax.central.message.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-12-11 15:41
+ * @Version: todo
+ */
+@Getter
+@Setter
+public class MappingErrorCO extends PageQuery {
+    @NotEmpty(message = "group不能为空", groups = {Valid.Read.class})
+    private String group;
+    @NotEmpty(message = "entity不能为空", groups = {Valid.Read.class})
+    private String entity;
+    @NotEmpty(message = "pipelineCode不能为空", groups = {Valid.Read.class})
+    private String pipelineCode;
+    @NotEmpty(message = "systemType不能为空", groups = {Valid.Read.class})
+    private String systemType;
+}
+package com.diligrp.tax.storage.model.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2025-12-11 15:45
+ * @Version: todo
+ */
+@Getter
+@Setter
+public class MappingErrorVO {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 分组
+     */
+    private String group;
+    /**
+     * 实体
+     */
+    private String entity;
+    /**
+     * 租户账套编码
+     */
+    private String pipelineCode;
+    /**
+     * 文档类型
+     */
+    private String documentType;
+    /**
+     * 系统类型
+     */
+    private String systemType;
+    /**
+     * 同步系统数据唯一键
+     */
+    private String systemDataId;
+    /**
+     * 原始发送数据
+     */
+    private String originData;
+    /**
+     * 同步状态
+     */
+    private Integer state;
+    /**
+     * 错误信息
+     */
+    private String errorMessage;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 修改时间
+     */
+    private LocalDateTime modifiedTime;
+}
 package com.diligrp.tax.storage.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diligrp.tax.central.domain.MessageContext;
 import com.diligrp.tax.central.model.PipelineMappingErrorDO;
 import com.diligrp.tax.central.service.IMappingErrorService;
+import com.diligrp.tax.central.type.MappingStateType;
+import com.diligrp.tax.central.type.SystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.storage.domain.MappingError;
+import com.diligrp.tax.storage.model.co.MappingErrorCO;
+import com.diligrp.tax.storage.model.vo.MappingErrorVO;
 import com.diligrp.tax.storage.repo.MappingErrorRepository;
+import com.fasterxml.jackson.core.type.TypeReference;
 import jakarta.annotation.Resource;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import static com.diligrp.tax.central.queue.TaxAutoPush.NORMAL_EXCHANGE;
+import static com.diligrp.tax.central.queue.TaxAutoPush.NORMAL_ROUTING;
  
 /**
  * @Author: zhangmeiyang
@@ -19,14 +33,53 @@ public class MappingErrorService implements IMappingErrorService {
     @Resource
     private MappingErrorRepository mappingErrorRepository;
  
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
     /**
      * 插入
      *
      * @param error 错误
      */
     @Override
+    @Transactional
     public void insert(PipelineMappingErrorDO error) {
         MappingError save = JsonUtils.convertValue(error, MappingError.class);
         mappingErrorRepository.insert(save);
     }
+
+    /**
+     * 分页查询
+     *
+     * @param co 科罗拉多
+     * @return {@link IPage }<{@link MappingErrorVO }>
+     */
+    public IPage<MappingErrorVO> page(MappingErrorCO co) {
+        Page<MappingError> page = new Page<>(co.getPageNumber(), co.getPageSize());
+        SystemType.validateSystemType(co.getSystemType());
+        LambdaQueryWrapper<MappingError> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MappingError::getGroup, co.getGroup());
+        queryWrapper.eq(MappingError::getEntity, co.getEntity());
+        queryWrapper.eq(MappingError::getPipelineCode, co.getPipelineCode());
+        queryWrapper.eq(MappingError::getSystemType, co.getSystemType());
+        Page<MappingError> pages = mappingErrorRepository.selectPage(page, queryWrapper);
+        return pages.convert(e -> JsonUtils.convertValue(e, MappingErrorVO.class));
+    }
+
+    @Transactional
+    public void retry(Long id) {
+        MappingError error = mappingErrorRepository.selectById(id);
+        MessageContext ctx = new MessageContext();
+        ctx.setSystemDataId(error.getSystemDataId());
+        ctx.setGroup(error.getGroup());
+        ctx.setEntity(error.getEntity());
+        ctx.setPipelineCode(error.getPipelineCode());
+        ctx.setDocumentType(error.getDocumentType());
+        ctx.setSystemType(error.getSystemType());
+        ctx.setMsgBody(JsonUtils.fromJsonString(error.getOriginData(), new TypeReference<>() {}));
+        String messageJson = JsonUtils.toJsonString(ctx);
+        rabbitTemplate.convertAndSend(NORMAL_EXCHANGE, NORMAL_ROUTING, messageJson);
+        error.setState(MappingStateType.SYNC_RETRY.value);
+        mappingErrorRepository.updateById(error);
+    }
 }