列表查询及删除接口

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -3,16 +3,14 @@ package com.siwei.apply.controller.cadastre;
 import com.siwei.apply.domain.vo.CadastreFileFilterVo;
 import com.siwei.apply.domain.vo.CheckInfoResultVo;
 import com.siwei.apply.domain.vo.CompareResultVo;
+import com.siwei.apply.domain.vo.IdsVo;
 import com.siwei.apply.domain.vo.ProjectFilterVo;
 import com.siwei.apply.service.cadastre.CadastreManageService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import org.gdal.ogr.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
@@ -92,6 +90,25 @@ public class CadastreManageController extends BaseController {
         }
     }
 
+    /**
+     * 批量删除
+     *
+     * @param idsVo 包含要删除的ID列表
+     * @return
+     */
+    @DeleteMapping("")
+    public R<Void> Delete(@RequestBody IdsVo idsVo) {
+        try {
+            if (idsVo == null || idsVo.getIds() == null || idsVo.getIds().isEmpty()) {
+                return R.fail("删除的ID列表不能为空");
+            }
+            cadastreManageService.batchDelete(idsVo.getIds());
+            return R.ok();
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
 
 
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/CadastreFile.java

@@ -23,8 +23,9 @@ public class CadastreFile extends BaseId {
     //1 为矢量，2为表格属性
     private String fileType;
     private String storage;
-    //0 为全量，1为矢量
+
     private String status;
+    //0 为全量，1为矢量
     private String readStatus;
     private String readMessage;
     private String fileStorageTime;

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/CadastreFileFilterVo.java

@@ -18,9 +18,16 @@ public class CadastreFileFilterVo {
     private String fileType;
 
     /**
-     * 上传时间 (可以是日期字符串，如 "2023-01-01")
+     * 入库开始 (可以是日期字符串，如 "2023-01-01")
      */
-    private String uploadTime;
+    private String storageBeginTime;
+
+    /**
+     * 入库结束时间 (可以是日期字符串，如 "2023-01-01")
+     */
+    private String storageEndTime;
+
+
 
     /**
      * 状态

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/CadastreFileMapper.java

@@ -30,6 +30,11 @@ public interface CadastreFileMapper {
      */
     void delete(String id);
 
+    /**
+     * 批量删除
+     */
+    void batchDelete(@Param("ids") List<String> ids);
+
 
     /**
      * 列表查询

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/CadastreManageService.java

@@ -5,6 +5,7 @@ import com.siwei.apply.domain.vo.CadastreFileFilterVo;
 import com.siwei.apply.domain.vo.CheckInfoResultVo;
 import com.siwei.apply.domain.vo.CompareResultVo;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -23,4 +24,9 @@ public interface CadastreManageService {
      */
     Map<String, Object> list(CadastreFileFilterVo cadastreFileFilterVo);
 
+    /**
+     * 批量删除
+     */
+    void batchDelete(List<String> ids);
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -205,7 +205,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
                     //0 为全量更新，1为增量更新
                     if (StringUtils.isNotBlank(updateType)) {
-                        cadastreFile.setStatus(updateType);
+                        cadastreFile.setReadStatus(updateType);
                     }
 
                     cadastreFile.setUploadUser("admin");
@@ -558,4 +558,16 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         return map;
     }
 
+    /**
+     * 批量删除
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchDelete(List<String> ids) {
+        if (ids == null || ids.isEmpty()) {
+            throw new IllegalArgumentException("IDs list cannot be null or empty");
+        }
+        cadastreFileMapper.batchDelete(ids);
+    }
+
 }

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml

@@ -64,6 +64,14 @@
         DELETE FROM t_cadastre_file WHERE id = #{id}
     </delete>
 
+    <delete id="batchDelete">
+        DELETE FROM t_cadastre_file
+        WHERE id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
     <select id="getList" resultMap="cadastreFileMap">
         SELECT <include refid="Base_Column_List"/>
         FROM t_cadastre_file
@@ -147,8 +155,6 @@
     </update>
 
 
-
-
     <select id="getListByFilter" parameterType="com.siwei.apply.domain.vo.CadastreFileFilterVo" resultMap="cadastreFileMap">
         SELECT <include refid="Base_Column_List"/>
         FROM t_cadastre_file
@@ -159,11 +165,14 @@
             <if test="fileType != null and fileType != ''">
                 AND file_type = #{fileType}
             </if>
-            <if test="uploadTime != null and uploadTime != ''">
-                AND to_char(upload_time, 'YYYY-MM-DD') = #{uploadTime}
+            <if test="storageBeginTime != null and storageBeginTime != ''"><!-- 结束时间检索 -->
+                AND "upload_time" &lt;= TO_TIMESTAMP(#{storageBeginTime}, 'YYYY-MM-DD HH24:MI:SS')
+            </if>
+            <if test="storageEndTime != null and storageEndTime != ''"><!-- 结束时间检索 -->
+                AND "upload_time" &lt;= TO_TIMESTAMP(#{storageEndTime}, 'YYYY-MM-DD HH24:MI:SS')+ INTERVAL '1 day'
             </if>
             <if test="readStatus != null and readStatus != ''">
-                AND status = #{readStatus}
+                AND read_status = #{readStatus}
             </if>
         </where>
         ORDER BY upload_time DESC
@@ -180,11 +189,17 @@
             <if test="fileType != null and fileType != ''">
                 AND file_type = #{fileType}
             </if>
-            <if test="uploadTime != null and uploadTime != ''">
-                AND to_char(upload_time, 'YYYY-MM-DD') = #{uploadTime}
+            <if test="storageBeginTime != null and storageBeginTime != ''"><!-- 结束时间检索 -->
+                AND "upload_time" &lt;= TO_TIMESTAMP(#{storageBeginTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
-            <if test="status != null and status != ''">
-                AND status = #{status}
+            <if test="storageEndTime != null and storageEndTime != ''"><!-- 结束时间检索 -->
+                AND "upload_time" &lt;= TO_TIMESTAMP(#{storageEndTime}, 'YYYY-MM-DD HH24:MI:SS')+ INTERVAL '1 day'
+            </if>
+<!--            <if test="uploadTime != null and uploadTime != ''">-->
+<!--                AND to_char(upload_time, 'YYYY-MM-DD') = #{uploadTime}-->
+<!--            </if>-->
+            <if test="readStatus != null and readStatus != ''">
+                AND read_status = #{readStatus}
             </if>
         </where>
     </select>