手动合并 秋晴的代码

common/common_utils/src/main/java/com/founder/commonutils/viewEntity/TbStLayer.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,5 +28,6 @@ public class TbStLayer {
     private String gxdwdm;
     private String gxdwdc;
     private Date gxsj;
+    private List<TbStLayerData> stLayerDataList;
 
 }

service/view/src/main/java/com/founder/view/controller/TbStLayerController.java

+package com.founder.view.controller;
+
+import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.util.KeyUtil;
+import com.founder.commonutils.util.LngLonUtil;
+import com.founder.commonutils.viewEntity.TbStLayer;
+import com.founder.commonutils.viewEntity.TbStLayerData;
+import com.founder.view.service.TbStLayerDataService;
+import com.founder.view.service.TbStLayerService;
+import io.swagger.annotations.Api;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Api(description = "图层数据")
+@RestController
+@RequestMapping("/tbStLayer")
+public class TbStLayerController {
+    @Resource
+    TbStLayerDataService tbStLayerDataService;
+
+    @Resource
+    TbStLayerService tbStLayerService;
+    @RequestMapping("getLayer")
+    public MapRestResult getLayer() {
+        return null;
+    }
+}

service/view/src/main/java/com/founder/view/controller/TbStLayerDataController.java

@@ -20,7 +20,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;