Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg

epmet-module/gov-mine/gov-mine-server/pom.xml

@@ -72,6 +72,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java

@@ -21,6 +21,7 @@ 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.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.service.StaffAgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -52,4 +53,15 @@ public class StaffAgencyController {
 		return staffAgencyService.getMyGrids(tokenDTO);
 	}
 
+	/**
+	 * 获取最近一次登录的客户信息
+	 *
+	 * @param tokenDTO
+	 * @return
+	 */
+	@PostMapping("getlatestcustomer")
+	public Result<LatestCustomerResultDTO> getLatestCustomer(@LoginUser TokenDto tokenDTO) {
+		return staffAgencyService.getLatestCustomer(tokenDTO);
+	}
+
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -1,8 +1,13 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description
@@ -10,4 +15,12 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
 public interface EpmetUserFeignClient {
+	/**
+	 * 获取最近一次登录的客户信息
+	 *
+	 * @param userId
+	 * @return
+	 */
+	@GetMapping("/epmetuser/staffagencyvisited/getlatestcustomer/{userId}")
+	Result<LatestCustomerResultDTO> getLatestCustomer(@PathVariable("userId") String userId);
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java

@@ -1,5 +1,9 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -10,4 +14,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 
+	@Override
+	public Result<LatestCustomerResultDTO> getLatestCustomer(String userId) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestCustomer", userId);
+	}
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 
 import java.util.List;
 
@@ -37,4 +38,11 @@ public interface StaffAgencyService {
      * @Author sun
      */
     Result<List<CustomerGridByUserIdResultDTO>> getMyGrids(TokenDto tokenDTO);
+
+    /**
+     * 获取最近一次登录的客户信息
+     * @param tokenDTO
+     * @return
+     */
+    Result<LatestCustomerResultDTO> getLatestCustomer(TokenDto tokenDTO);
 }

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@@ -20,6 +20,7 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.StaffAgencyService;
@@ -52,4 +53,10 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
         return govOrgFeignClient.getMyGrids(tokenDTO.getUserId());
     }
 
+    @Override
+    public Result<LatestCustomerResultDTO> getLatestCustomer(TokenDto tokenDTO) {
+        return epmetUserFeignClient.getLatestCustomer(tokenDTO.getUserId());
+    }
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql

@@ -106,3 +106,8 @@ alter table customer_grid drop column SORT;
 alter table customer_grid add column ORG_ID varchar(64) NOT NULL COMMENT '所属组织机构ID（customer_organization.id）';
 alter table customer_grid add column MANAGE_DISTRICT varchar(255) DEFAULT "" NOT NULL COMMENT '管辖区域';
 alter table customer_grid add column TOTAL_USER INT(11) DEFAULT 0 NOT NULL COMMENT '当前网格总人数';
+ALTER TABLE customer_agency ADD (
+	COUNTRY VARCHAR (32) DEFAULT NULL COMMENT '国家',
+	PROVINCE VARCHAR (32) DEFAULT NULL COMMENT '省份',
+	CITY VARCHAR (32) DEFAULT NULL COMMENT '城市'
+);

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java

@@ -133,4 +133,15 @@ public class CustomerController {
 	public Result<List<ValidCustomerResultDTO>> getValidCustomerList() {
 		return customerService.getValidCustomerList();
 	}
+
+	/**
+	 * 获取客户信息
+	 * @param dto
+	 * @return
+	 */
+	@PostMapping("getcostomerInfo")
+	public Result<CustomerDTO> getCustomerInfo(@RequestBody CustomerDTO dto) {
+		return customerService.getCustomerInfo(dto);
+	}
+
 }

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java

@@ -113,4 +113,11 @@ public interface CustomerService extends BaseService<CustomerEntity> {
      * @Date 2020/3/18 9:44
      **/
     Result<String> saveCustomerInfo(CustomerDTO dto);
+
+    /**
+     * 获取客户信息
+     * @param dto
+     * @return
+     */
+    Result<CustomerDTO> getCustomerInfo(CustomerDTO dto);
 }

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -129,4 +129,10 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         return new Result<String>().ok(entity.getId());
     }
 
