平阴联动平台 登陆pc工作端接口

epmet-auth/src/main/java/com/epmet/controller/SsoController.java

@@ -5,7 +5,9 @@ import com.epmet.commons.thirdplat.bean.ThirdPlatUserInfo;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.SsoLoginFormDTO;
+import com.epmet.dto.form.SsoLoginOperFormDTO;
 import com.epmet.dto.result.SsoLoginResultDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.service.SsoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,7 +30,7 @@ public class SsoController {
     private JcetApiService jcetApiService;
 
     /**
-     * @Description  0、入口：得到token
+     * @Description 0、泸州app登陆入口：得到token
      * @Param formDTO
      * @author zxc
      * @date 2021/1/18 下午4:59
@@ -39,6 +41,18 @@ public class SsoController {
         return new Result<SsoLoginResultDTO>().ok(ssoService.ssoLogin(formDTO));
     }
 
+    /**
+     * @Description 0、第三方系统跳转至 运营平台登陆接口
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/1/18 下午4:59
+     */
+    @PostMapping("oper/third/login")
+    public Result<UserTokenResultDTO> thirdLoginOper(@RequestBody SsoLoginOperFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, SsoLoginOperFormDTO.ThirdPlatformLoginForm.class);
+        return new Result<UserTokenResultDTO>().ok(ssoService.thirdLoginOper(formDTO));
+    }
+
     @PostMapping("test")
     public Result<ThirdPlatUserInfo> testssoLogin() {
         ThirdPlatUserInfo userInfoByTicket = null;

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

@@ -14,12 +14,16 @@ public class SsoLoginFormDTO implements Serializable {
 
     private static final long serialVersionUID = -6543952487970013031L;
 
-    public interface SsoLoginForm{}
+    public interface SsoLoginForm {
+    }
+
+    public interface ThirdPlatformLoginForm {
+    }
 
     /**
      *  sso票据，有效期为300秒
      */
-    @NotBlank(message = "sso票据不能为空",groups = SsoLoginForm.class)
+    @NotBlank(message = "sso票据不能为空", groups = {SsoLoginForm.class, ThirdPlatformLoginForm.class})
     private String ticket;
 
     /**
@@ -36,4 +40,18 @@ public class SsoLoginFormDTO implements Serializable {
 
     @NotBlank(message = "client不能为空", groups = SsoLoginForm.class)
     private String client;
+
+    /**
+     * 上游系统token
+     */
+    @NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class})
+    private String thirdToken;
+
+    /**
+     * 上游系统token
+     *
+     * @see com.epmet.enums.ThirdPlatformEnum
+     */
+    @NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class})
+    private String platform;
 }

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

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/1/18 下午4:43
+ */
+@Data
+public class SsoLoginOperFormDTO extends LoginCommonFormDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 8711491709544498082L;
+
+    public interface ThirdPlatformLoginForm {
+    }
+
+    /**
+     * 上游系统token
+     */
+    @NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class})
+    private String thirdToken;
+
+    /**
+     * 上游系统token
+     *
+     * @see com.epmet.enums.ThirdPlatformEnum
+     */
+    @NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class})
+    private String platform;
+}

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

@@ -0,0 +1,57 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/1/18 下午4:43
+ */
+@Data
+public class ThirdPlatFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6543952487970013031L;
+
+    public interface SsoLoginForm {
+    }
+
+    public interface ThirdPlatformLoginForm {
+    }
+
+    /**
+     * sso票据，有效期为300秒
+     */
+    @NotBlank(message = "sso票据不能为空", groups = {SsoLoginForm.class, ThirdPlatformLoginForm.class})
+    private String ticket;
+
+    /**
+     * 三方平台应用AppId
+     */
+    @NotBlank(message = "三方平台应用AppId不能为空", groups = SsoLoginForm.class)
+    private String appId;
+
+    /**
+     * app类型 resi；居民段，work：工作端
+     */
+    @NotBlank(message = "app不能为空", groups = SsoLoginForm.class)
+    private String app;
+
+    @NotBlank(message = "client不能为空", groups = SsoLoginForm.class)
+    private String client;
+
+    /**
+     * 上游系统token
+     */
+    @NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class})
+    private String thirdToken;
+
+    /**
+     * 上游系统token
+     *
+     * @see com.epmet.enums.ThirdPlatformEnum
+     */
+    @NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class})
+    private String platform;
+}

epmet-auth/src/main/java/com/epmet/enums/ThirdPlatformEnum.java

