>().ok(resultList);
+ }
+
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java
new file mode 100644
index 0000000000..a63a5aa8e4
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/dao/LogOperationDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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 {
+
+}
\ No newline at end of file
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java
new file mode 100644
index 0000000000..3bbbb75841
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/LogOperationEntity.java
@@ -0,0 +1,87 @@
+/**
+ * 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 result = userOpenFeignClient.getCustomerStaffInfoByUserId(form);
+ CustomerStaffDTO staffInfo = getResultDataOrThrowsException(result, ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(),
+ "调用epmet-user服务获取staff信息发生异常");
+ return new OperatorInfo(staffInfo.getMobile(), staffInfo.getRealName());
+ }
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/bean/log/OperatorInfo.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/bean/log/OperatorInfo.java
new file mode 100644
index 0000000000..fe1ce2fc09
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/bean/log/OperatorInfo.java
@@ -0,0 +1,11 @@
+package com.epmet.mq.listener.bean.log;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class OperatorInfo {
+ private String mobile;
+ private String name;
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java
new file mode 100644
index 0000000000..85573d40f0
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/AuthOperationLogListener.java
@@ -0,0 +1,94 @@
+package com.epmet.mq.listener.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.auth.constants.AuthOperationEnum;
+import com.epmet.commons.rocketmq.messages.LoginMQMsg;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.IpUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.entity.LogOperationEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.mq.listener.bean.log.LogOperationHelper;
+import com.epmet.mq.listener.bean.log.OperatorInfo;
+import com.epmet.service.LogOperationService;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author wxz
+ * @Description 登录操作日志监听器
+
+ * @return
+ * @date 2021.06.07 16:12
+ */
+public class AuthOperationLogListener implements MessageListenerConcurrently {
+
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Override
+ public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) {
+ try {
+ msgs.forEach(msg -> consumeMessage(msg));
+ } catch (Exception e) {
+ logger.error(ExceptionUtils.getErrorStackTrace(e));
+ return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+ }
+ return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+ }
+
+ private void consumeMessage(MessageExt messageExt) {
+ String tags = messageExt.getTags();
+ String msg = new String(messageExt.getBody());
+ logger.info("认证操作日志监听器-收到消息内容:{}", msg);
+ LoginMQMsg msgObj = JSON.parseObject(msg, LoginMQMsg.class);
+
+ //获取操作人信息
+ OperatorInfo operatorInfo = LogOperationHelper.getInstance().getOperatorInfo(msgObj.getUserId());
+ LogOperationEntity logEntity = new LogOperationEntity();
+ logEntity.setCategory(messageExt.getTopic());
+ logEntity.setType(tags);
+ logEntity.setTypeDisplay(AuthOperationEnum.getDisplay(tags));
+ logEntity.setIp(msgObj.getIp());
+ logEntity.setFromApp(msgObj.getFromApp());
+ logEntity.setFromClient(msgObj.getFromClient());
+ logEntity.setTargetId("");
+ logEntity.setOperatorId(msgObj.getUserId());
+ logEntity.setOperatorName(operatorInfo.getName());
+ logEntity.setOperatorMobile(operatorInfo.getMobile());
+ logEntity.setOperatingTime(msgObj.getLoginTime());
+ logEntity.setContent("成功登录系统");
+
+ DistributedLock distributedLock = null;
+ RLock lock = null;
+ try {
+ distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+ lock = distributedLock.getLock(String.format("lock:auth_operation_log:%s:%s", logEntity.getType(), logEntity.getOperatorId()),
+ 30L, 30L, TimeUnit.SECONDS);
+ SpringContextUtils.getBean(LogOperationService.class).log(logEntity);
+ } catch (RenException e) {
+ // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+ logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+ } catch (Exception e) {
+ // 不是我们自己抛出的异常，可以让MQ重试
+ logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+ throw e;
+ } finally {
+ distributedLock.unLock(lock);
+ }
+ }
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java
new file mode 100644
index 0000000000..5240444701
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/mq/listener/listener/ProjectOperationLogListener.java
@@ -0,0 +1,109 @@
+package com.epmet.mq.listener.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.messages.LoginMQMsg;
+import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
+import com.epmet.commons.tools.distributedlock.DistributedLock;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.SpringContextUtils;
+import com.epmet.entity.LogOperationEntity;
+import com.epmet.mq.listener.bean.log.LogOperationHelper;
+import com.epmet.mq.listener.bean.log.OperatorInfo;
+import com.epmet.service.LogOperationService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
+import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.redisson.api.RLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author wxz
+ * @Description 项目操作日志监听器
+
+ * @return
+ * @date 2021.06.08 22.21
+ */
+public class ProjectOperationLogListener implements MessageListenerConcurrently {
+
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Override
+ public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) {
+ try {
+ msgs.forEach(msg -> consumeMessage(msg));
+ } catch (Exception e) {
+ logger.error(ExceptionUtils.getErrorStackTrace(e));
+ return ConsumeConcurrentlyStatus.RECONSUME_LATER;
+ }
+ return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
+ }
+
+ private void consumeMessage(MessageExt messageExt) {
+ //String tags = messageExt.getTags();
+ String msg = new String(messageExt.getBody());
+ logger.info("项目变动操作日志监听器-收到消息内容:{}", msg);
+ ProjectChangedMQMsg msgObj = JSON.parseObject(msg, ProjectChangedMQMsg.class);
+
+ String content = StringUtils.isBlank(msgObj.getOperationBrief()) ? "" : msgObj.getOperationBrief();
+
+ OperatorInfo operatorInfo = LogOperationHelper.getInstance().getOperatorInfo(msgObj.getOperatorId());
+
+ LogOperationEntity logEntity = new LogOperationEntity();
+ logEntity.setCategory(messageExt.getTopic());
+ logEntity.setType(msgObj.getOperation());
+ logEntity.setTypeDisplay(getOperationTypeDisplay(msgObj.getOperation()));
+ logEntity.setTargetId(msgObj.getProjectId());
+ logEntity.setIp(msgObj.getIp());
+ logEntity.setFromApp(msgObj.getFromApp());
+ logEntity.setFromClient(msgObj.getFromClient());
+ logEntity.setOperatorId(msgObj.getOperatorId());
+ logEntity.setOperatorMobile(operatorInfo.getMobile());
+ logEntity.setOperatorName(operatorInfo.getName());
+ logEntity.setOperatingTime(msgObj.getOperatingTime());
+ logEntity.setContent(content);
+
+ DistributedLock distributedLock = null;
+ RLock lock = null;
+ try {
+ distributedLock = SpringContextUtils.getBean(DistributedLock.class);
+ lock = distributedLock.getLock(String.format("lock:project_operation_log:%s:%s", logEntity.getType(), logEntity.getTargetId()),
+ 30L, 30L, TimeUnit.SECONDS);
+ SpringContextUtils.getBean(LogOperationService.class).log(logEntity);
+ } catch (RenException e) {
+ // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
+ logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+ } catch (Exception e) {
+ // 不是我们自己抛出的异常，可以让MQ重试
+ logger.error("【RocketMQ】添加操作日志失败:".concat(ExceptionUtils.getErrorStackTrace(e)));
+ throw e;
+ } finally {
+ distributedLock.unLock(lock);
+ }
+ }
+
+ private String getOperationTypeDisplay(String type) {
+ switch (type) {
+ case "response":
+ return "项目响应处理";
+ case "issue_shift_project":
+ return "议题转项目";
+ case "close":
+ return "项目结案";
+ case "return":
+ return "项目退回";
+ case "transfer":
+ return "项目吹哨";
+ case "created":
+ return "项目立项";
+ default:
+ return null;
+ }
+ }
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java
new file mode 100644
index 0000000000..67b3736395
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/LogOperationService.java
@@ -0,0 +1,28 @@
+package com.epmet.service;
+
+import com.epmet.dto.region.LogOperationResultDTO;
+import com.epmet.entity.LogOperationEntity;
+
+import java.util.List;
+
+/**
+ * 操作日志
+ */
+public interface LogOperationService {
+
+ /**
+ * @Description 记录日志
+ * @return
+ * @author wxz
+ * @date 2021.06.07 21:56
+ */
+ void log(LogOperationEntity msg);
+
+ /**
+ * @Description 查询操作日志 列表
+ * @return
+ * @author wxz
+ * @date 2021.06.07 21:56
+ */
+ List listOperationLogs(String condition, String customerId, Integer pageNo, Integer pageSize);
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
new file mode 100644
index 0000000000..ad8a3c1d6a
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/LogOperationServiceImpl.java
@@ -0,0 +1,176 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.epmet.auth.constants.AuthOperationEnum;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dao.LogOperationDao;
+import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.form.CustomerStaffFormDTO;
+import com.epmet.dto.region.LogOperationResultDTO;
+import com.epmet.entity.LogOperationEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.service.LogOperationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class LogOperationServiceImpl implements LogOperationService, ResultDataResolver {
+
+ @Autowired
+ private LogOperationDao logOperationDao;
+
+ @Autowired
+ private EpmetUserOpenFeignClient userOpenFeignClient;
+
+ @Override
+ public void log(LogOperationEntity msg) {
+ LambdaQueryWrapper w = new LambdaQueryWrapper<>();
+ w.eq(LogOperationEntity::getType, msg.getType());
+ w.eq(LogOperationEntity::getTargetId, msg.getTargetId());
+ w.eq(LogOperationEntity::getOperatorId, msg.getOperatorId());
+ w.eq(LogOperationEntity::getOperatingTime, msg.getOperatingTime());
+
+ Integer existsCount = logOperationDao.selectCount(w);
+ if (existsCount > 0) {
+ // 该日志已存在，不做任何操作
+ return;
+ }
+ logOperationDao.insert(msg);
+ }
+
+ @Override
+ public List listOperationLogs(String condition, String customerId, Integer pageNo, Integer pageSize) {
+ // 1.条件查询
+ List logDtos = listByOperatorMobile(condition, customerId, pageNo, pageSize);
+ if (CollectionUtils.isEmpty(logDtos)) {
+ logDtos = listByOperatorName(condition, pageNo, pageSize);
+ }
+
+ if (CollectionUtils.isEmpty(logDtos)) {
+ return new ArrayList<>();
+ }
+
+ // 2.直接分页查询
+ // 条件查询，排序
+ LambdaQueryWrapper w = new LambdaQueryWrapper<>();
+ w.orderByDesc(LogOperationEntity::getOperatingTime);
+ IPage iPage = logOperationDao.selectPage(new Page<>(pageNo, pageSize), w);
+ List logEntities = iPage.getRecords();
+ List userIds = logEntities.stream().map(l -> l.getOperatorId()).collect(Collectors.toList());
+
+ return convertLogOperationEntity2DTO(logEntities, getStaffMapByUserIds(userIds));
+ }
+
+ private Map getStaffMapByUserIds(List userIds) {
+ CustomerStaffFormDTO form = new CustomerStaffFormDTO();
+ form.setUserIds(userIds);
+ Result> result = userOpenFeignClient.list(form);
+ List staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务发生异常");
+
+ HashMap staffMap = new HashMap<>();
+ staffs.forEach(s -> {
+ staffMap.put(s.getUserId(), s);
+ });
+
+ return staffMap;
+ }
+
+ /**
+ * 通过操作人手机号查询操作日志列表
+ *
+ * @param operatorMobile
+ * @param customerId
+ */
+ private List listByOperatorMobile(String operatorMobile, String customerId, Integer pageNo, Integer pageSize) {
+ CustomerStaffFormDTO form = new CustomerStaffFormDTO();
+ form.setCustomerId(customerId);
+ form.setMobile(operatorMobile);
+ Result> result = userOpenFeignClient.list(form);
+ List staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务发生异常");
+
+ if (staffs.size() == 0) {
+ return null;
+ }
+ CustomerStaffDTO staff = staffs.get(0);
+
+ QueryWrapper w = new QueryWrapper<>();
+ w.lambda()
+ .eq(LogOperationEntity::getOperatorId, staff.getUserId())
+ .eq(LogOperationEntity::getDelFlag, 0)
+ .orderByDesc(LogOperationEntity::getOperatingTime);
+
+ IPage iPage = logOperationDao.selectPage(new Page<>(pageNo, pageSize), w);
+
+ HashMap staffMap = new HashMap<>();
+ staffMap.put(staff.getUserId(), staff);
+
+ return convertLogOperationEntity2DTO(iPage.getRecords(), staffMap);
+ }
+
+ /**
+ * @Description 通过操作人姓名查询操作日志列表
+ * @return
+ * @author wxz
+ * @date 2021.06.08 11:12
+ */
+ private List listByOperatorName(String operatorName, Integer pageNo, Integer pageSize) {
+ CustomerStaffFormDTO form = new CustomerStaffFormDTO();
+ form.setRealName(operatorName);
+ Result> result = userOpenFeignClient.list(form);
+ List staffs = getResultDataOrThrowsException(result, ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用user服务查询工作人员信息发生异常");
+
+ List userIds = new ArrayList<>();
+ HashMap staffMap = new HashMap();
+ staffs.forEach(s -> {
+ staffMap.put(s.getUserId(), s);
+ userIds.add(s.getUserId());
+ });
+
+ if (CollectionUtils.isEmpty(userIds)) {
+ return new ArrayList<>();
+ }
+ LambdaQueryWrapper w = new LambdaQueryWrapper<>();
+ w.in(LogOperationEntity::getOperatorId, userIds);
+ w.eq(LogOperationEntity::getDelFlag, 0);
+ w.orderByDesc(LogOperationEntity::getOperatingTime);
+
+ IPage iPage = logOperationDao.selectPage(new Page<>(pageNo, pageSize), w);
+
+ return convertLogOperationEntity2DTO(iPage.getRecords(), staffMap);
+ }
+
+ /**
+ * @Description 将操作日志entity转化为dto列表
+ * @return
+ * @author wxz
+ * @date 2021.06.08 11:12
+ */
+ private List convertLogOperationEntity2DTO(List logOperationEntities, Map staffMap) {
+ return logOperationEntities.stream().map(l -> {
+ LogOperationResultDTO ldto = new LogOperationResultDTO();
+ ldto.setCategory(l.getCategory());
+ ldto.setContent(l.getContent());
+ ldto.setOperatingTime(l.getOperatingTime().getTime()/1000);
+ ldto.setOperatorId(l.getOperatorId());
+ ldto.setTargetId(l.getTargetId());
+ ldto.setType(l.getType());
+ ldto.setTypeDisplay(l.getTypeDisplay());
+ ldto.setOperatorMobile(staffMap.get(l.getOperatorId()).getMobile());
+ ldto.setOperatorName(staffMap.get(l.getOperatorId()).getRealName());
+ return ldto;
+ }).collect(Collectors.toList());
+ }
+}
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
index 89f42ed404..0d9082cec3 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
@@ -134,3 +134,6 @@ shutdown:
graceful:
enable: true #是否开启优雅停机
waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
+
+rocketmq:
+ name-server: @rocketmq.nameserver@
\ No newline at end of file
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.3__add_log_ope_table.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.3__add_log_ope_table.sql
new file mode 100644
index 0000000000..c6ccb2e1e9
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.3__add_log_ope_table.sql
@@ -0,0 +1,21 @@
+CREATE TABLE `log_operation` (
+ `ID` varchar(64) NOT NULL COMMENT '主键ID',
+ `TYPE` varchar(64) NOT NULL COMMENT '动作类型枚举',
+ `TYPE_DISPLAY` varchar(64) NOT NULL COMMENT '操作类型中文展示',
+ `CONTENT` varchar(512) NOT NULL COMMENT '内容',
+ `CATEGORY` varchar(64) NOT NULL COMMENT '操作类型大类。例如login和logout都属于login大类。项目立项，项目流转，项目结案都属于项目大类',
+ `IP` varchar(15) NOT NULL COMMENT 'IP地址',
+ `FROM_APP` varchar(10) NOT NULL COMMENT '所用的APP',
+ `FROM_CLIENT` varchar(10) NOT NULL COMMENT '所用的client',
+ `TARGET_ID` varchar(64) NOT NULL COMMENT '操作目标ID',
+ `OPERATOR_ID` varchar(64) NOT NULL COMMENT '操作人ID',
+ `OPERATOR_NAME` varchar(15) NOT NULL COMMENT '操作者姓名',
+ `OPERATOR_MOBILE` varchar(11) NOT NULL COMMENT '操作者电话',
+ `OPERATING_TIME` datetime NOT NULL COMMENT '操作时间,该时间不是插入数据的时间，而是操作发生的真实时间',
+ `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+ `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+ `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+ `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+ `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+ `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='操作日指标'
\ No newline at end of file
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml
new file mode 100644
index 0000000000..0e00d21c34
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/mapper/LogOperationDao.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-auth-client/pom.xml b/epmet-auth-client/pom.xml
new file mode 100644
index 0000000000..1aee53c24e
--- /dev/null
+++ b/epmet-auth-client/pom.xml
@@ -0,0 +1,14 @@
+
+
+
+ epmet-cloud
+ com.epmet
+ 2.0.0
+
+ 4.0.0
+
+ epmet-auth-client
+
+
\ No newline at end of file
diff --git a/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java b/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java
new file mode 100644
index 0000000000..2cffd341ee
--- /dev/null
+++ b/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java
@@ -0,0 +1,9 @@
+package com.epmet.auth.constants;
+
+/**
+ * 认证操作常量
+ */
+public interface AuthOperationConstants {
+ String LOGIN = "login";
+ String LOGOUT = "logout";
+}
diff --git a/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java b/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java
new file mode 100644
index 0000000000..fb112e7c36
--- /dev/null
+++ b/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java
@@ -0,0 +1,43 @@
+package com.epmet.auth.constants;
+
+/**
+ * 认证操作枚举
+ */
+public enum AuthOperationEnum {
+
+ LOGIN(AuthOperationConstants.LOGIN, "登录"),
+ LOGOUT(AuthOperationConstants.LOGOUT, "退出");
+
+ private String operationType;
+ private String operationDisplay;
+
+ AuthOperationEnum(String operationType, String operationDisplay) {
+ this.operationType = operationType;
+ this.operationDisplay = operationDisplay;
+ }
+
+ public String getOperationType() {
+ return operationType;
+ }
+
+ public String getOperationDisplay() {
+ return operationDisplay;
+ }
+
+ public static AuthOperationEnum get(String operationType) {
+ for (AuthOperationEnum e : AuthOperationEnum.values()) {
+ if (e.getOperationType().equals(operationType)) {
+ return e;
+ }
+ }
+ return null;
+ }
+
+ public static String getDisplay(String operationType) {
+ AuthOperationEnum obj = get(operationType);
+ if (obj == null) {
+ return null;
+ }
+ return obj.getOperationDisplay();
+ }
+}
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 05fabd3f57..d04c994992 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -133,6 +133,11 @@
2.0.0
compile
+
+ com.epmet
+ epmet-auth-client
+ 2.0.0
+
diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
index 144e18d024..65e718aacf 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
@@ -1,7 +1,10 @@
package com.epmet.controller;
+import com.epmet.commons.tools.annotation.LoginUser;
+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.dto.UserDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.StaffOrgsResultDTO;
import com.epmet.dto.result.UserTokenResultDTO;
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index 8dd958fe36..4d848f2dcf 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -5,14 +5,19 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.epmet.auth.constants.AuthOperationConstants;
import com.epmet.common.token.constant.LoginConstant;
+import com.epmet.commons.rocketmq.messages.LoginMQMsg;
+import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.feign.ResultDataResolver;
import com.epmet.commons.tools.security.dto.GovTokenDto;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.password.PasswordUtils;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.*;
import com.epmet.commons.tools.validator.PhoneValidatorUtils;
import com.epmet.constant.AuthHttpUrlConstant;
@@ -34,7 +39,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@@ -44,7 +52,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Service
-public class ThirdLoginServiceImpl implements ThirdLoginService {
+public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResolver {
private static final Logger logger = LoggerFactory.getLogger(ThirdLoginServiceImpl.class);
@Autowired
@@ -61,6 +69,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired
private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+ @Autowired
+ private EpmetMessageOpenFeignClient messageOpenFeignClient;
+ @Autowired
+ private LoginUserUtil loginUserUtil;
/**
* @param formDTO
@@ -170,8 +182,17 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
this.saveLatestGovTokenDto(staffLatestAgencyResultDTO, userWechatDTO, token);
UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
userTokenResultDTO.setToken(token);
- return userTokenResultDTO;
+ //7.发送登录事件
+ try {
+ sendLoginEvent(staffLatestAgencyResultDTO.getStaffId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP);
+ } catch (RenException e) {
+ log.error(e.getInternalMsg());
+ } catch (Exception e) {
+ log.error("【工作端workLogin登录】发送登录事件失败，程序继续执行。");
+ }
+
+ return userTokenResultDTO;
}
/**
@@ -392,6 +413,15 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
userTokenResultDTO.setToken(token);
+
+ //6.发送登录事件
+ try {
+ sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP);
+ } catch (RenException e) {
+ log.error(e.getInternalMsg());
+ } catch (Exception e) {
+ log.error("【工作端enterOrg登录】发送登录事件失败，程序继续执行。错误信息");
+ }
return userTokenResultDTO;
}
@@ -635,4 +665,29 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile()));
}
+
+ /**
+ * @Description 发送登录事件
+ * @return
+ * @author wxz
+ * @date 2021.06.08 15:27
+ */
+ private void sendLoginEvent(String userId, String appId, String fromApp, String fromClient) {
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+ LoginMQMsg loginMQMsg = new LoginMQMsg();
+ loginMQMsg.setUserId(userId);
+ loginMQMsg.setLoginTime(new Date());
+ loginMQMsg.setAppId(appId);
+ loginMQMsg.setIp(IpUtils.getIpAddr(request));
+ loginMQMsg.setFromApp(fromApp);
+ loginMQMsg.setFromClient(fromClient);
+
+ SystemMsgFormDTO form = new SystemMsgFormDTO();
+ form.setMessageType(AuthOperationConstants.LOGIN);
+ form.setContent(loginMQMsg);
+ messageOpenFeignClient.sendSystemMsgByMQ(form);
+ //getResultDataOrThrowsException(result, ServiceConstant.EPMET_MESSAGE_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用Message服务，发送登录事件到MQ失败");
+ }
+
}
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
index 5acfebb90e..ef5970dbb3 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
@@ -31,4 +31,14 @@ public interface ConsomerGroupConstants {
*/
String GROUP_ACHIEVEMENT_COMPONENTS_GROUP = "group_achievement_components_group";
+ /**
+ * 认证操作日志消费组
+ */
+ String AUTH_OPERATION_LOG_GROUP = "auth_operation_log_group";
+
+ /**
+ * 项目操作日志小肥猪
+ */
+ String PROJECT_OPERATION_LOG_GROUP = "project_operation_log_group";
+
}
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
index bd9fed05eb..70d4e006f8 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
@@ -1,5 +1,8 @@
package com.epmet.commons.rocketmq.constants;
+/**
+ * 话题列表常量，其他服务要想发送消息到mq，则应当引入epmet-commons-rocketmq模块，并且使用此常量
+ */
public interface TopicConstants {
/**
* 初始化客户
@@ -13,4 +16,9 @@ public interface TopicConstants {
* 小组成就
*/
String GROUP_ACHIEVEMENT = "group_achievement";
+
+ /**
+ * 认证
+ */
+ String AUTH = "auth";
}
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java
new file mode 100644
index 0000000000..646db43501
--- /dev/null
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/LoginMQMsg.java
@@ -0,0 +1,26 @@
+package com.epmet.commons.rocketmq.messages;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class LoginMQMsg {
+
+ /**
+ * 谁登录
+ */
+ private String userId;
+ private String appId;
+ /**
+ * 什么时间登录的
+ */
+ private Date loginTime;
+
+ private String ip;
+
+ private String fromApp;
+
+ private String fromClient;
+
+}
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java
index d93871bd55..5f33faae98 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java
@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* desc：项目变动通知消息实体类
@@ -18,4 +19,22 @@ public class ProjectChangedMQMsg implements Serializable {
* 操作类型 议题转项目issue_shift_project, 处理：response, 结案close，退回return，部门流转transfer，立项created
*/
private String operation;
+
+// ============> new
+ private String projectId;
+ private String operatorId;
+ private Date operatingTime;
+ /**
+ * 操作简介
+ */
+ private String operationBrief;
+
+ /**
+ * 操作者ip
+ */
+ private String ip;
+ private String fromApp;
+ private String fromClient;
+
+
}
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/feign/ResultDataResolver.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java
new file mode 100644
index 0000000000..1e44b924c2
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/ResultDataResolver.java
@@ -0,0 +1,50 @@
+package com.epmet.commons.tools.feign;
+
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.Result;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Feign请求结果解析器
+ */
+public interface ResultDataResolver {
+
+ /**
+ * @Description 获取Result种的data，如果失败(返回result为null或者result.success为false)，那么返回null
+ * @return
+ * @author wxz
+ * @date 2021.06.07 22:45
+ */
+ //default R tryGetResultData(Result result, String targetServiceName) {
+ // Logger logger = LoggerFactory.getLogger(ResultDataResolver.class);
+ // if (result == null) {
+ // logger.error("调用{}服务发生错误，返回Result为null", targetServiceName);
+ // return null;
+ // }
+ // if (!result.success()) {
+ // logger.error("调用{}服务发生错误，错误信息:{}", targetServiceName, result.getInternalMsg());
+ // return null;
+ // }
+ // return result.getData();
+ //}
+
+ /**
+ * @Description 获取Result种的data，如果失败(返回result为null或者result.success为false)，那么抛出异常
+ * @return
+ * @author wxz
+ * @date 2021.06.07 22:45
+ */
+ default R getResultDataOrThrowsException(Result result, String targetServiceName, Integer errorCode, String errorInternalMsg) {
+ if (result == null) {
+ throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "调用{}服务发生错误，返回Result为null", targetServiceName);
+ }
+ if (!result.success()) {
+ Integer finalErrorCode = errorCode == null ? result.getCode() : errorCode;
+ String finalErrorInternalMsg = StringUtils.isBlank(errorInternalMsg) ? result.getInternalMsg() : errorInternalMsg;
+ throw new RenException(finalErrorCode, finalErrorInternalMsg);
+ }
+ return result.getData();
+ }
+
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java
index 410549aecb..bb5e6f7b5d 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java
@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
import java.util.List;
/**
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..67ab18f0ec 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
@@ -818,4 +818,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-gateway/pom.xml b/epmet-gateway/pom.xml
index 7ebcad9bde..b89bc59c0e 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -258,6 +258,7 @@
lb://epmet-auth-server
+
lb://epmet-admin-server
lb://epmet-oss-server
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
index ad1d27d9e6..39e833c4b1 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java
@@ -30,7 +30,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable {
/**
* 党员建组数
*/
- private Integer groupCount;
+ private Integer groupCount = 0;
/**
* 党员建组数占比
*/
@@ -38,7 +38,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable {
/**
* 组内党员人数
*/
- private Integer groupMemberCount;
+ private Integer groupMemberCount = 0;
/**
* 组内党员人数占比
*/
@@ -46,7 +46,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable {
/**
* 党员发布话题数
*/
- private Integer topicCount;
+ private Integer topicCount = 0;
/**
* 党员发布话题数占比
*/
@@ -54,7 +54,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable {
/**
* 党员发布话题转议题数
*/
- private Integer issueCount;
+ private Integer issueCount = 0;
/**
* 党员发布话题转议题数占比
*/
@@ -62,7 +62,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable {
/**
* 党员发布话题转项目数
*/
- private Integer projectCount;
+ private Integer projectCount = 0;
/**
* 党员发布话题转项目数占比
*/
@@ -70,7 +70,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable {
/**
* 党员发布话题转项目结案数
*/
- private Integer projectClosedCount;
+ private Integer projectClosedCount = 0;
/**
* 党员发布话题转项目结案数占比
*/
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/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/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 9b8c6fd6bd..f075b3c427 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -446,7 +446,7 @@
- epmet_data_statistical_user
+ epmet_data_statistical
EpmEt-db-UsEr
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..4f7145b3fd 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,24 @@
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.datastats.form.SubAgencyFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+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 +26,28 @@ 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));
+ }
+
+
}
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 agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId());
//网格排行
@@ -1041,6 +1044,9 @@ public class DataStatsServiceImpl implements DataStatsService {
}
private BigDecimal transform(BigDecimal count) {
+ if (count == null){
+ count = NumConstant.ZERO_DECIMAL;
+ }
return count.multiply(new BigDecimal(NumConstant.ONE_HUNDRED) ).setScale(NumConstant.ONE,
RoundingMode.HALF_UP);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
index d6e03f7f40..b43df6d3a4 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
@@ -1,5 +1,7 @@
package com.epmet.dataaggre.service.epmetuser;
+import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
import java.util.List;
@@ -26,4 +28,10 @@ public interface EpmetUserService {
*/
List selectUserIdByCustomerId(List userIds);
+ /**
+ * @Param formDTO
+ * @Description 001、各人员巡查记录列表查询
+ * @author sun
+ */
+ List staffList(StaffListFormDTO 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..2463f47a0c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolDetailService.java
@@ -0,0 +1,33 @@
+/**
+ * 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/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..c2cfcdd450
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StaffPatrolRecordService.java
@@ -0,0 +1,32 @@
+/**
+ * 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/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..301b3ff441 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,25 @@
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.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+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 java.util.*;
+import java.util.stream.Collectors;
/**
* @Author zxc
@@ -22,6 +32,10 @@ public class EpmetUserServiceImpl implements EpmetUserService {
@Autowired
private UserBaseInfoDao userBaseInfoDao;
+ @Autowired
+ private GovOrgService govOrgService;
+ @Autowired
+ private StaffPatrolRecordDao staffPatrolRecordDao;
/**
* @Description 根据UserIds查询
@@ -44,4 +58,40 @@ 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;
+ }
+
+
}
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..fad170f41f
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolDetailServiceImpl.java
@@ -0,0 +1,41 @@
+/**
+ * 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 {
+
+
+}
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..f245db7138
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StaffPatrolRecordServiceImpl.java
@@ -0,0 +1,42 @@
+/**
+ * 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 {
+
+
+
+}
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/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index fafc989776..fb5757da88 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -360,18 +360,18 @@
SELECT
orgId,
orgName,
- GROUP_COUNT,
- GROUP_RATIO,
- GROUP_MEMBER_COUNT,
- GROUP_MEMBER_RATIO,
- TOPIC_COUNT,
- TOPIC_RATIO,
- ISSUE_COUNT,
- ISSUE_RATIO,
- PROJECT_COUNT,
- PROJECT_RATIO,
- PROJECT_CLOSED_COUNT,
- PROJECT_CLOSED_RATIO
+ ifnull(GROUP_COUNT,0) AS GROUP_COUNT,
+ ifnull(GROUP_RATIO,0) AS GROUP_RATIO,
+ ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT,
+ ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO,
+ ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT,
+ ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO,
+ ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT,
+ ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO,
+ ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT,
+ ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO,
+ ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT,
+ ifnull(PROJECT_CLOSED_RATIO,0) PROJECT_CLOSED_RATIO
FROM
(
SELECT
@@ -403,18 +403,18 @@
SELECT
orgId,
orgName,
- GROUP_COUNT,
- GROUP_RATIO,
- GROUP_MEMBER_COUNT,
- GROUP_MEMBER_RATIO,
- TOPIC_COUNT,
- TOPIC_RATIO,
- ISSUE_COUNT,
- ISSUE_RATIO,
- PROJECT_COUNT,
- PROJECT_RATIO,
- PROJECT_CLOSED_COUNT,
- PROJECT_CLOSED_RATIO
+ ifnull(GROUP_COUNT,0) AS GROUP_COUNT,
+ ifnull(GROUP_RATIO,0) AS GROUP_RATIO,
+ ifnull(GROUP_MEMBER_COUNT,0) AS GROUP_MEMBER_COUNT,
+ ifnull(GROUP_MEMBER_RATIO,0) AS GROUP_MEMBER_RATIO,
+ ifnull(TOPIC_COUNT,0) AS TOPIC_COUNT,
+ ifnull(TOPIC_RATIO,0) AS TOPIC_RATIO,
+ ifnull(ISSUE_COUNT,0) AS ISSUE_COUNT,
+ ifnull(ISSUE_RATIO,0) AS ISSUE_RATIO,
+ ifnull(PROJECT_COUNT,0) AS PROJECT_COUNT,
+ ifnull(PROJECT_RATIO,0) AS PROJECT_RATIO,
+ ifnull(PROJECT_CLOSED_COUNT,0) AS PROJECT_CLOSED_COUNT,
+ ifnull(PROJECT_CLOSED_RATIO,0) AS PROJECT_CLOSED_RATIO
FROM
(
SELECT
@@ -654,4 +654,4 @@
ORDER BY problem_resolved_count DESC
-
\ No newline at end of file
+
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 > 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/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
index 4fc1974446..5510d056c5 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
@@ -147,7 +147,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
screenUserJoinDao.selectUserJoinDataByAreaCode(agencyInfo.getAreaCode(),monthId);
//保证获取公众参与概率数据的最大可能性
int time = NumConstant.TWELVE;
- while (null == latest && time > NumConstant.ONE) {
+ while ((null == latest || latest.getId() == null) && time > NumConstant.ONE) {
time--;
monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
latest = CollectionUtils.isEmpty(subCustomers)||StringUtils.isBlank(agencyInfo.getAreaCode()) ?
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..fb205ff276
--- /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 (StringUtils.isNotBlank(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<>();
+ }
+
+
+}
\ 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/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/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 15a410753b..26c21cd8b1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -238,19 +238,9 @@
FROM
screen_index_data_monthly dm
INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id
-
-
-
- INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-
-
- INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.AGENCY_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-
-
- INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.DEPT_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-
-
-
+
+ INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
+
AND dm.month_id = rd.month_id
WHERE
dm.del_flag = '0'
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index 5af47f5590..de0473571e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -28,6 +28,7 @@
SELECT
+ scj.ID,
IFNULL(avg( scj.JOIN_TOTAL ),0) AS total,
IFNULL(ROUND( avg( scj.AVG_JOIN ), 1 ),0) AS averageJoin,
IFNULL(avg( scj.JOIN_TOTAL_UP_RATE ),0) AS monthIncr,
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/org/result/OrgStaffDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/OrgStaffDTO.java
new file mode 100644
index 0000000000..bfaea6a0fd
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/OrgStaffDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.dto.org.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 返回每个网格、每个组织下，工作人员的userId
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/3 9:49
+ */
+@Data
+public class OrgStaffDTO implements Serializable {
+
+ /**
+ * 组织id或者网格id
+ */
+ private String orgId;
+ /**
+ * agency or grid
+ */
+ private String orgType;
+ /**
+ * 当前组织或者当前网格下的：
+ */
+ private List staffIds;
+}
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..60fdc4a14a 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
*/
@@ -149,4 +154,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..6859b4a1ee
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/GridCenterPointForm.java
@@ -0,0 +1,30 @@
+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 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/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index 108f82d575..331303957b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -112,6 +112,8 @@ public class DemoController {
@Autowired
private FactOriginProjectCategoryDailyService originProjectCategoryDailyService;
@Autowired
+ private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService;
+ @Autowired
private StatsPartyMemberVanguardService statsPartyMemberVanguardService;
@Autowired
private FactGroupActDailyService factGroupActDailyService;
@@ -897,6 +899,11 @@ public class DemoController {
return new Result().ok(ndddYhjfService.difficultyDataExtract(param));
}
+ @PostMapping("centralZoneDataHub")
+ public Result Test(@RequestBody ScreenCentralZoneDataFormDTO param){
+ screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
+ return new Result();
+ }
@PostMapping("vanguard")
public Result partyMemberVanguard(@RequestBody StatsFormDTO formDTO) {
statsPartyMemberVanguardService.agencyStats(formDTO);
@@ -928,5 +935,4 @@ public class DemoController {
factAgencyGovernDailyService.extractFactAgencyGovernDaily(fromDTO.getCustomerId(), fromDTO.getDateId());
return new Result();
}
-
}
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/org/StatsCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
index 6a20ae9f7f..fc575d3024 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
@@ -3,6 +3,7 @@ package com.epmet.dao.org;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.AgencySubTreeDto;
import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -34,6 +35,31 @@ public interface StatsCustomerAgencyDao extends BaseDao {
CustomerAgencyEntity getRootAgencyInfo(String customerId);
+ /**
+ * 获取每个组织、每个网格下工作人员userId集合
+ *
+ * @param customerId
+ * @return com.epmet.dto.org.result.OrgStaffResultDTO
+ */
+ List selectGridStaffIds(String customerId);
+
+ /**
+ * 根据客户id下,查询所有的组织
+ *
+ * @param customerId
+ * @return com.epmet.entity.org.CustomerAgencyEntity
+ */
+ List selectListByCustomerId(@Param("customerId")String customerId);
+
+ /**
+ * 查询agency下面的网格员，注意：向上汇聚的，
+ *
+ * @param agencyId
+ * @param customerId
+ * @return java.lang.String
+ */
+ List selectAgencyStaffIds(@Param("customerId") String customerId,@Param("agencyId")String agencyId);
+
List queryAgencyListByCustomerId(String customerId);
/**
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 411452caeb..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,21 +125,39 @@ 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, 返回这些人当中多少个网格员
+ *
+ * @param staffIds
+ * @return int
+ */
+ 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/evaluationindex/screen/ScreenUserTotalDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenUserTotalDataEntity.java
index c41ef72cc3..4843a44a24 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenUserTotalDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenUserTotalDataEntity.java
@@ -95,4 +95,8 @@ public class ScreenUserTotalDataEntity extends BaseEpmetEntity {
*/
private Integer projectTotal;
+ /**
+ * 06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
+ */
+ private Integer gridMemberTotal;
}
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..afd8256f26 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;
@@ -71,27 +70,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 +82,19 @@ 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());
+ }
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 +126,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..d19a8bfca8 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,8 @@ 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);
+}
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 79591a5aab..f8100355bc 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
@@ -19,6 +19,8 @@ package com.epmet.service.evaluationindex.screen.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
@@ -29,6 +31,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;
@@ -38,6 +41,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;
@@ -186,4 +190,20 @@ 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);
+ }
+}
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..c846f14f30 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;
@@ -16,10 +18,8 @@ import com.epmet.service.org.CustomerGridService;
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 +52,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询可更新的单位
+ *
* @return
*/
private List listAgencies2Update() {
@@ -69,6 +70,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询可增加的单位
+ *
* @return
*/
private List listAgencies2Add() {
@@ -92,6 +94,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询需要更新的部门列表
+ *
* @return
*/
private List listDepts2Update() {
@@ -109,6 +112,7 @@ public class EIDimServiceImpl implements EIDimService {
/**
* 查询需要新增的部门列表
+ *
* @return
*/
private List listDepts2Add() {
@@ -126,10 +130,32 @@ 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.selectGridInfoByCustomerId(param.getCustomerId());
+ Map result = new HashMap<>();
+
+ gridInfos.forEach(grid -> {
+ //客户id 和组织id 都相等 且 名字 包含关系时才修改
+ if (grid.getCustomerId().equals(param.getCustomerId())) {
+ AtomicInteger integer = new AtomicInteger(0);
+ param.getCenterDataList().forEach(o -> {
+ String title = o.getTitle().replace("委会","");
+ if (grid.getGridName().contains(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/org/CustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
index 176167685c..d436fa8671 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
@@ -1,6 +1,7 @@
package com.epmet.service.org;
import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
import java.util.Date;
@@ -21,6 +22,14 @@ public interface CustomerAgencyService {
CustomerAgencyEntity getRootAgencyInfo(String customerId);
+ /**
+ * 获取每个组织、每个网格下工作人员userId集合
+ *
+ * @param customerId
+ * @return com.epmet.dto.org.result.OrgStaffResultDTO
+ */
+ List queryOrgStaffIds(String customerId);
+
List queryAgencyListByCustomerId(String customerId);
@@ -39,4 +48,5 @@ public interface CustomerAgencyService {
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
CustomerAgencyEntity getAgencyByDeptId(String deptId);
+
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
index b61066f7a7..0bd6e0f92a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
@@ -4,6 +4,7 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.org.StatsCustomerAgencyDao;
import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
import com.epmet.service.org.CustomerAgencyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -77,4 +78,29 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
public CustomerAgencyEntity getAgencyByDeptId(String deptId) {
return customerAgencyDao.selectByDeptId(deptId);
}
+
+ /**
+ * 获取每个组织、每个网格下工作人员userId集合
+ *
+ * @param customerId
+ * @return com.epmet.dto.org.result.OrgStaffResultDTO
+ */
+ @Override
+ public List queryOrgStaffIds(String customerId) {
+ List resultList=new ArrayList<>();
+ List list=customerAgencyDao.selectListByCustomerId(customerId);
+ for(CustomerAgencyEntity agencyEntity:list){
+ List agencyStaffIds=customerAgencyDao.selectAgencyStaffIds(customerId,agencyEntity.getId());
+ if(!CollectionUtils.isEmpty(agencyStaffIds)){
+ OrgStaffDTO agencyStaffDTO=new OrgStaffDTO();
+ agencyStaffDTO.setOrgId(agencyEntity.getId());
+ agencyStaffDTO.setOrgType("agency");
+ agencyStaffDTO.setStaffIds(agencyStaffIds);
+ resultList.add(agencyStaffDTO);
+ }
+ }
+ List gridStaffIds=customerAgencyDao.selectGridStaffIds(customerId);
+ resultList.addAll(gridStaffIds);
+ return resultList;
+ }
}
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 feceadf83d..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
@@ -4,14 +4,16 @@ 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.constant.DataSourceConstant;
-import com.epmet.dao.stats.*;
+import com.epmet.dao.stats.FactAgencyProjectDailyDao;
+import com.epmet.dao.stats.FactGroupGridDailyDao;
+import com.epmet.dao.stats.FactIssueGridDailyDao;
import com.epmet.dao.stats.topic.FactTopicTotalGridDailyDao;
-
-
-
import com.epmet.dao.stats.user.FactRegUserGridDailyDao;
+import com.epmet.dto.org.result.OrgStaffDTO;
import com.epmet.entity.evaluationindex.screen.ScreenUserTotalDataEntity;
+import com.epmet.service.org.CustomerAgencyService;
import com.epmet.service.stats.ScreenCentralZoneDataExtractService;
+import com.epmet.service.user.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -43,7 +45,10 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
private FactIssueGridDailyDao factIssueGridDailyDao;
@Autowired
private FactAgencyProjectDailyDao factAgencyProjectDailyDao;
-
+ @Autowired
+ private CustomerAgencyService customerAgencyService;
+ @Autowired
+ private UserService userService;
private final String ORG_LEVEL_AGENCY = "agency";
private final String ORG_LEVEL_GRID = "grid";
@@ -155,6 +160,12 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
Map projectMap = agencyProject.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getProjectTotal));
projectMap.putAll(gridProject.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getProjectTotal)));
+ //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
+ //先查询各个组织，各个网格下的用户id集合
+ List orgStaffDTOList=customerAgencyService.queryOrgStaffIds(customerId);
+ //再查询这些人当中多少个网格员
+ Map gridManagerMap=userService.queryOrgGridManager(customerId,orgStaffDTOList);
+
result.forEach(o -> {
String orgId = o.getOrgId();
Integer count = groupMap.get(orgId);
@@ -169,10 +180,10 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
count = projectMap.get(orgId);
o.setProjectTotal(null == count ? NumConstant.ZERO : count);
o.setDataEndTime(dimId);
- });
-
-
+ //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
+ 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 36229bfbb2..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
@@ -2,6 +2,7 @@ package com.epmet.service.user;
import com.epmet.dto.AgencySubTreeDto;
import com.epmet.dto.extract.form.GridHeartedFormDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.stats.user.result.UserStatisticalData;
import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
@@ -83,5 +84,14 @@ public interface UserService {
* @author wangc
* @date 2021.03.08 17:16
*/
- List fillScreenProjectData(List list);
+ void fillScreenProjectData(List list);
+
+ /**
+ * 返回每个组织或者每个网格下的网格员数量
+ *
+ * @param customerId
+ * @param orgStaffDTOList
+ * @return com.epmet.dto.user.OrgGridManagerTotalDTO
+ */
+ Map queryOrgGridManager(String customerId,List orgStaffDTOList);
}
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 b5594541a6..a7f1d594c4 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
@@ -4,10 +4,12 @@ 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;
import com.epmet.dto.extract.result.UserPartyResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.stats.user.*;
import com.epmet.dto.stats.user.result.UserStatisticalData;
@@ -743,16 +745,56 @@ 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()))
+ 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());
+ if (CollectionUtils.isEmpty(topicUserIdList)){
+ return;
+ }
+ List collection = userDao.selectScreenProjectData(topicUserIdList);
+ Map topicUserMap = collection.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getTopicId,o->o,(o1,o2)->o1));
+ /* if(!CollectionUtils.isEmpty(collection)){
+ 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());
+ return target;}));
+ }*/
+ List staffUserIdList = list.stream().filter(o -> ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(o.getOrigin()))
+ .map(ScreenProjectDataDTO::getLinkName).distinct().collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(topicUserIdList)){
+ return;
+ }
+ List staffList = userDao.selectStaffInfo(staffUserIdList);
+ Map collect = staffList.stream().collect(Collectors.toMap(ScreenProjectDataDTO::getId,o->o,(o1,o2)->o1));
+ list.forEach(project->{
+ ScreenProjectDataDTO userDTO = collect.get(project.getLinkName());
+ if (userDTO == null){
+ userDTO = topicUserMap.get(project.getLinkName());
+ }
+ if (userDTO != null){
+ project.setLinkName(userDTO.getLinkName());
+ project.setLinkMobile(userDTO.getLinkMobile());
+ }
+ });
+ }
+
+ /**
+ * 返回每个组织或者每个网格下的网格员数量
+ *
+ * @param customerId
+ * @param orgStaffDTOList
+ * @return com.epmet.dto.user.OrgGridManagerTotalDTO
+ */
+ @Override
+ public Map queryOrgGridManager(String customerId,List orgStaffDTOList) {
+ Map resultMap=new HashMap<>();
+ for (OrgStaffDTO orgStaffDTO : orgStaffDTOList) {
+ if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(orgStaffDTO.getStaffIds())){
+ resultMap.put(orgStaffDTO.getOrgId(),userDao.selectGridManagerTotal(customerId,orgStaffDTO.getStaffIds()));
+ }
}
- return collection;
+ return resultMap;
}
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql
new file mode 100644
index 0000000000..5d470eaec9
--- /dev/null
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql
@@ -0,0 +1,4 @@
+-- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL
+
+-- epmet_evaluation_index 、 epmet_data_statistical_display 库执行以下：
+ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL;
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index eeec0fa8e5..21df7f9a68 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -352,16 +352,19 @@
SELECT
- AGENCY_ID,
- count( ID ) AS "sum",
- sum(IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
+ a.ID AS AGENCY_ID,
+ count( b.ID ) AS "sum",
+ sum( IF( IS_OWNER_PARTY = 1, 1, 0 )) AS "count"
FROM
- fact_origin_group_main_daily
- WHERE CUSTOMER_ID = #{customerId}
- AND DATE_ID <= #{dateId}
- AND (GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden')
+ dim_agency a
+ INNER JOIN
+ fact_origin_group_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+ WHERE
+ b.CUSTOMER_ID = #{customerId}
+ AND b.DATE_ID <= #{dateId}
+ AND ( GROUP_STATE = 'approved' OR GROUP_STATE = 'hidden' )
GROUP BY
- AGENCY_ID
+ a.ID
SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
index c0fb2fb43c..bb5fc4b2e5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMemberDailyDao.xml
@@ -29,25 +29,33 @@
SELECT
- a.AGENCY_ID,
+ da.ID AS AGENCY_ID,
COUNT( DISTINCT MEMBER_ID ) AS "sum",
IFNULL( b.partyCount, 0 ) AS "count"
FROM
- fact_origin_group_member_daily a
- LEFT JOIN
- (SELECT
- AGENCY_ID,
- COUNT( DISTINCT MEMBER_ID ) AS partyCount
- FROM fact_origin_group_member_daily
- WHERE IS_PARTY = 1
- AND CUSTOMER_ID = #{customerId}
- AND DATE_ID <= #{dateId}
- GROUP BY AGENCY_ID
- ) b ON a.AGENCY_ID = b.AGENCY_ID
- WHERE a.CUSTOMER_ID = #{customerId}
- AND a.DATE_ID <= #{dateId}
+ dim_agency da
+ INNER JOIN fact_origin_group_member_daily a ON a.PIDS LIKE CONCAT( '%', da.ID, '%' )
+ AND a.CUSTOMER_ID = #{customerId}
+ AND a.DATE_ID <= #{dateId}
+ LEFT JOIN (
+ SELECT
+ agency.ID AS AGENCY_ID,
+ COUNT( DISTINCT MEMBER_ID ) AS partyCount
+ FROM
+ dim_agency agency
+ INNER JOIN fact_origin_group_member_daily member ON member.PIDS LIKE CONCAT( '%', agency.ID, '%' )
+ AND member.IS_PARTY = 1
+ AND member.CUSTOMER_ID = #{customerId}
+ AND member.DATE_ID <= #{dateId}
+ WHERE
+ agency.CUSTOMER_ID = #{customerId}
+ GROUP BY
+ agency.ID
+ ) b ON da.ID = b.AGENCY_ID
+ WHERE
+ da.CUSTOMER_ID = #{customerId}
GROUP BY
- a.AGENCY_ID
+ da.ID
SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
index a488706d0b..d5bbf0cc29 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
@@ -293,13 +293,18 @@
SELECT
- AGENCY_ID,
- COUNT(ID) AS "sum",
- SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
- FROM fact_origin_issue_main_daily
- WHERE CUSTOMER_ID = #{customerId}
- AND DATE_ID <= #{dateId}
- GROUP BY AGENCY_ID
+ a.ID AS AGENCY_ID,
+ count( b.ID ) AS "sum",
+ sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+ FROM
+ dim_agency a
+ INNER JOIN
+ fact_origin_issue_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+ WHERE
+ b.CUSTOMER_ID = #{customerId}
+ AND b.DATE_ID <= #{dateId}
+ GROUP BY
+ a.ID
SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index 9213e3c855..c9d6d8bfde 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -763,14 +763,19 @@
SELECT
- AGENCY_ID,
- COUNT(ID) AS "sum",
- SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
- FROM fact_origin_project_main_daily
- WHERE CUSTOMER_ID = #{customerId}
- AND DATE_ID <= #{dateId}
+ a.ID AS AGENCY_ID,
+ count( b.ID ) AS "sum",
+ sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+ FROM
+ dim_agency a
+ INNER JOIN
+ fact_origin_project_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+ WHERE
+ b.CUSTOMER_ID = #{customerId}
+ AND b.DATE_ID <= #{dateId}
AND ORIGIN = 'issue'
- GROUP BY AGENCY_ID
+ GROUP BY
+ a.ID
SELECT
@@ -785,15 +790,20 @@
SELECT
- AGENCY_ID,
- COUNT(ID) AS "sum",
- SUM(IF(IS_PARTY = 1 ,1, 0)) AS "count"
- FROM fact_origin_project_main_daily
- WHERE CUSTOMER_ID = #{customerId}
- AND DATE_ID <= #{dateId}
+ a.ID AS AGENCY_ID,
+ count( b.ID ) AS "sum",
+ sum( IF( IS_PARTY = 1, 1, 0 )) AS "count"
+ FROM
+ dim_agency a
+ INNER JOIN
+ fact_origin_project_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+ WHERE
+ b.CUSTOMER_ID = #{customerId}
+ AND b.DATE_ID <= #{dateId}
AND PROJECT_STATUS = 'closed'
AND ORIGIN = 'issue'
- GROUP BY AGENCY_ID
+ GROUP BY
+ a.ID
SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
index 59bc2006c0..2ee9f8afe1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
@@ -192,13 +192,18 @@
SELECT
- AGENCY_ID,
- COUNT(ID) as "sum",
- SUM(IF(CREATE_TOPIC_USER_IS_PARTY = 1 ,1, 0)) as "count"
- FROM fact_origin_topic_main_daily
- WHERE CUSTOMER_ID = #{customerId}
- AND DATE_ID <= #{dateId}
- GROUP BY AGENCY_ID
+ a.ID AS AGENCY_ID,
+ count( b.ID ) AS "sum",
+ sum( IF( CREATE_TOPIC_USER_IS_PARTY = 1, 1, 0 )) AS "count"
+ FROM
+ dim_agency a
+ INNER JOIN
+ fact_origin_topic_main_daily b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
+ WHERE
+ b.CUSTOMER_ID = #{customerId}
+ AND b.DATE_ID <= #{dateId}
+ GROUP BY
+ a.ID
SELECT
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml
index 4e228f3fed..8b205de7ad 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml
@@ -75,6 +75,7 @@
TOPIC_TOTAL,
ISSUE_TOTAL,
PROJECT_TOTAL,
+ GRID_MEMBER_TOTAL,
DEL_FLAG,
REVISION,
CREATED_BY,
@@ -97,6 +98,7 @@
#{item.topicTotal},
#{item.issueTotal},
#{item.projectTotal},
+ #{item.gridMemberTotal},
0,
0,
'CRAWLER_ROBOT',
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index 771a60ba32..cf3ce06acc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -126,6 +126,47 @@
and ca.CUSTOMER_ID=#{customerId}
+
+
+
+
+
+
+ SELECT
+ csg.GRID_ID AS orgId,
+ 'grid' AS orgType,
+ csg.USER_ID AS staffId
+ FROM
+ customer_staff_grid csg
+ WHERE
+ csg.DEL_FLAG = '0'
+ AND csg.CUSTOMER_ID = #{customerId}
+ ORDER BY
+ orgType asc,orgId ASC
+
+
+
+ select * from customer_agency ca
+ where ca.DEL_FLAG='0'
+ and ca.CUSTOMER_ID=#{customerId}
+
+
+
+ SELECT
+ distinct csa.USER_ID AS staffId
+ FROM customer_agency ca
+ left join customer_staff_agency csa
+ on(ca.id =csa.AGENCY_ID
+ and csa.DEL_FLAG='0')
+ WHERE
+ ca.DEL_FLAG = '0'
+ AND ca.CUSTOMER_ID = #{customerId}
+ and ca.pids like CONCAT(#{agencyId},'%')
+
+
select *
from customer_agency ca
@@ -150,4 +191,4 @@
AND cd.DEL_FLAG = '0'
)
-
\ No newline at end of file
+
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index f30740e0ee..acb6c9feb3 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -528,8 +528,46 @@
user_base_info
WHERE
del_flag = '0'
-
- user_id = #{project.linkName}
+
+ user_id = #{userId}
+
+
+
+
+
+ SELECT
+ count( 1 )
+ FROM
+ staff_role sr
+ WHERE
+ sr.DEL_FLAG = '0'
+ AND sr.CUSTOMER_ID = #{customerId}
+ AND sr.ROLE_ID IN (
+ SELECT
+ m.id AS roleId
+ FROM
+ gov_staff_role m
+ WHERE
+ m.DEL_FLAG = '0'
+ AND m.CUSTOMER_ID = #{customerId}
+ AND m.ROLE_KEY = 'grid_member'
+ )
+ AND sr.STAFF_ID in
+
+ #{staffId}
+
+
+
+ SELECT
+ USER_ID as ID,
+ REAL_NAME AS linkName,
+ MOBILE AS linkMobile
+ FROM
+ customer_staff
+ WHERE
+ del_flag = '0'
+
+ user_id = #{userId}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
index f5ff55f74e..a8f8c7802d 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
@@ -1,5 +1,6 @@
package com.epmet.task;
+import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.utils.Result;
import com.epmet.service.StatsGroupService;
import org.slf4j.Logger;
@@ -28,7 +29,7 @@ public class StatsGroupAgencyDailyTask implements ITask {
if (result.success()){
logger.info("StatsGroupAgencyDailyTask定时任务执行成功");
}else {
- logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" + result.getMsg());
+ logger.error("StatsGroupAgencyDailyTask定时任务执行失败:" , JSON.toJSONString(result));
}
}
}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
index 20fc7cb138..aa0d5545ed 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@@ -113,7 +113,7 @@ hystrix:
execution:
isolation:
thread:
- timeoutInMilliseconds: 60000 #缺省为1000
+ timeoutInMilliseconds: 90000 #缺省为1000
ribbon:
ReadTimeout: 300000
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
index 282dc7b711..bc71d2817a 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java
@@ -1,7 +1,7 @@
package com.epmet.constant;
/**
- * 系统消息类型
+ * 系统消息类型（可以理解为动作，约等于rocket mq中的tag）
*/
public interface SystemMessageType {
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
index 4e8e7c954a..a6204e07ac 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java
@@ -37,7 +37,7 @@ public class SendMqMsgUtil {
}
/**
- * desc: 发送小组成就消息,计算小组成就
+ * desc: 发送项目变动事件消息
*
* @param msgContent
* @return boolean
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index 9cf8dfab0e..6cf052999a 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -125,6 +125,12 @@
epmet-commons-rocketmq
2.0.0
+
+
+ com.epmet
+ epmet-auth-client
+ 2.0.0
+
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
index 2051ea1b96..2a97439d20 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java
@@ -1,6 +1,8 @@
package com.epmet.service.impl;
import com.alibaba.fastjson.JSON;
+import com.epmet.auth.constants.AuthOperationConstants;
+import com.epmet.auth.constants.AuthOperationEnum;
import com.epmet.commons.rocketmq.constants.TopicConstants;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -43,7 +45,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
//发送mq消息
try {
- Message meMessage = new Message(getTopicByMsgType(messageType), contentStr.getBytes(RemotingHelper.DEFAULT_CHARSET));
+ Message meMessage = new Message(getTopicByMsgType(messageType), messageType, contentStr.getBytes(RemotingHelper.DEFAULT_CHARSET));
rocketMQTemplate.getProducer().send(meMessage);
} catch (Exception e) {
String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
@@ -70,6 +72,12 @@ public class SystemMessageServiceImpl implements SystemMessageService {
case SystemMessageType.GROUP_ACHIEVEMENT:
topic = TopicConstants.GROUP_ACHIEVEMENT;
break;
+ case AuthOperationConstants.LOGIN:
+ topic = TopicConstants.AUTH;
+ break;
+ case AuthOperationConstants.LOGOUT:
+ topic = TopicConstants.AUTH;
+ break;
}
return topic;
}
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java
index 1e3563fb6d..d2a37797fa 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java
@@ -214,7 +214,7 @@ public class BizPointUserTotalDetailServiceImpl extends BaseServiceImpl {
//楼院小组显示昵称，支部小组显示姓名
if (("ordinary").equals(group.getData().getGroupType())) {
- item.setName(user.getNickname());
+ item.setName(StringUtils.isBlank(user.getNickname()) ? StrConstant.EPMETY_STR : user.getNickname());
} else {
item.setName(StrConstant.EPMETY_STR);
if (StringUtils.isNotBlank(user.getSurname())){
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
index 25afa314fa..09727f5e56 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
@@ -453,6 +453,9 @@ public class AccessServiceImpl implements AccessService {
}
CustomerAgencyDTO belongAgency = belongAgencyRst.getData();
+ if (belongAgency == null || belongAgency.getId() == null) {
+ throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，用户所属的组织信息不存在");
+ }
//Result agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId);
//if (!agencyByStaffRst.success()) {
@@ -467,11 +470,15 @@ public class AccessServiceImpl implements AccessService {
// 2.拿到当前所处机关单位信息
Result currAgencyRst = govOrgFeignClient.getAgencyById(currAgencyId);
- CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
- if (!currAgencyRst.success() || currAgencyDto == null) {
+ if (!currAgencyRst.success()) {
throw new RenException(String.format("根据当前机构id[%s]查询pids失败:%s", currAgencyId, currAgencyRst.getMsg()));
}
+ CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
+ if (currAgencyDto == null || currAgencyDto.getId() == null) {
+ throw new RenException(EpmetErrorCode.REQUIRE_PERMISSION.getCode(), "操作权限不足，当前组织信息不存在");
+ }
+
// 获取机关单位中的角色
// 目前一个人只在一个单位下，所以不动态查询，如果后面需要一个人在多个单位，再改这里
//List roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId());
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
index 6e61017ed1..9236ff80a5 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -503,15 +503,15 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl list){
- String result = "";
+ StringBuilder r = new StringBuilder();
if (!CollectionUtils.isEmpty(list)){
list.forEach(l -> {
- result.concat(l.getCategoryName()).concat(",");
+ r.append(l.getCategoryName()).append(",");
});
}
- if (StringUtils.isEmpty(result)){
- return result;
+ if (StringUtils.isEmpty(r.toString())){
+ return r.toString();
}
- return result.substring(NumConstant.ZERO,result.length()-NumConstant.ONE);
+ return r.toString().substring(NumConstant.ZERO,r.length()-NumConstant.ONE);
}
}
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 2c0cf4bb23..b1f1701e75 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -125,6 +125,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp
private IssueProjectTagDictService issueProjectTagDictService;
@Autowired
private IssueVoteDetailDao issueVoteDetailDao;
+ @Autowired
+ private EpmetMessageOpenFeignClient messageOpenFeignClient;
@Value("${openapi.scan.server.url}")
@@ -1041,6 +1043,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp
if(!resiGroupOpenFeignClient.sendEvent(eventParam).success()){
logger.warn("com.epmet.service.impl.IssueServiceImpl.shiftProjectV2，话题被转为项目积分事件发送失败，参数：{}", JSON.toJSONString(formDTO));
}
+
+ //8.记录日志
+ //SendMqMsgUtil.build().openFeignClient(messageOpenFeignClient).sendProjectChangedMqMsg();
}
/**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
index 4a7b073b73..dca01a63f5 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -235,12 +235,13 @@
SELECT
#{l.projectId} AS projectId,
- CATEGORY_NAME
- FROM issue_project_category_dict
- WHERE DEL_FLAG = '0'
- AND IS_DISABLE = 'enable'
- AND CUSTOMER_ID = #{customerId}
- AND CATEGORY_CODE = #{l.categoryCode}
+ CONCAT(if(cd2.CATEGORY_CODE = '0','',CONCAT(cd2.CATEGORY_NAME,'-')),cd.CATEGORY_NAME) AS categoryName
+ FROM issue_project_category_dict cd
+ LEFT JOIN issue_project_category_dict cd2 ON cd2.CATEGORY_CODE = cd.PARENT_CATEGORY_CODE AND cd2.DEL_FLAG = '0' AND cd2.CUSTOMER_ID = #{customerId}
+ WHERE cd.DEL_FLAG = '0'
+ AND cd.IS_DISABLE = 'enable'
+ AND cd.CUSTOMER_ID = #{customerId}
+ AND cd.CATEGORY_CODE = #{l.categoryCode}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java
new file mode 100644
index 0000000000..d74af6d7f6
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStaffResultDTO.java
@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/8 3:23 下午
+ * @DESC
+ */
+@Data
+public class GridStaffResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -5910427385795368242L;
+
+ private String gridId;
+
+ private String staffId;
+
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index 6cefd55a53..4e28d10dc1 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -333,4 +333,13 @@ public interface GovOrgOpenFeignClient {
**/
@PostMapping(value = "/gov/org/customeragency/getprocessorlist/{agencyId}")
Result getProcessorList(@PathVariable("agencyId") String agencyId);
+
+ /**
+ * @Description 查询网格下的网格员
+ * @Param gridIds
+ * @author zxc
+ * @date 2021/6/8 3:36 下午
+ */
+ @PostMapping("/gov/org/customerstaffgrid/gridstaff")
+ Result> selectGridStaffByGridIds(@RequestBody List gridIds);
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index f34b6f53ae..4976297323 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -192,4 +192,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
public Result getProcessorList(String agencyId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getProcessorList", agencyId);
}
+
+ @Override
+ public Result> selectGridStaffByGridIds(List gridIds) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectGridStaffByGridIds", gridIds);
+ }
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
index 72b6dabe25..53e6330d06 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
@@ -29,6 +29,7 @@ import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.form.CommonGridIdFormDTO;
import com.epmet.dto.form.LatestGridFormDTO;
import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.GridStaffResultDTO;
import com.epmet.excel.CustomerStaffGridExcel;
import com.epmet.service.CustomerStaffGridService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -119,4 +120,15 @@ public class CustomerStaffGridController {
ValidatorUtils.validateEntity(gridIdFormDTO);
return customerStaffGridService.getAllGridStaffs(gridIdFormDTO);
}
+
+ /**
+ * @Description 查询网格下的人
+ * @Param gridIds
+ * @author zxc
+ * @date 2021/6/8 3:36 下午
+ */
+ @PostMapping("gridstaff")
+ public Result> selectGridStaffByGridIds(@RequestBody List gridIds){
+ return new Result>().ok(customerStaffGridService.selectGridStaffByGridIds(gridIds));
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
index 54cad95662..d9ce1b0e61 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
@@ -22,6 +22,7 @@ import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.CustomerStaffDepartmentDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.result.GridStaffResultDTO;
import com.epmet.entity.CustomerStaffGridEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -97,4 +98,12 @@ public interface CustomerStaffGridDao extends BaseDao {
* @Description 查询人员在客户下参与的网格列表
*/
List selectStaffGridList(CustomerStaffGridDTO staffGridDTO);
+
+ /**
+ * @Description 查询网格下的人
+ * @Param gridIds
+ * @author zxc
+ * @date 2021/6/8 3:36 下午
+ */
+ List selectGridStaffByGridIds(@Param("gridIds") List gridIds);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
index 7813dd3b06..0cf4041cce 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
@@ -26,6 +26,7 @@ import com.epmet.dto.form.CustomerGridFormDTO;
import com.epmet.dto.form.LatestGridFormDTO;
import com.epmet.dto.result.CommonStaffInfoResultDTO;
import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.GridStaffResultDTO;
import com.epmet.entity.CustomerStaffGridEntity;
import java.util.List;
@@ -117,4 +118,12 @@ public interface CustomerStaffGridService extends BaseService> getAllGridStaffs(CommonGridIdFormDTO gridIdFormDTO);
+
+ /**
+ * @Description 查询网格下的人
+ * @Param gridIds
+ * @author zxc
+ * @date 2021/6/8 3:36 下午
+ */
+ List selectGridStaffByGridIds(List gridIds);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
index 2eb0873cc8..ac8abc82fc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
@@ -30,13 +31,16 @@ import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.form.CommonGridIdFormDTO;
import com.epmet.dto.form.LatestGridFormDTO;
import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.GridStaffResultDTO;
import com.epmet.entity.CustomerStaffGridEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.redis.CustomerStaffGridRedis;
import com.epmet.service.CustomerStaffGridService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -56,6 +60,9 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl page(Map params) {
@@ -146,4 +153,32 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl selectGridStaffByGridIds(List gridIds) {
+ if (CollectionUtils.isEmpty(gridIds)){
+ return new ArrayList<>();
+ }
+ // 查询网格下所有的人
+ List gridStaff = baseDao.selectGridStaffByGridIds(gridIds);
+ if (CollectionUtils.isEmpty(gridStaff)){
+ return new ArrayList<>();
+ }
+ // 拿着网格下所有人去筛选网格员
+ Result> result = epmetUserOpenFeignClient.staffGridRole(gridStaff);
+ if (!result.success()){
+ throw new RenException("查询网格下的网格员失败【"+result.getMsg()+"】");
+ }
+ List data = result.getData();
+ if (CollectionUtils.isEmpty(data)){
+ return new ArrayList<>();
+ }
+ return data;
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index d72d3cdd8a..a77dd1c449 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -3,6 +3,8 @@ package com.epmet.service.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.*;
@@ -47,6 +49,8 @@ public class StaffServiceImpl implements StaffService {
private StaffTransferRecordService staffTransferRecordService;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+ @Autowired
+ private RedisUtils redisUtils;
@Override
public Result getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@@ -255,6 +259,11 @@ public class StaffServiceImpl implements StaffService {
staffTransferRecordDTO.setAgencyId(fromDTO.getAgencyId());
staffTransferRecordDTO.setRemarks(fromDTO.getRemarks());
staffTransferRecordService.save(staffTransferRecordDTO);
+ //2021.6.7 添加逻辑-人员调动删除token sun start
+ //8.清除可能存在的工作人员登陆token
+ String key = RedisKeys.getCpUserKey("gov", "wxmp", fromDTO.getStaffId());
+ redisUtils.delete(key);
+ //2021.6.7 添加逻辑-人员调动删除token sun end
}
/**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
index 7f1a8d3220..5e08a59b97 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
@@ -88,6 +88,20 @@
AND customer_id = #{customerId}
+
+
+ SELECT
+ USER_ID AS staffId,
+ GRID_ID
+ FROM customer_staff_grid
+ WHERE DEL_FLAG = '0'
+ AND (
+
+ GRID_ID = #{gridId}
+
+ )
+
+
insert into customer_staff_grid
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
index 6ba33ec68a..4aeebf8c47 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/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/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java
index c79613963f..d269a4aeaa 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java
@@ -28,6 +28,12 @@ public class ProjectApprovalFormDTO implements Serializable {
@NotBlank(message = "内部备注不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
@Length(max=1000,message = "内部备注不能超过1000位",groups = {ProjectApprovalFormDTO.ApprovalCategory.class})
private String internalRemark;
+ //定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+ private String locateAddress;
+ //定位经度
+ private String locateLongitude;
+ //定位纬度
+ private String locateDimension;
public interface ApprovalCategory extends CustomerClientShowGroup {}
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
index ebffaef4d7..1491ee95c6 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
@@ -73,6 +73,19 @@ public class ProjectDetailResultDTO implements Serializable {
*/
private List platformIds;
+ /**
+ * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+ * */
+ private String locateAddress;
+ /**
+ * 定位经度
+ * */
+ private String locateLongitude;
+ /**
+ * 定位纬度
+ * */
+ private String locateDimension;
+
public ProjectDetailResultDTO() {
this.processable = false;
this.isSend = false;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
index 444eebee06..cbdd5c31e7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectEntity.java
@@ -83,4 +83,19 @@ public class ProjectEntity extends BaseEpmetEntity {
*/
private String orgIdPath;
+ /**
+ * 定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
+ * */
+ private String locateAddress;
+
+ /**
+ * 定位经度
+ * */
+ private String locateLongitude;
+
+ /**
+ * 定位纬度
+ * */
+ private String locateDimension;
+
}
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
index e9a3967717..f73740fd69 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@@ -31,7 +31,9 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.scan.param.TextScanParamDTO;
import com.epmet.commons.tools.scan.param.TextTaskDTO;
import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.IpUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.ScanContentUtils;
import com.epmet.constant.ProjectConstant;
@@ -73,7 +75,10 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@@ -118,6 +123,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl page(Map params) {
@@ -388,8 +395,18 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl processStaff = epmetUserFeignClient.getCustomerStaffInfoByUserId(form);
+
+ ProjectEntity projectEntity = projectService.selectById(projectId);
+ return String.format("将项目\"%s\"吹哨给%s%s处理", projectEntity.getTitle(), departmentName, processStaff.getData().getRealName());
+ }
+
/**
* @Description 项目流转给流转工作人员推送消息
* @author sun
@@ -743,7 +775,16 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl getProjectByIssue(ShiftProjectsFromDTO fromDTO) {
List resultList = new ArrayList<>();
@@ -1011,6 +1069,9 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectTraceS
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+ @Autowired
+ private LoginUserUtil loginUserUtil;
@Override
public List getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) {
@@ -359,6 +366,9 @@ public class ProjectTraceServiceImpl implements ProjectTraceS
projectEntity.setBackGround(formDTO.getBackGround());
projectEntity.setStatus(ProjectConstant.PENDING);
projectEntity.setOrgIdPath(loginUser.getOrgIdPath());
+ projectEntity.setLocateAddress(null == formDTO.getLocateAddress() ? "" : formDTO.getLocateAddress());
+ projectEntity.setLocateLongitude(null == formDTO.getLocateLongitude() ? "" : formDTO.getLocateLongitude());
+ projectEntity.setLocateDimension(null == formDTO.getLocateDimension() ? "" : formDTO.getLocateDimension());
projectService.insert(projectEntity);
//3-2.项目进展表新增第一个节点数据
@@ -506,7 +516,16 @@ public class ProjectTraceServiceImpl implements ProjectTraceS
}
//项目实时统计消息
- ProjectChangedMQMsg mqMsg = new ProjectChangedMQMsg(projectEntity.getCustomerId(), ProjectConstant.OPERATION_CREATED);
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String mqMsgBrief = String.format("创建了\"%s\"的项目", formDTO.getTitle());
+ ProjectChangedMQMsg mqMsg = new ProjectChangedMQMsg(projectEntity.getCustomerId(), ProjectConstant.OPERATION_CREATED,
+ projectEntity.getId(),
+ formDTO.getUserId(),
+ new Date(),
+ mqMsgBrief,
+ IpUtils.getIpAddr(request),
+ loginUserUtil.getLoginUserApp(),
+ loginUserUtil.getLoginUserClient());
boolean msgResult = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendProjectChangedMqMsg(mqMsg);
if (!msgResult) {
log.error("项目实时统计消息发送失败");
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql
new file mode 100644
index 0000000000..fd3b7ffcfa
--- /dev/null
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql
@@ -0,0 +1,24 @@
+ALTER TABLE `project`
+ADD COLUMN `LOCATE_ADDRESS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]' AFTER `ORG_ID_PATH`,
+ADD COLUMN `LOCATE_LONGITUDE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`,
+ADD COLUMN `LOCATE_DIMENSION` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`;
+
+
+
+UPDATE
+ project a,
+ (
+ SELECT
+ locate_address a,
+ locate_longitude b,
+ locate_dimension c,
+ issue_id d
+ FROM epmet_resi_group.resi_topic
+ ) b
+SET
+ a.locate_address = b.a,
+ a.locate_longitude = b.b,
+ a.locate_dimension = b.c
+WHERE
+ a.origin = 'issue'
+AND a.origin_id = b.d
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 166917e5d7..a83934841c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -128,6 +128,9 @@
p.ORIGIN AS "origin",
p.ORIGIN_ID AS "originId",
p.STATUS AS "projectStatus",
+ p.locate_address AS "locateAddress",
+ p.locate_longitude AS "locateLongitude",
+ p.locate_dimension AS "locateDimension",
IFNULL(pp.PUBLIC_REPLY, '无') AS "publicReply",
IFNULL(pp.INTERNAL_REMARK, '无') AS "internalRemark"
FROM project p
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index a29cfbd7ed..0f1fb12a0e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -191,7 +191,6 @@ public interface ResiGroupOpenFeignClient {
@PostMapping("resi/group/topic/sendevent")
Result sendEvent(@RequestBody TopicEventFormDTO param);
-
@GetMapping("resi/group/topic/querytopicinfobyissueid/{issueId}")
Result queryTopicInfoByIssueId(@PathVariable("issueId")String issueId);
@@ -271,8 +270,6 @@ public interface ResiGroupOpenFeignClient {
@PostMapping("/resi/group/topic/allmessages")
Result> allMessages(@RequestBody AllMessagesFormDTO formDTO);
- /**
-
/**
* @Description 查询话题信息
* @Param issueIds
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index b49820bec8..eb8751a79a 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -223,12 +223,12 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
}
@Override
- public Result> getTopicInfos(List issueIds) {
- return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds);
+ public Result> listTopicDetailsByIds(TopicDetailBatchFormDTO input) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listTopicDetailsByIds", input);
}
@Override
- public Result> listTopicDetailsByIds(TopicDetailBatchFormDTO input) {
- return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listTopicDetailsByIds", input);
+ public Result> getTopicInfos(List issueIds) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicInfos", issueIds);
}
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 6bb5d1a9f8..4f25fd2803 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -532,5 +532,4 @@ public class ResiTopicController {
return new Result>().ok(topicDetails);
}
-
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 7520074fdc..520f575a13 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -2825,32 +2825,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicInfos(List issueIds) {
- if (CollectionUtils.isEmpty(issueIds)){
- return new ArrayList<>();
- }
- List topicInfos = baseDao.getTopicInfos(issueIds);
- Result> gridNames = govOrgOpenFeignClient.getGridListByGridIds(topicInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
- if (!gridNames.success()){
- throw new RenException("查询网格Name失败");
- }
- topicInfos.forEach(t -> {
- gridNames.getData().forEach(g -> {
- if (t.getGridId().equals(g.getGridId())){
- t.setGridName(g.getGridName());
- }
- });
- });
- return topicInfos;
- }
-
@Override
public List listTopicDetailsByIds(List topicIdList) {
LambdaQueryWrapper qw = new LambdaQueryWrapper<>();
@@ -2885,6 +2859,32 @@ public class ResiTopicServiceImpl extends BaseServiceImpl a.getAttachmentUrl()).collect(Collectors.toList());
}
+ /**
+ * @Description 查询话题信息
+ * @Param issueIds
+ * @author zxc
+ * @date 2021/5/17 4:19 下午
+ */
+ @Override
+ public List getTopicInfos(List issueIds) {
+ if (CollectionUtils.isEmpty(issueIds)){
+ return new ArrayList<>();
+ }
+ List topicInfos = baseDao.getTopicInfos(issueIds);
+ Result> gridNames = govOrgOpenFeignClient.getGridListByGridIds(topicInfos.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
+ if (!gridNames.success()){
+ throw new RenException("查询网格Name失败");
+ }
+ topicInfos.forEach(t -> {
+ gridNames.getData().forEach(g -> {
+ if (t.getGridId().equals(g.getGridId())){
+ t.setGridName(g.getGridName());
+ }
+ });
+ });
+ return topicInfos;
+ }
+
}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerStaffFormDTO.java
index 43acb11d1c..f5317723e6 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerStaffFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerStaffFormDTO.java
@@ -4,6 +4,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
+import java.util.List;
/**
* @Description 根据手机号+客户id获取工作人员基本信息
@@ -13,9 +14,23 @@ import java.io.Serializable;
@Data
public class CustomerStaffFormDTO implements Serializable {
private static final long serialVersionUID = 7619815083427853431L;
- @NotBlank(message = "手机号不能为空")
+
+ // 根据手机号+客户id获取工作人员基本信息
+ public interface GetCustomerStaffInfo {}
+
+ @NotBlank(message = "手机号不能为空", groups = { GetCustomerStaffInfo.class })
private String mobile;
- @NotBlank(message = "客户id不能为空")
+ @NotBlank(message = "客户id不能为空", groups = { GetCustomerStaffInfo.class })
private String customerId;
+
+ /**
+ * 姓名
+ */
+ private String realName;
+
+ /**
+ * 用户id集合
+ */
+ private List userIds;
}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolTrackFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolTrackFormDTO.java
new file mode 100644
index 0000000000..6c0dfb8478
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolTrackFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:27 下午
+ * @DESC
+ */
+@Data
+public class PatrolTrackFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 5074643104620363029L;
+
+ public interface PatrolTrackForm{}
+
+ @NotBlank(message = "巡查记录ID不能为空",groups = PatrolTrackForm.class)
+ private String staffPatrolRecId;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java
new file mode 100644
index 0000000000..cfaf7a62c4
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:09 下午
+ * @DESC
+ */
+@Data
+public class RecordListFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1034587652692011650L;
+
+ public interface RecordListForm{}
+
+ @NotBlank(message = "staffId不能为空",groups = RecordListForm.class)
+ private String staffId;
+
+ @NotBlank(message = "网格ID不能为空",groups = RecordListForm.class)
+ private String gridId;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java
new file mode 100644
index 0000000000..8a8e51887b
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridManagerUserListResultDTO.java
@@ -0,0 +1,65 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 2:57 下午
+ * @DESC
+ */
+@Data
+public class GridManagerUserListResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 3606766812822179356L;
+
+ /**
+ * 工作人员id
+ */
+ private String staffId;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 网格ID
+ */
+ private String gridId;
+
+ /**
+ * 正在巡查：patrolling；否则返回空字符串
+ */
+ private String status;
+
+ /**
+ * 网格名称，最多显示上两级
+ */
+ private String gridName;
+
+ /**
+ * 姓名
+ */
+ private String staffName;
+
+ /**
+ * 中心点位
+ */
+ @JsonIgnore
+ private String centerMark;
+
+ /**
+ * 经纬度赋值状态
+ */
+ @JsonIgnore
+ private Boolean llStatus;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUserResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUserResultDTO.java
new file mode 100644
index 0000000000..da70a707fe
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUserResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/8 4:30 下午
+ * @DESC
+ */
+@Data
+public class GridStaffUserResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 7715622585539953368L;
+
+ private String gridId;
+
+ private String staffId;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolTrackResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolTrackResultDTO.java
new file mode 100644
index 0000000000..d20d951367
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PatrolTrackResultDTO.java
@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:29 下午
+ * @DESC
+ */
+@Data
+public class PatrolTrackResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 5147586435344204616L;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RecordListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RecordListResultDTO.java
new file mode 100644
index 0000000000..078586c69d
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RecordListResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:14 下午
+ * @DESC
+ */
+@Data
+public class RecordListResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -1021736989973649009L;
+
+ /**
+ * 巡查记录id
+ */
+ private String staffPatrolRecId;
+
+ /**
+ * 开始时间；yyyy-MM-dd HH:mm
+ */
+ private String patrolStartTime;
+
+ /**
+ * 结束时间；yyyy-MM-dd HH:mm
+ */
+ private String patrolEndTime;
+
+ /**
+ * 正在巡查：patrolling；已结束：end
+ */
+ private String status;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameAndLLResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameAndLLResultDTO.java
new file mode 100644
index 0000000000..ac255b7c56
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameAndLLResultDTO.java
@@ -0,0 +1,33 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/9 11:12 上午
+ * @DESC
+ */
+@Data
+public class UserNameAndLLResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 8997436689118596889L;
+
+ /**
+ * 用户名字
+ */
+ private List userNames;
+
+ /**
+ * 经纬度
+ */
+ private List ll;
+
+ public UserNameAndLLResultDTO() {
+ this.userNames = new ArrayList<>();
+ this.ll = new ArrayList<>();
+ }
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameResultDTO.java
new file mode 100644
index 0000000000..286fc17ea7
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserNameResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/9 11:12 上午
+ * @DESC
+ */
+@Data
+public class UserNameResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 5383959788021394553L;
+
+ private String userId;
+ private String userName;
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index f85ba6d782..c9f1e56f01 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -21,7 +21,7 @@ import java.util.Map;
* @author yinzuomei@elink-cn.com
* @date 2020/6/4 13:09
*/
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "http://127.0.0.1:8087")
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
public interface EpmetUserOpenFeignClient {
@@ -224,7 +224,7 @@ public interface EpmetUserOpenFeignClient {
* @Author sun
* @Description 根据客户ID、手机号查询政府端工作人员基本信息，校验用户是否存在
**/
- @GetMapping(value = "epmetuser/customerstaff/getCustsomerStaffByIdAndPhone")
+ @GetMapping(value = "/epmetuser/customerstaff/getCustsomerStaffByIdAndPhone")
Result> getCustsomerStaffByIdAndPhone(@RequestBody ThirdCustomerStaffFormDTO formDTO);
/**
@@ -530,4 +530,60 @@ public interface EpmetUserOpenFeignClient {
*/
@PostMapping("/epmetuser/badge/userbadges")
Result> userBadges(@RequestBody UserBadgesFormDTO formDTO);
+
+ /**
+ * 根据用户ID获取工作人员基本信息
+ *
+ * @param formDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @author zhaoqifeng
+ * @date 2020/4/22 10:05
+ **/
+ @PostMapping(value = "/epmetuser/customerstaff/getstaffinfobyuserid")
+ Result getCustomerStaffInfoByUserId(@RequestBody CustomerStaffDTO formDTO);
+
+ /**
+ * @Description 通用批量查询
+ * @return
+ * @author wxz
+ * @date 2021.06.08 10:54
+ */
+ @PostMapping(value = "/epmetuser/customerstaff/list")
+ Result> list(CustomerStaffFormDTO input);
+
+ /**
+ * @Description 查询网格员角色
+ * @Param forms
+ * @author zxc
+ * @date 2021/6/8 4:42 下午
+ */
+ @PostMapping("/epmetuser/staffrole/staffgridrole")
+ Result> staffGridRole(@RequestBody List forms);
+
+ /**
+ * @Description 查询经纬度
+ * @Param userIds
+ * @author zxc
+ * @date 2021/6/9 10:40 上午
+ */
+ @PostMapping("/epmetuser/staffpatrol/getll")
+ Result selectll(@RequestBody List userIds);
+
+ /**
+ * @Description 002、查看巡查记录
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:25 下午
+ */
+ @PostMapping("/epmetuser/staffpatrol/recordlist")
+ Result> recordList(@RequestBody RecordListFormDTO formDTO);
+
+ /**
+ * @Description 003、巡查轨迹
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 3:35 下午
+ */
+ @PostMapping("/epmetuser/staffpatrol/patroltrack")
+ Result> patrolTrack(@RequestBody PatrolTrackFormDTO formDTO);
}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 518cca9cef..43671d4f6c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -373,4 +373,35 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
public Result> userBadges(UserBadgesFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userBadges", formDTO);
}
+
+ @Override
+ public Result getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfoByUserId", formDTO);
+ }
+
+ @Override
+ public Result> list(CustomerStaffFormDTO input) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "list", input);
+ }
+
+ @Override
+ public Result> staffGridRole(List forms) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffGridRole", forms);
+ }
+
+ @Override
+ public Result selectll(List userIds) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectll", userIds);
+ }
+
+ @Override
+ public Result> recordList(RecordListFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "recordList", formDTO);
+ }
+
+ @Override
+ public Result> patrolTrack(PatrolTrackFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "patrolTrack", formDTO);
+ }
+
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
index e1eefc0a94..d488ecff59 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
@@ -20,6 +20,7 @@ package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@@ -32,10 +33,12 @@ import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.excel.CustomerStaffExcel;
import com.epmet.service.CustomerStaffService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
@@ -53,6 +56,9 @@ public class CustomerStaffController {
@Autowired
private CustomerStaffService customerStaffService;
+ @Autowired
+ private LoginUserUtil loginUserUtil;
+
@GetMapping("page")
public Result> page(@RequestParam Map params) {
PageData page = customerStaffService.page(params);
@@ -116,7 +122,7 @@ public class CustomerStaffController {
**/
@PostMapping(value = "getcustomerstaffinfo")
public Result getCustomerStaffInfo(@RequestBody CustomerStaffFormDTO formDTO) {
- ValidatorUtils.validateEntity(formDTO);
+ ValidatorUtils.validateEntity(formDTO, CustomerStaffFormDTO.GetCustomerStaffInfo.class);
return customerStaffService.getCustomerStaffInfo(formDTO);
}
@@ -410,4 +416,19 @@ public class CustomerStaffController {
return new Result().ok(customerStaffService.getStaffBasicInfo(fromDTO));
}
+ /**
+ * @Description 通用列表查询。可以指定customerId，如果指定了，则使用指定的，如果未指定，则使用当前登录用户的customerId
+ * @return
+ * @author wxz
+ * @date 2021.06.08 10:54
+ */
+ @PostMapping("list")
+ public Result> list(@RequestBody CustomerStaffFormDTO input) {
+ String customerId = StringUtils.isBlank(input.getCustomerId()) ? loginUserUtil.getLoginUserCustomerId() : input.getCustomerId();
+
+ List staffs = customerStaffService.list(customerId, input.getRealName(), input.getMobile(), input.getUserIds());
+ return new Result>().ok(staffs);
+ }
+
+
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java
new file mode 100644
index 0000000000..f0a0558c34
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffPatrolController.java
@@ -0,0 +1,68 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.PatrolTrackFormDTO;
+import com.epmet.dto.form.RecordListFormDTO;
+import com.epmet.dto.result.GridManagerUserListResultDTO;
+import com.epmet.dto.result.PatrolTrackResultDTO;
+import com.epmet.dto.result.RecordListResultDTO;
+import com.epmet.dto.result.UserNameAndLLResultDTO;
+import com.epmet.service.StaffPatrolRecordService;
+import com.epmet.user.result.GridManagerListResultDTO;
+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 2021/6/9 10:32 上午
+ * @DESC
+ */
+@RestController
+@RequestMapping("staffpatrol")
+public class StaffPatrolController {
+
+ @Autowired
+ private StaffPatrolRecordService staffPatrolRecordService;
+
+ /**
+ * @Description 查询经纬度
+ * @Param userIds
+ * @author zxc
+ * @date 2021/6/9 10:40 上午
+ */
+ @PostMapping("getll")
+ public Result selectll(@RequestBody List userIds){
+ return new Result().ok(staffPatrolRecordService.selectLL(userIds));
+ }
+
+ /**
+ * @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(staffPatrolRecordService.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(staffPatrolRecordService.patrolTrack(formDTO));
+ }
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
index 60b4d5400e..00d3cd154e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
@@ -10,11 +10,8 @@ import com.epmet.dto.form.CommonUserFormDTO;
import com.epmet.dto.form.CustomerRoleFormDTO;
import com.epmet.dto.form.RolesUsersListFormDTO;
import com.epmet.dto.form.StaffRoleFormDTO;
-import com.epmet.dto.result.CustomerStaffRoleResultDTO;
+import com.epmet.dto.result.*;
import com.epmet.dto.form.*;
-import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
-import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.StaffRolesResultDTO;
import com.epmet.entity.GovStaffRoleEntity;
import com.epmet.service.GovStaffRoleService;
import com.epmet.service.StaffRoleService;
@@ -181,4 +178,15 @@ public class StaffRoleController {
staffRoleService.changeRoleOrg(formDTO);
return new Result();
}
+
+ /**
+ * @Description 查询网格员角色
+ * @Param forms
+ * @author zxc
+ * @date 2021/6/8 4:42 下午
+ */
+ @PostMapping("staffgridrole")
+ public Result> staffGridRole(@RequestBody List forms){
+ return new Result>().ok(staffRoleService.staffGridRole(forms));
+ }
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
index acffa2840e..e49790c0d4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
@@ -197,4 +197,20 @@ public interface CustomerStaffDao extends BaseDao {
* @return
*/
BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO);
+
+ /**
+ * 通用列表查询
+ * @param customerId
+ * @param realName
+ * @return
+ */
+ List listDTOS(@Param("customerId") String customerId, @Param("realName") String realName, @Param("mobile") String mobile, @Param("userIds") List userIds);
+
+ /**
+ * @Description 查询用户名字
+ * @Param userIds
+ * @author zxc
+ * @date 2021/6/9 1:36 下午
+ */
+ List selectUserName(@Param("userIds")List userIds);
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolDetailDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolDetailDao.java
new file mode 100644
index 0000000000..2d7ed83136
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/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-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffPatrolRecordDao.java
new file mode 100644
index 0000000000..a476cfd3a5
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/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 userIds
+ * @author zxc
+ * @date 2021/6/9 10:24 上午
+ */
+ List selectLL(@Param("userIds")List userIds);
+
+ /**
+ * @Description 巡查记录查询
+ * @Param formDTO
+ * @author zxc
+ * @date 2021/6/7 5:29 下午
+ */
+ List recordList(RecordListFormDTO formDTO);
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
index 3124fc68c7..6d10c5fe23 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
@@ -24,10 +24,7 @@ import com.epmet.dto.StaffRoleDTO;
import com.epmet.dto.form.CommonUserFormDTO;
import com.epmet.dto.form.CustomerStaffRoleListFormDTO;
import com.epmet.dto.form.GetRoleKeyListFormDTO;
-import com.epmet.dto.result.CustomerStaffRoleListResultDTO;
-import com.epmet.dto.result.CustomerStaffRoleResultDTO;
-import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.StaffRolesResultDTO;
+import com.epmet.dto.result.*;
import com.epmet.entity.StaffRoleEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -131,4 +128,12 @@ public interface StaffRoleDao extends BaseDao {
* @Description 工作端-查询用户角色key列表
**/
List selectStaffRoleKeyList(GetRoleKeyListFormDTO formDTO);
+
+ /**
+ * @Description 查询是网格员的人
+ * @Param forms
+ * @author zxc
+ * @date 2021/6/8 4:53 下午
+ */
+ List staffGridRole(@Param("forms") List forms);
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffPatrolDetailEntity.java
new file mode 100644
index 0000000000..fbc81edd1a
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/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 {
* @return
*/
BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO);
+
+ /**
+ * @Description 根据姓名查询工作人员
+ * @return
+ * @author wxz
+ * @date 2021.06.08 10:52
+ */
+ List list(String customerId, String realName, String mobile, List ids);
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolDetailService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolDetailService.java
new file mode 100644
index 0000000000..ff79804e27
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolDetailService.java
@@ -0,0 +1,32 @@
+/**
+ * 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-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java
new file mode 100644
index 0000000000..9883d87bc9
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffPatrolRecordService.java
@@ -0,0 +1,63 @@
+/**
+ * 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 userIds
+ * @author zxc
+ * @date 2021/6/9 10:40 上午
+ */
+ UserNameAndLLResultDTO selectLL(List