活码

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/KeyDataApiService.java

 package com.gic.haoban.manage.api.service;
 
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.haoban.manage.api.enums.KeyDataEnum;
 
 public interface KeyDataApiService {
     
-    public ServiceResponse<String> saveMobileData(String enterpiseId ,String linkShortCode, String mobile);
-
-    public ServiceResponse<String> getDataByKey(String key, KeyDataEnum dataEnum);
-
-    public ServiceResponse<String> getMobile(Long linkId, String key);
+    /**
+     * 
+    * @Title: saveMobileData
+    * @Description: 手机号加密
+    * @author xugh
+    * @param enterpiseId
+    * @param linkShortCode
+    * @param mobile
+    * @return
+    * @throws
+     */
+    public ServiceResponse<String> saveMobileData(String enterpiseId, String linkShortCode, String mobile);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/KeyDataService.java

@@ -2,15 +2,18 @@ package com.gic.haoban.manage.service.service;
 
 import com.gic.haoban.manage.api.dto.KeyDataDTO;
 import com.gic.haoban.manage.api.enums.KeyDataEnum;
+import com.gic.haoban.manage.service.pojo.bo.hm.KeyDataLinkBO;
 
 public interface KeyDataService {
 
     public KeyDataDTO saveData(String enterpriseId, String relationId, String data, KeyDataEnum dataEnum);
 
-    public String saveHmData(String enterpriseId, String unionid, Long linkId, Long hmId);
-
     public KeyDataDTO getDataByKey(String key, KeyDataEnum dataEnum, String relationId);
 
     public String getMobile(String key, String relationId);
 
+    public String saveDataForLink(String enterpriseId, KeyDataLinkBO bo);
+
+    public KeyDataLinkBO getDataForHmLink(String key);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/KeyDataServiceImpl.java

@@ -6,13 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.KeyDataDTO;
 import com.gic.haoban.manage.api.enums.KeyDataEnum;
 import com.gic.haoban.manage.service.dao.mapper.TabKeyDataMapper;
 import com.gic.haoban.manage.service.entity.TabKeyData;
+import com.gic.haoban.manage.service.pojo.bo.hm.KeyDataLinkBO;
+import com.gic.haoban.manage.service.pojo.bo.hm.KeyDataMobileBO;
 import com.gic.haoban.manage.service.service.KeyDataService;
 
 @Service("keyDataService")
@@ -37,16 +38,23 @@ public class KeyDataServiceImpl implements KeyDataService {
     }
 
     @Override
-    public String saveHmData(String enterpriseId, String unionid, Long linkId, Long hmId) {
-        JSONObject json = new JSONObject();
-        json.put("unid", unionid);
-        json.put("ljid", linkId);
-        json.put("hmid", hmId);
-        KeyDataDTO data = this.saveData(enterpriseId, String.valueOf(linkId), json.toString(), KeyDataEnum.DYNAMIC_HM);
+    public String saveDataForLink(String enterpriseId, KeyDataLinkBO link) {
+        KeyDataDTO data = this.saveData(enterpriseId, String.valueOf(link.getLinkId()), JSON.toJSONString(link),
+                KeyDataEnum.DYNAMIC_HM);
         return data.getDataKey();
     }
 
     @Override
+    public KeyDataLinkBO getDataForHmLink(String key) {
+        TabKeyData tab = this.tabKeyDataMapper.selectByKey(key, KeyDataEnum.DYNAMIC_HM.getType(), null);
+        if (null != tab) {
+            KeyDataLinkBO bo = JSON.parseObject(tab.getData(), KeyDataLinkBO.class);
+            return bo;
+        }
+        return null;
+    }
+
+    @Override
     public KeyDataDTO getDataByKey(String key, KeyDataEnum dataEnum, String relationId) {
         TabKeyData tab = this.tabKeyDataMapper.selectByKey(key, dataEnum.getType(), relationId);
         if (null != tab) {
@@ -59,14 +67,15 @@ public class KeyDataServiceImpl implements KeyDataService {
     public String getMobile(String key, String relationId) {
         KeyDataDTO data = this.getDataByKey(key, KeyDataEnum.MOBILE, relationId);
         if (null != data) {
-            return JSON.parseObject(data.getData()).getString("ph");
+            KeyDataMobileBO bo = JSON.parseObject(data.getData(), KeyDataMobileBO.class);
+            return bo.getMobile();
         }
         return null;
     }
 
     public static String generateKey(KeyDataEnum dataEnum, String data) {
         if (dataEnum.equals(KeyDataEnum.MOBILE)) {
-            String phone = JSON.parseObject(data).getString("ph");
+            String phone = JSON.parseObject(data).getString("mobile");
             return Long.toHexString(Long.valueOf(phone));
         }
         return UniqueIdUtils.uniqueLongHex();

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/KeyDataApiServiceImpl.java

@@ -4,12 +4,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.KeyDataDTO;
 import com.gic.haoban.manage.api.enums.KeyDataEnum;
 import com.gic.haoban.manage.api.service.KeyDataApiService;
-import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
+import com.gic.haoban.manage.service.pojo.bo.hm.KeyDataMobileBO;
 import com.gic.haoban.manage.service.service.KeyDataService;
 
 @Service("keyDataApiService")
@@ -20,30 +19,10 @@ public class KeyDataApiServiceImpl implements KeyDataApiService {
 
     @Override
     public ServiceResponse<String> saveMobileData(String enterpiseId, String linkShortCode, String mobile) {
-        JSONObject json = new JSONObject();
-        json.put("ph", mobile);
-        KeyDataDTO keyData = this.keyDataService.saveData(enterpiseId, linkShortCode, json.toString(),
+        KeyDataMobileBO bo = new KeyDataMobileBO();
+        bo.setMobile(mobile);
+        KeyDataDTO keyData = this.keyDataService.saveData(enterpiseId, linkShortCode, JSON.toJSONString(bo),
                 KeyDataEnum.MOBILE);
         return ServiceResponse.success(keyData.getDataKey());
     }
-
-    @Override
-    public ServiceResponse<String> getDataByKey(String key, KeyDataEnum dataEnum) {
-        KeyDataDTO data = this.keyDataService.getDataByKey(key, dataEnum, null);
-        if (null != data) {
-            return ServiceResponse.success(data.getData());
-        }
-        return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), "数据不存在");
-    }
-
-    @Override
-    public ServiceResponse<String> getMobile(Long linkId, String key) {
-        KeyDataDTO data = this.keyDataService.getDataByKey(key, KeyDataEnum.MOBILE, String.valueOf(linkId));
-        if (null != data) {
-            JSONObject json = JSON.parseObject(data.getData());
-            return ServiceResponse.success(json.getString("ph"));
-        }
-        return null;
-    }
-
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -33,6 +33,7 @@ import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmLinkBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmPageBO;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
+import com.gic.haoban.manage.service.pojo.bo.hm.KeyDataLinkBO;
 import com.gic.haoban.manage.service.service.KeyDataService;
 import com.gic.haoban.manage.service.service.MemberQueryService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
@@ -74,12 +75,12 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     private WxEnterpriseService wxEnterpriseService;
     @Autowired
     private HmPageService hmPageService;
-    
+
     @Override
     public ServiceResponse<String> getHmLinkUrl() {
         return ServiceResponse.success(config.getHmLinkUrl());
     }
-    
+
     @Override
     public ServiceResponse<HmLinkDTO> getByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId) {
         HmLinkBO link = this.hmLinkService.getByLinkId(wxEnterpriseId, enterpriseId, linkId);
@@ -274,7 +275,11 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             }
         }
         if (null != hm) {
-            String key = this.keyDataService.saveHmData(enterpriseId, unionid, linkId, hm.getHmId());
+            KeyDataLinkBO bo = new KeyDataLinkBO();
+            bo.setUnionid(unionid);
+            bo.setLinkId(linkId);
+            bo.setHmId(hm.getHmId());
+            String key = this.keyDataService.saveDataForLink(enterpriseId, bo);
             if (null != key) {
                 this.addQrcode(hm, key, wxEnterpriseDTO.getCorpid(), retDTO);
             }