修改问题

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

@@ -77,8 +77,9 @@ public class RscpAreaImageTotal implements java.io.Serializable {
     private String imageArea;
 
     /** dataId */
+    /** imageYear */
     @ApiModelProperty(value = "")
-    private String dataId;
+    private Long dataId;
 
     /** imageCloudage */
     @ApiModelProperty(value = "")
@@ -383,7 +384,7 @@ public class RscpAreaImageTotal implements java.io.Serializable {
      * 
      * @return dataId
      */
-    public String getDataId() {
+    public Long getDataId() {
         return this.dataId;
     }
 
@@ -392,7 +393,7 @@ public class RscpAreaImageTotal implements java.io.Serializable {
      * 
      * @param dataId
      */
-    public void setDataId(String dataId) {
+    public void setDataId(Long dataId) {
         this.dataId = dataId;
     }
 

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

@@ -19,7 +19,7 @@ public class RscpImageDataTotal implements java.io.Serializable {
 
     /** 标识id */
     @ApiModelProperty(value = "标识id")
-    private String id;
+    private Long id;
 
     /** 编号 */
     @ApiModelProperty(value = "编号")
@@ -277,4 +277,8 @@ public class RscpImageDataTotal implements java.io.Serializable {
     @ApiModelProperty(value = "")
     private Integer imageYear;
 
+    /** imageYear */
+    @ApiModelProperty(value = "")
+    private Long dataId;
+
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/fegin/DatacenterFeign.java

@@ -3,10 +3,13 @@ package com.upyuns.platform.rs.datacenter.fegin;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
+import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import java.util.List;
+
 
 /**
  * ${DESCRIPTION}
@@ -20,6 +23,6 @@ public interface DatacenterFeign {
     @RequestMapping(value = "/web/areaInfo/app/unauth/Fegin/queryByCodeFegin", method = RequestMethod.GET)
     public ObjectRestResponse<RscpAreaInfo> queryByCode(String areaCode);
 
-    @RequestMapping(value = "/web/imageData/app/unauth/Fegin/queryById", method = RequestMethod.GET)
-    public ObjectRestResponse<RscpImageDataTotal> queryById(String id);
+    @RequestMapping(value = "/web/imageData/app/unauth/Fegin/queryByIds", method = RequestMethod.GET)
+    public ObjectRestResponse<List<ImageDataVO>> queryByIds(String ids);
 }

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/ImageDataVO.java

+package com.upyuns.platform.rs.datacenter.pojo;
+
+import com.upyuns.platform.rs.datacenter.entity.RscpAreaImageTotal;
+import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ImageDataVO extends RscpAreaImageTotal {
+    BigDecimal price = BigDecimal.ZERO;
+}

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.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -14,7 +15,11 @@ import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.upyuns.platform.rs.datacenter.biz.RscpAreaImageTotalBiz;
 import com.upyuns.platform.rs.datacenter.biz.RscpImageDataTotalBiz;
+import com.upyuns.platform.rs.datacenter.biz.RscpImagePriceBiz;
+import com.upyuns.platform.rs.datacenter.entity.RscpAreaImageTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
+import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
+import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -27,6 +32,8 @@ import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
 @RestController
 @RequestMapping("/web/imageData")
 public class RscpImageDataTotalController extends BaseController<RscpImageDataTotalBiz, RscpImageDataTotal> {
@@ -34,6 +41,9 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
     @Autowired
     RscpAreaImageTotalBiz rscpAreaImageTotalBiz;
 
+    @Autowired
+    RscpImagePriceBiz rscpImagePriceBiz;
+
     @RequestMapping(value = "/app/unauth/query", method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse unauthQuery(PageParam pageParam) {
@@ -78,9 +88,28 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
         }
     }
 
-    @RequestMapping(value = "/web/imageData/app/unauth/Fegin/queryByIds", method = RequestMethod.GET)
-    public ObjectRestResponse<List<RscpImageDataTotal>> queryById(String ids){
-        return ObjectRestResponse.succ(baseBiz.selectByAttrs(RscpImageDataTotal::getId, CollUtil.toList(ids.split(","))));
+    @RequestMapping(value = "/app/unauth/Fegin/queryByIds", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse<List<RscpImageDataTotal>> queryByIds(String ids){
+        List<RscpImagePrice> list = rscpImagePriceBiz.selectByWeekend(w -> {
+            w.andEqualTo(RscpImagePrice::getStatus, SYS_TRUE);
+            return w;
+        }, " daily_sort asc");
+
+        List<RscpImageDataTotal> list2 = baseBiz.selectByAttrs(RscpImageDataTotal::getId, CollUtil.toList(ids.split(",")));
+        List<ImageDataVO> list3 = CollUtil.newArrayList();
+        list2.forEach(t -> {
+            ImageDataVO vo = BeanUtil.toBean(t, ImageDataVO.class);
+            vo.setBeginTime(t.getImageTakeTime());
+            list.forEach(p -> {
+                if(t.getImageSatelliteType().equals(p.getImageSatelliteType())
+                && t.getImageSensorType().equals(p.getImageSensorType())) {
+                    vo.setPrice(p.getUnitPrice());
+                }
+            });
+            list3.add(vo);
+        });
+        return ObjectRestResponse.succ(list3);
     }
 
 

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

@@ -22,21 +22,37 @@ public class CustomFormWebController extends BaseController<CustomFormBiz,Custom
 
     @RequestMapping(value = "customIndustry",method = RequestMethod.POST)
     public ObjectRestResponse customIndustry(@RequestBody CustomForm entity) {
-//        if(StrUtil.isNotBlank(entity.getProvinceCode())) {
-//            entity.setProvinceName(AssertUtils.isFeignSucc(datacenterFegin.queryByCode(entity.getProvinceCode()).getData());
-//        }
+        if(StrUtil.isNotBlank(entity.getProvinceCode())) {
+            entity.setProvinceName(datacenterFegin.queryByCode(entity.getProvinceCode()).getData().getName());
+        }
+        if(StrUtil.isNotBlank(entity.getCityCode())) {
+            entity.setCityName(datacenterFegin.queryByCode(entity.getCityCode()).getData().getName());
+        }
+        if(StrUtil.isNotBlank(entity.getAreaCode())) {
+            entity.setAreaName(datacenterFegin.queryByCode(entity.getAreaCode()).getData().getName());
+        }
         baseBiz.insertSelective(entity);
         return ObjectRestResponse.succ();
     }
 
     @RequestMapping(value = "customImgStorage",method = RequestMethod.POST)
     public ObjectRestResponse customImgStorage(@RequestBody CustomForm entity) {
+
         baseBiz.insertSelective(entity);
         return ObjectRestResponse.succ();
     }
 
     @RequestMapping(value = "customImageData",method = RequestMethod.POST)
     public ObjectRestResponse customImageData(@RequestBody CustomForm entity) {
+        if(StrUtil.isNotBlank(entity.getProvinceCode())) {
+            entity.setProvinceName(datacenterFegin.queryByCode(entity.getProvinceCode()).getData().getName());
+        }
+        if(StrUtil.isNotBlank(entity.getCityCode())) {
+            entity.setCityName(datacenterFegin.queryByCode(entity.getCityCode()).getData().getName());
+        }
+        if(StrUtil.isNotBlank(entity.getAreaCode())) {
+            entity.setAreaName(datacenterFegin.queryByCode(entity.getAreaCode()).getData().getName());
+        }
         baseBiz.insertSelective(entity);
         return ObjectRestResponse.succ();
     }