Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
This commit is contained in:
commit
d14e10d936
|
@ -23,4 +23,6 @@ public class DataUpload extends EntityData{
|
||||||
private Date disasterTime;
|
private Date disasterTime;
|
||||||
|
|
||||||
private Long disasterId;
|
private Long disasterId;
|
||||||
|
|
||||||
|
private String vordmId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,6 +107,10 @@ public class EntityData implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Integer isDeleted;
|
private Integer isDeleted;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否发布(0未发布/1已发布)
|
||||||
|
*/
|
||||||
|
private Integer isPublish;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传人姓名
|
* 上传人姓名
|
||||||
|
|
|
@ -76,10 +76,6 @@ public class Hotspot implements Serializable {
|
||||||
@ExcelIgnore
|
@ExcelIgnore
|
||||||
private Date reviewTime;
|
private Date reviewTime;
|
||||||
|
|
||||||
/**
|
|
||||||
* 是否删除 0未删除 1已删除
|
|
||||||
*/
|
|
||||||
private Integer isDeleted;
|
|
||||||
|
|
||||||
@ExcelIgnore
|
@ExcelIgnore
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
|
|
|
@ -18,6 +18,8 @@ public class OtherData{
|
||||||
|
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
|
private String title;
|
||||||
|
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
private Long disasterId;
|
private Long disasterId;
|
||||||
|
|
|
@ -67,4 +67,12 @@ public class CallForHelpVo extends DisasterInfo {
|
||||||
* 受灾国家
|
* 受灾国家
|
||||||
*/
|
*/
|
||||||
private String disasterCountry;
|
private String disasterCountry;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 受灾国家
|
||||||
|
*/
|
||||||
|
private String vordmId;
|
||||||
|
|
||||||
|
|
||||||
|
private Date reviewTime;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
|
||||||
@SpringCloudApplication
|
@SpringCloudApplication
|
||||||
public class VoRdmApplication {
|
public class VoRdmApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ public class AdminManagerController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/pages")
|
@GetMapping("/pages")
|
||||||
public R pages(Query query, @RequestParam Map<String,Object> params){
|
public R pages(Query query, @RequestParam Map<String,Object> params){
|
||||||
|
|
||||||
return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params));
|
return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -61,5 +61,16 @@ public class EntityDataController {
|
||||||
entityData.setReviewTime(new Date());
|
entityData.setReviewTime(new Date());
|
||||||
return R.data(entityDataService.updateById(entityData));
|
return R.data(entityDataService.updateById(entityData));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改实体数据
|
||||||
|
* @param entityData
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/updateEntityData")
|
||||||
|
public R updateEntityData(@RequestBody EntityData entityData) {
|
||||||
|
return R.data(entityDataService.updateById(entityData));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,42 +28,47 @@ public class RemoteSensingSourceDataController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据页码和灾害信息查出遥感影像源数据,可多个灾害
|
* 根据页码和灾害信息查出遥感影像源数据,可多个灾害
|
||||||
|
*
|
||||||
* @param disasterInfo
|
* @param disasterInfo
|
||||||
* @param query
|
* @param query
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/SourceData")
|
@GetMapping("/SourceData")
|
||||||
public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){
|
public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query) {
|
||||||
List<Long> disasterIds = disasterInfoService.getDisasterId(disasterInfo);
|
List<Long> disasterIds = disasterInfoService.getDisasterId(disasterInfo);
|
||||||
if (disasterIds.isEmpty()){
|
if (disasterIds.isEmpty()) {
|
||||||
return R.data(null);
|
return R.data(null);
|
||||||
}
|
}
|
||||||
return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper<RemoteSensingSourceData>().in("disaster_id",disasterIds)));
|
return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper<RemoteSensingSourceData>().in("disaster_id", disasterIds)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 实体数据列表信息
|
* 实体数据列表信息
|
||||||
|
*
|
||||||
* @param optionsJson 实体数据条件信息
|
* @param optionsJson 实体数据条件信息
|
||||||
* @param query current当前页 size 每页数据量
|
* @param query current当前页 size 每页数据量
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/Condition")
|
@GetMapping("/Condition")
|
||||||
public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition( String optionsJson, Query query) {
|
public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition(String optionsJson, Query query) {
|
||||||
RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
|
RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
|
||||||
if (optionsJson!=null){
|
if (optionsJson != null) {
|
||||||
remoteSensingSourceData = (RemoteSensingSourceData)JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
|
remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
|
||||||
}
|
}
|
||||||
return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
|
return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 实体数据列表信息
|
* 实体数据列表信息
|
||||||
* @param params
|
*
|
||||||
* @param query
|
* @param disasterId
|
||||||
* @return
|
* @param query
|
||||||
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/PagesData")
|
@GetMapping("/PagesData")
|
||||||
public R<IPage<RemoteSensingSourceData>> Pages(@RequestParam Map<String,Object> params, Query query){
|
public R<IPage<RemoteSensingSourceData>> pages(Query query, String disasterId) {
|
||||||
return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(params,RemoteSensingSourceData.class)));
|
QueryWrapper<RemoteSensingSourceData> qw = new QueryWrapper<>();
|
||||||
|
qw.eq("disaster_id", disasterId);
|
||||||
|
return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,13 +21,15 @@
|
||||||
di.disaster_keyword,
|
di.disaster_keyword,
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.id as disasterId,
|
di.id as disasterId,
|
||||||
|
di.vordm_id AS vordmId,
|
||||||
di.disaster_time as disasterTime,
|
di.disaster_time as disasterTime,
|
||||||
di.disaster_country as disasterCountry
|
di.disaster_country as disasterCountry
|
||||||
from entity_data ed
|
from entity_data ed
|
||||||
left join blade_user bu on bu.id = ed.uploader_id
|
left join blade_user bu on bu.id = ed.uploader_id
|
||||||
left join disaster_info di on di.id = ed.disaster_id
|
left join disaster_info di on di.id = ed.disaster_id
|
||||||
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
||||||
where ed.disaster_id is not null
|
where ed.disaster_id is not null
|
||||||
|
AND di.disaster_keyword IS NOT NUll
|
||||||
group by di.id,bdb.dict_value
|
group by di.id,bdb.dict_value
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
@ -37,9 +37,7 @@
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<sql id="Home_Disaster_Info">
|
<sql id="Home_Disaster_Info">
|
||||||
d
|
d.disaster_type
|
||||||
.
|
|
||||||
disaster_type
|
|
||||||
,d.disaster_time,d.disaster_country,
|
,d.disaster_time,d.disaster_country,
|
||||||
m.organization
|
m.organization
|
||||||
</sql>
|
</sql>
|
||||||
|
@ -130,15 +128,18 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
|
<select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
|
||||||
SELECT bu.name AS `name`,
|
SELECT
|
||||||
count(*) AS cnt,
|
g.username AS `name`,
|
||||||
'responseOrganization' AS `type`
|
count(*) AS cnt,
|
||||||
FROM guest_manage_disaster_ref t
|
'sponsorOrganization' AS `type`
|
||||||
INNER JOIN blade_user bu ON bu.id = t.manager_id
|
FROM
|
||||||
WHERE bu.name != ''
|
disaster_info t
|
||||||
AND t.`status` = '1'
|
INNER JOIN guest_manage_disaster_ref gm ON gm.disaster_id = t.id
|
||||||
|
INNER JOIN guest_info g ON g.id = gm.sponsor_id
|
||||||
|
WHERE
|
||||||
|
gm.`status` != 2
|
||||||
GROUP BY
|
GROUP BY
|
||||||
bu.name
|
gm.sponsor_id
|
||||||
ORDER BY
|
ORDER BY
|
||||||
cnt DESC
|
cnt DESC
|
||||||
LIMIT 5
|
LIMIT 5
|
||||||
|
@ -173,6 +174,7 @@
|
||||||
SELECT
|
SELECT
|
||||||
d.chief_id,
|
d.chief_id,
|
||||||
d.chief_name,
|
d.chief_name,
|
||||||
|
d.vordm_id,
|
||||||
u.username ,
|
u.username ,
|
||||||
u.last_name AS lastName,
|
u.last_name AS lastName,
|
||||||
u.first_name AS firstName,
|
u.first_name AS firstName,
|
||||||
|
@ -189,6 +191,7 @@
|
||||||
d.upload_time,
|
d.upload_time,
|
||||||
d.geometry,
|
d.geometry,
|
||||||
d.respond_status,
|
d.respond_status,
|
||||||
|
ud.review_time AS reviewTime,
|
||||||
bdb.dict_value as dictValue
|
bdb.dict_value as dictValue
|
||||||
From
|
From
|
||||||
guest_manage_disaster_ref ud join
|
guest_manage_disaster_ref ud join
|
||||||
|
@ -214,7 +217,10 @@
|
||||||
and d.chief_id = #{callForHelpVo.chiefIdEquals}
|
and d.chief_id = #{callForHelpVo.chiefIdEquals}
|
||||||
</if>
|
</if>
|
||||||
<if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''">
|
<if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''">
|
||||||
and bdb.dict_value like concat('%', #{callForHelpVo.disasterType},'%')
|
and d.disaster_type = #{callForHelpVo.disasterType}
|
||||||
|
</if>
|
||||||
|
<if test="callForHelpVo.disasterCountry != null and callForHelpVo.disasterCountry != ''">
|
||||||
|
and d.disaster_country like concat('%', #{callForHelpVo.disasterCountry},'%')
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by d.upload_time desc
|
order by d.upload_time desc
|
||||||
|
|
|
@ -21,6 +21,9 @@
|
||||||
<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"/>
|
<result property="sourceOrganization" column="source_organization" jdbcType="TIMESTAMP"/>
|
||||||
|
<result property="uploadType" column="upload_type" jdbcType="INTEGER"/>
|
||||||
|
<result property="isDeleted" column="is_deleted" jdbcType="INTEGER"/>
|
||||||
|
<result property="isPublish" column="is_publish" jdbcType="INTEGER"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
|
@ -29,7 +32,8 @@
|
||||||
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.visual_lon,ed.visual_lat,
|
||||||
ed.status,ed.uploader_id,ed.manager_id,
|
ed.status,ed.uploader_id,ed.manager_id,
|
||||||
ed.review_time, ed.source_organization
|
ed.review_time, ed.source_organization,
|
||||||
|
ed.upload_type, ed.is_deleted, ed.is_publish
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
||||||
|
@ -40,8 +44,8 @@
|
||||||
ms.vordm_id,
|
ms.vordm_id,
|
||||||
ms.name AS msName
|
ms.name AS msName
|
||||||
from entity_data ed
|
from entity_data ed
|
||||||
inner join guest_info gi on gi.id = ed.uploader_id
|
left join guest_info gi on gi.id = ed.uploader_id
|
||||||
inner join map_server ms on ms.disaster_id = ed.disaster_id
|
left join map_server ms on ms.disaster_id = ed.disaster_id
|
||||||
<where>
|
<where>
|
||||||
<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}
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
<update id="updatePassword">
|
<update id="updatePassword">
|
||||||
update blade_user t set t.password = #{password} where t.email = #{email}
|
update blade_user t set t.password = #{password} where t.email = #{email}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateAccount">
|
|
||||||
|
|
||||||
|
<update id="updateAccount">
|
||||||
update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
|
update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
|
||||||
t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country}
|
t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country}
|
||||||
where t.id = #{id}
|
where t.id = #{id}
|
||||||
|
@ -39,6 +39,7 @@
|
||||||
email = #{email}
|
email = #{email}
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getByUserStatisticsOne" resultType="java.lang.Integer">
|
<select id="getByUserStatisticsOne" resultType="java.lang.Integer">
|
||||||
select count(di.id)
|
select count(di.id)
|
||||||
FROM disaster_info di
|
FROM disaster_info di
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
di.disaster_time,
|
di.disaster_time,
|
||||||
di.disaster_level,
|
di.disaster_level,
|
||||||
di.disaster_country,
|
di.disaster_country,
|
||||||
di.sponsor_organization
|
di.sponsor_organization,
|
||||||
from guest_manage_disaster_ref gmdr
|
from guest_manage_disaster_ref gmdr
|
||||||
left join disaster_info di on gmdr.disaster_id = di.id
|
left join disaster_info di on gmdr.disaster_id = di.id
|
||||||
left join blade_user bu on gmdr.manager_id = bu.id
|
left join blade_user bu on gmdr.manager_id = bu.id
|
||||||
|
|
|
@ -19,12 +19,13 @@
|
||||||
<select id="queryDisasterPage" resultType="com.kening.vordm.entity.DataUpload">
|
<select id="queryDisasterPage" resultType="com.kening.vordm.entity.DataUpload">
|
||||||
select
|
select
|
||||||
di.disaster_keyword,
|
di.disaster_keyword,
|
||||||
|
di.vordm_id,
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.id as disasterId,
|
di.id as disasterId,
|
||||||
di.disaster_time as disasterTime,
|
di.disaster_time as disasterTime,
|
||||||
di.disaster_country as disasterCountry
|
di.disaster_country as disasterCountry
|
||||||
from disaster_info di
|
from disaster_info di
|
||||||
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="queryPage" resultType="com.kening.vordm.entity.DataUpload">
|
<select id="queryPage" resultType="com.kening.vordm.entity.DataUpload">
|
||||||
|
@ -35,7 +36,7 @@
|
||||||
ed.visual_lon,ed.visual_lat,
|
ed.visual_lon,ed.visual_lat,
|
||||||
ed.status,ed.uploader_id,ed.manager_id,
|
ed.status,ed.uploader_id,ed.manager_id,
|
||||||
ed.review_time, ed.source_organization,
|
ed.review_time, ed.source_organization,
|
||||||
ed.upload_type,
|
ed.upload_type, ed.is_publish,
|
||||||
bu.name as uploaderName
|
bu.name as uploaderName
|
||||||
from entity_data ed
|
from entity_data ed
|
||||||
left join blade_user bu on bu.id = ed.uploader_id
|
left join blade_user bu on bu.id = ed.uploader_id
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
di.disaster_keyword,
|
di.disaster_keyword,
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.id as disasterId,
|
di.id as disasterId,
|
||||||
|
di.vordm_id,
|
||||||
di.disaster_time as disasterTime,
|
di.disaster_time as disasterTime,
|
||||||
di.disaster_country as disasterCountry
|
di.disaster_country as disasterCountry
|
||||||
from disaster_info di
|
from disaster_info di
|
||||||
|
|
|
@ -102,6 +102,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
|
||||||
entityData.setDisasterId(OtherData.getDisasterId());
|
entityData.setDisasterId(OtherData.getDisasterId());
|
||||||
entityData.setUploadTime(new Date());
|
entityData.setUploadTime(new Date());
|
||||||
entityData.setRemark(OtherData.getRemark());
|
entityData.setRemark(OtherData.getRemark());
|
||||||
|
entityData.setTitle(OtherData.getTitle());
|
||||||
entityData.setStatus(1);
|
entityData.setStatus(1);
|
||||||
entityData.setUploadType(2);
|
entityData.setUploadType(2);
|
||||||
entityData.setUploaderId(AuthUtil.getUserId());
|
entityData.setUploaderId(AuthUtil.getUserId());
|
||||||
|
|
|
@ -16,15 +16,15 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author G1393
|
* @author G1393
|
||||||
* @description 针对表【picture_info(照片存储表)】的数据库操作Service实现
|
* @description 针对表【picture_info(照片存储表)】的数据库操作Service实现
|
||||||
* @createDate 2023-04-04 15:54:31
|
* @createDate 2023-04-04 15:54:31
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class PictureInfoServiceImpl extends ServiceImpl<PictureInfoMapper, PictureInfo>
|
public class PictureInfoServiceImpl extends ServiceImpl<PictureInfoMapper, PictureInfo>
|
||||||
implements PictureInfoService {
|
implements PictureInfoService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 对象存储模块
|
* 对象存储模块
|
||||||
|
@ -33,6 +33,7 @@ implements PictureInfoService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改图片信息
|
* 修改图片信息
|
||||||
|
*
|
||||||
* @param pictureInfo
|
* @param pictureInfo
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
@ -44,7 +45,7 @@ implements PictureInfoService {
|
||||||
picture.setLink(bladeFile.getLink());
|
picture.setLink(bladeFile.getLink());
|
||||||
picture.setName(bladeFile.getOriginalName());
|
picture.setName(bladeFile.getOriginalName());
|
||||||
picture.setSize(multipartFile.getSize());
|
picture.setSize(multipartFile.getSize());
|
||||||
picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".")+1));
|
picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
|
||||||
picture.setIsMain(pictureInfo.getIsMain());
|
picture.setIsMain(pictureInfo.getIsMain());
|
||||||
picture.setId(pictureInfo.getId());
|
picture.setId(pictureInfo.getId());
|
||||||
return updateById(picture);
|
return updateById(picture);
|
||||||
|
@ -52,21 +53,26 @@ implements PictureInfoService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传图片
|
* 上传图片
|
||||||
|
*
|
||||||
* @param otherData
|
* @param otherData
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean uploadData(OtherData otherData) {
|
public boolean uploadData(OtherData otherData) {
|
||||||
log.info("上传数据:{}",otherData);
|
log.info("上传数据:{}", otherData);
|
||||||
List<PictureInfo> pictureInfoList = new ArrayList<>();
|
List<PictureInfo> pictureInfoList = new ArrayList<>();
|
||||||
for (MultipartFile multipartFile : otherData.getFile()) {
|
for (MultipartFile multipartFile : otherData.getFile()) {
|
||||||
BladeFile bladeFile = minioTemplate.putFile(multipartFile);
|
BladeFile bladeFile = minioTemplate.putFile(multipartFile);
|
||||||
PictureInfo pictureInfo = new PictureInfo();
|
PictureInfo pictureInfo = new PictureInfo();
|
||||||
pictureInfo.setLink(bladeFile.getLink());
|
pictureInfo.setLink(bladeFile.getLink());
|
||||||
pictureInfo.setDisasterId(otherData.getDisasterId());
|
pictureInfo.setDisasterId(otherData.getDisasterId());
|
||||||
pictureInfo.setName(bladeFile.getOriginalName());
|
if (otherData.getTitle() != null) {
|
||||||
|
pictureInfo.setName(otherData.getTitle());
|
||||||
|
} else {
|
||||||
|
pictureInfo.setName(bladeFile.getName());
|
||||||
|
}
|
||||||
pictureInfo.setSize(multipartFile.getSize());
|
pictureInfo.setSize(multipartFile.getSize());
|
||||||
pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".")+1));
|
pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
|
||||||
pictureInfo.setIsMain(otherData.getIsMain());
|
pictureInfo.setIsMain(otherData.getIsMain());
|
||||||
pictureInfoList.add(pictureInfo);
|
pictureInfoList.add(pictureInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
<modules>
|
<modules>
|
||||||
<module>biz-vordm</module>
|
<module>biz-vordm</module>
|
||||||
<module>vordm-crawl</module>
|
<module>vordm-crawl</module>
|
||||||
|
<module>vordm-twitter</module>
|
||||||
<!-- <module>kn-setting</module>-->
|
<!-- <module>kn-setting</module>-->
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
FROM bladex/alpine-java:openjdk8-openj9_cn_slim
|
||||||
|
|
||||||
|
LABEL maintainer=whq<460794335@qq.com>
|
||||||
|
|
||||||
|
RUN mkdir -p /kn/vordm
|
||||||
|
|
||||||
|
WORKDIR /kn/vordm
|
||||||
|
|
||||||
|
EXPOSE 8980
|
||||||
|
|
||||||
|
ADD ./target/vordm-twitter.jar ./app.jar
|
||||||
|
|
||||||
|
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
|
||||||
|
|
||||||
|
CMD ["--spring.profiles.active=test"]
|
|
@ -0,0 +1,74 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<parent>
|
||||||
|
<artifactId>kn-service</artifactId>
|
||||||
|
<groupId>com.kening.platform</groupId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<artifactId>vordm-twitter</artifactId>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<maven.compiler.source>8</maven.compiler.source>
|
||||||
|
<maven.compiler.target>8</maven.compiler.target>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.kening.platform</groupId>
|
||||||
|
<artifactId>kn-launcher</artifactId>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-undertow</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>wildfly-common</artifactId>
|
||||||
|
<groupId>org.wildfly.common</groupId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.itmuch</groupId>
|
||||||
|
<artifactId>spring-cloud-wii</artifactId>
|
||||||
|
<version>2.2.6.RELEASE</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>de.codecentric</groupId>
|
||||||
|
<artifactId>spring-boot-admin-starter-client</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!--Hystrix-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.cloud</groupId>
|
||||||
|
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>commons-logging</groupId>
|
||||||
|
<artifactId>commons-logging</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>HdrHistogram</artifactId>
|
||||||
|
<groupId>org.hdrhistogram</groupId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<!-- Nacos -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
|
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
|
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
</project>
|
|
@ -0,0 +1,13 @@
|
||||||
|
package com.kening.crawl.twitter;
|
||||||
|
|
||||||
|
import org.springblade.core.launch.BladeApplication;
|
||||||
|
import org.springframework.cloud.client.SpringCloudApplication;
|
||||||
|
import org.springframework.context.annotation.ComponentScan;
|
||||||
|
|
||||||
|
@SpringCloudApplication
|
||||||
|
@ComponentScan({"org.springblade", "com.kening.crawl.twitter"})
|
||||||
|
public class TwitterApplication {
|
||||||
|
public static void main(String[] args) {
|
||||||
|
BladeApplication.run("vordm-twitter", TwitterApplication.class, args);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,12 @@
|
||||||
|
server:
|
||||||
|
port: 8980
|
||||||
|
|
||||||
|
spring:
|
||||||
|
cloud:
|
||||||
|
gateway:
|
||||||
|
discovery:
|
||||||
|
locator:
|
||||||
|
enabled: true
|
||||||
|
loadbalancer:
|
||||||
|
retry:
|
||||||
|
enabled: true
|
Loading…
Reference in New Issue