数据导入添加 类型名称字段

src/main/java/com/dskj/znzn/transData/web/common/controller/SysConfController.java

@@ -44,4 +44,11 @@ public class SysConfController {
     public R<List<SysConf>> getTypeName() {
         return R.ok(sysConfService.getTypeName());
     }
+
+    @ApiOperation("刷新配置")
+    @GetMapping("/flushConf")
+    public R flushConf() {
+        sysConfService.flushConf();
+        return R.ok();
+    }
 }

src/main/java/com/dskj/znzn/transData/web/common/service/ISysConfService.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 魏志亮
@@ -19,4 +19,8 @@ public interface ISysConfService extends IService<SysConf> {
 
     List<SysConf> getTypeName();
 
+    String getValueByType(String type, String paramKey);
+
+    void flushConf();
+
 }

src/main/java/com/dskj/znzn/transData/web/common/service/impl/SysConfServiceImpl.java

@@ -10,9 +10,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -26,6 +24,8 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor = @__({@Autowired}))
 public class SysConfServiceImpl extends ServiceImpl<SysConfMapper, SysConf> implements ISysConfService {
 
+    public static Map<String, String> sysMap = new HashMap<>();
+
     @Override
     public List<SysConf> getByType(String type) {
         LambdaQueryWrapper<SysConf> wrapper = Wrappers.lambdaQuery();
@@ -40,4 +40,22 @@ public class SysConfServiceImpl extends ServiceImpl<SysConfMapper, SysConf> impl
                 .groupBy(Arrays.asList(SysConf::getType, SysConf::getTypeName));
         return list(wrapper);
     }
+
+    @Override
+    public String getValueByType(String type, String paramKey) {
+        if (sysMap.isEmpty()) {
+            LambdaQueryWrapper<SysConf> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(SysConf::getStatus, 1);
+            list(wrapper).forEach(sysConf -> {
+                sysMap.put(sysConf.getType() + "__" + sysConf.getParamKey(), sysConf.getParamValue());
+            });
+        }
+
+        return sysMap.get(type + "__" + paramKey);
+    }
+
+    @Override
+    public void flushConf() {
+        sysMap = new HashMap<>();
+    }
 }

src/main/java/com/dskj/znzn/transData/web/dataTransfer/entity/DataTransfer.java

@@ -1,6 +1,7 @@
 package com.dskj.znzn.transData.web.dataTransfer.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -64,7 +65,7 @@ public class DataTransfer implements Serializable {
     @ApiModelProperty("异常信息")
     private String errInfo;
 
-    @ApiModelProperty("转换状态(-1：等待转换 0:转换中 1:转换成功 2:转换失败)")
+    @ApiModelProperty("导入状态(-1：等待中 0-导入中 1-导入成功 2-导入失败)")
     private Integer transferStatus;
 
     @ApiModelProperty("转化系统的状态值")
@@ -108,4 +109,8 @@ public class DataTransfer implements Serializable {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
+
+    @ApiModelProperty("转换类型名称")
+    @TableField(exist = false)
+    private String transferTypeName;
 }

src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/GetDataTransferInData.java

@@ -15,6 +15,6 @@ public class GetDataTransferInData extends PageInfo {
     @ApiModelProperty("转化类型")
     private String transferType;
 
-    @ApiModelProperty(value = "转换状态(null: 全部 -1：等待转换 0:转换中 1:转换成功 2:转换失败)", example = "null")
+    @ApiModelProperty(value = "导入状态(null: 全部,-1：等待中 0-导入中 1-导入成功 2-导入失败)", example = "null")
     private Integer transferStatus;
 }

src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/impl/DataTransferServiceImpl.java

@@ -54,6 +54,10 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
         wrapper.eq(DataTransfer::getStatus, 1);
         wrapper.orderByDesc(DataTransfer::getUpdateTime);
         IPage<DataTransfer> pageData = page(queryPage, wrapper);
+        for (DataTransfer record : pageData.getRecords()) {
+            record.setTransferTypeName(sysConfService.getValueByType("trans_type", record.getTransferType()));
+        }
+
         return PageR.page(pageData, pageData.getRecords());
     }
 
@@ -61,9 +65,8 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
     public void addDataTransferTask(AddDataTransferTaskInData data) {
         DataTransfer dataTransfer = new DataTransfer();
         BeanUtils.copyProperties(data, dataTransfer);
-        dataTransfer.setTransferStatus(-1);
         dataTransfer.setCreateTime(new Date());
-        dataTransfer.setTransferStatus(0);
+        dataTransfer.setTransferStatus(-1);
         save(dataTransfer);
     }
 
@@ -190,7 +193,11 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
         wrapper.eq(DataTransfer::getTransferStatus, 1).eq(DataTransfer::getStatus, 1);
         wrapper.orderByDesc(DataTransfer::getUpdateTime);
         wrapper.last("limit 1");
-        return getOne(wrapper);
+        DataTransfer transfer = getOne(wrapper);
+        if (null != transfer) {
+            transfer.setTransferTypeName(sysConfService.getValueByType("trans_type", transfer.getTransferType()));
+        }
+        return transfer;
     }
 
     @Override
@@ -257,5 +264,4 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
             System.out.println(sdf.format(period.getStartTime()) + " " + sdf.format(period.getEndTime()));
         }
     }
-
 }