+    @Override
+    public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
+        CustomerEntity entity = baseDao.selectById(dto.getId());
+        return new Result<CustomerDTO>().ok(ConvertUtils.sourceToTarget(entity, CustomerDTO.class));
+    }
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/22 9:59
+ */
+@Data
+public class LatestCustomerResultDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 客户名称
+	 */
+	private String customerName;
+	/**
+	 * 客户顶级名称
+	 */
+	private String agencyId;
+	/**
+	 * 工作人员头像
+	 */
+	private String staffHeadPhoto;
+}

epmet-user/epmet-user-server/pom.xml

@@ -70,6 +70,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>oper-crm-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffAgencyVisitedController.java

@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.service.StaffAgencyVisitedService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,4 +62,16 @@ public class StaffAgencyVisitedController {
 	public Result saveStaffLoginRecord(@RequestBody StaffLoginAgencyRecordFormDTO formDTO) {
 		return staffAgencyVisitedService.saveStaffLoginRecord(formDTO);
 	}
+
+	/**
+	 * 获取最近一次登录的客户信息
+	 *
+	 * @param userId 参数
+	 * @return Result
+	 * @author zhaoqifeng
+	 */
+	@GetMapping("getlatestcustomer/{userId}")
+    public Result<LatestCustomerResultDTO> getLatestCustomer(@PathVariable("userId") String userId) {
+		return staffAgencyVisitedService.getLatestCustomer(userId);
+	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -51,4 +51,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Date 2020/4/20 14:08
      **/
     CustomerStaffDTO selectListCustomerStaffInfo(CustomerStaffFormDTO formDTO);
+
+    CustomerStaffDTO selectStaffInfoByUserId(CustomerStaffDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffAgencyVisitedDao.java

@@ -38,4 +38,7 @@ public interface StaffAgencyVisitedDao extends BaseDao<StaffAgencyVisitedEntity>
      * @Date 2020/4/20 12:45
      **/
     StaffLatestAgencyResultDTO selectLatestStaffWechatLoginRecord(String openId);
+
+
+    StaffLatestAgencyResultDTO selectLatestCustomer(String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java

@@ -0,0 +1,25 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerDTO;
+import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/22 10:41
+ */
+@FeignClient(name = ServiceConstant.OPER_CRM_SERVER, fallback = OperCrmFeignClientFallBack.class)
+public interface OperCrmFeignClient {
+	/**
+	 * 获取客户信息
+	 * @param dto
+	 * @return
+	 */
+	@PostMapping("/oper/crm/customer/getcostomerInfo")
+	Result<CustomerDTO> getCustomerInfo(@RequestBody CustomerDTO dto);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java

@@ -0,0 +1,21 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerDTO;
+import com.epmet.feign.OperCrmFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/4/22 10:43
+ */
+@Component
+public class OperCrmFeignClientFallBack implements OperCrmFeignClient {
+	@Override
+	public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getCustomerInfo", dto);
+	}
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -112,4 +112,14 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Date 2020/4/20 14:05
 	 **/
 	Result<CustomerStaffDTO> getCustomerStaffInfo(CustomerStaffFormDTO formDTO);
+
+	/**
+	 * 根据用户ID获取工作人员基本信息
+	 *
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerStaffDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/4/22 10:05
+	 **/
+	Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffAgencyVisitedService.java

@@ -19,9 +19,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StaffAgencyVisitedDTO;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.entity.StaffAgencyVisitedEntity;
 
@@ -113,4 +115,13 @@ public interface StaffAgencyVisitedService extends BaseService<StaffAgencyVisite
 	 * @Date 2020/4/20 14:33
 	 **/
 	Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO formDTO);
+
+	/**
+	 * 获取最近一次登录的客户信息
+	 *
+	 * @param userId 参数
+	 * @return Result
+	 * @author zhaoqifeng
+	 */
+	Result<LatestCustomerResultDTO> getLatestCustomer(String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -134,4 +134,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
     }
 
+    @Override
+    public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
+        CustomerStaffDTO customerStaffDTO = baseDao.selectStaffInfoByUserId(formDTO);
+        return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffAgencyVisitedServiceImpl.java

@@ -22,17 +22,24 @@ 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.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.StaffAgencyVisitedDao;
+import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.StaffAgencyVisitedDTO;
 import com.epmet.dto.form.StaffLoginAgencyRecordFormDTO;
+import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.dto.result.StaffLatestAgencyResultDTO;
 import com.epmet.entity.StaffAgencyVisitedEntity;
+import com.epmet.feign.OperCrmFeignClient;
+import com.epmet.service.CustomerStaffService;
 import com.epmet.service.StaffAgencyVisitedService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,6 +57,11 @@ import java.util.Map;
 public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl<StaffAgencyVisitedDao, StaffAgencyVisitedEntity> implements StaffAgencyVisitedService {
 	private static final Logger logger = LoggerFactory.getLogger(StaffAgencyVisitedServiceImpl.class);
 
+	@Autowired
+	private CustomerStaffService customerStaffService;
+	@Autowired
+	private OperCrmFeignClient operCrmFeignClient;
+
 	@Override
 	public PageData<StaffAgencyVisitedDTO> page(Map<String, Object> params) {
 		IPage<StaffAgencyVisitedEntity> page = baseDao.selectPage(
@@ -118,4 +130,24 @@ public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl<StaffAgencyVi
 		insert(entity);
 		return new Result();
 	}
+
+	@Override
+	public Result<LatestCustomerResultDTO> getLatestCustomer(String userId) {
+		LatestCustomerResultDTO resultDTO = new LatestCustomerResultDTO();
+		StaffLatestAgencyResultDTO latestCustomer = baseDao.selectLatestCustomer(userId);
+		resultDTO.setAgencyId(latestCustomer.getAgencyId());
+		resultDTO.setCustomerId(latestCustomer.getCustomerId());
+		//获取工作人员头像
+		CustomerStaffDTO customerStaffParam = new CustomerStaffDTO();
+		customerStaffParam.setUserId(userId);
+		Result<CustomerStaffDTO> staffInfo =
+				customerStaffService.getCustomerStaffInfoByUserId(customerStaffParam);
+		resultDTO.setStaffHeadPhoto(staffInfo.getData().getHeadPhoto());
+		//获取客户名称
+		CustomerDTO customerDTO = new CustomerDTO();
+		customerDTO.setId(latestCustomer.getCustomerId());
+		Result<CustomerDTO> customerResult = operCrmFeignClient.getCustomerInfo(customerDTO);
+		resultDTO.setCustomerName(customerResult.getData().getCustomerName());
+		return new Result<LatestCustomerResultDTO>().ok(resultDTO);
+	}
 }

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -18,4 +18,9 @@
         and cs.CUSTOMER_ID=#{customerId}
         and cs.DEL_FLAG='1'
     </select>
+    <select id="selectStaffInfoByUserId" parameterType="com.epmet.dto.CustomerStaffDTO" resultType="com.epmet.dto.CustomerStaffDTO">
+        select * from customer_staff cs
+        where cs.USER_ID=#{userId}
+          and cs.DEL_FLAG='0'
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyVisitedDao.xml

@@ -35,4 +35,19 @@
             sav.CREATED_TIME DESC
             LIMIT 1
     </select>
+    <select id="selectLatestCustomer" parameterType="java.lang.String"
+            resultType="com.epmet.dto.result.StaffLatestAgencyResultDTO">
+        SELECT
+            sav.CUSTOMER_ID,
+            sav.STAFF_ID,
+            sav.AGENCY_ID
+        FROM
+            staff_agency_visited sav
+        WHERE
+            sav.DEL_FLAG = '0'
+          AND sav.STAFF_ID =#{userId}
+        ORDER BY
+            sav.CREATED_TIME DESC
+        LIMIT 1
+    </select>
 </mapper>