glj-代码提交

kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -49,7 +49,7 @@ public interface CommonConstant {
 	/**
 	 * 对接TB模块的名称
 	 */
-	String KN_VORDM_MODULE_NAME = "biz-vordm";
+	String KN_VORDM_MODULE_NAME = "biz-vordm-glj";
 
 	/**
 	 * 系统管理模块 application name

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

@@ -1,5 +1,6 @@
 package com.kening.vordm.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
@@ -18,25 +19,35 @@ public class Administrator extends BaseEntity {
 
 	private Long id;
 
+	//租户ID
 	private String tenantId;
 
+	//用户编号
 	private String code;
 
+	//用户平台
 	private Integer userType;
 
+	//账号
 	private String account;
 
+	//密码
 	@JsonIgnore
 	private String password;
 
+	//昵称
 	private String name;
 
+	//真名
 	private String realName;
 
+	//头像
 	private String avatar;
 
+	//邮箱
 	private String email;
 
+	//手机
 	private String phone;
 
 	/**
@@ -44,6 +55,7 @@ public class Administrator extends BaseEntity {
 	 */
 	private String organization;
 
+	//角色id
 	private String roleId;
 
 	private Long createDept;
@@ -58,8 +70,30 @@ public class Administrator extends BaseEntity {
 
 	private Integer status;
 
+	//研究范围
+	private String researchField;
+
+	//职业
+	private String occupation;
+
+	//国家
+	private String country;
+
+	private String firstName;
+
+	private String lastName;
+
 	//分数
 	private Integer fraction;
 
+	//教育
+	private String education;
+
+	//简介
+	private String Introduction;
+
+	@TableField(exist = false)
+	private String newPassword;
+
 	private Integer isDeleted;
 }

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

@@ -105,6 +105,12 @@ public class DisasterInfo implements Serializable {
 	@TableField(exist = false)
 	private String name;
 
+	/**
+	 * 发起用户Id
+	 */
+	@TableField(exist = false)
+	private Long sponsorId;
+
 	/**
 	 * 发起用户
 	 */
@@ -146,6 +152,11 @@ public class DisasterInfo implements Serializable {
 	 */
 	private String adminName;
 
+	/**
+	 * 灾害结束审批（0灾害正常流程/1B2管理员提交审批/2B1管理员审批）
+	 */
+	private Integer approvalRole;
+
 	/**
 	 * 管理用户
 	 */
@@ -181,7 +192,6 @@ public class DisasterInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-
 	/**
 	 * Allocation 是否是分配
 	 */
@@ -217,4 +227,8 @@ public class DisasterInfo implements Serializable {
 	@TableField(exist = false)
 	private String email;
 
+	//分数
+	@TableField(exist = false)
+	private Integer fraction;
+
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 其他上传的实体数据
@@ -32,7 +33,13 @@ public class EntityData implements Serializable {
     private Long size;
 
     /**
-     * 数据类型（0-基础数据，1-减灾产品，2-制图产品）
+     * 数据类型（
+	 * 0-基础数据(Basic data)，
+	 * 1-减灾产品(Responded report)，
+	 * 2-制图产品(Cartographic product)
+	 * 3-Social media 社会化媒体
+	 * 4遥感数据(Remote sensing data)）
+	 * 5-Other data 其他数据
      */
     private String type;
 
@@ -73,7 +80,7 @@ public class EntityData implements Serializable {
 
 
     /**
-     * 0 未审核，1-审核已通过，2-审核未通过
+     * 审核状态（0-B2管理添加未审核/1-B2管理发起审核/2-B1管理发起审核或审核完B2管理的状态/3审核未通过)
      */
     private Integer status;
 
@@ -128,6 +135,8 @@ public class EntityData implements Serializable {
 
 	/**
 	 * 1-Optical satellite, 2-Night light satellite, 3-Video satellite, 4-Hyperspectral satellite, 5-Radar satellite
+	 *
+	 * 数据类型（\r\n0-基础数据(Basic data)，\r\n1-减灾产品(Responded report)，\r\n2-制图产品(Cartographic product)\r\n3-Social media 社会化媒体\r\n4遥感数据(Remote sensing data)）\r\n5-Other data 其他数据',
 	 */
 	private Integer satelliteTypeSelect;
 
@@ -144,7 +153,7 @@ public class EntityData implements Serializable {
 	/**
 	 * 产品分辨率
 	 */
-	private Double productResolution;
+	private String productResolution;
 
 	/**
 	 * 云层覆盖量
@@ -161,6 +170,25 @@ public class EntityData implements Serializable {
 	 */
 	private String productBandsNum;
 
+	/**
+	 * 审核失败原因
+	 */
+	private String reason;
+
+	/**
+	 * Personal/Other  信息来源
+	 */
+	private String source;
+
+	/**
+	 * 1-Optical,  2-Radar , 3-Luminous 传感器类型
+	 */
+	private String sensorType;
+
+	/**
+	 * downloadLink下载地址
+	 */
+	private String downloadLink;
 
 	/**
 	 * 上传人姓名
@@ -204,11 +232,6 @@ public class EntityData implements Serializable {
 	@TableField(exist = false)
 	private String disasterType;
 
-	/**
-	 * 拒绝理由
-	 */
-	@TableField(exist = false)
-	private String reason;
 
 	/**
 	 * 上传用户邮箱
@@ -216,6 +239,29 @@ public class EntityData implements Serializable {
 	@TableField(exist = false)
 	private String email;
 
+
+	/**
+	 * 查询枚举
+	 */
+	@TableField(exist = false)
+	private List<String> typeList;
+
+	/**
+	 * 审核状态（0-B2管理添加未审核/1-B2管理发起审核/2-B1管理发起审核或审核完B2管理的状态/3审核未通过)
+	 */
+	@TableField(exist = false)
+	private String stateListNew;
+
+	/**
+	 * 查询枚举
+	 */
+	@TableField(exist = false)
+	private List<String> stateList;
+
+	//标志灾前灾后字段 0-灾前，1-灾后
+	@TableField(exist = false)
+	private Integer beforeOrAfter;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

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

@@ -71,6 +71,12 @@ public class GuestInfo implements Serializable {
 	 */
 	private String firstName;
 
+
+	/**
+	 * 名字
+	 */
+	private String country;
+
 	/**
 	 * 姓名
 	 */

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

@@ -52,7 +52,7 @@ public class GuestManageDisasterRef implements Serializable {
 	private Date reviewTime;
 
 	/**
-	 * 管理人
+	 * 管理人B2
 	 */
 	private Long adminId;
 

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

@@ -0,0 +1,80 @@
+package com.kening.vordm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 灾害受影响范围
+ * @TableName influence
+ */
+@TableName(value ="influence")
+@Data
+public class Influence implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 受影响人数
+     */
+    private String influenceNumber;
+
+    /**
+     * 死亡人数
+     */
+    private String deathNumber;
+
+    /**
+     * 受伤人数
+     */
+    private String injuryNumber;
+
+    /**
+     * 失踪人数
+     */
+    private String disappearanceNumber;
+
+    /**
+     * 无家可归人数
+     */
+    private String homelessnessNumber;
+
+    /**
+     * 影响范围
+     */
+    private String influenceRange;
+
+    /**
+     * 直接经济损失
+     */
+    private String economicLosses;
+
+    /**
+     * 经济损失占比
+     */
+    private String lossProportion;
+
+	/**
+	 * 来源网站
+	 */
+    private String sourceLink;
+
+    /**
+     * 关联灾害Id
+     */
+    private Long disasterId;
+
+    /**
+     * 是否删除（0未删除/1删除）
+     */
+    private Integer isDeleted;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -67,6 +67,11 @@ public class PictureInfo implements Serializable {
 	 */
 	private Integer isDeleted;
 
+	/**
+	 * 审核状态（0-B2管理添加未审核/1-B2管理发起审核/2-B1管理发起审核或审核完B2管理的状态）
+	 */
+	private Integer reviewStatus;
+
 	/**
 	 * 图片对象
 	 */

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

@@ -128,7 +128,7 @@ public class SocialMedia implements Serializable {
     private Integer type;
 
     /**
-     * 审核状态，0为未审核，1为审核保留，2为审核不保留
+     * 审核状态（0-B2管理添加未审核/1-B2管理发起审核/2-B1管理发起审核或审核完B2管理的状态/3审核未通过)
      */
 	@ExcelIgnore
     private Integer status;
@@ -145,6 +145,12 @@ public class SocialMedia implements Serializable {
 	@ExcelIgnore
     private Date reviewTime;
 
+	/**
+	 * 审核失败理由
+	 */
+	@ExcelIgnore
+	private String reason;
+
 	@ExcelIgnore
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

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

@@ -13,6 +13,12 @@ import java.util.Date;
 @Data
 public class VisualData {
 
+
+	/**
+	 * 该词组归属的时间
+	 */
+	private String date;
+
 	private String areaCn;
 
 	private String areaEn;

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

@@ -56,6 +56,16 @@ public class Websites implements Serializable {
      */
     private Long uploadId;
 
+    /**
+     * 审核状态（0-B2管理添加未审核/1-B2管理发起审核/2-B1管理发起审核或审核完B2管理的状态/3审核未通过)
+     */
+    private Integer reviewStatus;
+
+	/**
+	 * 审核失败理由
+	 */
+	private String reason;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java

@@ -23,10 +23,10 @@ public class EntityDataUserVo {
 	/**
 	 * 数据产品的大小（byte）
 	 */
-	private Integer size;
+	private Long size;
 
 	/**
-	 * 数据类型（0-基础数据，1-减灾产品，2-制图产品）
+	 * 数据类型（0-基础数据(Basic data)，1-减灾产品(Responded report)，2-制图产品(Cartographic product)4遥感数据(Remote sensing data)）',
 	 */
 	private String type;
 
@@ -163,7 +163,7 @@ public class EntityDataUserVo {
 	/**
 	 * 产品分辨率
 	 */
-	private Double productResolution;
+	private String productResolution;
 
 	/**
 	 * 云层覆盖量
@@ -206,4 +206,29 @@ public class EntityDataUserVo {
 	 * 网络连接
 	 */
 	private String sourceLink;
+
+	/**
+	 * 国家
+	 */
+	private String country;
+
+	/**
+	 * 审核失败原因
+	 */
+	private String reason;
+
+	/**
+	 * Personal/Other  信息来源
+	 */
+	private String source;
+
+	/**
+	 * 1-Optical,  2-Radar , 3-Luminous 传感器类型
+	 */
+	private String sensorType;
+
+	/**
+	 * downloadLink下载地址
+	 */
+	private String downloadLink;
 }

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java

@@ -95,8 +95,13 @@ public class UserVo {
 	//国家
 	private String country;
 
+	private Integer fraction;
+
 	private Integer byUserStatisticsOne;
+
 	private Integer byUserStatisticsTwo;
+
 	private Integer byUserStatisticsThree;
+
 	private Integer byUserStatisticsFour;
 }

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

@@ -50,6 +50,7 @@ public class AdminManagerController {
 				DisasterInfo disasterInfo = new DisasterInfo();
 				disasterInfo.setId(guestManageDisasterRef1.getDisasterId());
 				disasterInfo.setChiefId(guestManageDisasterRef1.getManagerId());
+				disasterInfo.setAdminId(guestManageDisasterRef1.getAdminId());
 				disasterInfoService.updateById(disasterInfo);
 			}
 

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

@@ -1,9 +1,14 @@
 package com.kening.vordm.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kening.vordm.entity.Administrator;
+import com.kening.vordm.entity.GuestInfo;
+import com.kening.vordm.entity.Influence;
 import com.kening.vordm.service.AdministratorService;
+import com.kening.vordm.service.GuestInfoService;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.mp.support.Condition;
@@ -28,7 +33,12 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 @RequestMapping("/ui/administrator")
 public class AdministratorController {
 
+	//用户信息
 	private AdministratorService service;
+
+	//游客信息
+	private GuestInfoService guestInfoService;
+
 	//引入BladeRedis
 	private BladeRedis bladeRedis;
 
@@ -128,4 +138,50 @@ public class AdministratorController {
 	}
 
 
+	@PutMapping("/updatePasswordByEmail")
+	public R<Boolean> updatePasswordByEmail(@RequestParam String account, @RequestParam String email,@RequestParam String tenantId,@RequestParam String newPassword){
+		bladeRedis.del("blade:user::user:account:595035-"+account);
+		Administrator administrator = service.getOne(Wrappers.<Administrator>query().lambda().eq(Administrator::getAccount,account).eq(Administrator::getEmail,email).eq(Administrator::getTenantId,tenantId));
+		if(administrator == null){
+			return R.data(false);
+		}
+		administrator.setPassword(DigestUtil.encrypt(newPassword));
+		return R.data(service.updateById(administrator));
+	}
+
+
+	@PostMapping("/updateUserById")
+	public R<Boolean> updateUserById(@RequestBody Administrator administrator){
+		Administrator administratorNew = service.getById(administrator.getId());
+		if(administratorNew == null){
+			return R.data(false);
+		}
+		if (administrator.getNewPassword()!=null){
+			bladeRedis.del("blade:user::user:account:595035-"+administrator.getAccount());
+			administrator.setPassword(DigestUtil.encrypt(administrator.getNewPassword()));
+		}
+		return R.data(service.updateById(administrator));
+	}
+
+
+
+	@GetMapping("/getUserById")
+	public R getUserById(Long id) {
+		Administrator detail = service.getById(id);
+		if (detail!=null){
+			return R.data(detail);
+		}else {
+			Administrator administrator = new Administrator();
+			GuestInfo byId = guestInfoService.getById(id);
+			administrator.setName(byId.getUsername());
+			administrator.setCountry(byId.getCountry());
+			administrator.setEmail(byId.getEmail());
+			administrator.setId(byId.getId());
+			administrator.setOccupation(byId.getOccupation());
+			administrator.setOrganization(byId.getOrganization());
+			return R.data(administrator);
+		}
+	}
+
+
 }

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

@@ -67,6 +67,23 @@ public class DisasterInfoController {
 		return R.status(guestManageDisasterRefService.updateById(one));
 	}
 
+	/**
+	 * 用户发起审批
+	 * @param disasterId
+	 * @param adminId
+	 * @return
+	 */
+	@GetMapping("/saveGuestAdminDisasterRefNew")
+	public R saveGuestAdminDisasterRefNew(Long disasterId, Long adminId) {
+		LambdaQueryWrapper<GuestManageDisasterRef> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(GuestManageDisasterRef::getDisasterId, disasterId);
+		GuestManageDisasterRef one = guestManageDisasterRefService.getOne(queryWrapper);
+		one.setAdminId(adminId);
+		one.setApplyTime(new Date());
+		one.setStatus(0);
+		return R.status(guestManageDisasterRefService.updateById(one));
+	}
+
 
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "分页", notes = "传入Tool")
@@ -277,6 +294,7 @@ public class DisasterInfoController {
 		DisasterInfo disasterInfoDetail = disasterInfoService.getDisasterInfoDetail(id);
 		LambdaQueryWrapper<Websites> qw = new LambdaQueryWrapper<>();
 		qw.eq(Websites::getDisasterId, disasterInfoDetail.getId());
+		qw.eq(Websites::getReviewStatus, 2);
 		List<Websites> list = websitesService.list(qw);
 		disasterInfoDetail.setWebsitesList(list);
 		return R.data(disasterInfoDetail);
@@ -493,6 +511,11 @@ public class DisasterInfoController {
 		return R.status(disasterInfoService.saveOrUpdate(disasterInfo));
 	}
 
+	/**
+	 * B2用户审核提交
+	 * @param disasterInfo
+	 * @return
+	 */
 	@ApiOperation(value = "提交", notes = "传入DisasterInfo")
 	@PostMapping("/submitByAdmin")
 	public R submitByAdmin(@ApiParam(value = "DisasterInfo对象", required = true) @RequestBody DisasterInfo disasterInfo) {
@@ -573,15 +596,40 @@ public class DisasterInfoController {
 		return R.data(disasterInfoService.statistics(year));
 	}
 
+	//前台个人中心-统计折线图
 	@GetMapping("/statisticsByUser")
 	public R statisticsByUser(String year, Long userId, String email, Long roleId) {
-		if (roleId.compareTo(Long.parseLong("1123598816738675203")) == 0) {
+		//管理员B1
+		if (roleId.compareTo(Long.parseLong("1793193529859244033")) == 0) {
 			return R.data(disasterInfoService.statisticsByUserNew(year, userId, email));
 		} else {
+			//管理员B2
 			return R.data(disasterInfoService.statisticsByUser(year, userId, email));
 		}
 	}
 
+	//个人中心详情下饼状图
+	@GetMapping("/statisticsByUserCountry")
+	public R statisticsByUserCountry(Long userId, Long roleId) {
+		HashMap<String, Object> map = new HashMap<>();
+		//获取用户发起的灾害信息
+		List<DisasterInfo> disasterInfoList = disasterInfoService.statisticsByUserCountry(userId);
+
+		LambdaQueryWrapper<DisasterInfo> queryWrapper = new LambdaQueryWrapper<>();
+		//管理员B1
+		if (roleId.compareTo(Long.parseLong("1793193529859244033")) == 0) {
+			queryWrapper.eq(DisasterInfo::getChiefId,userId);
+		} else {
+			//管理员B2
+			queryWrapper.eq(DisasterInfo::getAdminId,userId);
+		}
+		List<DisasterInfo> list = disasterInfoService.list(queryWrapper);
+		map.put("launch",disasterInfoList.stream().collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry)));
+		map.put("administration",list.stream().collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry)));
+		return R.data(map);
+	}
+
+
 	/**
 	 * 批量更新灾害的chief管理者
 	 *
@@ -657,8 +705,8 @@ public class DisasterInfoController {
 
 	//chief管理个人中心统计
 	@GetMapping("/getByUserDisasterInfoStatistics")
-	public R getByUserDisasterInfo(Long userId, String email) {
+	public R getByUserDisasterInfo(Long userId, String email, Long roleId) {
-		return R.data(disasterInfoService.getByUserDisasterInfoStatistics(userId, email));
+		return R.data(disasterInfoService.getByUserDisasterInfoStatistics(userId, email, roleId));
 	}
 
 	//普通用户个人中心统计
@@ -676,16 +724,8 @@ public class DisasterInfoController {
 
 	//个人中心列表统计
 	@GetMapping("/getDisasterInfoByUserId")
-	public R<List<DisasterInfo>> getDisasterInfoByUserId(Long userId, String email) {
+	public R<List<DisasterInfo>> getDisasterInfoByUserId(Long userId, String email, Long roleId) {
-		return R.data(disasterInfoService.getDisasterInfoByUserId(userId, email));
+		return R.data(disasterInfoService.getDisasterInfoByUserId(userId, email, roleId));
-	}
-
-	//个人中心列表统计-根据国家分类饼状图
-	@GetMapping("/getDisasterInfoByUserIdCountry")
-	public R<Map<String, List<DisasterInfo>>> getDisasterInfoByUserIdCountry(Long userId, String email) {
-		List<DisasterInfo> disasterInfoByUserId = disasterInfoService.getDisasterInfoByUserId(userId, email);
-		Map<String, List<DisasterInfo>> collect = disasterInfoByUserId.stream().collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry));
-		return R.data(collect);
 	}
 
 
@@ -722,7 +762,31 @@ public class DisasterInfoController {
 	public R<Boolean> examineDisasterInfoEnd(@RequestBody DisasterInfo disasterInfo) {
 		//是否发起灾害响应结束申请（0：未发起/1：发起审批/2审批通过/3审批不通过）
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+		String userEmail = "";
+		Administrator byId = administratorService.getById(disasterInfo.getAdminId());
+
+		if (byId != null){
+			userEmail = byId.getEmail();
+			Integer fractionUser = byId.getFraction();
+			Integer fractionUserNew = 0;
+			Integer fraction = disasterInfo.getFraction();
+			if (fraction == 5) {
+				fractionUserNew = fractionUser + 3;
+			} else if (fraction == 4) {
+				fractionUserNew = fractionUser + 2;
+			} else if (fraction == 3) {
+				fractionUserNew = fractionUser + 1;
+			}
+			byId.setFraction(fractionUserNew);
+			administratorService.updateById(byId);
+
+		}else {
+			userEmail = disasterInfo.getEmail();
+		}
+
 		if (disasterInfo.getIsEndApply() == 2) {
+
 			DisasterInfoVo disasterInfoVo = disasterInfoVoService.getById(disasterInfo.getId());
 			//发送邮件
 			Email email = new Email();
@@ -732,7 +796,7 @@ public class DisasterInfoController {
 			String text = "The disaster reduction task of " + disasterInfoVo.getDisasterCountry() + " " + disasterInfoVo.getDictValue() + "(" + simpleDateFormat.format(disasterInfoVo.getDisasterTime()) + ")" + " you claimed has been completed!";
 
 			email.setText(text);
-			String[] to = new String[]{disasterInfo.getEmail()};
+			String[] to = new String[]{userEmail};
 			email.setTos(to);
 
 			try {
@@ -744,8 +808,6 @@ public class DisasterInfoController {
 			}
 			//审核不通过
 		} else if (disasterInfo.getIsEndApply() == 3) {
-//			Administrator user = administratorService.getById(disasterInfo.getChiefId());
-//			DisasterInfoVo disasterInfoVo = disasterInfoVoService.getById(disasterInfo.getId());
 			//发送邮件
 			Email email = new Email();
 
@@ -754,7 +816,7 @@ public class DisasterInfoController {
 //			String text = "Sorry,  the disaster reduction task of "+disasterInfoVo.getDisasterCountry()+" "+disasterInfoVo.getDictValue()+"("+simpleDateFormat.format(disasterInfoVo.getDisasterTime())+")" +" you claimed  will continue! Please continue to monitor the progress of the disaster!";
 
 			email.setText(disasterInfo.getRefuseReason());
-			String[] to = new String[]{disasterInfo.getEmail()};
+			String[] to = new String[]{userEmail};
 			email.setTos(to);
 
 			try {
@@ -767,7 +829,7 @@ public class DisasterInfoController {
 		return R.data(disasterInfoService.updateById(disasterInfo));
 	}
 
-
+	//个人中心DisasterInfo列表
 	@GetMapping("/getUserDisasterInfoList")
 	public R<IPage<DisasterInfo>> getUserDisasterInfoList(Query query, @RequestParam Map<String, String> params) {
 		String type = params.get("type");
@@ -782,8 +844,14 @@ public class DisasterInfoController {
 				IPage<DisasterInfo> centerDisasterInfoIPage = disasterInfoService.getUserDisasterInfoListNDR(Condition.getPage(query), params.get("userId"));
 				return R.data(centerDisasterInfoIPage);
 			}
-
 		}
 	}
 
+
+	//个人中心DisasterInfo列表 6月1号New
+	@GetMapping("/getUserDisasterInfoListNew")
+	public R<IPage<DisasterInfo>> getUserDisasterInfoListNew(Query query, @RequestParam Map<String, String> params) {
+		return R.data(disasterInfoService.getUserDisasterInfoListNew(Condition.getPage(query), params.get("userId"),params.get("roleId")));
+	}
+
 }

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

@@ -11,6 +11,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -69,6 +70,27 @@ public class EntityDataController {
 		return R.data(entityDataService.updateById(entityData));
 	}
 
+	//批量修改
+	@GetMapping("/updateByIdEntityDataStatusBatch")
+	public R updateByIdEntityDataStatusBatch(Integer status,String ids) {
+		List<String> strings = Arrays.asList(ids.split(","));
+		strings.stream().forEach(id->{
+			EntityData entityData = new EntityData();
+			entityData.setId(Long.parseLong(id));
+			entityData.setStatus(status);
+			entityData.setReviewTime(new Date());
+			entityDataService.updateById(entityData);
+		});
+		return R.data(true);
+	}
+
+	//批量删除
+	@GetMapping("/deleteByIdEntityDataBatch")
+	public R deleteByIdEntityDataBatch(String ids) {
+		List<String> strings = Arrays.asList(ids.split(","));
+		return R.data(entityDataService.removeByIds(strings));
+	}
+
 
 	/**
 	 * 修改实体数据
@@ -76,7 +98,7 @@ public class EntityDataController {
 	 * @return
 	 */
 	@PostMapping("/updateEntityData")
-	public R updateEntityData(@RequestBody EntityData entityData) {
+	public R updateEntityData(EntityData entityData) {
 		return R.data(entityDataService.updateById(entityData));
 	}
 
@@ -99,5 +121,10 @@ public class EntityDataController {
 	public R getStatisticsByUserIdPancake(Long id) {
 		return R.data(entityDataService.getStatisticsByUserIdPancake(id));
 	}
+
+	@GetMapping("/removeByIdEntityData")
+	public R removeByIdEntityData(Long id) {
+		return R.data(entityDataService.removeById(id));
+	}
 }
 

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

@@ -0,0 +1,70 @@
+package com.kening.vordm.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.kening.vordm.entity.Influence;
+import com.kening.vordm.service.InfluenceService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.*;
+
+import java.util.Arrays;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/ui/influence")
+public class InfluenceController {
+
+	private final InfluenceService influenceService;
+
+	@GetMapping("/list")
+	public R<IPage<Influence>> list(Influence influence, Query query) {
+		IPage<Influence> pages = influenceService.page(Condition.getPage(query), Condition.getQueryWrapper(influence));
+		return R.data(pages);
+	}
+
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "新增", notes = "传入Influence")
+	@PostMapping("/save")
+	public R save(@ApiParam(value = "Influence对象", required = true) @RequestBody Influence influence) {
+		return R.status(influenceService.save(influence));
+	}
+
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "修改", notes = "传入Influence")
+	@PostMapping("/update")
+	public R update(@ApiParam(value = "Influence对象", required = true) @RequestBody Influence influence) {
+		return R.status(influenceService.updateById(influence));
+	}
+
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "删除", notes = "传入id")
+	@PostMapping("/remove")
+	public R remove(@ApiParam(value = "主键", required = true) @RequestParam String ids) {
+		return R.status(influenceService.removeByIds(Arrays.asList(ids.split(","))));
+	}
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "详情", notes = "传入id")
+	@GetMapping("/detail")
+	public R<Influence> detail(@ApiParam(value = "主键", required = true) @RequestParam String id) {
+		Influence detail = influenceService.getById(id);
+		return R.data(detail);
+	}
+
+	@GetMapping("/detailByDisasterInfoId")
+	public R<Influence> detailByDisasterInfoId(@ApiParam(value = "主键", required = true) @RequestParam String id) {
+		LambdaQueryWrapper<Influence> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(Influence::getDisasterId,id);
+		Influence detail = influenceService.getOne(queryWrapper);
+		return R.data(detail);
+	}
+
+
+}

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

@@ -1,23 +1,16 @@
 package com.kening.vordm.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kening.vordm.entity.DataUpload;
-import com.kening.vordm.entity.EntityData;
-import com.kening.vordm.entity.Hotspot;
 import com.kening.vordm.entity.OtherData;
-import com.kening.vordm.service.DataUploadService;
 import com.kening.vordm.service.OtherDataService;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -56,7 +49,7 @@ public class OtherDataController {
 
 
     /**
-     * 批量审批
+     * 上传
 	 * @return
      */
 	@PostMapping("/upload")

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

@@ -50,7 +50,7 @@ public class PictureInfoController {
 	}
 
 	/**
-	 * 批量上传
+	 * 上传
 	 * @return
 	 */
 	@PostMapping("/upload")

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -84,4 +85,10 @@ public class SocialMediaController {
 	public R<Boolean> delete(@RequestBody List<Long> ids) {
 		return R.data(service.removeByIds(ids));
 	}
+
+	@GetMapping("/deleteByIdsBatch")
+	public R<Boolean> deleteByIdsBatch(String ids) {
+		List<String> strings = Arrays.asList(ids.split(","));
+		return R.data(service.removeByIds(strings));
+	}
 }

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

@@ -49,7 +49,7 @@ public class ToolController{
 			queryWrapper.like("tool_name", tool.getToolName());
 		}
 		if(!StringUtils.isEmpty(tool.getLabel())){
-			queryWrapper.like("Introduction", tool.getLabel()).or().like("label", tool.getLabel());
+			queryWrapper.like("label", tool.getLabel());
 		}
 		if(tool.getUploader()!=null) {
 			queryWrapper.eq("uploader", tool.getUploader());

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

@@ -1,10 +1,8 @@
 package com.kening.vordm.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.kening.vordm.entity.*;
 import com.kening.vordm.service.HotspotService;
-import com.kening.vordm.service.OtherDataService;
 import com.kening.vordm.service.VisualDataService;
 import com.kening.vordm.service.WordCloudsService;
 import lombok.AllArgsConstructor;

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

@@ -1,6 +1,7 @@
 package com.kening.vordm.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kening.vordm.entity.EntityData;
 import com.kening.vordm.entity.Websites;
 import com.kening.vordm.service.WebsitesService;
 import lombok.RequiredArgsConstructor;
@@ -10,7 +11,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
@@ -41,6 +44,23 @@ public class WebsitesController {
 		return R.status(websitesService.updateById(websites));
 	}
 
+	/**
+	 * 批量修改状态
+	 * @param ids
+	 * @return
+	 */
+	@GetMapping("/updateWebsitesBatch")
+	public R updateWebsites(String ids){
+		List<String> strings = Arrays.asList(ids.split(","));
+		strings.stream().forEach(id->{
+			Websites websites = new Websites();
+			websites.setId(Long.parseLong(id));
+			websites.setReviewStatus(2);
+			websitesService.updateById(websites);
+		});
+		return R.data(true);
+	}
+
 	@GetMapping("/getWebsitesById")
 	public R<Websites> getWebsitesById(Long id){
 		return R.data(websitesService.getById(id));

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

@@ -108,4 +108,11 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 
 	List<Map<String, Long>> initiateAndResponseDataByUserNew(@Param("year") String year,@Param("userId") Long userId,@Param("email") String email);
 
+	List<DisasterInfo> statisticsByUserCountry(@Param("userId") Long userId);
+
+	List<DisasterInfo> getDisasterInfoByUserIdNDRB1(@Param("userId") Long userId);
+
+	IPage<DisasterInfo> getUserDisasterInfoListNewB2(IPage<Object> page, @Param("userId") String userId);
+
+	IPage<DisasterInfo> getUserDisasterInfoListNew(IPage<Object> page, @Param("userId")  String userId);
 }

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

@@ -27,17 +27,16 @@
         <result property="isEndApply" column="is_end_apply" jdbcType="INTEGER"/>
     </resultMap>
 
+
     <sql id="Base_Column_List">
-        di
+        di.id,di.disaster_type,di.disaster_keyword,
-        .
-        id
-        ,di.disaster_type,di.disaster_keyword,
         di.disaster_time,di.upload_time,di.geometry,
         di.disaster_level,di.disaster_country,di.respond_status,
         di.visit_count,di.spider_type,di.tempend_time,
         di.temp_start_time,di.create_time,di.vordm_id,
         di.respond_time,di.download_count,di.sponsor_organization,
-        di.responded_time,di.is_end_apply
+        di.responded_time,di.is_end_apply,di.admin_id,di.admin_name,
+        di.chief_id,di.chief_name,di.approval_role
     </sql>
 
     <sql id="Home_Disaster_Info">
@@ -66,6 +65,7 @@
     <select id="getDisasterInfoDetail" resultType="com.kening.vordm.entity.DisasterInfo">
         select
         <include refid="Base_Column_List"/>,
+        gmdr.sponsor_id AS sponsorId,
         gi.username AS sponsorName,
         gi.organization AS sponsorOrganization,
         bu.name AS managerName,
@@ -178,9 +178,7 @@
         SELECT
         d.id,
         d.chief_id,
-        d.chief_name,
         d.admin_id,
-        d.admin_name,
         d.vordm_id,
         d.id AS disasterId,
         d.disaster_type,
@@ -195,11 +193,15 @@
         d.is_end_apply,
         ud.review_time AS reviewTime,
         ud.sponsor_id AS sponsorId,
-        bdb.dict_value as dictValue
+        bdb.dict_value as dictValue,
+        buc.name as chiefName,
+        bua.name as adminName
         From
         guest_manage_disaster_ref ud join
         disaster_info d on d.id = ud.disaster_id
         left join blade_dict_biz bdb on d.disaster_type = bdb.dict_key
+        left join blade_user buc on buc.id = d.chief_id
+        left join blade_user bua on bua.id = d.admin_id
         <where>
             <if test="callForHelpVo.respondStatus!=null">
                 d.respond_status = #{callForHelpVo.respondStatus}
@@ -566,7 +568,7 @@
         <include refid="Base_Column_List"/>
         from disaster_info di
         LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
-        LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+        LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
         <where>
             gi.email = #{email}
             and gmdr.status != 2
@@ -622,7 +624,7 @@
                  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 guest_info gi on gi.id = gmdr.sponsor_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
@@ -631,7 +633,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-02')
@@ -642,7 +644,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-03')
@@ -653,7 +655,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-04')
@@ -664,7 +666,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-05')
@@ -675,7 +677,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-06')
@@ -686,7 +688,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-07')
@@ -697,7 +699,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-08')
@@ -708,7 +710,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-09')
@@ -719,7 +721,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-10')
@@ -730,7 +732,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-11')
@@ -741,7 +743,7 @@
                  FROM disaster_info t
                      LEFT JOIN guest_manage_disaster_ref gmdr
                  on gmdr.disaster_id = t.id
-                     LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+                     LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-12')
@@ -757,7 +759,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-01')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-02') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -766,7 +768,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-02')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-03') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -775,7 +777,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-03')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-04') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -784,7 +786,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-04')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-05') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -793,7 +795,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-05')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-06') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -802,7 +804,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-06')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-07') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -811,7 +813,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-07')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-08') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -820,7 +822,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-08')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-09') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -829,7 +831,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-09')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-10') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -838,7 +840,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-10')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-11') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -847,7 +849,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-11')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
                  union ALL
                  SELECT CONCAT(#{year}, '-12') as `key`, count (1) as response, 0 as initiate
                  FROM disaster_info t
@@ -856,7 +858,7 @@
                  where date_format(t.disaster_time
                      , '%Y-%m') = CONCAT(#{year}
                      , '-12')
-                   and gmdr.manager_id = #{userId}
+                   and gmdr.admin_id = #{userId}
              ) d
         GROUP BY d.`key`
         ORDER BY d.`key`
@@ -867,7 +869,7 @@
         <include refid="Base_Column_List"/>
         from disaster_info di
         LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
-        LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+        LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
         <where>
             gi.email = #{email}
             and gmdr.status != 2
@@ -891,9 +893,8 @@
         from disaster_info di
         LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
         <where>
-            gmdr.manager_id = #{userId}
+            di.manager_id = #{userId}
             and di.respond_status = #{respondStatus}
-         <!--   and di.is_end_apply = 0-->
         </where>
     </select>
     <select id="disasterInfoType" resultType="java.util.Map">
@@ -1665,4 +1666,47 @@
         ORDER BY d.`key`
     </select>
 
+    <select id="statisticsByUserCountry" resultType="com.kening.vordm.entity.DisasterInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from disaster_info di
+        LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
+        <where>
+            gmdr.sponsor_id = #{userId}
+            and di.respond_status > 1
+        </where>
+    </select>
+
+    <select id="getDisasterInfoByUserIdNDRB1" resultType="com.kening.vordm.entity.DisasterInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from disaster_info di
+        <where>
+            di.admin_id = #{userId}
+            and di.respond_status > 1
+        </where>
+    </select>
+
+    <select id="getUserDisasterInfoListNewB2" resultType="com.kening.vordm.entity.DisasterInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from disaster_info di
+        LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
+        <where>
+        gmdr.admin_id = #{userId}
+        and di.respond_status = 2
+        </where>
+    </select>
+
+    <select id="getUserDisasterInfoListNew" resultType="com.kening.vordm.entity.DisasterInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from disaster_info di
+        LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
+        <where>
+            gmdr.manager_id = #{userId}
+            and di.respond_status = 2
+        </where>
+    </select>
+
 </mapper>

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

@@ -28,13 +28,16 @@
         <result property="account" column="account" jdbcType="VARCHAR"/>
         <result property="password" column="password" jdbcType="VARCHAR"/>
         <result property="sourceLink" column="source_link" jdbcType="VARCHAR"/>
+        <result property="source" column="source" 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="productResolution" column="product_resolution" jdbcType="VARCHAR"/>
+        <result property="sensorType" column="sensor_type" jdbcType="VARCHAR"/>
         <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"/>
+        <result property="reason" column="reason" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -46,39 +49,64 @@
         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.source,
         ed.satellite_type_select, ed.satellite_code, ed.product_serial_num,
         ed.product_resolution, ed.cloud_cover, ed.product_time,
-        ed.product_bands_num
+        ed.product_bands_num,ed.reason,ed.sensor_type
     </sql>
 
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
         select
         <include refid="Base_Column_List"/>,
-        gi.username AS uploaderName,
+        bu.name AS uploaderName,
+        bu.email AS email,
         di.vordm_id,
         di.geometry
         from entity_data ed
-        left join guest_info gi on gi.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
         <where>
             <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.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>
+            <if test="entityData.satelliteTypeSelect != null and entityData.satelliteTypeSelect != ''">
+                and ed.satellite_type_select = #{entityData.satelliteTypeSelect}
+            </if>
             <if test="entityData.title != null and entityData.title != ''">
                 and ed.title like concat('%',#{entityData.title},'%')
             </if>
+            <if test="entityData.productResolution != null and entityData.productResolution != ''">
+                and ed.product_resolution like concat('%',#{entityData.productResolution},'%')
+            </if>
+            <if test="entityData.typeList != null and entityData.typeList.size > 0">
+                and ed.type IN
+                <foreach collection="entityData.typeList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="entityData.stateList != null and entityData.stateList.size > 0">
+                and ed.status IN
+                <foreach collection="entityData.stateList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            /*灾前还是灾后*/
+            <if test="entityData.beforeOrAfter != null and entityData.beforeOrAfter != ''">
+                <if test="entityData.beforeOrAfter == 1">
+                    and r.product_time &gt;= (select
+                    disaster_time
+                    from disaster_info where id = #{entityData.disasterId})
+                </if>
+                <if test="entityData.beforeOrAfter == 0">
+                    and r.product_time &lt; (select
+                    disaster_time
+                    from disaster_info where id = #{entityData.disasterId})
+                </if>
+            </if>
             AND ed.is_deleted = 0
-            -- and ed.status = 1
         </where>
         ORDER BY ed.upload_time DESC
     </select>

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

@@ -37,4 +37,5 @@ public interface GuestInfoMapper extends BaseMapper<GuestInfo> {
 	int getByUserStatisticsThreeNew(@Param("userId") Long userId);
 
 
+	int getByUserStatisticsTwoB2(@Param("userId") Long userId);
 }

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

@@ -44,7 +44,7 @@
         select count(di.id)
         FROM disaster_info di
         LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
-        LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+        LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
         <where>
             gi.email = #{email}
             and gmdr.status != 2
@@ -83,7 +83,7 @@
         select count(di.id)
         FROM guest_manage_disaster_ref di
         LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
-        LEFT JOIN guest_info gi on gi.id = gmdr.sponsor_id
+        LEFT JOIN blade_user gi on gi.id = gmdr.sponsor_id
         <where>
             gi.email = #{email}
             and gmdr.status != 2
@@ -98,4 +98,14 @@
         </where>
     </select>
 
+    <select id="getByUserStatisticsTwoB2" resultType="java.lang.Integer">
+        select count(di.id)
+        FROM disaster_info di
+        LEFT JOIN guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
+        <where>
+            gmdr.admin_id = #{userId}
+            and di.respond_status > 1
+        </where>
+    </select>
+
 </mapper>

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

@@ -26,6 +26,7 @@
             gmdr.status,
             gmdr.review_time,
             gmdr.apply_time,
+            gmdr.admin_id,
             bu.name as managerName,
             bu.research_field as researchField,
             bu.occupation,

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

@@ -0,0 +1,18 @@
+package com.kening.vordm.mapper;
+
+import com.kening.vordm.entity.Influence;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author G
+* @description 针对表【influence(灾害受影响范围)】的数据库操作Mapper
+* @createDate 2024-05-30 14:55:17
+* @Entity com.kening.vordm.entity.Influence
+*/
+public interface InfluenceMapper extends BaseMapper<Influence> {
+
+}
+
+
+
+

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kening.vordm.mapper.InfluenceMapper">
+
+    <resultMap id="BaseResultMap" type="com.kening.vordm.entity.Influence">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="influenceNumber" column="influence_number" jdbcType="INTEGER"/>
+            <result property="deathNumber" column="death_number" jdbcType="INTEGER"/>
+            <result property="injuryNumber" column="Injury_number" jdbcType="INTEGER"/>
+            <result property="disappearanceNumber" column="disappearance_number" jdbcType="INTEGER"/>
+            <result property="homelessnessNumber" column="homelessness_number" jdbcType="INTEGER"/>
+            <result property="influenceRange" column="influence_range" jdbcType="VARCHAR"/>
+            <result property="economicLosses" column="economic_losses" jdbcType="VARCHAR"/>
+            <result property="lossProportion" column="Loss_proportion" jdbcType="VARCHAR"/>
+            <result property="sourceLink" column="source_link" jdbcType="VARCHAR"/>
+            <result property="disasterId" column="disaster_id" jdbcType="BIGINT"/>
+            <result property="isDeleted" column="is_deleted" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,influence_number,death_number,
+        Injury_number,disappearance_number,homelessness_number,
+        range,economic_losses,Loss_proportion,
+        disaster_id,is_deleted, source_link
+    </sql>
+</mapper>

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

@@ -25,6 +25,7 @@
             <result property="status" column="status" jdbcType="SMALLINT"/>
             <result property="managerId" column="manager_id" jdbcType="BIGINT"/>
             <result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
+            <result property="reason" column="reason" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -34,7 +35,7 @@
         geo,coordinates,place,
         contributors,topic,create_time,
         disaster_id,type,status,
-        manager_id,review_time
+        manager_id,review_time,reason
     </sql>
 
     <select id="tweetsCount" resultType="com.kening.vordm.entity.Tweets" parameterType="java.lang.Long">

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

@@ -13,6 +13,8 @@
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="websiteId" column="website_id" jdbcType="BIGINT"/>
             <result property="uploadId" column="upload_id" jdbcType="BIGINT"/>
+            <result property="reviewStatus" column="review_status" jdbcType="BIGINT"/>
+            <result property="reason" column="reason" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">

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

@@ -13,21 +13,27 @@
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="websiteId" column="website_id" jdbcType="BIGINT"/>
             <result property="uploadId" column="upload_id" jdbcType="BIGINT"/>
+            <result property="reviewStatus" column="review_status" jdbcType="INTEGER"/>
+            <result property="reason" column="reason" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,title,link,
         provider,disaster_id,create_time,
-        website_id,upload_id
+        website_id,upload_id,review_status,reason
     </sql>
 
     <select id="websitesPage" resultType="com.kening.vordm.entity.Websites">
-        SELECT id,title,link,provider,disaster_id,create_time,website_id,upload_id
+        SELECT id,title,link,provider,disaster_id,create_time,
+               website_id,upload_id,review_status,reason
         FROM  websites
         <where>
             <if test="websites.disasterId!=null">
                 and disaster_id = #{websites.disasterId}
             </if>
+            <if test="websites.reviewStatus!=null">
+                and review_status = #{websites.reviewStatus}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -71,13 +71,13 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 
 	Integer getByUserDisasterInfo(Long userId, Long disasterId);
 
-	UserVo getByUserDisasterInfoStatistics(Long userId, String email);
+	UserVo getByUserDisasterInfoStatistics(Long userId, String email, Long roleId);
 
 	CallForHelpVo getByUserIdRole(Long chiefIdEquals);
 
 	UserVo getByOrdinaryUserDisasterInfoStatistics(Long userId, String email);
 
-	List<DisasterInfo> getDisasterInfoByUserId(Long userId, String email);
+	List<DisasterInfo> getDisasterInfoByUserId(Long userId, String email, Long roleId);
 
 	List<Map<String, Object>> getDisasterInfoByMouth(Integer type, Long userId, String email);
 
@@ -92,4 +92,8 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 	IPage<DisasterInfo> getUserDisasterInfoListNDRNew(IPage<Object> page, String userId, String respondStatus);
 
 	Map<String,Object> statisticsByUserNew(String year, Long userId, String email);
+
+	List<DisasterInfo> statisticsByUserCountry(Long userId);
+
+	IPage<DisasterInfo> getUserDisasterInfoListNew(IPage<Object> page, String userId, String roleId);
 }

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

@@ -0,0 +1,13 @@
+package com.kening.vordm.service;
+
+import com.kening.vordm.entity.Influence;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author G
+* @description 针对表【influence(灾害受影响范围)】的数据库操作Service
+* @createDate 2024-05-30 14:55:17
+*/
+public interface InfluenceService extends IService<Influence> {
+
+}

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

@@ -52,9 +52,11 @@ public class DataUploadServiceImpl extends ServiceImpl<DataUploadMapper, EntityD
 		dataUploads.stream().forEach(dataUpload -> {
 			if (dataUpload.getUploaderName()==null){
 				GuestInfo guestInfo = guestInfoMapper.selectById(dataUpload.getUploaderId());
+				if (guestInfo!=null) {
 					dataUpload.setUploaderName(guestInfo.getUsername());
 					dataUpload.setUploaderEmail(guestInfo.getEmail());
 				}
+			}
 		});
 		return page.setRecords(dataUploads);
 	}

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

@@ -152,17 +152,21 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 	public IPage<CallForHelpVo> page(IPage<CallForHelpVo> page, CallForHelpVo callForHelpVo) {
 		List<CallForHelpVo> callForHelpVoList = this.baseMapper.page(page, callForHelpVo);
 		callForHelpVoList.stream().forEach(callForHelpVo1 -> {
+			if (callForHelpVo1.getSponsorId() != null) {
 				GuestInfo guestInfo = guestInfoMapper.selectById(callForHelpVo1.getSponsorId());
-			if (guestInfo!=null){
+				if (guestInfo != null) {
 					callForHelpVo1.setUsername(guestInfo.getUsername());
 					callForHelpVo1.setEmail(guestInfo.getEmail());
 					callForHelpVo1.setOrganization(guestInfo.getOrganization());
-			}else {
+				} else {
 					Administrator administrator = administratorMapper.selectById(callForHelpVo1.getSponsorId());
+					if (administrator !=null){
 						callForHelpVo1.setUsername(administrator.getName());
 						callForHelpVo1.setEmail(administrator.getEmail());
 						callForHelpVo1.setOrganization(administrator.getOrganization());
 					}
+				}
+			}
 		});
 		return page.setRecords(callForHelpVoList);
 	}
@@ -230,11 +234,20 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 	}
 
 	@Override
-	public UserVo getByUserDisasterInfoStatistics(Long userId, String email) {
+	public UserVo getByUserDisasterInfoStatistics(Long userId, String email, Long roleId) {
 		//发起人
-		int byUserStatisticsOne = guestInfoMapper.getByUserStatisticsOne(userId,email);
+		int byUserStatisticsOne = guestInfoMapper.getByUserStatisticsOne(userId, email);
+
+		int byUserStatisticsTwo = 0;
+		//B1
+		if (roleId.compareTo(Long.parseLong("1793193529859244033")) == 0) {
 			//正在响应
-		int byUserStatisticsTwo = guestInfoMapper.getByUserStatisticsTwo(userId);
+			byUserStatisticsTwo = guestInfoMapper.getByUserStatisticsTwo(userId);
+		} else {
+			byUserStatisticsTwo = guestInfoMapper.getByUserStatisticsTwoB2(userId);
+		}
+
+
 		//贡献灾害内容得次数
 		int byUserStatisticsThree = guestInfoMapper.getByUserStatisticsThreeNew(userId);
 		//用户上传的工具数量
@@ -254,8 +267,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 
 	@Override
 	public UserVo getByOrdinaryUserDisasterInfoStatistics(Long userId, String email) {
-		//正在响应
+		//正在响应-发起灾害
-		int byUserStatisticsOne = guestInfoMapper.getByUserStatisticsOneNew(userId,email);
+		int byUserStatisticsOne = guestInfoMapper.getByUserStatisticsOneNew(userId, email);
 		//贡献灾害内容得次数
 		int byUserStatisticsThree = guestInfoMapper.getByUserStatisticsThreeNew(userId);
 		//用户上传的工具数量
@@ -268,11 +281,17 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 	}
 
 	@Override
-	public List<DisasterInfo> getDisasterInfoByUserId(Long userId, String email) {
+	public List<DisasterInfo> getDisasterInfoByUserId(Long userId, String email, Long roleId) {
 		//用户发起的
-		List<DisasterInfo> disasterInfoByUserIdNCI = baseMapper.getDisasterInfoByUserIdNCI(userId,email);
+		List<DisasterInfo> disasterInfoByUserIdNCI = baseMapper.getDisasterInfoByUserIdNCI(userId, email);
-		//用户响应的
+
 		List<DisasterInfo> disasterInfoByUserIdNDR = baseMapper.getDisasterInfoByUserIdNDR(userId);
+
+		if (roleId.compareTo(Long.parseLong("1793193529859244033")) != 0) {
+			//用户响应的
+			disasterInfoByUserIdNDR = baseMapper.getDisasterInfoByUserIdNDRB1(userId);
+		}
+
 		//用户有上传资源的
 		List<DisasterInfo> disasterInfoByUserIdNR = baseMapper.getDisasterInfoByUserIdNR(userId);
 
@@ -293,6 +312,7 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 
 		List<DisasterInfo> disasterInfoList1 = new ArrayList<>();
 
+		List<DisasterInfo> finalDisasterInfoByUserIdNDR = disasterInfoByUserIdNDR;
 		disList.stream().forEach(disasterInfo -> {
 			disasterInfo.setIsNci(false);
 			disasterInfo.setIsNdr(false);
@@ -307,8 +327,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 				});
 			}
 
-			if (!disasterInfoByUserIdNDR.isEmpty()) {
+			if (!finalDisasterInfoByUserIdNDR.isEmpty()) {
-				disasterInfoByUserIdNDR.stream().forEach(disasterInfo2 -> {
+				finalDisasterInfoByUserIdNDR.stream().forEach(disasterInfo2 -> {
 					if (disasterInfo2.getId().compareTo(disasterInfo.getId()) == 0) {
 						disasterInfo.setIsNdr(true);
 					}
@@ -556,32 +576,49 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 	public Map<String, Object> statisticsByUser(String year, Long userId, String email) {
 		Map<String, Object> resultMap = Maps.newHashMap();
 		//响应量和发起量
-		List<Map<String, Long>> initiateAndResponseData = this.baseMapper.initiateAndResponseDataByUser(year,userId,email);
+		List<Map<String, Long>> initiateAndResponseData = this.baseMapper.initiateAndResponseDataByUser(year, userId, email);
 		resultMap.put("line", initiateAndResponseData);
 		return resultMap;
 	}
 
 	@Override
 	public IPage<DisasterInfo> getUserDisasterInfoListNCI(IPage<Object> page, String email) {
-		return this.baseMapper.getUserDisasterInfoListNCI(page,email);
+		return this.baseMapper.getUserDisasterInfoListNCI(page, email);
 	}
 
 	@Override
 	public IPage<DisasterInfo> getUserDisasterInfoListNDR(IPage<Object> page, String userId) {
-		return this.baseMapper.getUserDisasterInfoListNDR(page,userId);
+		return this.baseMapper.getUserDisasterInfoListNDR(page, userId);
 	}
 
 	@Override
 	public IPage<DisasterInfo> getUserDisasterInfoListNDRNew(IPage<Object> page, String userId, String respondStatus) {
-		return this.baseMapper.getUserDisasterInfoListNDRNew(page,userId,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);
+		List<Map<String, Long>> initiateAndResponseData = this.baseMapper.initiateAndResponseDataByUserNew(year, userId, email);
 		resultMap.put("line", initiateAndResponseData);
 		return resultMap;
 	}
+
+	@Override
+	public List<DisasterInfo> statisticsByUserCountry(Long userId) {
+		return baseMapper.statisticsByUserCountry(userId);
+	}
+
+	@Override
+	public IPage<DisasterInfo> getUserDisasterInfoListNew(IPage<Object> page, String userId, String roleId) {
+		//B1
+		if (roleId.equals("1793193529859244033")) {
+			//用户响应的
+			return baseMapper.getUserDisasterInfoListNew(page, userId);
+		} else {
+			//用户响应的
+			return baseMapper.getUserDisasterInfoListNewB2(page, userId);
+		}
+	}
 }

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

@@ -25,6 +25,7 @@ import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +64,12 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 
 	@Override
 	public IPage<EntityData> getEntityDataList(IPage<Object> page, EntityData entityData) {
+		if (entityData.getType() !=null && !entityData.getType().isEmpty()){
+			entityData.setTypeList(Arrays.asList(entityData.getType().split(",")));
+		}
+		if (entityData.getStateListNew() !=null && !entityData.getStateListNew().isEmpty()){
+			entityData.setStateList(Arrays.asList(entityData.getStateListNew().split(",")));
+		}
 		return this.baseMapper.getEntityDataList(entityData, page);
 	}
 
@@ -87,30 +94,29 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 		LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
 		qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
 		GuestInfo guestInfo1 = guestInfoMapper.selectOne(qw);
-		if (guestInfo1 == null) {
+
 		GuestInfo guestInfo = new GuestInfo();
 		guestInfo.setEmail(entityDataUserVo.getEmail());
 		guestInfo.setOrganization(entityDataUserVo.getOrganization());
 		guestInfo.setIsManage(entityDataUserVo.getIsManage());
 		guestInfo.setResearchField(entityDataUserVo.getResearchField());
 		guestInfo.setUsername(entityDataUserVo.getUsername());
-			guestInfo.setCreateTime(new Date());
+		guestInfo.setCountry(entityDataUserVo.getCountry());
 		guestInfo.setOccupation(entityDataUserVo.getOccupation());
 		guestInfo.setProfessionalTitle(entityDataUserVo.getProfessionalTitle());
+
+		if (guestInfo1 == null) {
 			guestInfoMapper.insert(guestInfo);
 			entityData.setUploaderId(guestInfo.getId());
 		} else {
+			guestInfo.setId(guestInfo1.getId());
+			guestInfoMapper.updateById(guestInfo);
 			entityData.setUploaderId(guestInfo1.getId());
 		}
 
-		if (entityDataUserVo.getType().equals("4")) {
+		BeanUtils.copyProperties(entityDataUserVo, entityData);
-			entityData.setTitle(entityDataUserVo.getTitle());
-			entityData.setDisasterId(entityDataUserVo.getDisasterId());
-			entityData.setSourceOrganization(entityDataUserVo.getOrganization());
-			entityData.setSatelliteCode(entityDataUserVo.getSatelliteCode());
-			entityData.setProductResolution(entityDataUserVo.getProductResolution());
-			entityData.setCloudCover(entityDataUserVo.getCloudCover());
 
+		if (entityDataUserVo.getProductTime() != null && !entityDataUserVo.getProductTime().isEmpty()){
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'");
 			Date date = null;
 			try {
@@ -119,47 +125,20 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 				e.printStackTrace();
 			}
 			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 {
-
-			//路径拼接
-			List<String> link = new ArrayList<>();
-			//文件大小
-			List<Long> size = new ArrayList<>();
-			//文件数据
-			List<MultipartFile> filesArray = entityDataUserVo.getFilesArray();
-			filesArray.stream().forEach(files -> {
-				BladeFile bladeFile = minioTemplate.putFile(files);
-				bladeFile = format(bladeFile, imageUrl);
-				//获取文件大小
-				Long fileSize = files.getSize();
-				link.add(bladeFile.getLink());
-				size.add(fileSize);
-			});
-
-			Long sum = size.stream().reduce(Long::sum).orElse(0L);
-			//实体数据
-			entityData.setTitle(entityDataUserVo.getTitle());
-			entityData.setSize(sum);
-			entityData.setLink(StringUtils.join(link, ","));
-			entityData.setDisasterId(entityDataUserVo.getDisasterId());
-			entityData.setUploadTime(new Date());
-			entityData.setRemark(entityDataUserVo.getRemark());
-			entityData.setSourceOrganization(entityDataUserVo.getOrganization());
-			entityData.setType(entityDataUserVo.getType());
-			return R.status(this.baseMapper.insert(entityData) > 0);
 		}
+
+		entityData.setUploadTime(new Date());
+		entityData.setStatus(0);
+		if (entityData.getId()!=null){
+			return R.status(this.baseMapper.updateById(entityData) > 0);
+		}
+		return R.status(this.baseMapper.insert(entityData) > 0);
 	}
 
 
 	/**
 	 * 格式化上传文件返回路径
+	 *
 	 * @param bladeFile 上传成功后返回的值
 	 * @param showUrl   回显地址
 	 * @return 上传后的文件内容
@@ -187,21 +166,21 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 
 		List<Map<String, Object>> disasterCountryList = new ArrayList<>();
 		Map<String, Object> map = new HashMap<>();
-		for(String mapKey : collectDisasterCountry.keySet()){
+		for (String mapKey : collectDisasterCountry.keySet()) {
 			List<EntityData> entityData = collectDisasterCountry.get(mapKey);
-			map.put(mapKey,entityData.size());
+			map.put(mapKey, entityData.size());
 			disasterCountryList.add(map);
 		}
 		List<Map<String, Object>> disasterTypeList = new ArrayList<>();
 		Map<String, Object> map2 = new HashMap<>();
-		for(String mapKey : collectDisasterType.keySet()){
+		for (String mapKey : collectDisasterType.keySet()) {
 			List<EntityData> entityData = collectDisasterType.get(mapKey);
-			map2.put(mapKey,entityData.size());
+			map2.put(mapKey, entityData.size());
 			disasterTypeList.add(map2);
 		}
 		Map<String, Object> map3 = new HashMap<>();
-		map3.put("DisasterCountry",disasterCountryList);
+		map3.put("DisasterCountry", disasterCountryList);
-		map3.put("DisasterType",disasterTypeList);
+		map3.put("DisasterType", disasterTypeList);
 		return map3;
 	}
 
@@ -209,12 +188,12 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 	public R updateEntityDataAdmin(EntityDataUserVo entityDataUserVo) {
 		EntityData entityData = new EntityData();
 		entityData.setId(entityDataUserVo.getId());
-		if (entityDataUserVo.getSourceLink()!=null){
+		if (entityDataUserVo.getSourceLink() != null) {
 			entityData.setSourceLink(entityDataUserVo.getSourceLink());
 		}
 		//文件数据
 		List<MultipartFile> filesArray = entityDataUserVo.getFilesArray();
-		if (filesArray!=null && !filesArray.isEmpty()){
+		if (filesArray != null && !filesArray.isEmpty()) {
 
 			//路径拼接
 			List<String> link = new ArrayList<>();
@@ -239,13 +218,13 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 		entityData.setDisasterId(entityDataUserVo.getDisasterId());
 		entityData.setRemark(entityDataUserVo.getRemark());
 		entityData.setType(entityDataUserVo.getType());
-		if (entityDataUserVo.getIsDownload()!=null){
+		if (entityDataUserVo.getIsDownload() != null) {
 			entityData.setIsDownload(entityDataUserVo.getIsDownload());
 		}
-		if (entityDataUserVo.getAccount()!=null){
+		if (entityDataUserVo.getAccount() != null) {
 			entityData.setAccount(entityDataUserVo.getAccount());
 		}
-		if (entityDataUserVo.getPassword()!=null){
+		if (entityDataUserVo.getPassword() != null) {
 			entityData.setPassword(entityDataUserVo.getPassword());
 		}
 		return R.status(this.baseMapper.updateById(entityData) > 0);

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

@@ -0,0 +1,22 @@
+package com.kening.vordm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kening.vordm.entity.Influence;
+import com.kening.vordm.service.InfluenceService;
+import com.kening.vordm.mapper.InfluenceMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author G
+* @description 针对表【influence(灾害受影响范围)】的数据库操作Service实现
+* @createDate 2024-05-30 14:55:17
+*/
+@Service
+public class InfluenceServiceImpl extends ServiceImpl<InfluenceMapper, Influence>
+    implements InfluenceService{
+
+}
+
+
+
+

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

@@ -205,7 +205,11 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 			Menu byId = this.baseMapper.selectById(roleMenu.getMenuId());
 			menuList.add(byId);
 		});
-		return menuList;
+		List<Menu> ageOrderList = menuList.stream().sorted(
+			Comparator.comparing(Menu::getSort, Comparator.nullsLast(Integer::compareTo)))
+			.collect(Collectors.toList());
+		return ageOrderList;
+
 	}
 
 }

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

@@ -115,14 +115,12 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, News>
 						news.setCreateTime(new Date());
 						news.setDisasterId(disasterId);
 						news.setType(typeData);
-						news.setStatus(0);
+						news.setStatus(1);
 						this.baseMapper.insert(news);
 					}
 				}
 			}
-
 		} else {
-
 			for (int i = 0; i < content.size(); ++i) {
 				List<Object> row = (List) content.get(i);
 				if (i != 0) {
@@ -138,11 +136,11 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, News>
 						String reply_count = ExcelCellUtil.strHandle(row.get(5));
 						String visit_count = ExcelCellUtil.strHandle(row.get(6));
 						String retweet_count = ExcelCellUtil.strHandle(row.get(7));
-						String geo = ExcelCellUtil.strHandle(row.get(7));
+						String geo = ExcelCellUtil.strHandle(row.get(8));
-						String coordinates = ExcelCellUtil.strHandle(row.get(7));
+						String coordinates = ExcelCellUtil.strHandle(row.get(9));
-						String place = ExcelCellUtil.strHandle(row.get(7));
+						String place = ExcelCellUtil.strHandle(row.get(10));
-						String contributors = ExcelCellUtil.strHandle(row.get(7));
+						String contributors = ExcelCellUtil.strHandle(row.get(11));
-						String topic = ExcelCellUtil.strHandle(row.get(7));
+						String topic = ExcelCellUtil.strHandle(row.get(12));
 
 						SocialMedia socialMedia = new SocialMedia();
 						socialMedia.setCreateTime(new Date());

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

@@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.oss.MinioTemplate;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.oss.props.OssProperties;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kening.vordm.entity.News;
 import com.kening.vordm.entity.RemoteSensingSourceData;
 import com.kening.vordm.mapper.RemoteSensingSourceDataMapper;
 import com.kening.vordm.service.RemoteSensingSourceDataService;
@@ -29,7 +28,6 @@ import org.springblade.core.oss.props.OssProperties;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.IoUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -1,25 +1,18 @@
 package com.kening.vordm.service.impl;
 
-import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kening.vordm.entity.*;
-import com.kening.vordm.mapper.OtherDataMapper;
 import com.kening.vordm.mapper.VisualDataMapper;
 import com.kening.vordm.service.HotspotService;
-import com.kening.vordm.service.OtherDataService;
 import com.kening.vordm.service.VisualDataService;
 import com.kening.vordm.service.WordCloudsService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.oss.MinioTemplate;
-import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.Date;