@@ -0,0 +1,50 @@
+package com.epmet.enums;
+
+/**
+ * 系统环境变量枚举类
+ * dev|test|prod
+ *
+ * @author jianjun liu
+ * @date 2020-07-03 11:14
+ **/
+public enum ThirdPlatformEnum {
+	/**
+	 * 平阴联动指挥平台
+	 */
+	PINGYIN_LIANDONG("pyld", "平阴联动指挥平台", "pyldApiService"),
+	;
+
+	private String code;
+	private String name;
+	private String apiService;
+
+
+	ThirdPlatformEnum(String code, String name, String apiService) {
+		this.code = code;
+		this.name = name;
+		this.apiService = apiService;
+	}
+
+	public static ThirdPlatformEnum getEnum(String code) {
+		ThirdPlatformEnum[] values = ThirdPlatformEnum.values();
+		for (ThirdPlatformEnum value : values) {
+			if (value.getCode().equals(code)) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getApiService() {
+		return apiService;
+	}
+}

epmet-auth/src/main/java/com/epmet/service/SsoService.java

@@ -1,7 +1,9 @@
 package com.epmet.service;
 
 import com.epmet.dto.form.SsoLoginFormDTO;
+import com.epmet.dto.form.SsoLoginOperFormDTO;
 import com.epmet.dto.result.SsoLoginResultDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
 
 /**
  * @Author zxc
@@ -17,4 +19,13 @@ public interface SsoService {
      */
     SsoLoginResultDTO ssoLogin(SsoLoginFormDTO formDTO);
 
+    /**
+     * desc: sso登陆运营端
+     *
+     * @param formDTO
+     * @return com.epmet.dto.result.UserTokenResultDTO
+     * @author LiuJanJun
+     * @date 2021/2/24 1:28 下午
+     */
+    UserTokenResultDTO thirdLoginOper(SsoLoginOperFormDTO formDTO);
 }

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

@@ -10,11 +10,13 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.UserDTO;
-import com.epmet.dto.form.ApiServiceFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.SsoLoginFormDTO;
+import com.epmet.dto.result.GovWebOperLoginResultDTO;
-import com.epmet.dto.form.UserInfoFormDTO;
 import com.epmet.dto.result.SsoLoginResultDTO;
 import com.epmet.dto.result.ThirdplatApiserviceResultDTO;
+import com.epmet.dto.result.UserTokenResultDTO;
+import com.epmet.enums.ThirdPlatformEnum;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
@@ -22,12 +24,14 @@ import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.redis.SsoRedis;
 import com.epmet.service.SsoService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
 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 java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -56,6 +60,9 @@ public class SsoServiceImpl implements SsoService {
     @Autowired
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
 
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
+
     /**
      * @Description 0、入口：得到token
      * @Param formDTO
@@ -110,10 +117,52 @@ public class SsoServiceImpl implements SsoService {
         if (StringUtils.isBlank(customerId)) {
             throw new RenException("【SSO登录】customerId为空,缓存放置token失败");
         }
-        this.disposeTokenDto(formDTO, userId, token, customerId);
+        this.disposeTokenDto(formDTO.getApp(), formDTO.getClient(), userId, token, customerId);
         return new SsoLoginResultDTO(token);
     }
 
+    @Override
+    public UserTokenResultDTO thirdLoginOper(SsoLoginOperFormDTO formDTO) {
+        ThirdPlatUserInfo thirdUser;
+        try {
+            ThirdPlatformEnum platformEnum = ThirdPlatformEnum.getEnum(formDTO.getPlatform());
+            String apiService = platformEnum.getApiService();
+            AbstractApiService apiServiceImpl = (AbstractApiService) SpringContextUtils.getBean(apiService);
+            thirdUser = apiServiceImpl.getUserInfoByTicket(formDTO.getThirdToken());
+        } catch (Exception e) {
+            throw new RenException(e.getMessage());
+        }
+        //获取用户信息
+        GovWebOperLoginFormDTO form = new GovWebOperLoginFormDTO();
+        form.setCustomerId(thirdUser.getCustomerId());
+        form.setMobile(thirdUser.getMobile());
+        Result<GovWebOperLoginResultDTO> result = epmetUserFeignClient.getStaffIdAndPwd(form);
+        //todo userId 写死测试 3f7f852ce22c511aa67ecb695395295d start
+        GovWebOperLoginResultDTO demo = new GovWebOperLoginResultDTO();
+        demo.setUserId("3f7f852ce22c511aa67ecb695395295d");
+        result = new Result<>();
+        result.ok(demo);
+        //test end
+
+        if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {
+            logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在");
+            throw new RenException(EpmetErrorCode.ERR10003.getCode());
+        }
+
+        //4、生成token返回，且将TokenDto存到redis
+        //生成业务token
+        GovWebOperLoginResultDTO epmetUser = result.getData();
+
+
+        String token = this.generateToken(formDTO.getApp(), formDTO.getClient(), epmetUser.getUserId());
+        //存放Redis
+
+        this.disposeTokenDto(formDTO.getApp(), formDTO.getClient(), epmetUser.getUserId(), token, thirdUser.getCustomerId());
+        UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+        userTokenResultDTO.setToken(token);
+        return userTokenResultDTO;
+    }
+
     /**
      * @Description token放缓存
      * @Param formDTO
@@ -123,12 +172,12 @@ public class SsoServiceImpl implements SsoService {
      * @author zxc
      * @date 2021/1/18 下午5:32
      */
-    public void disposeTokenDto(SsoLoginFormDTO formDTO, String userId, String token, String customerId){
+    public void disposeTokenDto(String app, String client, String userId, String token, String customerId) {
         int expire = jwtTokenProperties.getExpire();
         TokenDto tokenDto = new TokenDto();
         tokenDto.setCustomerId(customerId);
-        tokenDto.setApp(formDTO.getApp());
+        tokenDto.setApp(app);
-        tokenDto.setClient(formDTO.getClient());
+        tokenDto.setClient(client);
         tokenDto.setUserId(userId);
         tokenDto.setToken(token);
         tokenDto.setUpdateTime(System.currentTimeMillis());
@@ -182,4 +231,25 @@ public class SsoServiceImpl implements SsoService {
         log.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer);
         return customer.getId();
     }
+
+    public static void main(String[] args) {
+        String url = "https://epmet-ext9.elinkservice.cn/platform/unifiedAuth/loginCheck";
+        String platformToken = "1348803062424166401_dd08e23b0d524879a5c67e7f2ffd1468";
+        String appId = "7a5aec009ba4eba8e254ee64fe3775e1";
+        String appKey = "14faef9af508d1c253b720ea5a43f9de";
+        String appSecret = "38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595";
+        long ts = System.currentTimeMillis();
+        String message = appId + appKey + appSecret + ts;
+        String accessToken = DigestUtils.md5Hex(message.getBytes(StandardCharsets.UTF_8));
+        //ThirdPlatformEnum platformEnum = ThirdPlatformEnum.getEnum("pyld");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("platformToken", platformToken);
+
+        Map<String, Object> headerMap = new HashMap<>(4);
+        headerMap.put("AppKey", appKey);
+        headerMap.put("Timestamp", ts);
+        headerMap.put("AccessToken", accessToken);
+        Result<String> stringResult = HttpClientManager.getInstance().sendPost(url, url.startsWith("https://"), jsonObject.toJSONString(), headerMap);
+        System.out.println(stringResult);
+    }
 }

epmet-auth/src/main/resources/bootstrap.yml

@@ -139,3 +139,8 @@ thirdplat:
     domain: @thirdplat.jcet.domain@
     appkey: @thirdplat.jcet.appkey@
     appsecret: @thirdplat.jcet.appsecret@
+  pyld:
+    domain: https://epmet-ext9.elinkservice.cn/platform
+    appId: 7a5aec009ba4eba8e254ee64fe3775e1
+    appKey: 14faef9af508d1c253b720ea5a43f9de
+    appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/AbstractApiService.java

@@ -32,7 +32,6 @@ public abstract class AbstractApiService {
             throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(),
                     EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getMsg().concat(":").concat(thResult.getInternalMsg()));
         }
-
         JcetResult jcetResult = JSON.parseObject(thResult.getData(), JcetResult.class);
         if (!jcetResult.isSuccess()) {
             throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(),

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java

@@ -13,11 +13,14 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
+@Service
 public class JcetApiService extends AbstractApiService {
 
     Logger logger = LoggerFactory.getLogger(getClass());
@@ -35,6 +38,7 @@ public class JcetApiService extends AbstractApiService {
      * @author wxz
      * @date 2021.01.19 10:26
      */
+    @Override
     public ThirdPlatUserInfo getUserInfoByTicket(String ticket) throws UnsupportedEncodingException {
 
         logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>");
@@ -98,10 +102,10 @@ public class JcetApiService extends AbstractApiService {
      * @return
      * @throws UnsupportedEncodingException
      */
-    private Map<String, String> getHeaders(Object contentObject) throws UnsupportedEncodingException {
+    private Map<String, Object> getHeaders(Object contentObject) throws UnsupportedEncodingException {
-        int bodyLength = JSON.toJSONString(contentObject).getBytes("utf-8").length;
+        int bodyLength = JSON.toJSONString(contentObject).getBytes(StandardCharsets.UTF_8).length;
 
-        Map<String, String> headers = new HashMap();
+        Map<String, Object> headers = new HashMap();
         long timestamp = System.currentTimeMillis();
         headers.put(JcetConstants.PLAT_HEADER_OPEN_TIMESTAMP, String.valueOf(timestamp));
         headers.put(JcetConstants.PLAT_HEADER_OPEN_APP_ID, jcetThirdplatProps.getAppkey());

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java

@@ -0,0 +1,126 @@
+package com.epmet.commons.thirdplat.apiservice.pyld;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.epmet.commons.thirdplat.apiservice.AbstractApiService;
+import com.epmet.commons.thirdplat.bean.ThirdPlatUserInfo;
+import com.epmet.commons.thirdplat.constants.PyldConstants;
+import com.epmet.commons.thirdplat.dto.result.jcet.PyldUserInfoResultDTO;
+import com.epmet.commons.thirdplat.properties.PyldThirdplatProps;
+import com.epmet.commons.thirdplat.properties.ThirdplatProps;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.commons.tools.utils.Result;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class PyldApiService extends AbstractApiService {
+
+    Logger logger = LoggerFactory.getLogger(getClass());
+
+    private PyldThirdplatProps pyldThirdplatProps;
+
+    public PyldApiService(ThirdplatProps props) {
+        this.thirdplatProps = props;
+        pyldThirdplatProps = props.getPyld();
+    }
+
+    /**
+     * @return
+     * @Description 通过第三方平台ticket获取用户信息
+     * @author wxz
+     * @date 2021.01.19 10:26
+     */
+    @Override
+    public ThirdPlatUserInfo getUserInfoByTicket(String platformToken) {
+
+        logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>");
+        logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口入参 platformToken:{}", platformToken);
+
+        try {
+            JSONObject jsonParam = new JSONObject();
+            jsonParam.put(PyldConstants.PLAT_PARAM_TOKEN, platformToken);
+            jsonParam.put(PyldConstants.PLAT_PARAM_MANAGEMENTKEY, PyldConstants.PLAT_PARAM_MANAGEMENTKEY_VALUE);
+
+            String domain = pyldThirdplatProps.getDomain();
+            Result<String> result = HttpClientManager.getInstance().sendPost(
+                    domain.concat(PyldConstants.METHOD_CHECK_LOGIN),
+                    domain.startsWith("https://"),
+                    jsonParam.toJSONString(),
+                    buildHeaders());
+
+            logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口返回:{}", result.getData());
+
+            logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口结束<<<<<<<<<<<<");
+
+            PyldUserInfoResultDTO resultDTO = this.parseResult(result);
+
+            ThirdPlatUserInfo userInfo = new ThirdPlatUserInfo();
+            userInfo.setMobile(resultDTO.getMobile());
+            userInfo.setCustomerId(resultDTO.getReserved());
+            return userInfo;
+        } catch (Exception e) {
+            logger.error("getUserInfoByTicket exception", e);
+        }
+        return null;
+    }
+
+
+    /**
+     * 构建请求头信息
+     *
+     * @return
+     */
+    private Map<String, Object> buildHeaders() {
+        Map<String, Object> headers = new HashMap();
+        long timestamp = System.currentTimeMillis();
+        headers.put(PyldConstants.PLAT_HEADER_TIMESTAMP, timestamp);
+        headers.put(PyldConstants.PLAT_HEADER_APP_KEY, pyldThirdplatProps.getAppkey());
+        String encryptContent = pyldThirdplatProps.getAppId() + pyldThirdplatProps.getAppkey() + pyldThirdplatProps.getAppSecret() + timestamp;
+        headers.put(PyldConstants.PLAT_HEADER_ACCESS_TOKEN, DigestUtils.md5Hex(encryptContent.getBytes(StandardCharsets.UTF_8)));
+        return headers;
+    }
+
+    /**
+     * desc: 解析结果
+     *
+     * @param thResult
+     * @return com.epmet.commons.thirdplat.dto.result.jcet.JcetUserInfoResultDTO
+     * @author LiuJanJun
+     * @date 2021/2/24 10:11 上午
+     */
+    private PyldUserInfoResultDTO parseResult(Result<String> thResult) {
+        if (!thResult.success()) {
+            throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(),
+                    EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getMsg().concat(":").concat(thResult.getInternalMsg()));
+        }
+        JSONObject jcetResult = JSON.parseObject(thResult.getData());
+        Integer code = jcetResult.getInteger("code");
+        String msg = jcetResult.getString("msg");
+        if (code == null || code != 0) {
+            throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(), msg.concat(",错误码:") + code);
+        }
+        JSONObject data = jcetResult.getJSONObject("data");
+        if (data == null) {
+            throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(),
+                    EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getMsg().concat(":").concat(PyldConstants.REPONSE_USER_NOT_LOGIN));
+        }
+        PyldUserInfoResultDTO userInfo = data.getObject("userInfo", PyldUserInfoResultDTO.class);
+        if (userInfo == null || StringUtils.isBlank(userInfo.getMobile()) || StringUtils.isBlank(userInfo.getReserved())) {
+            throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(),
+                    EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getMsg().concat(":").concat(PyldConstants.REPONSE_USER_NOT_LOGIN));
+        }
+        return userInfo;
+    }
+
+
+}

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/bean/ThirdPlatUserInfo.java

@@ -7,4 +7,5 @@ public class ThirdPlatUserInfo {
     private String openId;
     private String name;
     private String mobile;
+    private String customerId;
 }

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/constants/PyldConstants.java

@@ -0,0 +1,18 @@
+package com.epmet.commons.thirdplat.constants;
+
+public interface PyldConstants {
+
+    String METHOD_CHECK_LOGIN = "/unifiedAuth/loginCheck";
+
+
+    String PLAT_HEADER_TIMESTAMP = "timestamp";
+    String PLAT_HEADER_APP_KEY = "appkey";
+    String PLAT_HEADER_ACCESS_TOKEN = "accessToken";
+
+
+    String PLAT_PARAM_TOKEN = "platformToken";
+    String PLAT_PARAM_MANAGEMENTKEY = "managementKey";
+    String PLAT_PARAM_MANAGEMENTKEY_VALUE = "epmet_work";
+
+    String REPONSE_USER_NOT_LOGIN = "用户未登陆";
+}

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/dto/result/jcet/PyldUserInfoResultDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.commons.thirdplat.dto.result.jcet;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PyldUserInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 6176427074670949388L;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 客户Id
+     */
+    private String reserved;
+}

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/PyldThirdplatProps.java

@@ -0,0 +1,14 @@
+package com.epmet.commons.thirdplat.properties;
+
+import lombok.Data;
+
+/**
+ * 酒城e通三方平台配置
+ */
+@Data
+public class PyldThirdplatProps {
+    private String domain;
+    private String appId;
+    private String appkey;
+    private String appSecret;
+}

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/ThirdplatProps.java

@@ -6,7 +6,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @Data
 @ConfigurationProperties(prefix = "thirdplat")
 public class ThirdplatProps {
-
+    /**
+     * 泸州 酒城e通
+     */
     private JcetThirdplatProps jcet;
+    /**
+     * 平阴联动指挥平台
+     */
+    private PyldThirdplatProps pyld;
 
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java

@@ -33,7 +33,7 @@ public enum EnvEnum {
 	public static EnvEnum getEnum(String code) {
 		EnvEnum[] values = EnvEnum.values();
 		for (EnvEnum value : values) {
-			if (code != null && value.getCode().equals(code)) {
+			if (value.getCode().equals(code)) {
 				return value;
 			}
 		}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -188,7 +188,7 @@ public class HttpClientManager {
 
 	}
 
-	public Result<String> sendPost(String url, boolean isHttps, String jsonStrParam,Map<String,String> headerMap) {
+	public Result<String> sendPost(String url, boolean isHttps, String jsonStrParam, Map<String, Object> headerMap) {
 
 		try {
 			HttpPost httppost = new HttpPost(url);
@@ -196,7 +196,8 @@ public class HttpClientManager {
 			httppost.addHeader(HEADER_CONTENT_TYPE, HEADER_APPLICATION_JSON);
 			if (null != headerMap) {
 				headerMap.forEach((k, v) -> {
-					httppost.addHeader(k,v);
+					if (v != null)
+						httppost.addHeader(k, v.toString());
 				});
 			}
 			if (StringUtils.isNotEmpty(jsonStrParam)) {