登录获取组织接口修改

epmet-auth/src/main/java/com/epmet/dto/form/GovWxmpEnteOrgFormDTO.java

@@ -34,6 +34,6 @@ public class GovWxmpEnteOrgFormDTO implements Serializable {
      * 选择的要进入的组织(根组织id)
      */
     @NotBlank(message = "组织id不能为空")
-    private String agencyId;
+    private String rootAgencyId;
 }
 

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -127,6 +127,9 @@ public class GovLoginServiceImpl implements GovLoginService {
     public Result<UserTokenResultDTO> loginByWxCode(GovWxmpFormDTO formDTO) {
         //1、解析微信用户
         WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(formDTO.getApp(), formDTO.getWxCode());
+        if(null!=wxMaJscode2SessionResult){
+            logger.info(String.format("app=%s,wxCode=%s,openId=%s",formDTO.getApp(),formDTO.getWxCode(),wxMaJscode2SessionResult.getOpenid()));
+        }
         Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid());
         if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
             logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
@@ -200,7 +203,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         //5.1、获取用户token
         String token = this.generateGovWxmpToken(customerStaff.getUserId());
         //5.2、保存到redis
-        this.saveGovTokenDto(formDTO.getAgencyId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token);
+        this.saveGovTokenDto(formDTO.getRootAgencyId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token);
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
         userTokenResultDTO.setToken(token);
         return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
@@ -223,7 +226,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         staffLoginAgencyRecordFormDTO.setStaffId(staffId);
         staffLoginAgencyRecordFormDTO.setWxOpenId(openId);
         staffLoginAgencyRecordFormDTO.setMobile(formDTO.getMobile());
-        staffLoginAgencyRecordFormDTO.setAgencyId(formDTO.getAgencyId());
+        staffLoginAgencyRecordFormDTO.setAgencyId(formDTO.getRootAgencyId());
         Result staffLoginRecordResult = epmetUserFeignClient.saveStaffLoginRecord(staffLoginAgencyRecordFormDTO);
         return staffLoginRecordResult;
     }

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

@@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
-import java.util.Set;
 
 /**
  * 机关单位信息表
@@ -78,7 +77,7 @@ public class StaffAgencyController {
 	 * @Date 2020/4/23 10:34
 	 **/
 	@PostMapping("switchgrid")
