计划收储列表

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/StorageController.java

@@ -2,16 +2,15 @@ package com.siwei.apply.controller.cadastre;
 
 import com.siwei.apply.domain.cadastre.LandStorageInOutReportDTO;
 import com.siwei.apply.domain.cadastre.LandStorageReportDTO;
-import com.siwei.apply.domain.cadastre.LandSupplyReportDTO;
 import com.siwei.apply.domain.res.StorageYearStatisticsRes;
 import com.siwei.apply.domain.res.TrendStatisticsData;
 import com.siwei.apply.domain.res.TrendStatisticsRes;
 import com.siwei.apply.domain.res.TrendUseStatisticsData;
 import com.siwei.apply.domain.vo.LandSupplyProjectVO;
-import com.siwei.apply.domain.vo.LandSupplyReportVO;
 import com.siwei.apply.service.cadastre.impl.StorageServiceImpl;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
+import com.siwei.common.core.web.page.TableDataInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -23,7 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -615,6 +613,23 @@ public class StorageController extends BaseController {
     }
 
 
+    @GetMapping("/schedule/list")
+    public  R<?> scheduleList(
+            @RequestParam(value = "sourceType") String sourceType,
+            @RequestParam(value = "pageNum", required = false) Integer pageNum,
+            @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        try {
+            startPage();
+            List<Map<String, Object>>  resList = storageServiceImpl.actualList("gj_shouchu_xiangmu",sourceType);
+            return R.ok(getDataTable(resList));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
+
     /**
      *
      * 收储文件上传入库
@@ -632,7 +647,19 @@ public class StorageController extends BaseController {
     }
 
 
-
+    @GetMapping("/actual/list")
+    public  R<?> actualList(
+            @RequestParam(value = "pageNum", required = false) Integer pageNum,
+            @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        try {
+            startPage();
+            List<Map<String, Object>>  resList = storageServiceImpl.actualList("gj_shouchu_xiangmu_shiji","");
+            return R.ok(getDataTable(resList));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
 
 
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/GjShouchuJihuaMapper.java

@@ -27,4 +27,8 @@ public interface GjShouchuJihuaMapper {
 
     int insertTableActualData(@Param("tableName") String tableName, @Param("data") Map<String, Object> data, @Param("shpDbSRID") Integer shpDbSRID);
 
+
+    List<Map<String, Object>> actualList(@Param("tableName") String tableName,@Param("sourceType") String sourceType,@Param("year") String year);
+
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/StorageServiceImpl.java

@@ -809,13 +809,19 @@ public class StorageServiceImpl {
         int count = 1;
         for (Map<String, Object> shpData : shpDataList){
 //            String scfs = shpData.get("scfs").toString();
-//            String scnd = shpData.get("scnd").toString();
+            String scnd = shpData.get("scnd").toString();
 //            String sccb = shpData.get("sccb").toString();
-//            String mj_m = shpData.get("mj_m").toString();
+            String mj_m = shpData.get("mj_m").toString();
 //            String ghyt = shpData.get("ghyt").toString();
 //            if(StringUtils.isBlank(sccb)|| StringUtils.isBlank(scfs) ||StringUtils.isBlank(scnd) || StringUtils.isBlank(ghyt) || StringUtils.isBlank(mj_m)){
 //                throw new  ServiceException("关键字段不能为空（sccb,scnd,scfs,ghyt,mj_m），请检查第"+count+"条数据");
 //            }
+            if(StringUtils.isBlank(mj_m)){
+                throw new  ServiceException("关键字段不能为空（mj_m），请检查第"+count+"条数据");
+            }
+            if(StringUtils.isBlank(scnd)){
+                throw new  ServiceException("关键字段不能为空（scnd），请检查第"+count+"条数据");
+            }
             count++;
         }
         if("0".equals(addType)){
@@ -867,18 +873,17 @@ public class StorageServiceImpl {
             gjShouchuJihuaMapper.insertTableActualData(
                     "gj_shouchu_xiangmu_shiji", insertData, shpDbSRID);
         }
-
         retMap.put("status", "success");
         retMap.put("path", shpFilePath);
         return retMap;
     }
 
 
-
-
-
-
-
+    //导入实际的数据
+    public List<Map<String, Object>> actualList(String tableName,String sourceType) {
+        List<Map<String, Object>> actualList = gjShouchuJihuaMapper.actualList(tableName,sourceType,"");
+        return actualList;
+    }
 
 
 

siwei-modules/siwei-apply/src/main/resources/mapper/GjShouchuJihuaMapper.xml

@@ -208,10 +208,18 @@
         )
     </insert>
 
-
-
-
-
+    <select id="actualList" resultType="map">
+        SELECT *
+        FROM vector.${tableName}
+        WHERE 1=1
+        <if test="year != null and year != '' and year != '0'">
+            AND scnd = #{year}
+        </if>
+        <if test="sourceType != null and sourceType != ''">
+            AND source_type = #{sourceType}
+        </if>
+        ORDER BY gid ASC
+    </select>