From b35a46c502f4bcc22c75e9e3c7fd29af5b98d84b Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 05 三月 2025 16:06:54 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 68 +++++++++++++++++++++++++++++++--- 1 files changed, 62 insertions(+), 6 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java index eb378b4..77c2f83 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java @@ -1,6 +1,5 @@ package com.doumee.service.business.impl.hksync.ferp; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.doumee.biz.system.SystemDictDataBiz; @@ -11,20 +10,23 @@ import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.respose.*; import com.doumee.core.haikang.service.HKService; -import com.doumee.core.model.LoginUserInfo; +import com.doumee.service.business.third.model.LoginUserInfo; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.ImageBase64Util; import com.doumee.dao.business.*; import com.doumee.dao.business.dao.CompanyMapper; +import com.doumee.dao.business.dao.MemberMapper; import com.doumee.dao.business.join.MemberJoinMapper; import com.doumee.dao.business.model.*; +import com.doumee.dao.business.model.Member; +import com.doumee.dao.system.SystemUserMapper; +import com.doumee.dao.system.model.SystemUser; import com.doumee.service.business.ext.ERPSyncService; import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl; import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -64,9 +66,63 @@ @Autowired private ERPSyncService erpSyncService; @Autowired + private SystemUserMapper systemUserMapper; + @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired private DataSyncConfig dataSyncConfig; + + /** + * 缁戝畾娴峰悍鐢ㄦ埛openId + * { + * "openId" : "ovmre6R7w-vEQCHg52-UN2mV_abI", + * "userName" : "13856591439", + * "appKey" : "wx173e6caf5abc718a", + * "oaId" : "atwl", + * "platformName" : "瀹夋嘲鐗╂祦鍥尯", + * + * } + */ + @Override + public String syncHkUserOpenid(Integer id){ + SystemUser user = systemUserMapper.selectById(id); + if(user == null ||StringUtils.isBlank(user.getOpenid()) ||Constants.equalsInteger(user.getOpenidHkStatus(),Constants.ONE)){ + return null; + } + UserOpenidSaveRequest request = new UserOpenidSaveRequest(); + request.setUserName(user.getUsername()); + request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode()); + request.setOaId("atwl"); + request.setOpenId(user.getOpenid()); + request.setPlatformName(user.getRealname()); + BaseResponse<Integer> response = HKService.userOpenidSave(request); + if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE) && Constants.equalsInteger(response.getData(),Constants.ONE)){ + user.setOpenidHkStatus(Constants.ONE); + user.setOpenidHkInfo("缁戝畾鎴愬姛"); + }else{ + user.setOpenidHkStatus(Constants.TWO); + user.setOpenidHkInfo(response!=null?StringUtils.defaultString(response.getMsg(),"銆愭湭鐭ュけ璐ュ師鍥犮��"):"缁戝畾澶辫触"); + } + user.setOpenidHkDate(new Date()); + systemUserMapper.updateById(user); + return "鎴愬姛"; + } + @Override + public String delHkUserOpenid(UserOpenidSaveRequest param){ + UserOpenidSaveRequest request = new UserOpenidSaveRequest(); + request.setUserName(param.getUserName()); + request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode()); + BaseResponse response = HKService.userOpenidDel(request); + if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE)){ + } + request.setUserName(null); + request.setOpenId(param.getOpenId()); + request.setAppKey(systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode()); + response = HKService.userOpenidDel(request); + if(response!=null &&response.getCode().equals(HKConstants.RESPONSE_SUCCEE)){ + } + return "鎴愬姛"; + } /** * 鍚屾娴峰悍缁勭粐淇℃伅,鏍规嵁erp鍚屾缁勭粐缁撴灉锛屽畾鏃舵鏌ラ渶瑕佷笅鍙戝埌娴峰悍鐨勭粍缁囦俊鎭� @@ -151,7 +207,7 @@ if(addList!=null &&addList.size()>0){ //澶勭悊鏂板 BaseResponse<OrgOrUserAddResponse> result = HKService.addBatchOrg(addList); - if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){ + if(result !=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE)){ OrgOrUserAddResponse data = result.getData(); if(data.getSuccesses()!=null && data.getSuccesses().size()>0){ //澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵�� @@ -287,7 +343,7 @@ return; } Date date = new Date(); - String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); for(Member c : list){ dealMemberInfoBiz(c,date,path) ; @@ -692,7 +748,7 @@ //澶勭悊鏂板鏁版嵁 BaseResponse result = HKService.editUser(addHkModel); if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){ - if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){ + if(StringUtils.isNotBlank(c.getFaceImg()) && !Constants.equalsInteger(c.getFaceStatus(),Constants.TWO)){ //濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾 String faceid = dealMemberFace(c,path); if(StringUtils.isBlank(faceid)){ -- Gitblit v1.9.3