From 2fdfc281e64ca967064ed5dea0fd2cbdce43380a Mon Sep 17 00:00:00 2001 From: glj <13935964706@163.com> Date: Fri, 1 Mar 2024 09:15:10 +0800 Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/entity/RemoteSensingSourceData.java | 2 +- .../vordm/controller/OtherDataController.java | 2 + .../RemoteSensingSourceDataController.java | 13 ++++ .../mapper/RemoteSensingSourceDataMapper.java | 2 + .../mapper/RemoteSensingSourceDataMapper.xml | 68 +++++++++++++++++++ .../RemoteSensingSourceDataService.java | 2 + .../RemoteSensingSourceDataServiceImpl.java | 7 ++ pom.xml | 4 +- 8 files changed, 97 insertions(+), 3 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java index 8722a94..d2e7842 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java @@ -235,7 +235,7 @@ public class RemoteSensingSourceData implements Serializable { //标志灾前灾后字段 0-灾前，1-灾后 @TableField(exist = false) - private Integer beforeOrAfter =1; + private Integer beforeOrAfter; //多个Id @TableField(exist = false) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java index 4bb67c6..c54fde6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java @@ -53,6 +53,8 @@ public class OtherDataController { return R.data(service.queryPage(Condition.getPage(query),params)); } + + /** * 批量审批 * @return diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index 0e456b0..d54393b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -45,6 +46,13 @@ public class RemoteSensingSourceDataController { return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper().in("disaster_id", disasterIds))); } + + @GetMapping("/getRemoteSensingSourceDataPage") + public R> getRemoteSensingSourceDataPage(RemoteSensingSourceData remoteSensingSourceData, Query query) { + return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper().eq("disaster_id", remoteSensingSourceData.getDisasterId()).in("status",Arrays.asList(remoteSensingSourceData.getStatusListNew().split(","))))); + } + + /** * 实体数据列表信息 * @@ -62,6 +70,11 @@ public class RemoteSensingSourceDataController { return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); } + @GetMapping("/ConditionNew") + public R> getRemoteSensingSourceDataByConditionNew(RemoteSensingSourceData remoteSensingSourceData, Query query) { + return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByConditionNew(Condition.getPage(query), remoteSensingSourceData)); + } + /** * 实体数据列表信息 * diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java index 50bb108..5bffd9f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java @@ -24,4 +24,6 @@ public interface RemoteSensingSourceDataMapper extends BaseMapper getRemoteSensingSourceDataByCondition(@Param("remoteSensingSourceData") RemoteSensingSourceData remoteSensingSourceData, IPage page); List> getStatisticsByUserId(@Param("id") Long id,@Param("year") String year); + + IPage getRemoteSensingSourceDataByConditionNew(@Param("remoteSensingSourceData") RemoteSensingSourceData remoteSensingSourceData, IPage page); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml index 2460dec..e439bc3 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml @@ -77,25 +77,31 @@ and r.status = #{remoteSensingSourceData.status} + and r.product_resolution >= #{remoteSensingSourceData.productResolutionMin} and r.product_resolution < #{remoteSensingSourceData.productResolutionMax} + and r.product_resolution > #{remoteSensingSourceData.productResolutionMin} + /*卫星类型集合*/ and r.satellite_type_select in #{AList} + /*状态集合*/ and r.status in #{AList} + /*灾前还是灾后*/ + and r.product_time >= (select disaster_time @@ -106,6 +112,7 @@ disaster_time from disaster_info where id = #{remoteSensingSourceData.disasterId}) + @@ -188,4 +195,65 @@ ORDER BY d.`key` + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java index eed02ae..13b99dc 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/RemoteSensingSourceDataService.java @@ -29,4 +29,6 @@ public interface RemoteSensingSourceDataService extends IService fileList, Long disasterId); void exportRemoteSensing(Long id, HttpServletRequest request, HttpServletResponse response); + + IPage getRemoteSensingSourceDataByConditionNew(IPage page, RemoteSensingSourceData remoteSensingSourceData); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java index b4fa0c6..f5136d4 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java @@ -344,6 +344,13 @@ public class RemoteSensingSourceDataServiceImpl extends ServiceImpl getRemoteSensingSourceDataByConditionNew(IPage page, RemoteSensingSourceData remoteSensingSourceData) { + List result = Arrays.asList(remoteSensingSourceData.getStatusListNew().split(",")); + remoteSensingSourceData.setStatusList(result); + return this.baseMapper.getRemoteSensingSourceDataByConditionNew(remoteSensingSourceData, page); + } + public static void downLoadExcel(HttpServletResponse response, Workbook workbook, String fileName) { try { if (workbook instanceof HSSFWorkbook) { diff --git a/pom.xml b/pom.xml index 475d4fd..8c67d48 100644 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,7 @@ kening-release Release Repository - http://47.92.168.204:8081/repository/maven-public/ + http://192.168.31.17:8081/repository/maven-public/ true @@ -231,7 +231,7 @@ kening-plugin - http://47.92.168.204:8081/repository/maven-public/ + http://192.168.31.17:8081/repository/maven-public/ true