代码提交
This commit is contained in:
parent
03e21c5f96
commit
be7f0c29b5
|
@ -32,7 +32,7 @@ public class EntityData implements Serializable {
|
||||||
private Long size;
|
private Long size;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数据类型(制图产品,减灾产品和其他数据)
|
* 数据类型(0-基础数据,1-减灾产品,2-制图产品)
|
||||||
*/
|
*/
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
|
@ -96,6 +96,11 @@ public class EntityData implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Date reviewTime;
|
private Date reviewTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 来源机构
|
||||||
|
*/
|
||||||
|
private String sourceOrganization;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,12 @@ import lombok.RequiredArgsConstructor;
|
||||||
import org.springblade.core.mp.support.Condition;
|
import org.springblade.core.mp.support.Condition;
|
||||||
import org.springblade.core.mp.support.Query;
|
import org.springblade.core.mp.support.Query;
|
||||||
import org.springblade.core.tool.api.R;
|
import org.springblade.core.tool.api.R;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@RequestMapping("/EntityData")
|
@RequestMapping("/ui/EntityData")
|
||||||
public class EntityDataController {
|
public class EntityDataController {
|
||||||
|
|
||||||
//实体数据服务层
|
//实体数据服务层
|
||||||
|
@ -25,10 +24,10 @@ public class EntityDataController {
|
||||||
* @param query current当前页 size 每页数据量
|
* @param query current当前页 size 每页数据量
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/list")
|
@GetMapping("/getList")
|
||||||
public R<IPage<EntityData>> getEntityDataList(EntityData entityData, Query query) {
|
public R<IPage<EntityData>> getEntityDataList(EntityData entityData, Query query) {
|
||||||
return R.data(respondInfoService.getEntityDataList(Condition.getPage(query), entityData));
|
return R.data(respondInfoService.getEntityDataList(Condition.getPage(query), entityData));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
<result property="uploaderId" column="uploader_id" jdbcType="BIGINT"/>
|
<result property="uploaderId" column="uploader_id" jdbcType="BIGINT"/>
|
||||||
<result property="managerId" column="manager_id" jdbcType="BIGINT"/>
|
<result property="managerId" column="manager_id" jdbcType="BIGINT"/>
|
||||||
<result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
|
<result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
|
||||||
|
<result property="sourceOrganization" column="source_organization" jdbcType="TIMESTAMP"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
|
@ -29,7 +30,7 @@
|
||||||
ed.upload_time,ed.disaster_id,ed.visual_flag,
|
ed.upload_time,ed.disaster_id,ed.visual_flag,
|
||||||
ed.visual_lon,ed.visual_lat,ed.exam_time,
|
ed.visual_lon,ed.visual_lat,ed.exam_time,
|
||||||
ed.status,ed.uploader_id,ed.manager_id,
|
ed.status,ed.uploader_id,ed.manager_id,
|
||||||
ed.review_time
|
ed.review_time, ed.source_organization
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
||||||
|
@ -40,6 +41,18 @@
|
||||||
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
||||||
ed.disaster_id = #{entityData.disasterId}
|
ed.disaster_id = #{entityData.disasterId}
|
||||||
</if>
|
</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>
|
</where>
|
||||||
ORDER BY ed.upload_time DESC
|
ORDER BY ed.upload_time DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -1,24 +1,31 @@
|
||||||
package com.kening.vordm.service.impl;
|
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.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.kening.vordm.entity.EntityData;
|
import com.kening.vordm.entity.EntityData;
|
||||||
import com.kening.vordm.mapper.EntityDataMapper;
|
import com.kening.vordm.mapper.EntityDataMapper;
|
||||||
import com.kening.vordm.service.EntityDataService;
|
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.stereotype.Service;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author G1393
|
* @author G1393
|
||||||
* @description 针对表【entity_data(其他上传的实体数据)】的数据库操作Service实现
|
* @description 针对表【entity_data(其他上传的实体数据)】的数据库操作Service实现
|
||||||
* @createDate 2023-04-04 15:54:30
|
* @createDate 2023-04-04 15:54:30
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityData>
|
public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityData>
|
||||||
implements EntityDataService {
|
implements EntityDataService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPage<EntityData> getEntityDataList(IPage<Object> page, EntityData entityData) {
|
public IPage<EntityData> getEntityDataList(IPage<Object> page, EntityData entityData) {
|
||||||
this.baseMapper.getEntityDataList(entityData,page);
|
return this.baseMapper.getEntityDataList(entityData, page);
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue