Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/read/CustomStringStringConverter.java

@@ -2,8 +2,9 @@ package com.epmet.stats.test.read;
 
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 
 /**
@@ -13,7 +14,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
  */
 public class CustomStringStringConverter implements Converter<String> {
     @Override
-    public Class supportJavaTypeKey() {
+    public Class<?> supportJavaTypeKey() {
         return String.class;
     }
 
@@ -34,8 +35,8 @@ public class CustomStringStringConverter implements Converter<String> {
      * @return
      */
     @Override
-    public String convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
-        GlobalConfiguration globalConfiguration) {
+    public String convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+                                    GlobalConfiguration globalConfiguration) {
         return "自定义：" + cellData.getStringValue();
     }
 
@@ -51,9 +52,9 @@ public class CustomStringStringConverter implements Converter<String> {
      * @return
      */
     @Override
-    public CellData convertToExcelData(String value, ExcelContentProperty contentProperty,
-        GlobalConfiguration globalConfiguration) {
-        return new CellData(value);
+    public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty contentProperty,
+                                               GlobalConfiguration globalConfiguration) {
+        return new WriteCellData<>(value);
     }
 
 }