diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
index 67849b1..985f1d9 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
@@ -114,6 +114,24 @@ public class EntityData implements Serializable {
@TableField(exist = false)
private String uploaderName;
+ /**
+ * 图层名称
+ */
+ @TableField(exist = false)
+ private String layerName;
+
+ /**
+ * vordmId
+ */
+ @TableField(exist = false)
+ private String vordmId;
+
+ /**
+ * 图层名称
+ */
+ @TableField(exist = false)
+ private String msName;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
index e7013f2..51ce028 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
@@ -89,4 +89,9 @@ public class UserVo {
//国家
private String country;
+
+ private Integer byUserStatisticsOne;
+ private Integer byUserStatisticsTwo;
+ private Integer byUserStatisticsThree;
+ private Integer byUserStatisticsFour;
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index 4cd0e48..d9291b5 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -410,5 +410,8 @@ public class DisasterInfoController {
return R.data(disasterInfoService.updateById(disasterInfo));
}
-
+ @GetMapping("/getByUserDisasterInfoStatistics")
+ public R getByUserDisasterInfo(Long userId) {
+ return R.data(disasterInfoService.getByUserDisasterInfoStatistics(userId));
+ }
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
index cb58f2f..78bf371 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
@@ -35,9 +35,13 @@
+
+
+
+
+
+
+
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
index b5a00a7..f48d4c3 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
@@ -70,4 +70,6 @@ public interface DisasterInfoService extends IService {
UserVo getBladeUserByEmail(String email);
Integer getByUserDisasterInfo(Long userId, Long disasterId);
+
+ UserVo getByUserDisasterInfoStatistics(Long userId);
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
index e3e767c..00e4a9a 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
@@ -218,6 +218,24 @@ public class DisasterInfoServiceImpl extends ServiceImpl