代码提交

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java

@@ -32,7 +32,7 @@ public class EntityData implements Serializable {
     private Long size;
 
     /**
-     * 数据类型（制图产品，减灾产品和其他数据）
+     * 数据类型（0-基础数据，1-减灾产品，2-制图产品）
      */
     private String type;
 
@@ -96,6 +96,11 @@ public class EntityData implements Serializable {
      */
     private Date reviewTime;
 
+    /**
+     * 来源机构
+     */
+    private String sourceOrganization;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java

@@ -7,13 +7,12 @@ import lombok.RequiredArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/EntityData")
+@RequestMapping("/ui/EntityData")
 public class EntityDataController {
 
 	//实体数据服务层
@@ -25,10 +24,10 @@ public class EntityDataController {
 	 * @param query  current当前页  size 每页数据量
 	 * @return
 	 */
-	@GetMapping("/list")
+	@GetMapping("/getList")
 	public R<IPage<EntityData>> getEntityDataList(EntityData entityData, Query query) {
 		return R.data(respondInfoService.getEntityDataList(Condition.getPage(query), entityData));
 	}
 
-
 }
+

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml

@@ -21,6 +21,7 @@
             <result property="uploaderId" column="uploader_id" jdbcType="BIGINT"/>
             <result property="managerId" column="manager_id" jdbcType="BIGINT"/>
             <result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
+            <result property="sourceOrganization" column="source_organization" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -29,7 +30,7 @@
         ed.upload_time,ed.disaster_id,ed.visual_flag,
         ed.visual_lon,ed.visual_lat,ed.exam_time,
         ed.status,ed.uploader_id,ed.manager_id,
-        ed.review_time
+        ed.review_time, ed.source_organization
     </sql>
 
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
@@ -40,6 +41,18 @@
             <if test="entityData.disasterId != null and entityData.disasterId != ''">
                 ed.disaster_id = #{entityData.disasterId}
             </if>
+            <if test="entityData.status != null and entityData.status != ''">
+                and ed.status = #{entityData.status}
+            </if>
+            <if test="entityData.visualFlag != null and entityData.visualFlag != ''">
+                and ed.visual_flag = #{entityData.visualFlag}
+            </if>
+            <if test="entityData.type != null and entityData.type != ''">
+                and ed.type = #{entityData.type}
+            </if>
+            <if test="entityData.sourceOrganization != null and entityData.sourceOrganization != ''">
+                and ed.source_organization = #{entityData.sourceOrganization}
+            </if>
         </where>
         ORDER BY ed.upload_time DESC
     </select>

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java

@@ -1,11 +1,17 @@
 package com.kening.vordm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kening.vordm.entity.EntityData;
 import com.kening.vordm.mapper.EntityDataMapper;
 import com.kening.vordm.service.EntityDataService;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * @author G1393
@@ -18,7 +24,8 @@ implements EntityDataService {
 
 	@Override
 	public IPage<EntityData> getEntityDataList(IPage<Object> page, EntityData entityData) {
-		this.baseMapper.getEntityDataList(entityData,page);
-		return null;
+		return this.baseMapper.getEntityDataList(entityData, page);
 	}
+
+
 }