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

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java

@@ -3,9 +3,14 @@ package com.upyuns.platform.rs.datacenter.biz;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import com.upyuns.platform.rs.datacenter.mapper.RscpImageDataTotalMapper;
+import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, RscpImageDataTotal> {
-
+    public List<RscpImageDataTotal> queryDataList(RscpImageDataTotalController.QueryDTO dto) {
+        return mapper.queryDataList(dto);
+    }
 }

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpImageDataTotalMapper.java

 package com.upyuns.platform.rs.datacenter.mapper;
 
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
+import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -8,5 +9,6 @@ import java.util.Set;
 
 public interface RscpImageDataTotalMapper extends Mapper<RscpImageDataTotal> {
 
+    public List<RscpImageDataTotal> queryDataList(RscpImageDataTotalController.QueryDTO dto);
 
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java

 package com.upyuns.platform.rs.datacenter.rest;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -11,10 +12,15 @@ import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.upyuns.platform.rs.datacenter.biz.RscpImageDataTotalBiz;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import sun.nio.cs.ext.Big5;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.List;
 
 @RestController
 @RequestMapping("imageData")
@@ -25,12 +31,54 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
         return ObjectRestResponse.succ(baseBiz.selectByQuery(new Query(pageParam)));
     }
 
-    @RequestMapping(value = "/app/unauth/query1", method = RequestMethod.GET)
-    public ObjectRestResponse unauthQuery1(PageParam pageParam) {
-        return ObjectRestResponse.succ(baseBiz.selectByQuery(new Query(pageParam)));
+//   resolution
+//	     分辨率
+//	 spectrum
+//	     光谱
+//	 startDate
+//	     2017/04/14
+//     endDate
+//	     2017/07/13
+//     geom
+//	     {"type":"Polygon","coordinates":[[[3,4],[3,2],[1,2],[1,4],[3,4]]]}
+//	 areaNo
+//	     行政区域
+//	 areaName
+//	     行政区域名称
+//	 resolutionSa
+//	     分辨率/卫星
+//	 saSensor
+//	     卫星/传感器 {'GF2':'[PMS]','GF4':'[IRS]','GF1':'[PMS]'}
+//	 shp
+//	     2
+//     cloud
+//	     云量 10
+//     imageSatelliteType
+//	     卫星
+//	 request
+//	 resId
+//	     分辨率id
+
+    @RequestMapping(value = "/app/unauth/queryDataList", method = RequestMethod.POST)
+    public ObjectRestResponse queryDataList(@RequestBody QueryDTO dto) {
+        return ObjectRestResponse.succ(baseBiz.queryDataList(dto));
     }
 
-    static public class DTO {
 
+    @Data
+    static public class QueryDTO {
+	    String startDate;
+        String endDate;
+        String geom;
+        String areaNo;
+        String areaName;
+        List<satelliteDTO> saSensor;
+        BigDecimal cloud;
+    }
+
+    @Data
+    static public class satelliteDTO {
+        String satellite;
+        List<String> sensors = CollUtil.newArrayList();
     }
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/resources/mapper/RscpImageDataTotalMapper.xml

@@ -89,7 +89,36 @@
     </sql>
     <!-- This code was generated by TableGo tools, mark 2 end. -->
 
-<!--    <select id="selectList" >-->
-
-<!--    </select>-->
+    <select id="queryDataList" resultType="com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal">
+            select st_asgeojson(range,16,0) as range, *
+                from rscp_image_data_total
+                <where>
+                    <if test="saSensor != null">
+                        and
+                        <foreach collection="saSensor" item="sa" open="(" separator=" or " close=")">
+                            image_satellite_type = #{sa.satellite}
+                            <if test="sa.sensors != null and sa.sensors.size > 0">
+                                and image_sensor_type in
+                                <foreach collection="sa.sensors" item="sensor" open="(" separator="," close=")">
+                                    #{sensor}
+                                </foreach>
+                            </if>
+                        </foreach>
+                    </if>
+                    <if test="startDate != null">
+                        and start_date &gt;= #{startDate}
+                    </if>
+                    <if test="endDate != null">
+                        and endDate &lt;= #{endDate}
+                    </if>
+                    <if test="cloud != null">
+                        and image_cloudage &lt;= #{cloud}
+                    </if>
+                    <if test="geom != null">
+                        and ST_Intersects(geojsontowkt(#{geom}, 'true'),range)
+                    </if>
+                </where>
+            limit 5000
+            offset 0;
+    </select>
 </mapper>
\ No newline at end of file