From b3677b3ab0f7f2854cffb6b19588db3b104ad50b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 22 Feb 2022 16:04:15 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E9=97=B4=E9=9A=9420s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/StaffPatrolRecordServiceImpl.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index 9ddd74e7aa..b61df46291 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -58,8 +57,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -122,8 +119,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		result.setStaffPatrolRecId(entity.getId());
 		result.setStatus(entity.getStatus());
 		result.setLatestSerialNum(PatrolConstant.END.equals(entity.getStatus()) ? NumConstant.ONE_NEG : detail.getSerialNum());
-		//最小间隔设置 3*60s
-		result.setCarmDown(NumConstant.THREE * NumConstant.SIXTY);
+		//最小间隔设置 20s
+		result.setCarmDown(NumConstant.TWENTY);
 		result.setPatrolStartTime(DateUtils.format(entity.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN));
 		//状态为巡查中时返回所在网格ID和名称
 		if (PatrolConstant.PATROLLING.equals(entity.getStatus())) {

From f9cfd79589841858e045fe5297186145084d3a06 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 23 Feb 2022 10:08:04 +0800
Subject: [PATCH 2/6] bug

---
 .../impl/CustomerStaffGridServiceImpl.java      |  3 ++-
 .../main/java/com/epmet/dao/StaffRoleDao.java   |  2 ++
 .../service/impl/StaffRoleServiceImpl.java      |  5 ++++-
 .../src/main/resources/mapper/StaffRoleDao.xml  | 17 +++++++++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

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 23582c1906..184a4b7acd 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
@@ -176,7 +176,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         if (CollectionUtils.isEmpty(data)){
             return new ArrayList<>();
         }
-        return data;
+        gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
+        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());
     }
 
     /**
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 3cfb231881..8f62aef830 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
@@ -138,6 +138,8 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      */
     List<GridStaffResultDTO> staffGridRole(@Param("forms") List<GridStaffResultDTO> forms);
 
+    List<GridStaffResultDTO> staffGridRoleByIds(@Param("ids") List<String> ids);
+
     /**
      * @Description  查询角色
      * @Param userIds
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index fca7a68aed..c5f75b2222 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -32,6 +32,7 @@ import com.epmet.entity.StaffRoleEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.StaffRoleService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -136,7 +137,9 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         if (CollectionUtils.isEmpty(forms)){
             return new ArrayList<>();
         }
-        List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);
+        List<String> userIds = forms.stream().map(m -> m.getStaffId()).distinct().collect(Collectors.toList());
+        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
+        /*List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);*/
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index 777ef27ee8..6ce9736f4d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -210,6 +210,23 @@
         </foreach>
     </select>
 
+    <select id="staffGridRoleByIds" resultType="com.epmet.dto.result.GridStaffResultDTO">
+        SELECT
+            sr.org_id as gridId,
+            sr.STAFF_ID,
+            cs.MOBILE
+        FROM staff_role sr
+        LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = 0
+        LEFT JOIN  customer_staff cs ON cs.USER_ID = sr.STAFF_ID AND cs.customer_id = sr.customer_id AND cs.DEL_FLAG = 0
+        WHERE sr.DEL_FLAG = 0
+        AND gsr.ROLE_KEY = 'grid_member'
+        AND sr.STAFF_ID in (
+            <foreach collection="ids" item="id" separator=",">
+                #{id}
+            </foreach>
+            )
+    </select>
+
     <!-- 查询角色 -->
     <select id="getRolesByDB" resultType="com.epmet.dto.result.RoleKeyValueResultDTO">
         SELECT

From 45775fc7d1f737747f846dadeb71baa782ad6e22 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 23 Feb 2022 15:12:45 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9Cbugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PatrolRoutineWorkServiceImpl.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
index bc850e1d2c..61c70601d6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
@@ -35,7 +35,6 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SystemMessageType;
@@ -68,13 +67,13 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
-import java.beans.Encoder;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN;
-
 /**
  * 巡查例行工作
  *
@@ -106,7 +105,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
     public void add(PatrolRoutineWorkFormDTO formDTO) {
         PatrolRoutineWorkEntity entity = null;
         try {
-            if (formDTO.getWorkTypeList().toString().contains("02")
+            if (formDTO.getWorkTypeList().toString().startsWith("02")
                     && (formDTO.getIsKeyPeopleLocate() == null || StringUtils.isBlank(formDTO.getKeyPeopleStatus()))) {
                 log.warn("add patrolRoutineWork fail,param is error,param:{}", JSON.toJSONString(formDTO));
                 throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode());

From 4ceee13be0fe9067656f5b244a071988f2acc516 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 23 Feb 2022 15:18:28 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9Cbugfix1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
index ccf2ed67ca..df3d1c3418 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java
@@ -74,10 +74,7 @@ import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**

From 0804b61d83cb7bcc13fac034b0e72b9459044342 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 23 Feb 2022 16:48:17 +0800
Subject: [PATCH 5/6] =?UTF-8?q?user=EF=BC=8Corg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/CustomerStaffGridServiceImpl.java | 5 +++--
 .../java/com/epmet/service/impl/StaffRoleServiceImpl.java    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

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 184a4b7acd..c744a1b0a2 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
@@ -176,8 +176,9 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         if (CollectionUtils.isEmpty(data)){
             return new ArrayList<>();
         }
-        gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
-        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());
+        /*gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
+        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());*/
+        return data;
     }
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index c5f75b2222..6b69b9506b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -138,8 +138,8 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
             return new ArrayList<>();
         }
         List<String> userIds = forms.stream().map(m -> m.getStaffId()).distinct().collect(Collectors.toList());
-        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
-        /*List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);*/
+//        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
+        List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }

From 1d58c4e52bfdc92558e3b44ac9178e404f172812 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 24 Feb 2022 11:17:07 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=B9=E6=8D=AEstaffId=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AE=A2=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/BasicInfoResultDTO.java   |  3 ++-
 .../service/impl/CustomerStaffServiceImpl.java     | 14 +++++++++++++-
 .../src/main/resources/mapper/CustomerStaffDao.xml |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
index 2877fc47ed..5fff4bc298 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BasicInfoResultDTO.java
@@ -1,7 +1,6 @@
 package com.epmet.dto.result;
 
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -13,6 +12,8 @@ import java.io.Serializable;
 public class BasicInfoResultDTO implements Serializable {
 
 	private static final long serialVersionUID = 8987281818368677411L;
+	private String customerId;
+	private String customerName;
 	/**
 	 * 工作人员id
 	 */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 418b9dfbc6..4bf02513b6 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -765,7 +765,19 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	 */
 	@Override
 	public BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
-		return baseDao.getStaffBasicInfo(fromDTO);
+		BasicInfoResultDTO result = baseDao.getStaffBasicInfo(fromDTO);
+		//获取工作人员所属客户名
+		CustomerDTO dto = new CustomerDTO();
+		dto.setId(result.getCustomerId());
+		Result<CustomerDTO> customerResult = operCrmOpenFeignClient.getCustomerInfo(dto);
+		if (!customerResult.success()) {
+			throw new RenException(customerResult.getCode(), customerResult.getMsg());
+		}
+		if (null != customerResult.getData()) {
+			result.setCustomerName(customerResult.getData().getCustomerName());
+		}
+		
+		return result;
 	}
 
 	@Override
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index f441f419af..1448824323 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -341,6 +341,7 @@
 
     <select id="getStaffBasicInfo" resultType="com.epmet.dto.result.BasicInfoResultDTO">
         SELECT
+            CUSTOMER_ID,
             user_id AS "staffId",
             real_name AS "realName",
             mobile AS "mobile",