glj-代码提交
This commit is contained in:
parent
981f6531d7
commit
012e775504
|
@ -35,4 +35,6 @@ public class DataUpload extends EntityData{
|
|||
private String account;
|
||||
|
||||
private String password;
|
||||
|
||||
private String sourceLink;
|
||||
}
|
||||
|
|
|
@ -126,6 +126,42 @@ public class EntityData implements Serializable {
|
|||
//来源路径 方便查看信息来源
|
||||
private String sourceLink;
|
||||
|
||||
/**
|
||||
* 1-Optical satellite, 2-Night light satellite, 3-Video satellite, 4-Hyperspectral satellite, 5-Radar satellite
|
||||
*/
|
||||
private Integer satelliteTypeSelect;
|
||||
|
||||
/**
|
||||
* 卫星代号
|
||||
*/
|
||||
private String satelliteCode;
|
||||
|
||||
/**
|
||||
* 产品序列号
|
||||
*/
|
||||
private String productSerialNum;
|
||||
|
||||
/**
|
||||
* 产品分辨率
|
||||
*/
|
||||
private Double productResolution;
|
||||
|
||||
/**
|
||||
* 云层覆盖量
|
||||
*/
|
||||
private Integer cloudCover;
|
||||
|
||||
/**
|
||||
* 生产时间
|
||||
*/
|
||||
private Date productTime;
|
||||
|
||||
/**
|
||||
* 产品波段树
|
||||
*/
|
||||
private String productBandsNum;
|
||||
|
||||
|
||||
/**
|
||||
* 上传人姓名
|
||||
*/
|
||||
|
@ -168,6 +204,18 @@ public class EntityData implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private String disasterType;
|
||||
|
||||
/**
|
||||
* 拒绝理由
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String reason;
|
||||
|
||||
/**
|
||||
* 上传用户邮箱
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String email;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
|
@ -192,8 +192,18 @@ public class EntityDataUserVo {
|
|||
*/
|
||||
private Integer satelliteTypeSelect;
|
||||
|
||||
/**
|
||||
* 产品序列号
|
||||
*/
|
||||
private String productSerialNum;
|
||||
|
||||
/**
|
||||
* 文件信息
|
||||
*/
|
||||
private List<MultipartFile> filesArray;
|
||||
|
||||
/**
|
||||
* 网络连接
|
||||
*/
|
||||
private String sourceLink;
|
||||
}
|
||||
|
|
|
@ -2,8 +2,10 @@ package com.kening.vordm.controller;
|
|||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.kening.vordm.entity.DataUpload;
|
||||
import com.kening.vordm.entity.Email;
|
||||
import com.kening.vordm.entity.EntityData;
|
||||
import com.kening.vordm.service.DataUploadService;
|
||||
import com.kening.vordm.service.EmailService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springblade.core.mp.support.Condition;
|
||||
import org.springblade.core.mp.support.Query;
|
||||
|
@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 后端管理系统-数据上传界面
|
||||
|
@ -53,6 +56,7 @@ public class DataUploadController {
|
|||
public R<IPage<DataUpload>> pagesAdmin(Query query, @RequestParam Map<String,Object> params){
|
||||
return R.data(service.queryPage(Condition.getPage(query),params));
|
||||
}
|
||||
private final EmailService emailService;
|
||||
|
||||
/**
|
||||
* 批量审批
|
||||
|
@ -64,6 +68,23 @@ public class DataUploadController {
|
|||
data.setManagerId(AuthUtil.getUserId());
|
||||
data.setReviewTime(new Date());
|
||||
});
|
||||
|
||||
if (dataUploadList.get(0).getStatus() == 2){
|
||||
String emailList = dataUploadList.stream().map(EntityData::getEmail).collect(Collectors.joining(","));
|
||||
//发送邮件
|
||||
Email email = new Email();
|
||||
email.setSubject("The resource you uploaded did not pass");
|
||||
|
||||
email.setText(dataUploadList.get(0).getReason());
|
||||
String[] to = new String[]{emailList};
|
||||
email.setTos(to);
|
||||
email.setHtmlText(false);
|
||||
try {
|
||||
emailService.sendMimeMessage(email);
|
||||
} catch (Exception e) {
|
||||
return R.fail("Sending failed, please check if the email is correct!");
|
||||
}
|
||||
}
|
||||
return R.status(service.updateBatchById(dataUploadList));
|
||||
}
|
||||
|
||||
|
|
|
@ -486,8 +486,12 @@ public class DisasterInfoController {
|
|||
}
|
||||
|
||||
@GetMapping("/statisticsByUser")
|
||||
public R statisticsByUser(String year,Long userId,String email) {
|
||||
return R.data(disasterInfoService.statisticsByUser(year,userId,email));
|
||||
public R statisticsByUser(String year,Long userId,String email,Long roleId) {
|
||||
if (roleId.compareTo(Long.parseLong("1123598816738675203"))==0){
|
||||
return R.data(disasterInfoService.statisticsByUserNew(year,userId,email));
|
||||
}else {
|
||||
return R.data(disasterInfoService.statisticsByUser(year,userId,email));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -70,6 +70,7 @@ public class RemoteSensingSourceDataController {
|
|||
return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/ConditionNew")
|
||||
public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByConditionNew(RemoteSensingSourceData remoteSensingSourceData, Query query) {
|
||||
return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByConditionNew(Condition.getPage(query), remoteSensingSourceData));
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
ed.is_download,
|
||||
ed.account,
|
||||
ed.password,
|
||||
ed.source_link,
|
||||
bu.name as uploaderName,
|
||||
bu.email as uploaderEmail
|
||||
from entity_data ed
|
||||
|
|
|
@ -105,4 +105,7 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
|
|||
IPage<DisasterInfo> getUserDisasterInfoListNDRNew(IPage<Object> page,@Param("userId") String userId,@Param("respondStatus") String respondStatus);
|
||||
|
||||
List<Map<String, Long>> disasterInfoType(@Param("year") String year);
|
||||
|
||||
List<Map<String, Long>> initiateAndResponseDataByUserNew(@Param("year") String year,@Param("userId") Long userId,@Param("email") String email);
|
||||
|
||||
}
|
||||
|
|
|
@ -1422,4 +1422,250 @@
|
|||
GROUP BY d.`key`
|
||||
ORDER BY d.`key`
|
||||
</select>
|
||||
|
||||
<select id="initiateAndResponseDataByUserNew" resultType="java.util.Map">
|
||||
select d.`key`, sum(d.response) as response, SUM(d.initiate) as initiate
|
||||
from (
|
||||
SELECT CONCAT(#{year}, '-01') as `key`, 0 as response, count(1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time, '%Y-%m') = CONCAT(#{year}, '-01')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-02') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-02')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-03') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-03')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-04') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-04')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-05') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-05')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-06') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-06')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-07') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-07')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-08') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-08')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-09') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-09')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-10') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-10')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-11') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-11')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-12') as `key`, 0 as response, count (1) as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
|
||||
where date_format(t.disaster_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-12')
|
||||
and gi.email = #{email}
|
||||
and gmdr.status != 2
|
||||
union ALL
|
||||
|
||||
|
||||
SELECT CONCAT(#{year}, '-01') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-01')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-02') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-02')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-03') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-03')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-04') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-04')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-05') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-05')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-06') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-06')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-07') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-07')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-08') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-08')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-09') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-09')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-10') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-10')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-11') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-11')
|
||||
and gmdr.manager_id = #{userId}
|
||||
union ALL
|
||||
SELECT CONCAT(#{year}, '-12') as `key`, count (1) as response, 0 as initiate
|
||||
FROM disaster_info t
|
||||
LEFT JOIN guest_manage_disaster_ref gmdr
|
||||
on gmdr.disaster_id = t.id
|
||||
where date_format(t.respond_time
|
||||
, '%Y-%m') = CONCAT(#{year}
|
||||
, '-12')
|
||||
and gmdr.manager_id = #{userId}
|
||||
) d
|
||||
GROUP BY d.`key`
|
||||
ORDER BY d.`key`
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
@ -28,6 +28,13 @@
|
|||
<result property="account" column="account" jdbcType="VARCHAR"/>
|
||||
<result property="password" column="password" jdbcType="VARCHAR"/>
|
||||
<result property="sourceLink" column="source_link" jdbcType="VARCHAR"/>
|
||||
<result property="satelliteTypeSelect" column="satellite_type_select" jdbcType="INTEGER"/>
|
||||
<result property="satelliteCode" column="satellite_code" jdbcType="VARCHAR"/>
|
||||
<result property="productSerialNum" column="product_serial_num" jdbcType="VARCHAR"/>
|
||||
<result property="productResolution" column="product_resolution" jdbcType="DOUBLE"/>
|
||||
<result property="cloudCover" column="cloud_cover" jdbcType="INTEGER"/>
|
||||
<result property="productTime" column="product_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="productBandsNum" column="product_bands_num" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
|
@ -39,7 +46,10 @@
|
|||
ed.status,ed.uploader_id,ed.manager_id,
|
||||
ed.review_time, ed.source_organization,
|
||||
ed.upload_type, ed.is_deleted, ed.is_publish,
|
||||
ed.is_download, ed.account, ed.password, ed.source_link
|
||||
ed.is_download, ed.account, ed.password, ed.source_link,
|
||||
ed.satellite_type_select, ed.satellite_code, ed.product_serial_num,
|
||||
ed.product_resolution, ed.cloud_cover, ed.product_time,
|
||||
ed.product_bands_num
|
||||
</sql>
|
||||
|
||||
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
</foreach>
|
||||
</if>
|
||||
/*状态集合*/
|
||||
<if test="remoteSensingSourceData.statusList != null and remoteSensingSourceData.statusList != '' and remoteSensingSourceData.statusList.size() != 0">
|
||||
<if test="remoteSensingSourceData.statusList != null and remoteSensingSourceData.statusList != '' and remoteSensingSourceData.statusList.size() > 0">
|
||||
and r.status in
|
||||
<foreach item="AList" index="index" collection="remoteSensingSourceData.statusList"
|
||||
open="(" separator="," close=")">#{AList}
|
||||
|
|
|
@ -90,4 +90,6 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
|
|||
IPage<DisasterInfo> getUserDisasterInfoListNDR(IPage<Object> page, String userId);
|
||||
|
||||
IPage<DisasterInfo> getUserDisasterInfoListNDRNew(IPage<Object> page, String userId, String respondStatus);
|
||||
|
||||
Map<String,Object> statisticsByUserNew(String year, Long userId, String email);
|
||||
}
|
||||
|
|
|
@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||
import com.kening.vordm.entity.Administrator;
|
||||
import com.kening.vordm.entity.DataUpload;
|
||||
import com.kening.vordm.entity.EntityData;
|
||||
import com.kening.vordm.entity.GuestInfo;
|
||||
import com.kening.vordm.mapper.AdministratorMapper;
|
||||
import com.kening.vordm.mapper.DataUploadMapper;
|
||||
import com.kening.vordm.mapper.GuestInfoMapper;
|
||||
import com.kening.vordm.service.AdministratorService;
|
||||
import com.kening.vordm.service.DataUploadService;
|
||||
import org.springblade.core.mp.base.BaseServiceImpl;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
|
@ -21,6 +25,9 @@ import java.util.Map;
|
|||
@Service
|
||||
public class DataUploadServiceImpl extends ServiceImpl<DataUploadMapper, EntityData> implements DataUploadService {
|
||||
|
||||
@Autowired
|
||||
private GuestInfoMapper guestInfoMapper;
|
||||
|
||||
/**
|
||||
* 灾害分页列表查询
|
||||
* @param page
|
||||
|
@ -41,8 +48,15 @@ public class DataUploadServiceImpl extends ServiceImpl<DataUploadMapper, EntityD
|
|||
*/
|
||||
@Override
|
||||
public IPage queryPage(IPage page, Map<String, Object> params) {
|
||||
page.setRecords(baseMapper.queryPage(page,params));
|
||||
return page;
|
||||
List<DataUpload> dataUploads = baseMapper.queryPage(page, params);
|
||||
dataUploads.stream().forEach(dataUpload -> {
|
||||
if (dataUpload.getUploaderName()==null){
|
||||
GuestInfo guestInfo = guestInfoMapper.selectById(dataUpload.getUploaderId());
|
||||
dataUpload.setUploaderName(guestInfo.getUsername());
|
||||
dataUpload.setUploaderEmail(guestInfo.getEmail());
|
||||
}
|
||||
});
|
||||
return page.setRecords(dataUploads);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -559,4 +559,13 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
|
|||
public IPage<DisasterInfo> getUserDisasterInfoListNDRNew(IPage<Object> page, String userId, String respondStatus) {
|
||||
return this.baseMapper.getUserDisasterInfoListNDRNew(page,userId,respondStatus);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> statisticsByUserNew(String year, Long userId, String email) {
|
||||
Map<String, Object> resultMap = Maps.newHashMap();
|
||||
//响应量和发起量
|
||||
List<Map<String, Long>> initiateAndResponseData = this.baseMapper.initiateAndResponseDataByUserNew(year,userId,email);
|
||||
resultMap.put("line", initiateAndResponseData);
|
||||
return resultMap;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -83,8 +83,6 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
|||
//创建实体数据
|
||||
EntityData entityData = new EntityData();
|
||||
|
||||
RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
|
||||
|
||||
//判断上传用户是否存在
|
||||
LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
|
||||
qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
|
||||
|
@ -101,18 +99,17 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
|||
guestInfo.setProfessionalTitle(entityDataUserVo.getProfessionalTitle());
|
||||
guestInfoMapper.insert(guestInfo);
|
||||
entityData.setUploaderId(guestInfo.getId());
|
||||
remoteSensingSourceData.setUploadId(guestInfo.getId());
|
||||
} else {
|
||||
entityData.setUploaderId(guestInfo1.getId());
|
||||
remoteSensingSourceData.setUploadId(guestInfo1.getId());
|
||||
}
|
||||
|
||||
if (entityDataUserVo.getType().equals("4")) {
|
||||
remoteSensingSourceData.setDisasterId(entityDataUserVo.getDisasterId());
|
||||
remoteSensingSourceData.setSourceOrganization(entityDataUserVo.getOrganization());
|
||||
remoteSensingSourceData.setSatelliteCode(entityDataUserVo.getSatelliteCode());
|
||||
remoteSensingSourceData.setProductResolution(entityDataUserVo.getProductResolution());
|
||||
remoteSensingSourceData.setCloudCover(entityDataUserVo.getCloudCover());
|
||||
entityData.setTitle(entityDataUserVo.getTitle());
|
||||
entityData.setDisasterId(entityDataUserVo.getDisasterId());
|
||||
entityData.setSourceOrganization(entityDataUserVo.getOrganization());
|
||||
entityData.setSatelliteCode(entityDataUserVo.getSatelliteCode());
|
||||
entityData.setProductResolution(entityDataUserVo.getProductResolution());
|
||||
entityData.setCloudCover(entityDataUserVo.getCloudCover());
|
||||
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'");
|
||||
Date date = null;
|
||||
|
@ -121,11 +118,14 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
|||
} catch (ParseException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
remoteSensingSourceData.setProductTime(date);
|
||||
remoteSensingSourceData.setProductBandsNum(entityDataUserVo.getProductBandsNum());
|
||||
//0-爬虫获取,1-未审核,2-,已审核,上传源数据未补充下载 链接,3-已审核上传源数据已补充下载链接
|
||||
remoteSensingSourceData.setStatus(1);
|
||||
return R.status(remoteSensingSourceDataMapper.insert(remoteSensingSourceData) > 0);
|
||||
entityData.setProductTime(date);
|
||||
entityData.setUploadTime(new Date());
|
||||
entityData.setSatelliteTypeSelect(entityDataUserVo.getSatelliteTypeSelect());
|
||||
entityData.setProductBandsNum(entityDataUserVo.getProductBandsNum());
|
||||
entityData.setProductSerialNum(entityDataUserVo.getProductSerialNum());
|
||||
entityData.setStatus(0);
|
||||
entityData.setType(entityDataUserVo.getType());
|
||||
return R.status(this.baseMapper.insert(entityData) > 0);
|
||||
} else {
|
||||
|
||||
//路径拼接
|
||||
|
@ -209,7 +209,9 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
|
|||
public R updateEntityDataAdmin(EntityDataUserVo entityDataUserVo) {
|
||||
EntityData entityData = new EntityData();
|
||||
entityData.setId(entityDataUserVo.getId());
|
||||
|
||||
if (entityDataUserVo.getSourceLink()!=null){
|
||||
entityData.setSourceLink(entityDataUserVo.getSourceLink());
|
||||
}
|
||||
//文件数据
|
||||
List<MultipartFile> filesArray = entityDataUserVo.getFilesArray();
|
||||
if (filesArray!=null && !filesArray.isEmpty()){
|
||||
|
|
Loading…
Reference in New Issue