接口开放

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

@@ -41,7 +41,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
 
     @ApiModelProperty("检测图斑热度")
     @IgnoreUserToken
-    @RequestMapping(value = "/app/unauth/all",method = RequestMethod.GET)
+    @RequestMapping(value = "/app/unauth/hotall",method = RequestMethod.GET)
     public ObjectRestResponse<List<RscpMonitorimage>> all(RscpImageDataNewestDTO dto) {
         Example example = new Example(RscpMonitorimage.class);
         Example.Criteria criteria = example.createCriteria();
@@ -50,16 +50,16 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
         PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
         return ObjectRestResponse.succ(pageDataVO);
     }
-//    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.GET)
-//    @IgnoreUserToken
-//    public ObjectRestResponse unauthQuery() {
-//
-//        List<RscpMonitorimage> list = baseBiz.selectByWeekend(w -> {
-//            w.andEqualTo(RscpMonitorimage::getStatus, 2);
-//            return w;
-//        }, "start_time DESC");
-//        return ObjectRestResponse.succ(list);
-//    }
+    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse unauthQuery() {
+
+        List<RscpMonitorimage> list = baseBiz.selectByWeekend(w -> {
+            w.andEqualTo(RscpMonitorimage::getStatus, 2);
+            return w;
+        }, "start_time DESC");
+        return ObjectRestResponse.succ(list);
+    }
 //
 //    @RequestMapping(value = "/app/unauth/mapAll", method = RequestMethod.GET)
 //    @IgnoreUserToken

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

@@ -30,16 +30,16 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 @RequestMapping("/web/rscpMosaicimage")
 public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz, RscpMosaicimage> {
 
-//    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.GET)
-//    @IgnoreUserToken
-//    public ObjectRestResponse unauthQuery() {
-//
-//        List<RscpMosaicimage> list = baseBiz.selectByWeekend(w -> {
-//            w.andEqualTo(RscpMosaicimage::getStatus, 2);
-//            return w;
-//        }, "start_time asc");
-//        return ObjectRestResponse.succ(list);
-//    }
+    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse unauthQuery() {
+
+        List<RscpMosaicimage> list = baseBiz.selectByWeekend(w -> {
+            w.andEqualTo(RscpMosaicimage::getStatus, 2);
+            return w;
+        }, "start_time asc");
+        return ObjectRestResponse.succ(list);
+    }
 
     @ApiModelProperty("遥感影像最新时间分页")
     @IgnoreUserToken
@@ -58,7 +58,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz
 
     @ApiModelProperty("遥感影像热度排序")
     @IgnoreUserToken
-    @RequestMapping(value = "/app/unauth/all",method = RequestMethod.GET)
+    @RequestMapping(value = "/app/unauth/hotall",method = RequestMethod.GET)
     public ObjectRestResponse<List<RscpMosaicimage>> all(RscpImageDataNewestDTO dto) {
         Example example = new Example(RscpMosaicimage.class);
         Example.Criteria criteria = example.createCriteria();

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ImageInformationStorageDto.java

@@ -11,6 +11,8 @@ import lombok.Data;
  */
 @Data
 public class ImageInformationStorageDto extends PageParam {
+
+    private Integer isDel;
 	Integer status;
 	Integer type;
 	String name;

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ImageImgStorage.java

@@ -117,6 +117,10 @@ public class ImageImgStorage implements Serializable {
 
 	private Date updTime;
 
+	@Column(name = "hot")
+    @ApiModelProperty(value = "热度")
+	private String hot;
+
 	//源图像信息
 	@Transient
 	List<ImageInfoRelation> imageInfoRelationList;

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageImgStorageBiz.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.upyuns.platform.rs.datacenter.entity.RscpMonitorimage;
 import com.upyuns.platform.rs.website.dto.ImageInformationStorageDto;
 import com.upyuns.platform.rs.website.dto.ImageStorageImgDto;
 import com.upyuns.platform.rs.website.entity.ImageInfoRelation;
@@ -266,4 +267,23 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
 		return ObjectRestResponse.succ();
 	}
 
+    public ObjectRestResponse mapAll(ImageInformationStorageDto dto) {
+        Example example = new Example(ImageImgStorage.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("status",1);
+        example.setOrderByClause("crt_time DESC");
+        PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->selectByExample(example));
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+
+    public ObjectRestResponse all(ImageInformationStorageDto dto) {
+        Example example = new Example(ImageImgStorage.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("status",1);
+        example.setOrderByClause("hot DESC");
+        PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->selectByExample(example));
+        return ObjectRestResponse.succ(pageDataVO);
+    }
 }
\ No newline at end of file

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

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.ImageImgStorageBiz;
@@ -8,12 +9,31 @@ import com.upyuns.platform.rs.website.dto.ImageInformationStorageDto;
 import com.upyuns.platform.rs.website.dto.ImageStorageImgDto;
 import com.upyuns.platform.rs.website.entity.ImageImgStorage;
 import com.upyuns.platform.rs.website.entity.ImageInformation;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("imageImgStorage")
 public class ImageImgStorageController extends BaseController<ImageImgStorageBiz,ImageImgStorage> {
 
+
+    @ApiModelProperty("最新图谱库信息列表")
+    @GetMapping(value = "/app/unauth/mapAll")
+    @IgnoreUserToken
+    public ObjectRestResponse mapAll(ImageInformationStorageDto dto) {
+        return baseBiz.mapAll(dto);
+    }
+
+    @ApiModelProperty("热度图谱库信息列表")
+    @GetMapping(value = "/app/unauth/hotAll")
+    public ObjectRestResponse all(ImageInformationStorageDto dto) {
+        return baseBiz.all(dto);
+    }
+
+
+
+
+
 	@GetMapping(value = "getList")
 	public ObjectRestResponse getList(ImageInformationStorageDto imageInformationStorageDto) {
 		return baseBiz.selectList(imageInformationStorageDto, 1);

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

@@ -12,6 +12,10 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("shoppingCartInfo/web")
 public class ShoppingCartInfoWebController extends BaseController<ShoppingCartInfoBiz,ShoppingCartInfo> {
 
+
+
+
+
 	@PostMapping(value = "addUpdate")
 	public ObjectRestResponse addUpdate(@RequestBody OrderInfoDto orderInfoDto) {
 		return baseBiz.addShoppingCart(orderInfoDto);