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

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpResolution.java

@@ -20,7 +20,11 @@ public class RscpResolution implements java.io.Serializable {
     private String id;
 
     /** resolutionName */
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "分辨率标识")
+    private String resolution;
+
+    /** resolutionName */
+    @ApiModelProperty(value = "分辨率展示")
     private String resolutionName;
 
     /** sensorName */
@@ -32,7 +36,7 @@ public class RscpResolution implements java.io.Serializable {
     private Integer status;
 
     /** sort */
-    @ApiModelProperty(value = "")
+    @ApiModelProperty(value = "排序")
     private Integer sort;
 
     /** 首页排序 */

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

@@ -86,6 +86,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
         Integer type;
 	    String startDate;
         String endDate;
+        BigDecimal resolution;
         String startDateTime;
         String endDateTime;
         String geom;

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

@@ -36,7 +36,7 @@ public class RscpImagePriceController extends BaseController<RscpImagePriceBiz,
 
         List<ImagePriceVO> imagePriceVOS = CollUtil.newArrayList();
         String key = "";
-        List<String> satelliteTypes = list.parallelStream().map(RscpImagePrice::getImageSatelliteType).collect(Collectors.toList());
+        List<String> satelliteTypes = list.parallelStream().map(RscpImagePrice::getImageSatelliteType).distinct().collect(Collectors.toList());
         for(String satelliteType : satelliteTypes) {
             List<RscpImagePrice> imagePriceList = list.parallelStream().filter(rscpImagePrice -> satelliteType.equals(rscpImagePrice.getImageSatelliteType())).collect(Collectors.toList());
             imagePriceVOS.add(new ImagePriceVO(){{

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

@@ -63,6 +63,9 @@
                     </if>
                 </foreach>
             </if>
+            <if test="resolution != null">
+                and #{image_resolution} = any(image_resolution)
+            </if>
             <if test="startDateTime != null">
                 and begin_time &gt;= #{startDateTime}
             </if>

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

@@ -112,6 +112,9 @@
                     </if>
                 </foreach>
             </if>
+            <if test="resolution != null">
+                and #{image_resolution} = any(image_resolution)
+            </if>
             <if test="startDateTime != null">
                 and image_take_time &gt;= #{startDateTime}
             </if>

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/CustomFormWebController.java

@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.CustomFormBiz;
 import com.upyuns.platform.rs.website.entity.CustomForm;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,19 +14,19 @@ import org.springframework.web.bind.annotation.RestController;
 public class CustomFormWebController extends BaseController<CustomFormBiz,CustomForm> {
 
     @RequestMapping(value = "customIndustry",method = RequestMethod.POST)
-    public ObjectRestResponse customIndustry(CustomForm entity) {
+    public ObjectRestResponse customIndustry(@RequestBody CustomForm entity) {
         baseBiz.insertSelective(entity);
         return ObjectRestResponse.succ();
     }
 
     @RequestMapping(value = "customImgStorage",method = RequestMethod.POST)
-    public ObjectRestResponse customImgStorage(CustomForm entity) {
+    public ObjectRestResponse customImgStorage(@RequestBody CustomForm entity) {
         baseBiz.insertSelective(entity);
         return ObjectRestResponse.succ();
     }
 
     @RequestMapping(value = "customImageData",method = RequestMethod.POST)
-    public ObjectRestResponse customImageData(CustomForm entity) {
+    public ObjectRestResponse customImageData(@RequestBody CustomForm entity) {
         baseBiz.insertSelective(entity);
         return ObjectRestResponse.succ();
     }