修改代码

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

+package com.upyuns.platform.rs.datacenter.pojo.imagedata;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class BgImageQueryDTO extends PageParam {
+    String name;
+    String imageSatelliteType;
+    String resolution;
+}
\ No newline at end of file

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

@@ -12,6 +12,7 @@ import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import com.upyuns.platform.rs.datacenter.mapper.RscpAreaInfoMapper;
 import com.upyuns.platform.rs.datacenter.mapper.RscpImageDataTotalMapper;
 import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
+import com.upyuns.platform.rs.datacenter.pojo.imagedata.BgImageQueryDTO;
 import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
 import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,11 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
         return mapper.queryDataList(dto);
     }
 
+    public List<RscpImageDataTotal> bgQueryDataList(BgImageQueryDTO dto) {
+        return mapper.bgQueryDataList(dto);
+    }
+
+
     public RscpImageDataTotal queryDataList(String id) {
         List<RscpImageDataTotal> list2 = mapper.queryDataById(id);
         if(list2.size() > 0) {

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

@@ -2,6 +2,7 @@ package com.upyuns.platform.rs.datacenter.mapper;
 
 import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
+import com.upyuns.platform.rs.datacenter.pojo.imagedata.BgImageQueryDTO;
 import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.data.repository.query.Param;
@@ -15,6 +16,7 @@ import java.util.Set;
 public interface RscpImageDataTotalMapper extends Mapper<RscpImageDataTotal> {
 
     public List<RscpImageDataTotal> queryDataList(RscpImageDataTotalController.QueryDTO dto);
+    public List<RscpImageDataTotal> bgQueryDataList(BgImageQueryDTO dto);
 
     public List<RscpImageDataTotal> queryDataById(@Param("id")String id );
 

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

@@ -16,6 +16,8 @@ import com.upyuns.platform.rs.datacenter.biz.RscpImagePriceBiz;
 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 com.upyuns.platform.rs.datacenter.pojo.imagedata.BgImageQueryDTO;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,10 +32,10 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
 @RequestMapping("/bg/imageData")
 public class BgRscpImageDataTotalController extends BaseController<RscpImageDataTotalBiz, RscpImageDataTotal> {
 
-    @Override
-    public ObjectRestResponse<PageDataVO<RscpImageDataTotal>> pages(@RequestParam Map<String, Object> params) {
-        //查询列表数据
-        Query query = new Query(params);
-        return ObjectRestResponse.succ(baseBiz.selectByQueryLogicPage(query));
+    @ApiOperation("查询分页")
+    @RequestMapping(value = "/bgPages",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<PageDataVO<RscpImageDataTotal>> bgPages(BgImageQueryDTO dto) {
+        return ObjectRestResponse.succ(PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.bgQueryDataList(dto)));
     }
 }
\ No newline at end of file

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

@@ -96,6 +96,22 @@
             offset 0;
     </select>
 
+    <select id="bgQueryDataList" resultMap="BaseResultMap">
+        select *
+        from rscp_image_data_total
+        <where>
+        <if test="name != null">
+            and name like '%' || #{name} || '%'
+        </if>
+        <if test="imageSatelliteType != null">
+            and image_satellite_type like '%' || #{imageSatelliteType} || '%'
+        </if>
+        <if test="resolution != null">
+            and #{resolution} = any(image_resolution)
+        </if>
+        </where>
+    </select>
+
     <select id="queryDataById" resultMap="BaseResultMap">
         select st_asgeojson(range,16,0) as range, *
         from rscp_image_data_total