-	public Result<Set<String>> switchGrid(@LoginUser TokenDto tokenDto, @RequestBody @Valid SwitchGridFormDTO switchGridFormDTO) {
+	public Result switchGrid(@LoginUser TokenDto tokenDto, @RequestBody @Valid SwitchGridFormDTO switchGridFormDTO) {
 		switchGridFormDTO.setStaffId(tokenDto.getUserId());
 		return staffAgencyService.switchGrid(switchGridFormDTO);
 	}

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

@@ -25,7 +25,6 @@ import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 机关单位信息表
@@ -57,7 +56,7 @@ public interface StaffAgencyService {
      * @Description 切换网格
      * @Date 2020/4/23 10:49
      **/
-    Result<Set<String>> switchGrid(SwitchGridFormDTO switchGridFormDTO);
+    Result switchGrid(SwitchGridFormDTO switchGridFormDTO);
 
     /**
      * @Description 得到工作人员最后一次登录的网格

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

@@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 机关单位信息表
@@ -94,17 +93,17 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
 
 
     @Override
-    public Result<Set<String>> switchGrid(SwitchGridFormDTO switchGridFormDTO) {
+    public Result switchGrid(SwitchGridFormDTO switchGridFormDTO) {
         //记录网格访问记录
         StaffGridVisitedFormDTO staffGridVisitedFormDTO = ConvertUtils.sourceToTarget(switchGridFormDTO, StaffGridVisitedFormDTO.class);
         Result saveStaffGridVisitedRecord = epmetUserFeignClient.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
         if (!saveStaffGridVisitedRecord.success()) {
             logger.error("保存网格访问记录失败");
-            return new Result<Set<String>>().error();
         }
-        //查询网格的权限
+       /* //查询网格的权限
         Set<String> opeKeys = accessService.listOpeKeysByStaffId(switchGridFormDTO.getStaffId(), null, switchGridFormDTO.getGridId());
-        return new Result<Set<String>>().ok(opeKeys);
+        return new Result<Set<String>>().ok(opeKeys);*/
+        return new Result();
     }
 
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java

@@ -21,7 +21,7 @@ public class LatestCustomerResultDTO implements Serializable {
 	 */
 	private String customerName;
 	/**
-	 * 客户顶级名称
+	 * 用户所属组织id（任意一条）
 	 */
 	private String agencyId;
 	/**
@@ -29,7 +29,7 @@ public class LatestCustomerResultDTO implements Serializable {
 	 */
 	private String staffHeadPhoto;
 	/**
-	 * 性别
+	 * 性别0未知1男2女
 	 */
 	private Integer gender;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffOrgsResultDTO.java

@@ -14,9 +14,14 @@ public class StaffOrgsResultDTO implements Serializable {
     private static final long serialVersionUID = -9148184731135509803L;
 
     /**
-     * 组织id
+     * 根级根级组织id
      */
-    private String orgId;
+    private String rootAgencyId;
+
+    /**
+     * 根级组织名称
+     */
+    private String rootAgencyName;
 
     /**
      * 客户id
@@ -24,8 +29,8 @@ public class StaffOrgsResultDTO implements Serializable {
     private String customerId;
 
     /**
-     * 组织名称
+     * 客户名称
      */
-    private String orgName;
+    private String customerName;
 }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java

@@ -3,11 +3,14 @@ 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.dto.form.CustomerFormDTO;
 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;
 
+import java.util.List;
+
 /**
  * @author zhaoqifeng
  * @dscription
@@ -22,4 +25,14 @@ public interface OperCrmFeignClient {
 	 */
 	@PostMapping("/oper/crm/customer/getcostomerInfo")
 	Result<CustomerDTO> getCustomerInfo(@RequestBody CustomerDTO dto);
+
+	/**
+	 * @param customerFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.CustomerDTO>>
+	 * @Author yinzuomei
+	 * @Description 根据客户id查询客户信息
+	 * @Date 2020/4/24 9:07
+	 **/
+	@PostMapping("/oper/crm/customer/queryCustomerList")
+	Result<List<CustomerDTO>> queryCustomerList(CustomerFormDTO customerFormDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java

@@ -4,9 +4,12 @@ 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.dto.form.CustomerFormDTO;
 import com.epmet.feign.OperCrmFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @author zhaoqifeng
  * @dscription
@@ -18,4 +21,9 @@ public class OperCrmFeignClientFallBack implements OperCrmFeignClient {
 	public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getCustomerInfo", dto);
 	}
+
+	@Override
+	public Result<List<CustomerDTO>> queryCustomerList(CustomerFormDTO customerFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "queryCustomerList", customerFormDTO);
+	}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -30,9 +30,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.CustomerAgencyConstant;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
+import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
 import org.apache.commons.lang3.StringUtils;
@@ -55,10 +57,11 @@ import java.util.Map;
 @Service
 public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao, CustomerAgencyEntity> implements CustomerAgencyService {
 
-    private static final Logger log = LoggerFactory.getLogger(CustomerAgencyServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(CustomerAgencyServiceImpl.class);
     @Autowired
     private CustomerAgencyRedis customerAgencyRedis;
-
+    @Autowired
+    private OperCrmFeignClient operCrmFeignClient;
     @Override
     public PageData<CustomerAgencyDTO> page(Map<String, Object> params) {
         IPage<CustomerAgencyEntity> page = baseDao.selectPage(
@@ -117,6 +120,22 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             return new Result<>();
         }
         List<StaffOrgsResultDTO> list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList());
+        CustomerFormDTO customerFormDTO = new CustomerFormDTO();
+        customerFormDTO.setCustomerIdList(staffOrgsFormDTO.getCustomerIdList());
+        Result<List<CustomerDTO>> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO);
+        List<CustomerDTO> customerDTOList = customerDTOResult.getData();
+        if (customerDTOResult.success() && customerDTOList.size() > 0) {
+            for (CustomerDTO customer : customerDTOList) {
+                for (StaffOrgsResultDTO staffOrgsResultDTO : list) {
+                    if (customer.getId().equals(staffOrgsResultDTO.getCustomerId())) {
+                        staffOrgsResultDTO.setCustomerName(customer.getCustomerName());
+                        break;
+                    }
+                }
+            }
+        } else {
+            logger.error("获取客户名称失败");
+        }
         return new Result<List<StaffOrgsResultDTO>>().ok(list);
     }
 
@@ -147,7 +166,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         }
         //2:保存组织信息
         if (baseDao.insert(entity) < NumConstant.ONE) {
-            log.error(CustomerAgencyConstant.SAVE_EXCEPTION);
+            logger.error(CustomerAgencyConstant.SAVE_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.SAVE_EXCEPTION);
         }
         //3:返回新组织Id
@@ -169,7 +188,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         entity.setId(formDTO.getAgencyId());
         entity.setOrganizationName(formDTO.getAgencyName());
         if (baseDao.updateById(entity) < NumConstant.ONE) {
-            log.error(CustomerAgencyConstant.UPDATE_EXCEPTION);
+            logger.error(CustomerAgencyConstant.UPDATE_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.UPDATE_EXCEPTION);
         }
         return result;
@@ -194,7 +213,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         }
         //2:删除当前机关组织（逻辑删）
         if (baseDao.deleteById(formDTO.getAgencyId()) < NumConstant.ONE) {
-            log.error(CustomerAgencyConstant.DEL_EXCEPTION);
+            logger.error(CustomerAgencyConstant.DEL_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.DEL_EXCEPTION);
         }
         return result;

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -24,9 +24,9 @@
     <!-- 查询客户对应的根级组织 -->
     <select id="selectStaffOrgList" parameterType="map" resultType="com.epmet.dto.result.StaffOrgsResultDTO">
         SELECT
