修改可视化返回结构

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygxDTO.java

@@ -19,6 +19,8 @@ public class HnTbStRygxDTO implements Serializable  {
 
     private String id;
     private String label;
+    private int x;
+    private int y;
 
     private Kshpropertice properties;
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java

@@ -16,36 +16,5 @@ public class Kshpropertice implements Serializable {
     private String imgType;
     private String boderColor;
 
-   /* @ApiModelProperty(value = "标签")
-    private String describe;
 
-    @ApiModelProperty(value = "标识")
-    private String name;
-
-*//*    @ApiModelProperty(value = "姓名")
-    private String xm;
-
-    @ApiModelProperty(value = "身份证号")
-    private String sfzh;*//*
-
-    @ApiModelProperty(value = "ID随机")
-    private String id;
-
-    @ApiModelProperty(value = "图片")
-    private String img;
-
-    @ApiModelProperty(value = "类型")
-    private String type;
-
-    private String value;
-
-    *//**
-     * 是否为黑色节点
-     *//*
-    private Boolean gen;
-
-    *//**
-     * 是否为黄色节点
-     *//*
-    private Boolean yellow;*/
 }

common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceController.java

@@ -103,7 +103,7 @@ public class SkServiceController extends ApiController {
             String postfix = filename.substring(filename.lastIndexOf(".") + 1);
             //根据Excel文件后缀读取数据
             if (postfix.equals("xls")) {
-                Map xlsExcelMap = ExcelUtil.readXLSXExcel(file.getInputStream(), SkService.class, abandonFields);
+                Map xlsExcelMap = ExcelUtil.readXLSExcel(file.getInputStream(), SkService.class, abandonFields);
                 resultList = (List) xlsExcelMap.get("dataList");
             } else if (postfix.equals("xlsx")){
                 Map xlsxExcelMap = ExcelUtil.readXLSXExcel(file.getInputStream(), SkService.class, abandonFields);