diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
index 408ecd1fa8..ee8461e06f 100644
--- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
+++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-admin-server:
container_name: epmet-admin-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:version_placeholder
+ image: 192.168.1.140:5000/epmet-cloud-dev/epmet-admin-server:version_placeholder
ports:
- "8082:8082"
network_mode: host # 使用现有网络
diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml
index 5093acffb8..c9903ba390 100644
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-server/pom.xml
@@ -115,19 +115,19 @@
-
+
epmet_admin_user
EpmEt-db-UsEr
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
true
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -136,7 +136,7 @@
false
- 192.168.1.130:9876;192.168.1.132:9876
+ 192.168.1.140:9876;192.168.1.141:9876
epmet_message
@@ -151,19 +151,19 @@
-
+
epmet_admin_user
EpmEt-db-UsEr
0
- 118.190.150.119
- 47379
+ 192.168.1.140
+ 6379
123456
false
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -172,7 +172,7 @@
false
- 192.168.1.130:9876;192.168.1.132:9876
+ 192.168.1.140:9876;192.168.1.141:9876
epmet_message
diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index 1239aa8ac7..f721a6164f 100644
--- a/epmet-auth/deploy/docker-compose-dev.yml
+++ b/epmet-auth/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:version_placeholder
+ image: 192.168.1.140:5000/epmet-cloud-dev/epmet-auth:version_placeholder
ports:
- "8081:8081"
network_mode: host # 使用现有网络
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 87300fc380..08b0f4b480 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -172,13 +172,13 @@
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
true
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -227,13 +227,13 @@
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
false
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml
index 76cfc7865d..cc5174da7b 100644
--- a/epmet-cloud-generator/src/main/resources/application.yml
+++ b/epmet-cloud-generator/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
#MySQL配置
driverClassName: com.mysql.jdbc.Driver
- url: jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+ url: jdbc:mysql://192.168.1.140:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: epmet_dba
password: EpmEt-dbA-UsEr
#oracle配置
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java
index 31d5faaa34..29a416dfea 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java
@@ -15,7 +15,7 @@ public enum EnvEnum {
* 环境变量枚举
*/
LOCAL("local", "本地环境", "http://localhost:8080/api/"),
- DEV("dev", "开发环境", "http://192.168.1.130:8080/api/"),
+ DEV("dev", "开发环境", "http://192.168.1.140:8080/api/"),
TEST("test", "体验环境", "https://epmet-dev.elinkservice.cn/api/"),
PROD("prod", "生产环境", "https://epmet-cloud.elinkservice.cn/api/"),
UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"),
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 72d2e072b4..ca3e901d44 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -166,6 +166,16 @@ public enum RequirePermissionEnum {
MORE_BADGE_MANAGE_EDIT("more_badge_manage_edit","更多:徽章:徽章管理:编辑","编辑徽章"),
MORE_BADGE_MANAGE_DELETE("more_badge_manage_delete","更多:徽章:徽章管理:删除","删除徽章"),
+ /**
+ * 更多-日志记录
+ */
+ MORE_PATROL_RECORD_LIST("more_patrol_record_list","更多:日志记录:巡查记录:列表","巡查记录列表"),
+ /**
+ * 更多-系统
+ */
+ MORE_SYSTEM_LOG_LIST("MORE_SYSTEM_LOG_LIST","更多:系统:系统日志:列表","系统日志列表"),
+
+
/**
* 项目立项
*/
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index a38c4cbb0e..3faf895eb5 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -87,6 +87,7 @@ public enum EpmetErrorCode {
EXIT_PEND_PROJECT(8408,"该工作人员有项目尚在处理，处理完毕方可操作"),
EXIT_PUBLISHED_ACTIVITY(8409,"该工作人员有活动尚在进行，等活动完成方可操作"),
CAN_NOT_SELF(8410,"无法对自己进行操作"),
+ PATROL_IS_NOT_OVER(8520,"巡查尚未结束"),
ALREADY_EVALUATE(8501,"您已评价"),
ALREADY_VOTE(8502,"您已表态"),
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
index a2f88e4133..3a556da632 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java
@@ -608,6 +608,24 @@ public class DateUtils {
return minutes;
}
+
+ /**
+ * @return java.lang.Integer
+ * @param startDate
+ * @param endDate
+ * @author yinzuomei
+ * @description 计算两个时间点之间相隔秒数
+ * @Date 2020/7/29 13:38
+ **/
+ public static Integer calculateSecond(Date startDate,Date endDate){
+ long start=startDate.getTime();
+ long end=endDate.getTime();
+ // 计算差多少分钟
+ int second = (int) ((end - start) / 1000);
+ System.out.println("两个时间之间的分钟差为：" + second);
+ return second;
+ }
+
/**
* @return java.lang.String
* @param dateOne
@@ -818,4 +836,15 @@ public class DateUtils {
return date;
}
+ /**
+ * @Author sun
+ * @Description 获取当前日期几个自然月之前的日期（yyyy-MM-dd HH:mm:ss）
+ **/
+ public static String getBeforeMonthDate(int beforMonth){
+ Calendar c = Calendar.getInstance();
+ c.add(Calendar.MONTH, - beforMonth);
+ Date date = c.getTime();
+ return DateUtils.format(date,DateUtils.DATE_TIME_PATTERN);
+ }
+
}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java
index f1e2c53382..56d892202f 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java
@@ -36,7 +36,7 @@ public class WebUtil {
* 可是，如果通过了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP值，究竟哪个才是真正的用户端的真实IP呢？
* 答案是取X-Forwarded-For中第一个非unknown的有效IP字符串。
*
- * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.130,
+ * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.140,
* 192.168.1.100
*
* 用户真实IP为： 192.168.1.110
diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml
index 45db293a98..625089b478 100644
--- a/epmet-gateway/deploy/docker-compose-dev.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-gateway-server:
container_name: epmet-gateway-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:version_placeholder
+ image: 192.168.1.140:5000/epmet-cloud-dev/epmet-gateway:version_placeholder
ports:
- "8080:8080"
network_mode: host # 使用现有网络
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index dc2dd76fda..b89bc59c0e 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -117,13 +117,13 @@
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
true
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -242,13 +242,13 @@
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
false
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolDetailDTO.java
new file mode 100644
index 0000000000..def0db685a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolDetailDTO.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see gridIds;
+ /**
+ * 工作人员姓名；可空
+ */
+ private String staffName;
+ /**
+ * 页码
+ * */
+ @Min(1)
+ private Integer pageNo;
+ /**
+ * 每页多少条
+ * */
+ private Integer pageSize = 20;
+ //token中用户Id
+ private String userId;
+ //起止巡查开始时间
+ private String patrolStartTime;
+ public interface Staff extends CustomerClientShowGroup {}
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDateListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDateListResultDTO.java
new file mode 100644
index 0000000000..e51ce38b2a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDateListResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/6/10 14:32
+ */
+@NoArgsConstructor
+@Data
+public class PatrolDateListResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -1516170049255588336L;
+ private String startDate;
+ private List list;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java
new file mode 100644
index 0000000000..922f21867b
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordDetailDTO.java
@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/6/9 14:38
+ */
+@NoArgsConstructor
+@Data
+public class PatrolRecordDetailDTO implements Serializable {
+ private static final long serialVersionUID = 757994412954699222L;
+ /**
+ * 上传时间；yyyy-MM-dd HH:mm
+ */
+ private String uploadTime;
+ /**
+ * 纬度
+ */
+ private String latitude;
+ /**
+ * 经度
+ */
+ private String longitude;
+ /**
+ * 速度，单位m/s
+ */
+ private String speed;
+ /**
+ * 后端返回：开始巡查；结束巡查；此列只有集合第一条，和最后一条有值
+ */
+ private String flag;
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java
new file mode 100644
index 0000000000..d59abe39de
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java
@@ -0,0 +1,48 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/6/7 16:24
+ */
+@NoArgsConstructor
+@Data
+public class PatrolRecordListResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -8808482239766626564L;
+ /**
+ * 巡查记录id
+ */
+ private String staffPatrolRecId;
+ /**
+ * 总时长描述，后端返回格式：XX小时XX分；前端直接展示
+ */
+ private String totalTimeDesc;
+ /**
+ * 开始时间；yyyy-MM-dd HH:mm
+ */
+ private String patrolStartTime;
+ /**
+ * 结束时间；yyyy-MM-dd HH:mm
+ */
+ private String patrolEndTime;
+ /**
+ * 巡查中：patrolling；已结束：end；如果是巡查中，界面不展示结束时间这一行
+ */
+ private String status;
+ /**
+ * 后端返回：巡查员最近地址变动是XX分钟前
+ */
+ private String latestChangeDesc;
+ /**
+ * 巡查记录详情
+ */
+ private List details;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffListResultDTO.java
new file mode 100644
index 0000000000..15f2647e88
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffListResultDTO.java
@@ -0,0 +1,32 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 巡查-各人员巡查记录列表查询-接口入参
+ * @Auth sun
+ */
+@Data
+public class StaffListResultDTO implements Serializable {
+ private static final long serialVersionUID = 7129564173128153335L;
+
+ //工作人员所属网格id
+ private String gridId = "";
+ //工作人员所在网格名称，最多显示到网格的上两级
+ private String gridName = "";
+ //工作人员用户id
+ private String staffId = "";
+ //真名
+ private String staffName = "";
+ //最近巡查时间[最近一次进行中或已结束巡查的开始时间]
+ private String patrolStartTime = "";
+ //巡查总次数
+ private Integer patrolTotal = 0;
+ //性别0.未知，1男，2.女前端默认头像用
+ private String gender = "0";
+ //正在巡查中：patrolling；否则返回空字符串
+ private String status = "";
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java
index e94e2e9ad7..1a7f37a932 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectDTO.java
@@ -90,6 +90,21 @@ public class ProjectDTO implements Serializable {
*/
private String orgIdPath;
+ /**
+ * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+ * */
+ private String locateAddress;
+
+ /**
+ * 定位经度
+ * */
+ private String locateLongitude;
+
+ /**
+ * 定位纬度
+ * */
+ private String locateDimension;
+
/**
* 删除标识:0.未删除 1.已删除
*/
diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml
index e26e72451c..0973856c00 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
data-aggregator-server:
container_name: data-aggregator-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/data-aggregator-server:version_placeholder
+ image: 192.168.1.140:5000/epmet-cloud-dev/data-aggregator-server:version_placeholder
ports:
- "8114:8114"
network_mode: host # 使用现有网络
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 71880e1591..f075b3c427 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -110,77 +110,77 @@
-
+
epmet_gov_org_user
EpmEt-db-UsEr
-
+
epmet_gov_issue_user
EpmEt-db-UsEr
-
+
epmet_gov_project_user
EpmEt-db-UsEr
-
+
epmet_resi_group_user
EpmEt-db-UsEr
-
+
epmet_user_user
EpmEt-db-UsEr
-
+
epmet_common_service_user
EpmEt-db-UsEr
-
+
epmet_oper_crm_user
EpmEt-db-UsEr
-
+
epmet_data_statistical_user
EpmEt-db-UsEr
-
+
epmet_evaluation_index_user
EpmEt-db-UsEr
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
true
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -205,77 +205,77 @@
-
+
epmet_gov_org_user
EpmEt-db-UsEr
-
+
epmet_gov_issue_user
EpmEt-db-UsEr
-
+
epmet_gov_project_user
EpmEt-db-UsEr
-
+
epmet_resi_group_user
EpmEt-db-UsEr
-
+
epmet_user_user
EpmEt-db-UsEr
-
+
epmet_common_service_user
EpmEt-db-UsEr
-
+
epmet_oper_crm_user
EpmEt-db-UsEr
-
+
epmet_data_statistical_user
EpmEt-db-UsEr
-
+
epmet_evaluation_index_user
EpmEt-db-UsEr
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
false
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
index 583b66f4f1..f01ef8a3d4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
@@ -1,8 +1,25 @@
package com.epmet.dataaggre.controller;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
+import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* @Author zxc
* @DateTime 2020/12/25 上午9:45
@@ -10,4 +27,54 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("epmetuser")
public class EpmetUserController {
+
+ @Autowired
+ private EpmetUserService epmetUserService;
+
+
+ /**
+ * @Param formDTO
+ * @Description 001、各人员巡查记录列表查询
+ * @author sun
+ */
+ @PostMapping("stafflist")
+ public Result> staffList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
+ if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())) {
+ throw new RenException("参数错误，排序条件值错误");
+ }
+ if (formDTO.getTime() != 1 && formDTO.getTime() != 3) {
+ throw new RenException("参数错误，最近时间值不正确");
+ }
+ formDTO.setUserId(tokenDto.getUserId());
+ return new Result>().ok(epmetUserService.staffList(formDTO));
+ }
+
+ /**
+ * 巡查记录列表查询
+ * @author zhaoqifeng
+ * @date 2021/6/9 14:48
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ */
+ @PostMapping("recordlist")
+ public Result> recordList(@RequestBody PatrolRecordListFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO);
+ return new Result>().ok(epmetUserService.recordList(formDTO));
+ }
+
+ /**
+ * 历史巡查日期查询
+ * @author zhaoqifeng
+ * @date 2021/6/10 14:36
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ */
+ @PostMapping("patrolleddatelist")
+ public Result patrolDateList(@RequestBody PatrolDateListFormDTO formDTO) {
+ ValidatorUtils.validateEntity(formDTO);
+ return new Result().ok(epmetUserService.patrolDateList(formDTO));
+ }
+
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolDetailDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolDetailDao.java
new file mode 100644
index 0000000000..bb2247f220
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolDetailDao.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java
new file mode 100644
index 0000000000..5c6cb03bdb
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * @Description 按条件查询巡查业务数据
+ * @author sun
+ */
+ List selectPatrolList(StaffListFormDTO formDTO);
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
index 1da9910104..cc73cc2c1f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
@@ -18,6 +18,7 @@
package com.epmet.dataaggre.dao.govorg;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
@@ -54,4 +55,11 @@ public interface CustomerGridDao extends BaseDao {
* @Description 根据组织Id查询当前组织下所有网格列表
**/
List selectGridListByAgencyId(@Param("agencyId") String agencyId);
+
+ /**
+ * @param staffId
+ * @Author sun
+ * @Description 查询工作人员所属组织下网格列表
+ **/
+ List gridListByStaffId(@Param("staffId") String staffId);
}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolDetailEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolDetailEntity.java
new file mode 100644
index 0000000000..c74f88b459
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolDetailEntity.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see selectUserIdByCustomerId(List userIds);
+ /**
+ * @Param formDTO
+ * @Description 001、各人员巡查记录列表查询
+ * @author sun
+ */
+ List staffList(StaffListFormDTO formDTO);
+
+ /**
+ * 巡查记录列表查询
+ * @author zhaoqifeng
+ * @date 2021/6/9 14:49
+ * @param formDTO
+ * @return java.util.List
+ */
+ List recordList(PatrolRecordListFormDTO formDTO);
+
+ /**
+ * 历史巡查日期查询
+ * @author zhaoqifeng
+ * @date 2021/6/10 14:36
+ * @param formDTO
+ * @return com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO
+ */
+ PatrolDateListResultDTO patrolDateList(PatrolDateListFormDTO formDTO);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolDetailService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolDetailService.java
new file mode 100644
index 0000000000..54dccbe854
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolDetailService.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 获取记录明细
+ * @author zhaoqifeng
+ * @date 2021/6/9 15:09
+ * @param recordIds
+ * @return java.util.Map>
+ */
+ Map> getDetailByRecordIds(List recordIds);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolRecordService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolRecordService.java
new file mode 100644
index 0000000000..a7bf7d5155
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolRecordService.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 获取巡查记录列表
+ *
+ * @param gridId
+ * @param userId
+ * @param patrolDate
+ * @return java.util.List
+ * @author zhaoqifeng
+ * @date 2021/6/9 14:55
+ */
+ List getRecordList(String gridId, String userId, String patrolDate);
+
+ /**
+ * 获取日期列表
+ * @author zhaoqifeng
+ * @date 2021/6/10 14:49
+ * @param gridId
+ * @param staffId
+ * @return java.util.List
+ */
+ List getDateList(String gridId, String staffId);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 2dac9b0ccd..fdbb43843b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -1,15 +1,31 @@
package com.epmet.dataaggre.service.epmetuser.impl;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.epmetuser.StaffPatrolRecordDao;
import com.epmet.dataaggre.dao.epmetuser.UserBaseInfoDao;
-import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO;
+import com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.*;
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
+import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Author zxc
@@ -22,6 +38,14 @@ public class EpmetUserServiceImpl implements EpmetUserService {
@Autowired
private UserBaseInfoDao userBaseInfoDao;
+ @Autowired
+ private GovOrgService govOrgService;
+ @Autowired
+ private StaffPatrolRecordDao staffPatrolRecordDao;
+ @Resource
+ private StaffPatrolDetailService staffPatrolDetailService;
+ @Resource
+ private StaffPatrolRecordService staffPatrolRecordService;
/**
* @Description 根据UserIds查询
@@ -44,4 +68,112 @@ public class EpmetUserServiceImpl implements EpmetUserService {
public List selectUserIdByCustomerId(List userIds) {
return userBaseInfoDao.selectUserIdByCustomerId(userIds);
}
+
+ /**
+ * @Param formDTO
+ * @Description 001、各人员巡查记录列表查询
+ * @author sun
+ */
+ @Override
+ public List staffList(StaffListFormDTO formDTO) {
+ List resultList = new ArrayList<>();
+ //1.设置分页参数
+ int num = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+ formDTO.setPageNo(num);
+
+ //2.查询当前人员所属组织下网格列表数据，供后续使用
+ List list = govOrgService.gridListByStaffId(formDTO.getUserId());
+ if (list.size() < NumConstant.ONE) {
+ return resultList;
+ }
+ //网格集合为空则查询当前人员所属组织下网格列表
+ if (CollectionUtils.isEmpty(formDTO.getGridIds())) {
+ formDTO.setGridIds(list.stream().map(CustomerGridDTO::getId).collect(Collectors.toList()));
+ }
+
+ //3.按条件查询巡查业务数据
+ formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime()));
+ resultList = staffPatrolRecordDao.selectPatrolList(formDTO);
+ if (resultList.size() < NumConstant.ONE) {
+ return new ArrayList<>();
+ }
+
+ //4.封装数据并返回
+ resultList.forEach(re -> list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName())));
+ return resultList;
+ }
+
+ /**
+ * 巡查记录列表查询
+ *
+ * @param formDTO
+ * @return java.util.List
+ * @author zhaoqifeng
+ * @date 2021/6/9 14:49
+ */
+ @Override
+ public List recordList(PatrolRecordListFormDTO formDTO) {
+ List recordList = staffPatrolRecordService.getRecordList(formDTO.getGridId(), formDTO.getUserId(), formDTO.getPatrolDate());
+ if (CollectionUtils.isEmpty(recordList)) {
+ return Collections.emptyList();
+ }
+ List recordIds = recordList.stream().map(StaffPatrolRecordDTO :: getId).collect(Collectors.toList());
+ Map> details = staffPatrolDetailService.getDetailByRecordIds(recordIds);
+
+ List result = recordList.stream().map(record -> {
+ PatrolRecordListResultDTO dto = new PatrolRecordListResultDTO();
+ dto.setStaffPatrolRecId(record.getId());
+ dto.setStatus(record.getStatus());
+ dto.setPatrolStartTime(DateUtils.format(record.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
+ dto.setPatrolEndTime(DateUtils.format(record.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN));
+ Integer minutes;
+ if (("patrolling").equals(record.getStatus())) {
+ minutes = DateUtils.calculateMin(record.getPatrolStartTime(), new Date());
+ String latestChangeDesc = "后端返回：巡查员最近地址变动是" + minutes + "分钟前";
+ dto.setLatestChangeDesc(latestChangeDesc);
+ } else {
+ minutes = record.getTotalTime() / 60;
+ }
+ String totalTimeDesc = minutes / 60 + "小时"+ minutes % 60 + "分";
+ dto.setTotalTimeDesc(totalTimeDesc);
+ List detailList = details.get(record.getId());
+ List recordDetails =
+ detailList.stream().sorted(Comparator.comparing(StaffPatrolDetailDTO::getSerialNum).reversed()).collect(Collectors.toList()).stream().map( detail -> {
+ PatrolRecordDetailDTO detailDTO = new PatrolRecordDetailDTO();
+ detailDTO.setLatitude(detail.getLatitude());
+ detailDTO.setLongitude(detail.getLongitude());
+ detailDTO.setSpeed(detail.getSpeed());
+ detailDTO.setUploadTime(DateUtils.format(detail.getUploadTime(), DateUtils.DATE_TIME_PATTERN));
+ return detailDTO;
+ }).collect(Collectors.toList());
+ if (("end").equals(record.getStatus())) {
+ recordDetails.get(NumConstant.ZERO).setFlag("结束巡查");
+ }
+ recordDetails.get(recordDetails.size() - 1).setFlag("开始巡查");
+ dto.setDetails(recordDetails);
+ return dto;
+ }).collect(Collectors.toList());
+ return result;
+ }
+
+ /**
+ * 历史巡查日期查询
+ *
+ * @param formDTO
+ * @return com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO
+ * @author zhaoqifeng
+ * @date 2021/6/10 14:36
+ */
+ @Override
+ public PatrolDateListResultDTO patrolDateList(PatrolDateListFormDTO formDTO) {
+ List list = staffPatrolRecordService.getDateList(formDTO.getGridId(), formDTO.getStaffId());
+ PatrolDateListResultDTO dto = new PatrolDateListResultDTO();
+ if (CollectionUtils.isNotEmpty(list)) {
+ dto.setStartDate(list.get(NumConstant.ZERO));
+ }
+ dto.setList(list);
+ return dto;
+ }
+
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java
new file mode 100644
index 0000000000..98f41f75a3
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements StaffPatrolDetailService {
+
+
+ /**
+ * 获取记录明细
+ *
+ * @param recordIds
+ * @return java.util.Map>
+ * @author zhaoqifeng
+ * @date 2021/6/9 15:09
+ */
+ @Override
+ public Map> getDetailByRecordIds(List recordIds) {
+ if (CollectionUtils.isEmpty(recordIds)) {
+ return Collections.emptyMap();
+ }
+ StringBuilder sql = new StringBuilder("( STAFF_PATROL_REC_ID = '' ");
+ for (String id : recordIds) {
+ sql.append("OR STAFF_PATROL_REC_ID = '").append(id).append("' ");
+ }
+ sql.append(")");
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.apply(sql.toString());
+ List list = ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), StaffPatrolDetailDTO.class);
+ return list.stream().collect(Collectors.groupingBy(StaffPatrolDetailDTO::getStaffPatrolRecId));
+ }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolRecordServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolRecordServiceImpl.java
new file mode 100644
index 0000000000..67eb153f04
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolRecordServiceImpl.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements StaffPatrolRecordService {
+
+
+ /**
+ * 获取巡查记录列表
+ *
+ * @param gridId
+ * @param userId
+ * @param patrolDate
+ * @return java.util.List
+ * @author zhaoqifeng
+ * @date 2021/6/9 14:55
+ */
+ @Override
+ public List getRecordList(String gridId, String userId, String patrolDate) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("GRID", gridId)
+ .eq("STAFF_ID", userId)
+ .eq("DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d') ", patrolDate)
+ .orderByDesc("PATROL_START_TIME");
+
+ return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), StaffPatrolRecordDTO.class);
+ }
+
+ /**
+ * 获取日期列表
+ *
+ * @param gridId
+ * @param staffId
+ * @return java.util.List
+ * @author zhaoqifeng
+ * @date 2021/6/10 14:49
+ */
+ @Override
+ public List getDateList(String gridId, String staffId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.select("DISTINCT DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d') AS ID")
+ .eq("GRID", gridId)
+ .eq("STAFF_ID", staffId)
+ .orderByAsc("PATROL_START_TIME");
+ List list = baseDao.selectList(wrapper);
+ if (CollectionUtils.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+
+ return list.stream().map(StaffPatrolRecordEntity::getId).collect(Collectors.toList());
+ }
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index 916044b1f3..c79837ec60 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -1,5 +1,6 @@
package com.epmet.dataaggre.service.govorg;
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO;
@@ -48,4 +49,11 @@ public interface GovOrgService {
List queryNextLevelAreaCodeList(NextAreaCodeFormDTO formDTO);
List queryNextOrgInfoDTO(String customerId, String orgId);
+
+ /**
+ * @param staffId
+ * @Author sun
+ * @Description 查询工作人员所属组织下网格列表
+ **/
+ List gridListByStaffId(String staffId);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index ec45f0419f..e3c9752a00 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -9,6 +9,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.govorg.CustomerAgencyDao;
import com.epmet.dataaggre.dao.govorg.CustomerGridDao;
import com.epmet.dataaggre.dao.govorg.CustomerStaffAgencyDao;
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO;
import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
@@ -225,5 +226,16 @@ public class GovOrgServiceImpl implements GovOrgService {
System.out.println(JSON.toJSONString(allList, true));
}
+ /**
+ * @param staffId
+ * @Author sun
+ * @Description 查询工作人员所属组织下网格列表
+ **/
+ @Override
+ public List gridListByStaffId(String staffId) {
+ //网格名是拼接上两级组织名称
+ List resultList = customerGridDao.gridListByStaffId(staffId);
+ return resultList;
+ }
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolDetailDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolDetailDao.xml
new file mode 100644
index 0000000000..c06344967c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolDetailDao.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
new file mode 100644
index 0000000000..a0f8a495e0
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+ SELECT
+ spr.grid AS "gridId",
+ spr.staff_id AS "staffId",
+ MAX(spr.patrol_start_time) AS "patrolStartTime",
+ COUNT(spr.staff_id) AS "patrolTotal",
+ (
+ select
+ `status`
+ from
+ staff_patrol_record
+ where
+ grid = spr.grid
+ and staff_id = spr.staff_id
+ order by
+ patrol_start_time desc
+ limit 1
+ ) AS "status",
+ cs.real_name AS "staffName",
+ cs.gender AS "gender"
+ FROM
+ staff_patrol_record spr
+ LEFT JOIN customer_staff cs ON spr.staff_id = cs.user_id
+ WHERE
+ spr.del_flag = '0'
+
+ AND spr.patrol_start_time = ]]> #{patrolStartTime}
+
+
+ AND cs.real_name LIKE CONCAT('%',#{staffName},'%')
+
+
+ spr.GRID = #{gridId}
+
+ GROUP BY
+ spr.grid, spr.staff_id
+
+ ORDER BY COUNT(spr.staff_id) DESC
+
+
+ ORDER BY MAX(spr.patrol_start_time) DESC
+
+ LIMIT
+ #{pageNo}, #{pageSize}
+
+
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
index 331246a2f5..3d00ea3cd4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
@@ -52,4 +52,38 @@
AND pid = #{agencyId}
+
+ SELECT
+ cg.id AS 'id',
+ IF (
+ ca.pid = '0',
+ IF (
+ ca.organization_name = '',
+ cg.grid_name,
+ CONCAT(ca.organization_name,'-',cg.grid_name)
+ ),
+ CONCAT(
+ (select organization_name from customer_agency where id = ca.pid),
+ '-',
+ IF (
+ ca.organization_name = '',
+ cg.grid_name,
+ CONCAT(ca.organization_name,'-',cg.grid_name)
+ )
+ )
+ )AS 'gridName'
+ FROM
+ customer_grid cg
+ INNER JOIN customer_agency ca ON cg.pid = ca.id
+ WHERE
+ cg.del_flag = '0'
+ AND ca.del_flag = '0'
+ AND cg.pid = (
+ select agency_id
+ from customer_staff_agency
+ where del_flag = '0'
+ AND user_id = #{staffId}
+ )
+
+
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolDetailDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolDetailDTO.java
new file mode 100644
index 0000000000..a5f33265d5
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/StaffPatrolDetailDTO.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
-
+
epmet_data_statistical_user
EpmEt-db-UsEr
-
+
epmet_data_stats_display_user
EpmEt-db-UsEr
-
+
epmet_evaluation_index_user
EpmEt-db-UsEr
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
true
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -187,34 +187,34 @@
-
+
epmet_data_statistical_user
EpmEt-db-UsEr
-
+
epmet_data_stats_display_user
EpmEt-db-UsEr
-
+
epmet_evaluation_index_user
EpmEt-db-UsEr
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
false
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/PatrolConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/PatrolConstant.java
new file mode 100644
index 0000000000..eff0bdd451
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/PatrolConstant.java
@@ -0,0 +1,20 @@
+package com.epmet.datareport.constant;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/9 1:49 下午
+ * @DESC
+ */
+public interface PatrolConstant {
+
+ /**
+ * 经度
+ */
+ String LONGITUDE = "longitude";
+
+ /**
+ * 纬度
+ */
+ String LATITUDE = "latitude";
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
new file mode 100644
index 0000000000..72329ea1a1
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java
@@ -0,0 +1,66 @@
+package com.epmet.datareport.controller.user;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.datareport.service.user.StaffPatrolDetailService;
+import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.dto.form.PatrolTrackFormDTO;
+import com.epmet.dto.form.RecordListFormDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.dto.result.PatrolTrackResultDTO;
+import com.epmet.dto.result.RecordListResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+@RestController
+@RequestMapping("staffpatrol")
+public class StaffPatrolDetailController {
+
+ @Autowired
+ private StaffPatrolDetailService staffPatrolService;
+
+ /**
+ * @Description 001、网格员分布
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:06 下午
+ */
+ @PostMapping("gridmanagerlist")
+ public Result> gridManagerList(@RequestBody GridManagerListFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO, GridManagerListFormDTO.GridManagerListForm.class);
+ return new Result>().ok(staffPatrolService.gridManagerList(formDTO));
+ }
+
+ /**
+ * @Description 002、查看巡查记录
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:25 下午
+ */
+ @PostMapping("recordlist")
+ public Result> recordList(@RequestBody RecordListFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO, RecordListFormDTO.RecordListForm.class);
+ return new Result>().ok(staffPatrolService.recordList(formDTO));
+ }
+
+ /**
+ * @Description 003、巡查轨迹
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:35 下午
+ */
+ @PostMapping("patroltrack")
+ public Result> patrolTrack(@RequestBody PatrolTrackFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO, PatrolTrackFormDTO.PatrolTrackForm.class);
+ return new Result>().ok(staffPatrolService.patrolTrack(formDTO));
+ }
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolRecordController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolRecordController.java
new file mode 100644
index 0000000000..90a99c3d64
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolRecordController.java
@@ -0,0 +1,21 @@
+package com.epmet.datareport.controller.user;
+
+import com.epmet.datareport.service.user.StaffPatrolRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 工作人员巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+@RestController
+@RequestMapping("staffpatrolrecord")
+public class StaffPatrolRecordController {
+
+ @Autowired
+ private StaffPatrolRecordService staffPatrolRecordService;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index a0992f8d97..986a880aac 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -22,6 +22,7 @@ import com.epmet.dto.result.plugins.AgencyNodeDTO;
import com.epmet.dto.result.plugins.DeptNodeDTO;
import com.epmet.dto.result.plugins.GridNodeDTO;
import com.epmet.evaluationindex.screen.dto.result.*;
+import com.epmet.user.result.GridManagerListResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -161,4 +162,12 @@ public interface ScreenCustomerAgencyDao {
List getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId);
List selectSubAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId);
+
+ /**
+ * @Description 根据agencyId查询网格
+ * @Param agencyId
+ * @author zxc
+ * @date 2021/6/8 1:27 下午
+ */
+ List selectGrid(@Param("agencyId")String agencyId,@Param("areaCode")String areaCode);
}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java
new file mode 100644
index 0000000000..fafcc77d6e
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * @Description 查询巡查轨迹
+ * @Param staffPatrolRecId
+ * @author zxc
+ * @date 2021/6/7 5:13 下午
+ */
+ List selectPatrolTrack(@Param("staffPatrolRecId") String staffPatrolRecId);
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java
new file mode 100644
index 0000000000..19849b856b
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * @Description 巡查记录查询
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 5:29 下午
+ */
+ List recordList(RecordListFormDTO formDTO);
+
+ /**
+ * @Description 查询经纬度
+ * @Param userIds
+ * @author zxc
+ * @date 2021/6/9 10:24 上午
+ */
+ List selectLL(@Param("userIds")List userIds);
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolDetailEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolDetailEntity.java
new file mode 100644
index 0000000000..fd00e1b58f
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/user/StaffPatrolDetailEntity.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see selectAllGrid(String agencyId,String areaCode);
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
index 54b0b797be..3173e1269e 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java
@@ -164,7 +164,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
BranchBuildTrendResultDTO result = new BranchBuildTrendResultDTO();
//生成近十二个月的横坐标数组
Map monthMap = dateUtils.getXpro();
- result.setXAxis(monthMap.values().stream().collect(Collectors.toList()));
+ result.setXAxis(new ArrayList<>(monthMap.values()));
List dataArray = new LinkedList<>();
List yearlyDataList =
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenOrgServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenOrgServiceImpl.java
new file mode 100644
index 0000000000..c387350d34
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenOrgServiceImpl.java
@@ -0,0 +1,44 @@
+package com.epmet.datareport.service.evaluationindex.screen.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenOrgService;
+import com.epmet.user.result.GridManagerListResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/8 10:45 上午
+ * @DESC
+ */
+@Service
+@Slf4j
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
+public class ScreenOrgServiceImpl implements ScreenOrgService {
+
+ @Autowired
+ private ScreenCustomerAgencyDao agencyDao;
+
+ /**
+ * @Description 查询组织下的所有网格
+ * @Param agencyId
+ * @Param areaCode
+ * @author zxc
+ * @date 2021/6/8 10:46 上午
+ */
+ @Override
+ public List selectAllGrid(String agencyId,String areaCode) {
+ List result = agencyDao.selectGrid(agencyId, areaCode);
+ if (!CollectionUtils.isEmpty(result)){
+ return result;
+ }
+ return new ArrayList<>();
+ }
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java
new file mode 100644
index 0000000000..98260990a3
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java
@@ -0,0 +1,44 @@
+package com.epmet.datareport.service.user;
+
+import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.dto.form.PatrolTrackFormDTO;
+import com.epmet.dto.form.RecordListFormDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.dto.result.PatrolTrackResultDTO;
+import com.epmet.dto.result.RecordListResultDTO;
+
+import java.util.List;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+public interface StaffPatrolDetailService{
+
+ /**
+ * @Description 001、网格员分布
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:06 下午
+ */
+ List gridManagerList(GridManagerListFormDTO formDTO);
+
+ /**
+ * @Description 002、查看巡查记录
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:25 下午
+ */
+ List recordList(RecordListFormDTO formDTO);
+
+ /**
+ * @Description 003、巡查轨迹
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:35 下午
+ */
+ List patrolTrack(PatrolTrackFormDTO formDTO);
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolRecordService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolRecordService.java
new file mode 100644
index 0000000000..e1d15008e5
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolRecordService.java
@@ -0,0 +1,14 @@
+package com.epmet.datareport.service.user;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.datareport.entity.user.StaffPatrolRecordEntity;
+
+/**
+ * 工作人员巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+public interface StaffPatrolRecordService extends BaseService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java
new file mode 100644
index 0000000000..94050b403e
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java
@@ -0,0 +1,194 @@
+package com.epmet.datareport.service.user.impl;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.datareport.constant.PatrolConstant;
+import com.epmet.datareport.dao.user.StaffPatrolDetailDao;
+import com.epmet.datareport.dao.user.StaffPatrolRecordDao;
+import com.epmet.datareport.service.evaluationindex.screen.ScreenOrgService;
+import com.epmet.datareport.service.user.StaffPatrolDetailService;
+import com.epmet.dto.result.GridStaffResultDTO;
+import com.epmet.dto.result.UserNameAndLLResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.dto.form.PatrolTrackFormDTO;
+import com.epmet.dto.form.RecordListFormDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.dto.result.PatrolTrackResultDTO;
+import com.epmet.dto.result.RecordListResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 工作人员巡查记录明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+@Service
+@Slf4j
+public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
+
+ @Autowired
+ private StaffPatrolDetailDao staffPatrolDetailDao;
+
+ @Autowired
+ private StaffPatrolRecordDao staffPatrolRecordDao;
+
+ @Autowired
+ private ScreenOrgService screenOrgService;
+
+ @Autowired
+ private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+ @Autowired
+ private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+ /**
+ * @Description 001、网格员分布
+ * 1.根据agencyId或者areaCode查询出网格
+ * 2.根据查出来的网格ID去查网格下边的人【人只要网格员】
+ * 3.根据userId查询巡查记录表
+ * 4.数据补全
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:06 下午
+ */
+ @Override
+ public List gridManagerList(GridManagerListFormDTO formDTO) {
+ List grids = new ArrayList<>();
+ if (StringUtils.isEmpty(formDTO.getAreaCode())){
+ // 根据agencyId查询网格
+ grids = screenOrgService.selectAllGrid(formDTO.getAgencyId(), null);
+ }else {
+ // 根据areaCode查询网格
+ grids = screenOrgService.selectAllGrid(null, formDTO.getAreaCode());
+ }
+ if (CollectionUtils.isEmpty(grids)){
+ return new ArrayList<>();
+ }
+ List gridIds = grids.stream().map(m -> m.getGridId()).collect(Collectors.toList());
+ // 查询网格下的网格员
+ Result> resultData = govOrgOpenFeignClient.selectGridStaffByGridIds(gridIds);
+ if(!resultData.success()){
+ throw new RenException("查询网格下的网格员失败【"+resultData.getMsg()+"】");
+ }
+ List data = resultData.getData();
+ if (CollectionUtils.isEmpty(data)){
+ return new ArrayList<>();
+ }
+ List result = ConvertUtils.sourceToTarget(data, GridManagerListResultDTO.class);
+ // 查询经纬度
+ Result selectll = epmetUserOpenFeignClient.selectll(result.stream().map(m -> m.getStaffId()).collect(Collectors.toList()));
+ if (!selectll.success()){
+ throw new RenException("查询经纬度和姓名失败【"+selectll.getMsg()+"】");
+ }
+ UserNameAndLLResultDTO llAndNameData = selectll.getData();
+ List finalGrids = grids;
+ result.forEach(r -> {
+ // 经纬度赋值 巡查状态赋值
+ if (!CollectionUtils.isEmpty(llAndNameData.getLl())) {
+ llAndNameData.getLl().forEach(l -> {
+ if (r.getStaffId().equals(l.getStaffId()) && r.getGridId().equals(l.getGridId())) {
+ r.setLatitude(l.getLatitude());
+ r.setLongitude(l.getLongitude());
+ r.setStatus(l.getStatus());
+ r.setLlStatus(true);
+ }
+ });
+ }
+ // 姓名赋值
+ if (!CollectionUtils.isEmpty(llAndNameData.getUserNames())){
+ llAndNameData.getUserNames().forEach(n -> {
+ if (r.getStaffId().equals(n.getUserId())){
+ r.setStaffName(n.getUserName());
+ }
+ });
+ }
+ finalGrids.forEach(g -> {
+ if (r.getGridId().equals(g.getGridId())){
+ r.setGridName(g.getGridName());
+ }
+ });
+ });
+ result.forEach(r -> {
+ if (!r.getLlStatus()){
+ finalGrids.forEach(g -> {
+ if (r.getGridId().equals(g.getGridId()) && (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark()))){
+ r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE));
+ r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE));
+ }
+ });
+ }
+ });
+ return result;
+ }
+
+ /**
+ * @Description 根据中心点位截取经纬度
+ * @Param centMark
+ * @Param ll
+ * @author zxc
+ * @date 2021/6/9 2:08 下午
+ */
+ public String getLL(String centMark,String ll){
+ if (ll.equals(PatrolConstant.LONGITUDE)){
+ String longitude = centMark.substring(NumConstant.TWO, centMark.indexOf(","));
+ return longitude;
+ }else {
+ String s = centMark.substring(NumConstant.ZERO, centMark.indexOf(","));
+ String latitude = centMark.substring(s.length() + NumConstant.ONE, centMark.length() - NumConstant.TWO);
+ return latitude;
+ }
+ }
+
+ /**
+ * @Description 002、查看巡查记录
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:25 下午
+ */
+ @Override
+ public List recordList(RecordListFormDTO formDTO) {
+ Result> listResult = epmetUserOpenFeignClient.recordList(formDTO);
+ if (!listResult.success()){
+ throw new RenException("查询巡查记录失败【"+listResult.getMsg()+"】");
+ }
+ List result = listResult.getData();
+ if (!CollectionUtils.isEmpty(result)){
+ return result;
+ }
+ return new ArrayList<>();
+ }
+
+ /**
+ * @Description 003、巡查轨迹
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:35 下午
+ */
+ @Override
+ public List patrolTrack(PatrolTrackFormDTO formDTO) {
+ Result> result = epmetUserOpenFeignClient.patrolTrack(formDTO);
+ if (!result.success()){
+ throw new RenException("查询 巡查轨迹失败【"+result.getMsg()+"】");
+ }
+ List results = result.getData();
+ if (!CollectionUtils.isEmpty(results)){
+ return results;
+ }
+ return new ArrayList<>();
+ }
+
+
+}
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolRecordServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolRecordServiceImpl.java
new file mode 100644
index 0000000000..35351b5746
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolRecordServiceImpl.java
@@ -0,0 +1,21 @@
+package com.epmet.datareport.service.user.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.datareport.dao.user.StaffPatrolRecordDao;
+import com.epmet.datareport.entity.user.StaffPatrolRecordEntity;
+import com.epmet.datareport.service.user.StaffPatrolRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 工作人员巡查主记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-06-07
+ */
+@Service
+@Slf4j
+public class StaffPatrolRecordServiceImpl extends BaseServiceImpl implements StaffPatrolRecordService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 328bb2f753..4397b99fd6 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -320,4 +320,24 @@
+
+
+
+ SELECT
+ CONCAT(IF(ISNULL(ca2.AGENCY_NAME),'',CONCAT(ca2.AGENCY_NAME,'-')),
+ IF(ISNULL(ca.AGENCY_NAME),'',CONCAT(ca.AGENCY_NAME,'-')),
+ IF(ISNULL(cg.GRID_NAME),'',cg.GRID_NAME)) AS gridName,
+ cg.GRID_ID,
+ IFNULL(cg.CENTER_MARK,'') AS centerMark
+ FROM epmet_evaluation_index.screen_customer_grid cg
+ LEFT JOIN epmet_evaluation_index.screen_customer_agency ca ON ca.AGENCY_ID = cg.PARENT_AGENCY_ID AND ca.DEL_FLAG = 0
+ LEFT JOIN epmet_evaluation_index.screen_customer_agency ca2 ON ca2.AGENCY_ID = ca.PID AND ca2.DEL_FLAG = 0
+ WHERE cg.DEL_FLAG = 0
+
+ AND cg.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+
+
+ AND cg.PARENT_AGENCY_ID = #{agencyId}
+
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml
new file mode 100644
index 0000000000..2bf91e89f2
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ SELECT
+ LATITUDE,
+ LONGITUDE
+ FROM
+ staff_patrol_detail
+ WHERE
+ STAFF_PATROL_REC_ID = #{staffPatrolRecId}
+ AND DEL_FLAG = 0
+ ORDER BY SERIAL_NUM
+
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml
new file mode 100644
index 0000000000..02e4069ff7
--- /dev/null
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+ SELECT
+ ID AS staffPatrolRecId,
+ DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d %H:%i:%s') AS patrolStartTime,
+ DATE_FORMAT(PATROL_END_TIME,'%Y-%m-%d %H:%i:%s') AS patrolEndTime,
+ `STATUS`
+ FROM staff_patrol_record
+ WHERE DEL_FLAG = 0
+ AND GRID_ID = #{gridId}
+ AND STAFF_ID = #{staffId}
+ ORDER BY CREATED_TIME DESC
+
+
+
+
+ SELECT t.* FROM
+ (SELECT
+ distinct(pr.ID) AS ID,
+ pr.GRID AS gridId,
+ pr.STAFF_ID,
+ pr.`STATUS`,
+ pd.LATITUDE,
+ pd.LONGITUDE,
+ pd.SERIAL_NUM
+ FROM staff_patrol_record pr
+ LEFT JOIN staff_patrol_detail pd ON pd.STAFF_PATROL_REC_ID = pr.ID AND pd.DEL_FLAG = 0
+ WHERE pr.DEL_FLAG = 0
+ AND (
+
+ pr.STAFF_ID = #{userId}
+
+ )
+ ORDER BY pd.SERIAL_NUM DESC)t GROUP BY ID
+
+
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
index aeb148d8e9..6c292909d2 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
@@ -17,11 +17,11 @@
package com.epmet.dto.screen;
-import java.io.Serializable;
-import java.util.Date;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 中央区-项目数据
@@ -54,6 +54,11 @@ public class ScreenProjectDataDTO implements Serializable {
*/
private String orgId;
+ /**
+ * 来源：议题issue，组织agency
+ */
+ private String origin;
+
/**
* 上级组织Id
*/
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectGridDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectGridDailyDTO.java
index c1f5f2ed12..fefcc025bb 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectGridDailyDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectGridDailyDTO.java
@@ -55,6 +55,11 @@ public class ScreenProjectGridDailyDTO implements Serializable {
*/
private String gridId;
+ /**
+ * 网格id
+ */
+ private String gridName;
+
/**
* 网格所属的组织id
*/
@@ -65,6 +70,11 @@ public class ScreenProjectGridDailyDTO implements Serializable {
*/
private String pids;
+ /**
+ * 网格所有的父级id,以英文:或者英文,隔开
+ */
+ private String centerMark;
+
/**
* 截止到当前日期，网格内项目总数
*/
@@ -149,4 +159,4 @@ public class ScreenProjectGridDailyDTO implements Serializable {
this.delFlag = NumConstant.ZERO_STR;
this.revision = NumConstant.ZERO;
}
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/CenterPointForm.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/CenterPointForm.java
new file mode 100644
index 0000000000..59cf43ebf1
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/CenterPointForm.java
@@ -0,0 +1,18 @@
+package com.epmet.dto.screen.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * desc:修改组织中心点
+ * @author liujianjun
+ */
+@Data
+public class CenterPointForm implements Serializable {
+ private static final long serialVersionUID = 6425114459278919896L;
+ private String title;
+ private List center = new ArrayList<>();
+}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java
new file mode 100644
index 0000000000..22d1e569d3
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java
@@ -0,0 +1,31 @@
+package com.epmet.dto.screen.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * desc:修改组织中心点
+ * @author liujianjun
+ */
+@Data
+public class GridCenterPointForm implements Serializable {
+
+ private static final long serialVersionUID = -6988009829971668860L;
+
+ private String customerId;
+ private String pids;
+
+ private List centerDataList = new ArrayList<>();
+
+
+ /* @Data
+ public class CenterData implements Serializable{
+
+ private static final long serialVersionUID = 6425114459278919896L;
+ private String title;
+ private List center = new ArrayList<>();
+ }*/
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
index 818776c83a..09d626e7c5 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-dev
- image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:version_placeholder
+ image: 192.168.1.140:5000/epmet-cloud-dev/data-statistical-server:version_placeholder
ports:
- "8108:8108"
network_mode: host # 使用现有网络
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 79d0fb2130..d1b4c185c8 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -151,92 +151,92 @@
-
+
epmet_data_statistical_user
EpmEt-db-UsEr
-
+
epmet_gov_org_user
EpmEt-db-UsEr
-
+
epmet_gov_issue_user
EpmEt-db-UsEr
-
+
epmet_gov_project_user
EpmEt-db-UsEr
-
+
epmet_gov_voice_user
EpmEt-db-UsEr
-
+
epmet_oper_crm_user
EpmEt-db-UsEr
-
+
epmet_resi_group_user
EpmEt-db-UsEr
-
+
epmet_user_user
EpmEt-db-UsEr
-
+
epmet_data_stats_display_user
EpmEt-db-UsEr
-
+
epmet_evaluation_index_user
EpmEt-db-UsEr
-
+
epmet_resi_partymember_user
EpmEt-db-UsEr
-
+
epmet_heart_user
EpmEt-db-UsEr
-
+
epmet_point_user
EpmEt-db-UsEr
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
true
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -256,7 +256,7 @@
SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
- 192.168.1.130:9876;192.168.1.132:9876
+ 192.168.1.140:9876;192.168.1.141:9876
@@ -270,92 +270,92 @@
-
+
epmet_data_statistical_user
EpmEt-db-UsEr
-
+
epmet_gov_org_user
EpmEt-db-UsEr
-
+
epmet_gov_issue_user
EpmEt-db-UsEr
-
+
epmet_gov_project_user
EpmEt-db-UsEr
-
+
epmet_gov_voice_user
EpmEt-db-UsEr
-
+
epmet_oper_crm_user
EpmEt-db-UsEr
-
+
epmet_resi_group_user
EpmEt-db-UsEr
-
+
epmet_user_user
EpmEt-db-UsEr
-
+
epmet_data_stats_display_user
EpmEt-db-UsEr
-
+
epmet_evaluation_index_user
EpmEt-db-UsEr
-
+
epmet_resi_partymember_user
EpmEt-db-UsEr
-
+
epmet_heart_user
EpmEt-db-UsEr
-
+
epmet_point_user
EpmEt-db-UsEr
0
- 192.168.1.130
+ 192.168.1.140
6379
123456
false
- 192.168.1.130:8848
- 6ceab336-d004-4acf-89c6-e121d06f4988
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
false
@@ -375,7 +375,7 @@
SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
- 192.168.1.130:9876;192.168.1.132:9876
+ 192.168.1.140:9876;192.168.1.141:9876
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/EIDimController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/EIDimController.java
index 761c62bb0b..e15b66e188 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/EIDimController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/EIDimController.java
@@ -2,14 +2,18 @@ package com.epmet.controller;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.screen.form.GridCenterPointForm;
import com.epmet.service.EIDimService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
+
/**
* epmet_evaluation_index库的维度controller
*/
@@ -45,4 +49,14 @@ public class EIDimController {
return new Result();
}
+ /**
+ * desc 更新网格的中心点位
+ * @return
+ */
+ @PostMapping("update/gridcenterpoint")
+ public Result upsertOrgCenterPoint(@RequestBody GridCenterPointForm param) {
+ Map effectRow = eiDimService.updateCenterPointByName(param);
+ return new Result().ok(effectRow);
+ }
+
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
index 1d5099bc67..6aa2aacc1c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java
@@ -40,8 +40,8 @@ import java.util.List;
@Mapper
public interface ScreenCustomerGridDao extends BaseDao {
/**
- *15、网格信息上传
- * 1) 根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
+ * 15、网格信息上传
+ * 1) 根据CUSTOMER_ID 进行查询，如果有数据，则先进行物理删除, 一次删除1000条
*
* @param customerId
* @return java.util.Integer
@@ -52,18 +52,18 @@ public interface ScreenCustomerGridDao extends BaseDao
/**
* 15、网格信息上传
- * 2) 在批量新增
+ * 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
- void batchInsertCustomerGrid(@Param("list") List list, @Param("customerId")String customerId);
+ void batchInsertCustomerGrid(@Param("list") List list, @Param("customerId") String customerId);
/**
- * @return java.lang.Integer
* @param customerId
+ * @return java.lang.Integer
* @author yinzuomei
* @description 查询客户下网格总数
* @Date 2020/8/26 15:33
@@ -71,17 +71,17 @@ public interface ScreenCustomerGridDao extends BaseDao
Integer selectCountByCustomerId(@Param("customerId") String customerId);
/**
- * @return java.util.List
* @param customerId
+ * @return java.util.List
* @author yinzuomei
* @description 查询客户下网格信息
* @Date 2020/8/26 15:33
**/
- List selectListByCustomerId(@Param("customerId")String customerId);
+ List selectListByCustomerId(@Param("customerId") String customerId);
/**
- * @return java.util.List
* @param formDTO
+ * @return java.util.List
* @author yinzuomei
* @description 分页查询网格列表
* @Date 2020/8/27 14:42
@@ -89,7 +89,7 @@ public interface ScreenCustomerGridDao extends BaseDao
List pageListByCustomerId(PageQueryGridFormDTO formDTO);
/**
- * @param gridId 网格id
+ * @param gridId 网格id
* @return java.lang.String
* @author yinzuomei
* @description 查询网格所属的组织id
@@ -107,28 +107,29 @@ public interface ScreenCustomerGridDao extends BaseDao
* @Date 10:45 2020-09-04
**/
List selectListMismatchGridInfo(@Param("customerId") String customerId,
- @Param("gridIds") String[] gridIds,
- @Param("customerAreaCode") String customerAreaCode,
- @Param("subCustomerIds")List subCustomerIds);
+ @Param("gridIds") String[] gridIds,
+ @Param("customerAreaCode") String customerAreaCode,
+ @Param("subCustomerIds") List subCustomerIds);
/**
* 根据客户id 查询网格(党支部)详细信息
+ *
* @param customerId
* @return java.util.List
* @Author zhangyong
* @Date 16:57 2020-09-03
**/
- List selectListGridInfo(@Param("customerId")String customerId,
+ List selectListGridInfo(@Param("customerId") String customerId,
@Param("customerAreaCode") String customerAreaCode,
- @Param("subCustomerIds")List subCustomerIds);
+ @Param("subCustomerIds") List subCustomerIds);
/**
- * @Description 根据agencyId查询网格ID
* @param agencyId
+ * @Description 根据agencyId查询网格ID
* @author zxc
* @date 2020/9/22 2:16 下午
*/
- List selectGridIdByAgencyId(@Param("agencyId")String agencyId);
+ List selectGridIdByAgencyId(@Param("agencyId") String agencyId);
ScreenCustomerGridEntity getLastAddGrid();
@@ -137,58 +138,59 @@ public interface ScreenCustomerGridDao extends BaseDao
ScreenCustomerGridEntity getByGridId(String gridId);
/**
- * @Description 查询客户下所有网格ID
* @param customerId
* @param dateId
+ * @Description 查询客户下所有网格ID
* @author zxc
* @date 2020/9/23 3:10 下午
*/
List selectAllGridIdToParty(String customerId, String dateId);
/**
- * @Description 查询客户下所有网格ID
+ * @Description 查询客户下所有网格ID
* @Param customerId
* @Param monthId
* @author zxc
* @date 2020/9/25 10:43 上午
*/
- List selectAllGridIdToPartyLinkMessage(@Param("customerId") String customerId,@Param("monthId") String monthId);
- List selectAllGridIdToOrganize(@Param("customerId") String customerId,@Param("monthId") String monthId);
+ List selectAllGridIdToPartyLinkMessage(@Param("customerId") String customerId, @Param("monthId") String monthId);
+
+ List selectAllGridIdToOrganize(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
- * @Description 查询org名称
* @param gridIds
+ * @Description 查询org名称
* @author zxc
* @date 2020/9/24 1:27 下午
*/
List selectOrgName(@Param("gridIds") List gridIds);
/**
- * @Description 查询机关的直属网格
* @param agencyIds
+ * @Description 查询机关的直属网格
* @author zxc
* @date 2020/9/24 2:33 下午
*/
List selectDirectGrid(@Param("agencyIds") List agencyIds);
/**
- * @Description 查询全部网格信息
* @param customerId
+ * @Description 查询全部网格信息
* @author zxc
* @date 2020/9/19 10:50 上午
*/
List selectAllGridInfoToParty(String customerId);
/**
- * @Description 查询全部网格信息
* @param customerId
+ * @Description 查询全部网格信息
* @author zxc
* @date 2020/9/18 10:47 上午
*/
List selectAllGridInfo(@Param("customerId") String customerId);
/**
- * @Description 查询客户下的网格信息
+ * @Description 查询客户下的网格信息
* @Param customerId
* @author zxc
* @date 2021/1/28 下午3:18
@@ -196,11 +198,22 @@ public interface ScreenCustomerGridDao extends BaseDao
List selectGridInfoByCustomerId(@Param("customerId") String customerId);
/**
- * @Description 查询直属网格信息
+ * @Description 查询直属网格信息
* @Param customerId
* @Param level
* @author zxc
* @date 2021/3/23 下午4:03
*/
- List selectBelongGridInfo(@Param("customerId") String customerId,@Param("level") String level);
+ List selectBelongGridInfo(@Param("customerId") String customerId, @Param("level") String level);
+
+ /**
+ * desc: 根据客户Id 和pids 获取该客户下及该组织下的网格列表
+ *
+ * @param customerId
+ * @param pids
+ * @return java.util.List
+ * @author LiuJanJun
+ * @date 2021/6/10 10:45 上午
+ */
+ List selectGridInfoList(@Param("customerId") String customerId, @Param("pids") String pids);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
index e48dc81ab3..dabacfd7da 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java
@@ -22,97 +22,97 @@ import java.util.Set;
public interface UserDao {
/**
- * @Description 查询注册用户的总量与增量
* @param
* @return
+ * @Description 查询注册用户的总量与增量
* @author wangc
* @date 2020.06.18 18:50
- **/
- CommonTotalAndIncCountResultDTO selectResiTotalAndIncrByLevel(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate")Date targetDate);
+ **/
+ CommonTotalAndIncCountResultDTO selectResiTotalAndIncrByLevel(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate);
/**
- * @Description 查询党员的总量与增量
* @param
* @return
+ * @Description 查询党员的总量与增量
* @author wangc
* @date 2020.06.18 18:50
**/
CommonTotalAndIncCountResultDTO selectPartyTotalAndIncr(@Param("userIds") List userIds, @Param("incrUserIds") List incrUserIds, @Param("targetDate") Date targetDate);
/**
- * @Description 查询热心居民的总量与增量
* @param
* @return
+ * @Description 查询热心居民的总量与增量
* @author wangc
* @date 2020.06.18 18:50
**/
CommonTotalAndIncCountResultDTO selectWarmTotalAndIncr(@Param("userIds") List userIds, @Param("incrUserIds") List incrUserIds, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate);
/**
- * @Description 查询指定网格范围下单位时间内新增的注册用户Id
* @param
* @return
+ * @Description 查询指定网格范围下单位时间内新增的注册用户Id
* @author wangc
* @date 2020.06.18 18:50
**/
List selectIncrUserIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate);
/**
- * @Description 查询指定网格范围下截至指定位时间累计的注册用户Id
* @param
* @return
+ * @Description 查询指定网格范围下截至指定位时间累计的注册用户Id
* @author wangc
* @date 2020.06.18 18:50
**/
List selectTotalUserIds(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("targetDate") Date targetDate);
/**
- * @Description 查询指定时间范围内网格新增的注册/参与用户Id
* @param
* @return
+ * @Description 查询指定时间范围内网格新增的注册/参与用户Id
* @author wangc
* @date 2020.06.18 18:50
**/
- List selectIncrUserIdsWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate")Date startDate,@Param("endDate")Date endDate);
+ List selectIncrUserIdsWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
/**
- * @Description 查询指定时间范围内注册/参与用户增量
* @param
* @return
+ * @Description 查询指定时间范围内注册/参与用户增量
* @author wangc
* @date 2020.06.18 18:50
**/
- Integer selectResiIncrWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate")Date startDate,@Param("endDate")Date endDate);
+ Integer selectResiIncrWithinTimeRange(@Param("regOrPartiFlag") String regOrPartiFlag, @Param("gridIds") Set gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
/**
- * @Description 查询指定时间范围内党员的增量
* @param
* @return
+ * @Description 查询指定时间范围内党员的增量
* @author wangc
* @date 2020.06.18 18:50
**/
- Integer selectPartyIncrWithinTimeRange(@Param("incrUserIds")List incrUserIds,@Param("startDate")Date startDate,@Param("endDate")Date endDate);
+ Integer selectPartyIncrWithinTimeRange(@Param("incrUserIds") List incrUserIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
/**
- * @Description 查询指定时间范围内热心居民的增量
* @param
* @return
+ * @Description 查询指定时间范围内热心居民的增量
* @author wangc
* @date 2020.06.18 18:50
**/
- Integer selectWarmIncrWithinTimeRange(@Param("incrUserIds")List incrUserIds,@Param("gridIds") Set gridIds,@Param("startDate")Date startDate,@Param("endDate")Date endDate);
+ Integer selectWarmIncrWithinTimeRange(@Param("incrUserIds") List incrUserIds, @Param("gridIds") Set gridIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
/**
- * @Description 查询用户是不是党员
* @param userIds
+ * @Description 查询用户是不是党员
* @author zxc
* @date 2020/9/15 4:23 下午
*/
List selectUserIsParty(@Param("userIds") List userIds);
- List selectPartymembersByCustomerId(@Param("customerId")String customerId);
+ List selectPartymembersByCustomerId(@Param("customerId") String customerId);
- List selectWarmHeartedByCustomerId(@Param("customerId")String customerId);
+ List selectWarmHeartedByCustomerId(@Param("customerId") String customerId);
/**
* @param customerId
@@ -125,22 +125,22 @@ public interface UserDao {
List selectGridRegUserIds(@Param("customerId") String customerId, @Param("gridId") String gridId);
/**
- * @Description 获取客户下的网格注册居民
* @param customerId
* @return
+ * @Description 获取客户下的网格注册居民
* @author wangc
* @date 2020.09.25 13:54
**/
List selectRegisteredUserByCustomerId(@Param("customerId") String customerId);
/**
- * @Description 获取大屏项目相关信息 联系人
- * @param list
+ * @param userIdList
* @return java.util.List
+ * @Description 获取大屏项目相关信息 联系人
* @author wangc
* @date 2021.03.08 17:16
*/
- List selectScreenProjectData(@Param("list") List list);
+ List selectScreenProjectData(@Param("list") List userIdList);
/**
* 根据工作员用户id, 返回这些人当中多少个网格员
@@ -148,6 +148,16 @@ public interface UserDao {
* @param staffIds
* @return int
*/
- int selectGridManagerTotal(@Param("customerId")String customerId,@Param("staffIds")List staffIds);
+ int selectGridManagerTotal(@Param("customerId") String customerId, @Param("staffIds") List staffIds);
+
+ /**
+ * desc: 根据Id获取工作人员 昵称及手机号
+ *
+ * @param staffUserIdList
+ * @return java.util.List
+ * @author LiuJanJun
+ * @date 2021/6/8 5:21 下午
+ */
+ List selectStaffInfo(@Param("list") List staffUserIdList);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java
index 15c533efc3..20a32c24a6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectEntity.java
@@ -46,7 +46,7 @@ public class ProjectEntity extends BaseEpmetEntity {
private String agencyId;
/**
- * 来源：议题issue
+ * 来源：议题issue，组织agency
*/
private String origin;
@@ -80,4 +80,19 @@ public class ProjectEntity extends BaseEpmetEntity {
*/
private String orgIdPath;
+ /**
+ * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+ * */
+ private String locateAddress;
+
+ /**
+ * 定位经度
+ * */
+ private String locateLongitude;
+
+ /**
+ * 定位纬度
+ * */
+ private String locateDimension;
+
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/EIDimService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/EIDimService.java
index 64ba669caf..f74e041940 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/EIDimService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/EIDimService.java
@@ -1,7 +1,10 @@
package com.epmet.service;
+import com.epmet.dto.screen.form.GridCenterPointForm;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
/**
* epmet_evaluation_index 维度的service
*/
@@ -10,4 +13,14 @@ public interface EIDimService {
void initAgencies();
void initDepartments();
void initGrids();
+
+ /**
+ * desc: 更新中心点位
+ *
+ * @param param
+ * @return java.lang.Integer
+ * @author LiuJanJun
+ * @date 2021/6/7 3:52 下午
+ */
+ Map updateCenterPointByName(GridCenterPointForm param);
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
index d9a4c12c93..0f55775b23 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
@@ -361,13 +361,11 @@ public interface FactOriginProjectMainDailyService extends BaseService
* @author wangc
* @date 2021.03.04 22:56
*/
- List initNewScreenProjectData(String customerId,Integer rows ,String dateId,Integer exceedLimit,Integer about2exceedLimit);
+ List initNewScreenProjectData(String customerId,Integer rows ,String dateId);
void computerIfExceed(List list,Integer exceedLimit,Integer about2exceedLimit);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
index 7347feb480..3e8b210781 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
@@ -20,7 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.DataSourceConstant;
import com.epmet.constant.OrgTypeConstant;
@@ -470,19 +469,12 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl
* @author wangc
* @date 2021.03.04 22:56
*/
@Override
- public List initNewScreenProjectData(String customerId,Integer rows , String dateId,Integer exceedLimit,Integer about2exceedLimit) {
- boolean ifBeforeYesterday = true;
- int beforeDate = Integer.parseInt(DateUtils.getBeforeNDay(NumConstant.ONE));
- if(beforeDate > Integer.parseInt(dateId)){
- ifBeforeYesterday = false;
- }
+ public List initNewScreenProjectData(String customerId,Integer rows , String dateId) {
List projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId);
projects.forEach(project -> {
if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
index 730c2e8f17..6da4882ef5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
@@ -1,7 +1,6 @@
package com.epmet.service.evaluationindex.extract.toscreen.impl;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.dto.project.result.ProjectExceedParamsResultDTO;
+import com.epmet.constant.ProjectConstant;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.screen.ScreenProjectImgDataDTO;
import com.epmet.dto.screen.ScreenProjectProcessAttachmentDTO;
@@ -25,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -71,27 +71,9 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
public void extractScreenData(ScreenCentralZoneDataFormDTO param) {
//screen_project_data表是否存在此客户数据
int rows = targetDbService.checkIfExisted(param.getCustomerId());
- //查找客户项目超期参数
- List exceedParams = projectService.getProjectExceedParams(param.getCustomerId());
- Integer exceedLimit = NumConstant.FIVE;
- Integer about2ExceedLimit = NumConstant.FIVE;
-
-
- if(!CollectionUtils.isEmpty(exceedParams)){
- for(ProjectExceedParamsResultDTO ex :exceedParams){
- if(null != ex.getDefaultExceedLimit()){
- exceedLimit = null == ex.getExceedLimit() ? ex.getDefaultExceedLimit() : ex.getExceedLimit();
- }
- if(null != ex.getDefaultAbout2ExceedLimit()){
- about2ExceedLimit = null == ex.getAbout2ExceedLimit() ? ex.getDefaultAbout2ExceedLimit() : ex.getDefaultAbout2ExceedLimit();
- }
- }
- }
- //因为即将超期提醒时间(天)就是即将超期期限，在表中存储的是超期前多少天
- //所以这里要换算成滞留日
- about2ExceedLimit = exceedLimit >= about2ExceedLimit ? exceedLimit - about2ExceedLimit : exceedLimit;
+
List metaData =
- originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId(),exceedLimit,about2ExceedLimit);
+ originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId());
if(!CollectionUtils.isEmpty(metaData)) {
// 查询项目信息
@@ -101,11 +83,26 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
nature.getId())).map(projectInfo -> {
meta.setProjectCreateTime(projectInfo.getCreatedTime());
meta.setProjectTitle(projectInfo.getTitle());
+ meta.setOrigin(projectInfo.getOrigin());
+ //直接立项的话 项目内容是项目背景 经纬度添加
+ if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())){
+ meta.setProjectContent(projectInfo.getBackGround());
+ meta.setLinkName(projectInfo.getCreatedBy());
+ if (StringUtils.isNotBlank(projectInfo.getLocateDimension())){
+ meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension()));
+ }
+ if (StringUtils.isNotBlank(projectInfo.getLocateLongitude())){
+ meta.setLongitude(new BigDecimal(projectInfo.getLocateLongitude()));
+ }
+ meta.setProjectAddress(projectInfo.getLocateAddress());
+ }
return meta;
})).collect(Collectors.toList());
}
+ //设置项目经纬度和项目内容
topicService.fillScreenProjectData(metaData);
//metaData = Optional.ofNullable(topicService.getScreenProjectData(metaData)).orElse(metaData);
+ //设置联系人及电话
userService.fillScreenProjectData(metaData);
//metaData = Optional.ofNullable(userService.getScreenProjectData(metaData)).orElse(metaData);
}
@@ -137,7 +134,8 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
//重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily
// originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit);
- originMainService.setProjectLevel(orientData, param.getCustomerId());
+ //todo 与上面重复处理 暂时注释掉
+ //originMainService.setProjectLevel(orientData, param.getCustomerId());
processService.updateProjectCloseTime(metaData);
//更新结案时间和结案状态
processService.updateProjectStatus(orientData,param.getDateId(),param.getCustomerId());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
index ef39e1b781..f2a40b11c0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java
@@ -23,6 +23,7 @@ import com.epmet.dto.ScreenCustomerGridDTO;
import com.epmet.dto.extract.form.*;
import com.epmet.dto.extract.result.GridInfoResultDTO;
import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
+import com.epmet.dto.screen.ScreenProjectGridDailyDTO;
import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
import com.epmet.entity.org.CustomerGridEntity;
@@ -102,4 +103,10 @@ public interface ScreenCustomerGridService extends BaseService selectBelongGridInfo(String customerId,String level);
-}
\ No newline at end of file
+
+ Integer updateCenterPointByName(String customerId, String title, List center);
+
+ List selectGridInfoByCustomerId(String customerId);
+
+ List selectGridInfoList(String customerId, String pids);
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
index 67dae90b1c..b012accfe0 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
@@ -18,6 +18,8 @@
package com.epmet.service.evaluationindex.screen.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.utils.DateUtils;
@@ -28,6 +30,7 @@ import com.epmet.dto.ScreenCustomerGridDTO;
import com.epmet.dto.extract.form.*;
import com.epmet.dto.extract.result.GridInfoResultDTO;
import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
+import com.epmet.dto.screen.ScreenProjectGridDailyDTO;
import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
import com.epmet.entity.org.CustomerGridEntity;
import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
@@ -37,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -94,6 +98,12 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl w = new LambdaQueryWrapper<>();
+ w.eq(ScreenCustomerGridEntity::getGridId, grid.getId());
+ screenCustomerGridDao.delete(w);
+ }
}
}
}
@@ -179,4 +189,25 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl selectBelongGridInfo(String customerId, String level) {
return baseDao.selectBelongGridInfo(customerId, level);
}
-}
\ No newline at end of file
+
+ @Override
+ public Integer updateCenterPointByName(String customerId, String title, List center) {
+ LambdaUpdateWrapper tWrapper = new LambdaUpdateWrapper<>();
+ String val = center.toString();
+ List array = new ArrayList<>(Collections.singleton(val));
+ tWrapper.eq(ScreenCustomerGridEntity::getCustomerId,customerId)
+ .likeRight(ScreenCustomerGridEntity::getGridName,title)
+ .set(ScreenCustomerGridEntity::getCenterMark, array.toString());
+ return baseDao.update(null,tWrapper);
+ }
+
+ @Override
+ public List selectGridInfoByCustomerId(String customerId) {
+ return baseDao.selectGridInfoByCustomerId(customerId);
+ }
+
+ @Override
+ public List selectGridInfoList(String customerId, String pids) {
+ return baseDao.selectGridInfoList(customerId,pids);
+ }
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
index d35aa6bec6..696b6fb221 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java
@@ -1,5 +1,7 @@
package com.epmet.service.impl;
+import com.epmet.dto.screen.ScreenProjectGridDailyDTO;
+import com.epmet.dto.screen.form.GridCenterPointForm;
import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity;
import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
@@ -13,13 +15,12 @@ import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
import com.epmet.service.org.CustomerAgencyService;
import com.epmet.service.org.CustomerDepartmentService;
import com.epmet.service.org.CustomerGridService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
@Service
public class EIDimServiceImpl implements EIDimService {
@@ -52,6 +53,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询可更新的单位
+ *
* @return
*/
private List listAgencies2Update() {
@@ -69,6 +71,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询可增加的单位
+ *
* @return
*/
private List listAgencies2Add() {
@@ -92,6 +95,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询需要更新的部门列表
+ *
* @return
*/
private List listDepts2Update() {
@@ -109,6 +113,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询需要新增的部门列表
+ *
* @return
*/
private List listDepts2Add() {
@@ -126,10 +131,34 @@ public class EIDimServiceImpl implements EIDimService {
@Override
public void initGrids() {
List grids2Add = listGrids2Add();
- List grids2Update =listGrids2Update();
+ List grids2Update = listGrids2Update();
screenCustomerGridService.addAndUpdateGrids(grids2Add, grids2Update);
}
+ @Override
+ public Map updateCenterPointByName(GridCenterPointForm param) {
+ List gridInfos = screenCustomerGridService.selectGridInfoList(param.getCustomerId(),param.getPids());
+ Map result = new HashMap<>();
+
+ gridInfos.forEach(grid -> {
+ //客户id 和组织id 都相等 且 名字 包含关系时才修改
+ if (grid.getCustomerId().equals(param.getCustomerId())) {
+ AtomicInteger integer = new AtomicInteger(0);
+ if ("[]".equals(grid.getCenterMark()) || StringUtils.isBlank(grid.getCenterMark())){
+ param.getCenterDataList().forEach(o -> {
+ String title = o.getTitle().replace("委会","");
+ if (grid.getGridName().startsWith(title)) {
+ Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), title, o.getCenter());
+ integer.addAndGet(effectRow);
+ }
+ result.put(grid.getGridId(), integer.intValue());
+ });
+ }
+ }
+ });
+ return result;
+ }
+
private List listGrids2Update() {
ScreenCustomerGridEntity lastUpdateGrid = screenCustomerGridService.getLastUpdateGrid();
if (lastUpdateGrid != null) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
index 50382aa75e..a6cc1d5c1d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@@ -1,7 +1,6 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.convert.DateConverter;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.constant.GroupConstant;
import com.epmet.dto.AgencySubTreeDto;
@@ -11,7 +10,6 @@ import com.epmet.dto.group.form.GroupTotalFormDTO;
import com.epmet.dto.group.result.*;
import com.epmet.dto.stats.DimAgencyDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginGroupMainDailyEntity;
-import com.epmet.entity.group.ResiGroupEntity;
import com.epmet.entity.stats.DimAgencyEntity;
import com.epmet.entity.stats.DimGridEntity;
import com.epmet.entity.stats.FactGroupTotalAgencyDailyEntity;
@@ -24,14 +22,12 @@ import com.epmet.service.stats.*;
import com.epmet.util.DimIdGenerator;
import com.epmet.util.ModuleConstant;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
@@ -83,13 +79,12 @@ public class StatsGroupServiceImpl implements StatsGroupService {
Integer pageSize = NumConstant.ONE_HUNDRED;
List customerIds = new ArrayList<>();
- if (StringUtils.isNotBlank(formDTO.getCustomerId())) {
- customerIds.add(formDTO.getCustomerId());
- } else {
- customerIds = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
- }
do {
-
+ if (StringUtils.isNotBlank(formDTO.getCustomerId())) {
+ customerIds.add(formDTO.getCustomerId());
+ } else {
+ customerIds = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
+ }
DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
if (customerIds.size() != NumConstant.ZERO) {
customerIds.forEach(customerId -> {
@@ -214,7 +209,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
}
});
});
- Integer groupCount = approvedResult.stream().collect(Collectors.summingInt(AgencyGroupTotalCountResultDTO::getGridGroupCount));
+ Integer groupCount = approvedResult.stream().mapToInt(AgencyGroupTotalCountResultDTO::getGridGroupCount).sum();
agencyResult.setGroupTotalCount(groupCount);
// 3. 机关下所有组内人数和（不需要去重） 人员状态 != "removed"
List peopleTotal = new ArrayList<>();
@@ -226,7 +221,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
}
});
});
- Integer groupPeopleCount = peopleTotal.stream().collect(Collectors.summingInt(AgencyGridGroupPeopleTotalResultDTO::getGridGroupPeopleTotal));
+ Integer groupPeopleCount = peopleTotal.stream().mapToInt(AgencyGridGroupPeopleTotalResultDTO::getGridGroupPeopleTotal).sum();
agencyResult.setGroupMemberTotalCount(groupPeopleCount);
// 4. 机关下小组平均人数
agencyResult.setGroupMemberAvgCount(
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java
index ff368ab5da..36511421f3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java
@@ -182,11 +182,7 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
o.setDataEndTime(dimId);
//For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
- if(gridManagerMap.containsKey(orgId)){
- o.setGridMemberTotal(gridManagerMap.get(orgId));
- }else{
- o.setGridMemberTotal(NumConstant.ZERO);
- }
+ o.setGridMemberTotal(gridManagerMap.getOrDefault(orgId, NumConstant.ZERO));
});
return result;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
index b7cab26df1..ebc01ebdb3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java
@@ -84,7 +84,7 @@ public interface UserService {
* @author wangc
* @date 2021.03.08 17:16
*/
- List fillScreenProjectData(List list);
+ void fillScreenProjectData(List list);
/**
* 返回每个组织或者每个网格下的网格员数量
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
index fc40a2e5fd..59897628e3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java
@@ -1,9 +1,11 @@
package com.epmet.service.user.impl;
+import com.alibaba.fastjson.JSON;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.constant.DataSourceConstant;
import com.epmet.constant.ExtractConstant;
+import com.epmet.constant.ProjectConstant;
import com.epmet.dao.user.UserDao;
import com.epmet.dto.AgencySubTreeDto;
import com.epmet.dto.extract.form.GridHeartedFormDTO;
@@ -744,16 +746,37 @@ public class UserServiceImpl implements UserService {
* @date 2021.03.08 17:16
*/
@Override
- public List fillScreenProjectData(List list) {
- List collection = userDao.selectScreenProjectData(list);
- if(!CollectionUtils.isEmpty(collection)){
- list = list.stream().flatMap(target -> collection.stream().filter(res -> StringUtils.equals(target.getLinkName(),res.getTopicId()))
- .map(merge -> {
- target.setLinkName(merge.getLinkName());
- target.setLinkMobile(merge.getLinkMobile());
- return target;})).collect(Collectors.toList());
+ public void fillScreenProjectData(List list) {
+ List topicUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(o.getOrigin()))
+ .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList());
+ Map topicUserMap = new HashMap<>();
+ if (!CollectionUtils.isEmpty(topicUserIdList)){
+ List collection = userDao.selectScreenProjectData(topicUserIdList);
+ logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(collection),topicUserIdList);
+ topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1));
+ }
+
+
+ List staffUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(o.getOrigin()))
+ .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList());
+
+ Map staffMap = new HashMap<>();
+ if (!CollectionUtils.isEmpty(staffUserIdList)){
+ List staffList = userDao.selectStaffInfo(staffUserIdList);
+ logger.info("fillScreenProjectData staff list:{},param:{}", JSON.toJSONString(staffList),staffUserIdList);
+ staffMap = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1));
+ }
+
+ for (ScreenProjectDataDTO project : list) {
+ ScreenProjectDataDTO userDTO = staffMap.get(project.getLinkName());
+ if (userDTO == null) {
+ userDTO = topicUserMap.get(project.getLinkName());
+ }
+ if (userDTO != null) {
+ project.setLinkName(userDTO.getLinkName());
+ project.setLinkMobile(userDTO.getLinkMobile());
+ }
}
- return collection;
}
/**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
index e5d0c1a183..0fca6febf5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml
@@ -352,6 +352,7 @@
cg.GRID_NAME,
cg.PARENT_AGENCY_ID AS pid,
cg.AREA_CODE,
+ cg.CENTER_MARK,
ca.pids
FROM screen_customer_grid cg
LEFT JOIN screen_customer_agency ca ON ca.AGENCY_ID = cg.PARENT_AGENCY_ID
@@ -371,5 +372,18 @@
AND scg.DEL_FLAG = 0
AND scg.CUSTOMER_ID = #{customerId}
+