-            ca.pid AS orgId,
+            ca.pid AS agencyId,
-            ca.CUSTOMER_ID AS customerId,
+            ca.ORGANIZATION_NAME AS agencyName,
-            ca.ORGANIZATION_NAME AS orgName
+            ca.CUSTOMER_ID AS customerId
         FROM
             customer_agency ca
         WHERE

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 根据客户id查询客户信息
+ * @Author yinzuomei
+ * @Date 2020/4/24 9:09
+ */
+@Data
+public class CustomerFormDTO implements Serializable {
+    /**
+     * 客户id集合
+     * */
+    private List<String> customerIdList;
+}
+

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

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.form.CustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.excel.CustomerExcel;
 import com.epmet.service.CustomerService;
@@ -144,4 +145,15 @@ public class CustomerController {
 		return customerService.getCustomerInfo(dto);
 	}
 
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerDTO>
+	 * @Author yinzuomei
+	 * @Description 根据客户id查询客户信息
+	 * @Date 2020/4/24 9:13
+	 **/
+	@PostMapping("queryCustomerList")
+	public Result<List<CustomerDTO>> queryCustomerList(@RequestBody CustomerFormDTO formDTO) {
+		return customerService.queryCustomerList(formDTO);
+	}
 }

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java

@@ -18,9 +18,11 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.entity.CustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -40,4 +42,13 @@ public interface CustomerDao extends BaseDao<CustomerEntity> {
 	 * @date 2020-03-11
 	 */
 	List<ValidCustomerResultDTO> selectListValidCustomerResultDTO();
+
+	/**
+	 * @return java.util.List<com.epmet.dto.CustomerDTO>
+	 * @param customerIdList
+	 * @Author yinzuomei
+	 * @Description 根据客户id查询客户信息
+	 * @Date 2020/4/24 9:21 
+	 **/
+    List<CustomerDTO> selectListByIds(@Param("customerIdList") List<String> customerIdList);
 }

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.form.CustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.entity.CustomerEntity;
 
@@ -120,4 +121,13 @@ public interface CustomerService extends BaseService<CustomerEntity> {
      * @return
      */
     Result<CustomerDTO> getCustomerInfo(CustomerDTO dto);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerDTO>
+     * @Author yinzuomei
+     * @Description 根据客户id查询客户信息
+     * @Date 2020/4/24 9:13
+     **/
+    Result<List<CustomerDTO>> queryCustomerList(CustomerFormDTO formDTO);
 }

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

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerDao;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.form.CustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.entity.CustomerEntity;
 import com.epmet.redis.CustomerRedis;
@@ -135,4 +136,10 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         return new Result<CustomerDTO>().ok(ConvertUtils.sourceToTarget(entity, CustomerDTO.class));
     }
 
+    @Override
+    public Result<List<CustomerDTO>> queryCustomerList(CustomerFormDTO formDTO) {
+        List<CustomerDTO> customerDTOList = baseDao.selectListByIds(formDTO.getCustomerIdList());
+        return new Result<List<CustomerDTO>>().ok(customerDTOList);
+    }
+
 }

epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@@ -34,4 +34,18 @@
         ORDER BY
             CONVERT ( c.CUSTOMER_NAME USING gbk ) ASC
     </select>
+
+    <!-- 根据客户id查询客户信息   -->
+    <select id="selectListByIds" parameterType="map" resultType="com.epmet.dto.CustomerDTO">
+        SELECT
+            *
+        FROM
+            customer c
+        WHERE
+            c.DEL_FLAG = '0'
+            AND c.id IN
+            <foreach item="customerId" collection="customerIdList" open="(" separator="," close=")">
+                #{customerId}
+            </foreach>
+    </select>
 </mapper>

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

@@ -112,7 +112,7 @@ public class StaffAgencyVisitedServiceImpl extends BaseServiceImpl<StaffAgencyVi
 
 	@Override
 	public Result<StaffLatestAgencyResultDTO> getLatestStaffWechatLoginRecord(String openId) {
-		if (StringUtils.isNotBlank(openId)) {
+		if (StringUtils.isBlank(openId)) {
 			logger.error("openId 不能为空");
 			return new Result();
 		}