From bbab8c7666f778e70538eba8e4b0ae1c27fe1c39 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Tue, 5 Aug 2025 09:47:22 +0800 Subject: [PATCH] =?UTF-8?q?#chabaodao-4#=20e=E7=AD=BE=E5=AE=9D=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chapanda/beisen/dao/HrmAssessmentDao.java | 31 +++ .../esb/Esb2BeisenJobRequirementAction.java | 1 - .../beisen/esb/Esb2BeisenOfferCronJob.java | 6 +- .../esb/Esb2BeisenPerformanceCronJobNew.java | 26 +- .../chapanda/esign/constant/Constants.java | 19 ++ .../controller/SealTemplateController.java | 18 ++ .../chapanda/esign/dao/SealTemplateDao.java | 33 ++- .../esb/Esb2EsignCreateRequestAction.java | 64 +++++ .../esign/esb/Esb2EsignCreateUserAction.java | 55 +++++ .../esign/service/SealTemplateService.java | 2 + .../service/impl/SealTemplateServiceImpl.java | 85 ++++++- .../esign/util/Esb2EsignApplyRequestUtil.java | 185 +++++++++++++++ .../esign/util/Esb2EsignCreateUserUtil.java | 154 ++++++++++++ .../esign/util/Esb2EsignPreviewUrlUtil.java | 2 +- .../Esb2EsignTemplateSealPostionUtil.java | 224 ++++++++++++++++++ .../chapanda/feishu/constant/Constants.java | 2 +- .../feishu/dao/HrmQueryOpenIdDao.java | 58 +++++ .../chapanda/feishu/dao/HrmUserAvatarDao.java | 93 ++++++++ .../feishu/esb/Esb2FeishuHrmAvatarAction.java | 57 +++++ .../esb/Esb2FeishuHrmAvatarDateCron.java | 9 +- .../esb/Esb2FeishuHrmAvatarFullCron.java | 7 +- .../esb/Esb2FeishuSendFinishAction.java | 4 +- .../esb/Esb2FeishuSendMessageCardAction.java | 4 +- .../feishu/util/Esb2FeishuHrmAvatarUtil.java | 101 ++++++++ .../util/Esb2FeishuProfilePictureUtil.java | 61 ++++- .../feishu/util/Esb2FeishuSendDeleteUtil.java | 5 +- .../feishu/util/Esb2FeishuSendDoneUtil.java | 3 + .../feishu/util/Esb2FeishuSendFinishUtil.java | 3 +- .../util/Esb2FeishuSendMessageUtil.java | 13 +- .../util/Esb2FeishuUploadImageUtil.java | 129 +++++----- .../Esb2QunjieEconomicCompensationAction.java | 5 + .../esb/Esb2QunjieFinshSealApplyAction.java | 12 +- .../util/Esb2QunjieFinshSealApplyUtil.java | 13 +- 33 files changed, 1373 insertions(+), 111 deletions(-) create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateRequestAction.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateUserAction.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignApplyRequestUtil.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignCreateUserUtil.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignTemplateSealPostionUtil.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/dao/HrmQueryOpenIdDao.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/dao/HrmUserAvatarDao.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarAction.java create mode 100644 secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuHrmAvatarUtil.java diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/dao/HrmAssessmentDao.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/dao/HrmAssessmentDao.java index 0b036e2..e24a8fa 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/dao/HrmAssessmentDao.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/dao/HrmAssessmentDao.java @@ -225,4 +225,35 @@ public class HrmAssessmentDao { } return dataMap; } + + + public Map queryEmployeeAssessmentOtherInfo(String employeeid){ + String groupId = "weaver-ebuilder-form-service"; + String sourceType = "LOGIC"; + Map employeeMap = new HashMap(); + try{ + + String dataSql =" select hiredate as rzrq,zhgzr as lzrq,zzrq,personnel_status as ryzt,subcompany as gs,yjbm as bm1,ejbm as bm2,sanjbm as bm3,sijbm as bm4,rylb,location as gzdd" + + " from uf_jcl_employee_information \n" + + " where id = ? " + + " and tenant_key = ? \n" + + " and delete_type = 0 " ; + + log.error("dataSql:{}" , dataSql); + List paramList = new ArrayList<>(100); + paramList.add(employeeid); + paramList.add(Constants.TENANT_KEY); + List sqlParamList = databaseUtils.querySqlParamEntity(paramList); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlParamList); + List> recordList = databaseUtils.getDataSourceList(result); + log.error("recordList:{}",recordList.size()); + if(recordList.size() > 0){ + employeeMap = recordList.get(0); + } + }catch (Exception e){ + log.error("e:{}", e); + } + return employeeMap; + } + } diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenJobRequirementAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenJobRequirementAction.java index 4e0d786..3dd14d2 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenJobRequirementAction.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenJobRequirementAction.java @@ -62,7 +62,6 @@ public class Esb2BeisenJobRequirementAction implements EsbServerlessRpcRemoteInt String requestname = (String) params.get("requestname"); String createDate = (String) params.get("createDate"); - int requirementCount = converInteger(params,"requirementCount") ; String arivalTime = (String) params.get("arivalTime"); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenOfferCronJob.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenOfferCronJob.java index 21a7487..58736a5 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenOfferCronJob.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenOfferCronJob.java @@ -11,8 +11,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -21,7 +19,7 @@ public class Esb2BeisenOfferCronJob implements EsbServerlessRpcRemoteInterface { private final static Logger log = LoggerFactory.getLogger(Esb2BeisenOfferCronJob.class); @Autowired - Token2BeiSenUtil http2BenSenUtil ; + Token2BeiSenUtil token2BeiSenUtil ; @Autowired Offer2BeiSenUtil offer2BeiSenUtil; @@ -48,7 +46,7 @@ public class Esb2BeisenOfferCronJob implements EsbServerlessRpcRemoteInterface { String endDate = String.valueOf(params.get("endDate")); String endTime = String.valueOf(params.get("endTime")); - String token = http2BenSenUtil.getToken(); + String token = token2BeiSenUtil.getToken(); log.error("token:{}",token); if(StringUtils.isNotBlank(token)){ diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenPerformanceCronJobNew.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenPerformanceCronJobNew.java index 1cdf3c2..6c9ba89 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenPerformanceCronJobNew.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/beisen/esb/Esb2BeisenPerformanceCronJobNew.java @@ -21,10 +21,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service("Esb2BeisenPerformanceCronJobNew") public class Esb2BeisenPerformanceCronJobNew implements EsbServerlessRpcRemoteInterface { @@ -216,6 +213,16 @@ public class Esb2BeisenPerformanceCronJobNew implements EsbServerlessRpcRemoteIn } } + for(String ebId:ebList){ + + String rylb = ""; + String bm1 = ""; + if("2".equals(rylb)){ + + }else if("".equals(bm1)){ + + } + } log.error("ebList:{}", JSON.toJSONString(ebList)); @@ -366,6 +373,16 @@ public class Esb2BeisenPerformanceCronJobNew implements EsbServerlessRpcRemoteIn String employeeid = String.valueOf(employeeMap.get(value)); log.error("employeeid:{}",employeeid); dataJson.put("bkhr",employeeid); + if(StringUtils.isNotBlank(employeeid)){ + Map otherMap = hrmAssessmentDao.queryEmployeeAssessmentOtherInfo(employeeid); + Iterator> iterator = otherMap.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + String emKey = entry.getKey(); + String emValue = entry.getValue().toString(); + dataJson.put(emKey,emValue); + } + } } } } @@ -387,6 +404,7 @@ public class Esb2BeisenPerformanceCronJobNew implements EsbServerlessRpcRemoteIn if("TotalScoreRuleIdLookup".equals(name)){ dataJson.put("ppdj",text); } + } dataArray.add(dataJson); log.error("dataJson:{}",dataJson.toJSONString()); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/constant/Constants.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/constant/Constants.java index 60c8472..9fd487e 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/constant/Constants.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/constant/Constants.java @@ -44,4 +44,23 @@ public class Constants { public static String templateTable = "uf_dzqmbgl"; public static String templateTableZdb = "uf_dzqmbgl_zdb"; + + public static String qrDocSwitcher = "false"; + + public static String signFileFormat = "PDF"; + + public static String partyBaccountType = "2"; + + public static String autoSign = "false"; + + public static int edgePosition = 1; + + public static int edgeScope = 0; + + public static int sealType = 0; + + public static String partyAaccountType = "1"; + + + } diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/controller/SealTemplateController.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/controller/SealTemplateController.java index 1a47cc4..f9c812a 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/controller/SealTemplateController.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/controller/SealTemplateController.java @@ -14,7 +14,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; @RestController @@ -51,6 +53,22 @@ public class SealTemplateController { return WeaResult.success(dataMap); } + + @WeaPermission(publicPermission = true) + @GetMapping("/queryTemplateField") + public WeaResult queryTemplateField(HttpServletRequest request, HttpServletResponse response) throws IOException { + List> dataList = new ArrayList>(); + String templateId = request.getParameter("templateId"); + Map paraMap = CommonUtils.requestToMap(request); + + if(StringUtils.isNotBlank(templateId)){ + dataList = sealTemplateService.queryTemplateField(templateId,paraMap); + }else{ + return WeaResult.fail(500,"模板ID为空"); + } + return WeaResult.success(dataList); + } + /** * 测试接口 * @param request diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/dao/SealTemplateDao.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/dao/SealTemplateDao.java index a4656d1..aa533b5 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/dao/SealTemplateDao.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/dao/SealTemplateDao.java @@ -41,7 +41,9 @@ public class SealTemplateDao { Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlParamList); List> recordList = databaseUtils.getDataSourceList(result); if(recordList.size() > 0){ - dataid = String.valueOf(recordList.get(0).get("id")); + if(recordList.get(0).containsKey("id")){ + dataid = String.valueOf(recordList.get(0).get("id")); + } } }catch (Exception e){ log.error("getDepartmentCodeById:e:" + e); @@ -101,4 +103,33 @@ public class SealTemplateDao { return dataid; } + + public List> queryTemplateFieldByType(String templateId,String type){ + String groupId = "weaver-ebuilder-form-service"; + String sourceType = "LOGIC"; + List> recordList = new ArrayList>(); + try{ + String dataSql =" select k.zdm ,k.zdlx ,k.zdlx_obj ,k.zdz ,k.zdmc,k.zdz as rc \n" + + " from uf_dzqmbgl t\n" + + " inner join uf_dzqmbgl_zdb k on k.form_data_id = t.form_data_id \n" + + " where t.mbid=? and t.tenant_key=? and k.zdlx in("+type+") " + + " and t.delete_type=0 and k.tenant_key=? and k.delete_type=0 " ; + + log.error("dataSql:{}" , dataSql); + List paramList = new ArrayList<>(100); + paramList.add(templateId); + paramList.add(Constants.TENANT_KEY); + paramList.add(Constants.TENANT_KEY); + + List sqlParamList = databaseUtils.querySqlParamEntity(paramList); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlParamList); + recordList = databaseUtils.getDataSourceList(result); + log.error("recordList:{}", recordList.size()); + }catch (Exception e){ + log.error("getDepartmentCodeById:e:" + e); + } + return recordList; + } + + } diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateRequestAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateRequestAction.java new file mode 100644 index 0000000..2c61b42 --- /dev/null +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateRequestAction.java @@ -0,0 +1,64 @@ +package com.weaver.seconddev.chapanda.esign.esb; + +import com.alibaba.fastjson.JSONObject; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.seconddev.chapanda.esign.util.Esb2EsignApplyRequestUtil; +import com.weaver.seconddev.chapanda.esign.util.Esb2EsignUtil; +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.util.HashMap; +import java.util.Map; + +@Service("Esb2EsignCreateRequestAction") +public class Esb2EsignCreateRequestAction implements EsbServerlessRpcRemoteInterface { + private final static Logger log = LoggerFactory.getLogger(Esb2EsignCreateRequestAction.class); + + @Autowired + Esb2EsignApplyRequestUtil esb2EsignApplyRequestUtil; + + @Override + public WeaResult> execute(Map params) { + + String requestid = String.valueOf(params.get("requestid")); + String requestname = String.valueOf(params.get("requestname")); + String sealId = String.valueOf(params.get("sealId")); + String docFilekey = String.valueOf(params.get("docFilekey")); + String docName = String.valueOf(params.get("docName")); + String creditCode = String.valueOf(params.get("creditCode")); + + String employeeMobile = String.valueOf(params.get("employeeMobile")); + String qsrJobNum = String.valueOf(params.get("qsrJobNum")); + + String signFlowId = ""; + String signUrls = ""; + String accountIds = ""; + String uniqueIds = ""; + String fileKeys = ""; + String templateId = String.valueOf(params.get("templateId")); + if(StringUtils.isNotBlank(templateId)){ + JSONObject dataJson = esb2EsignApplyRequestUtil.applyRequest(requestid,requestname,employeeMobile,templateId,sealId,docFilekey,docName,creditCode,qsrJobNum); + signFlowId = dataJson.getString("signFlowId"); + signUrls = dataJson.getString("signUrls"); + accountIds = dataJson.getString("accountIds"); + uniqueIds = dataJson.getString("uniqueIds"); + fileKeys = dataJson.getString("fileKeys"); + } + + if(StringUtils.isBlank(fileKeys)){ + return WeaResult.fail(500,"用印申请失败"); + } + + Map actionMap = new HashMap(); + actionMap.put("code",200); + actionMap.put("signFlowId",signFlowId); + actionMap.put("accountIds",accountIds); + actionMap.put("signUrls",signUrls); + actionMap.put("uniqueIds",uniqueIds); + actionMap.put("fileKeys",fileKeys); + return WeaResult.success(actionMap); + } +} diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateUserAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateUserAction.java new file mode 100644 index 0000000..d7f270f --- /dev/null +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/esb/Esb2EsignCreateUserAction.java @@ -0,0 +1,55 @@ +package com.weaver.seconddev.chapanda.esign.esb; + +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.seconddev.chapanda.esign.util.Esb2EsignCreateUserUtil; +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.util.HashMap; +import java.util.Map; + +@Service("Esb2EsignCreateUserAction") +public class Esb2EsignCreateUserAction implements EsbServerlessRpcRemoteInterface { + private final static Logger log = LoggerFactory.getLogger(Esb2EsignCreateUserAction.class); + + @Autowired + Esb2EsignCreateUserUtil esb2EsignCreateUserUtil; + + @Override + public WeaResult> execute(Map params) { + + String mobile = String.valueOf(params.get("mobile")); + String name = String.valueOf(params.get("name")); + + if(StringUtils.isBlank(mobile)){ + return WeaResult.fail(500,"手机号为空"); + } + if(StringUtils.isBlank(name)){ + return WeaResult.fail(500,"姓名为空"); + } + + String esignAccountId = ""; + String usermobile = ""; + String uniqueId = ""; + if(StringUtils.isNotBlank(mobile) && StringUtils.isNotBlank(name)){ + Map dataMap = esb2EsignCreateUserUtil.createUser(name,mobile); + esignAccountId = String.valueOf(dataMap.get("esignAccountId")); + usermobile = String.valueOf(dataMap.get("mobile")); + uniqueId = String.valueOf(dataMap.get("mobile")); + } + + if(StringUtils.isBlank(esignAccountId)){ + return WeaResult.fail(500,"创建e签宝用户失败"); + } + + Map actionMap = new HashMap(); + actionMap.put("code",200); + actionMap.put("esignAccountId",esignAccountId); + actionMap.put("mobile",usermobile); + actionMap.put("uniqueId",uniqueId); + return WeaResult.success(actionMap); + } +} diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/SealTemplateService.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/SealTemplateService.java index 5c3f6b9..7efda0c 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/SealTemplateService.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/SealTemplateService.java @@ -2,11 +2,13 @@ package com.weaver.seconddev.chapanda.esign.service; import org.springframework.stereotype.Component; +import java.util.List; import java.util.Map; @Component public interface SealTemplateService { Map queryPreviewUrl(String templateId,Map paraMap); + List> queryTemplateField(String templateId, Map paraMap); } diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/impl/SealTemplateServiceImpl.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/impl/SealTemplateServiceImpl.java index 932b7fd..43eb1dc 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/impl/SealTemplateServiceImpl.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/service/impl/SealTemplateServiceImpl.java @@ -16,6 +16,8 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /*** @@ -72,7 +74,6 @@ public class SealTemplateServiceImpl implements SealTemplateService { } - bodyJson.put("templateFormValues",formArray); bodyJson.put("templateId",templateId); log.error("bodyJson:{}",bodyJson.toJSONString()); @@ -96,6 +97,7 @@ public class SealTemplateServiceImpl implements SealTemplateService { return dataMap; } + /*** * 转换规则 * @param paraMap @@ -172,4 +174,85 @@ public class SealTemplateServiceImpl implements SealTemplateService { bodyJson.put("formValue",value); return bodyJson; } + + + /*** + * + * @param templateId + * @param paraMap + * @return + */ + @Override + public List> queryTemplateField(String templateId, Map paraMap) { + String types = String.valueOf(paraMap.get("type")); + List> fieldList = new ArrayList>(); + String[] typeArr = types.split(","); + for(int i=0;i> dataList = sealTemplateDao.queryTemplateFieldByType(templateId,typeArr[i]); + if("3".equals(typeArr[i])){ + fieldList.addAll(convertSql2Param(dataList)); + }else{ + fieldList.addAll(convertParam2Param(dataList)); + } + } + return fieldList; + } + + + public List> convertSql2Param(List> dataList){ + List> paramList = new ArrayList>(); + List parameters = new ArrayList<>(); + for(int i=0;i paramMap = new HashMap(); + paramMap.put("field",key); + paramList.add(paramMap); + } + + return paramList; + } + + + public List> convertParam2Param(List> dataList){ + List> paramList = new ArrayList>(); + List parameters = new ArrayList<>(); + for(int i=0;i paramMap = new HashMap(); + paramMap.put("field",key); + paramList.add(paramMap); + } + return paramList; + } + + public static void main(String[] args) { + String data = "select mc from uf_legal_entity where id = '{?frgs}' and name = '{?test}' "; + + // 使用正则表达式按{?截取，}为结束 + Pattern pattern = Pattern.compile("\\{\\?([^}]+)\\}"); + Matcher matcher = pattern.matcher(data); + + List parameters = new ArrayList<>(); + while (matcher.find()) { + parameters.add(matcher.group(1)); // 提取{?和}之间的内容 + } + + } + } diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignApplyRequestUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignApplyRequestUtil.java new file mode 100644 index 0000000..ada5c8f --- /dev/null +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignApplyRequestUtil.java @@ -0,0 +1,185 @@ +package com.weaver.seconddev.chapanda.esign.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.chapanda.esign.constant.Constants; +import okhttp3.*; +import org.apache.commons.codec.binary.Hex; +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.Component; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +@Component +public class Esb2EsignApplyRequestUtil { + private final static Logger log = LoggerFactory.getLogger(Esb2EsignApplyRequestUtil.class); + @Autowired + Esb2EsignTemplateSealPostionUtil esb2EsignTemplateSealPostionUtil; + public JSONObject applyRequest(String requestid,String requestname,String employeeMobile,String templateId,String sealId,String docFilekey,String docName,String creditCode,String qsrJobNum){ + + JSONArray signDocs = new JSONArray(); + JSONObject signDoc = new JSONObject(); + signDoc.put("docFilekey",docFilekey); + signDoc.put("docName",docName); + signDoc.put("docOrder",1); + signDocs.add(signDoc); + + JSONArray signers = appendSignersParty(employeeMobile,templateId,sealId,docFilekey,creditCode,qsrJobNum); + + JSONObject bodyJson = new JSONObject(); + bodyJson.put("bizNo",requestid); + bodyJson.put("initiatorUniqueId","admin"); + bodyJson.put("qrDocSwitcher",Constants.qrDocSwitcher); + bodyJson.put("signDocs",signDocs); + bodyJson.put("signFileFormat",Constants.signFileFormat); + bodyJson.put("signers",signers); + bodyJson.put("subject",requestname); + + String xTimevaleSignature = encryptionHmacSHA256(bodyJson.toJSONString()); + log.error("xTimevaleSignature:"+xTimevaleSignature); + + JSONObject returnJson = new JSONObject(); + String msg = doHttpPost(xTimevaleSignature,bodyJson.toJSONString()); + if(StringUtils.isNotBlank(msg)){ + returnJson = convertData(msg); + } + return returnJson; + } + + + /** + * + * @param xTimevaleSignature + * @param bodyData + * @return + */ + public String doHttpPost(String xTimevaleSignature,String bodyData){ + String msg = ""; + OkHttpClient client = new OkHttpClient().newBuilder() + .build(); + MediaType mediaType = MediaType.parse("application/json"); + RequestBody body = RequestBody.create(mediaType, bodyData); + try { + Request request = new Request.Builder() + .url(Constants.eSignHost+Constants.previewUrl) + .method("POST", body) + .addHeader("x-timevale-project-id", Constants.xTimevaleProjectId) + .addHeader("x-timevale-signature", xTimevaleSignature) + .addHeader("Content-Type", "application/json") + .build(); + Response response = client.newCall(request).execute(); + int code = response.code(); + log.error("code:"+code); + msg = response.body().string(); + log.error("msg:"+msg); + } catch (IOException e) { + log.error("e:"+e.getMessage()); + throw new RuntimeException(e); + } + return msg; + } + + /*** + * + * @param bodyData + * @return + */ + public String encryptionHmacSHA256(String bodyData){ + String encryptionData = ""; +// String secretKey = "7f067a08f5c675137e6e72aa298e2c07"; + // 要签名的数据 +// JSONObject dataObject = new JSONObject(); +// dataObject.put("templateId","JMHT-ZXSJ"); +// String data = "{\"templateId\":\"JMHT-ZXSJ\"}" ; + try { + // 初始化Mac对象 + Mac sha256Hmac = Mac.getInstance("HmacSHA256"); + SecretKeySpec secretKeySpec = new SecretKeySpec(Constants.secretKey.getBytes(StandardCharsets.UTF_8), "HmacSHA256"); + sha256Hmac.init(secretKeySpec); + byte[] result = sha256Hmac.doFinal(bodyData.getBytes(StandardCharsets.UTF_8)); + encryptionData = Hex.encodeHexString(result); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + }catch (InvalidKeyException e) { + throw new RuntimeException(e); + } + return encryptionData; + } + + + public JSONArray appendSignersParty(String employeeMobile,String templateId,String sealId,String docFilekey,String creditCode,String qsrJobNum){ + JSONArray signers = new JSONArray(); + JSONObject detailJson = esb2EsignTemplateSealPostionUtil.getTemplateFormData(templateId,sealId,docFilekey); + JSONObject partyA = detailJson.getJSONObject("partyA"); + JSONObject partyB = detailJson.getJSONObject("partyB"); + JSONObject partyBJson = new JSONObject(); + partyBJson.put("authorizationOrganizeNo",""); + partyBJson.put("uniqueId",employeeMobile); + partyBJson.put("accountType",Constants.partyBaccountType); + partyBJson.put("autoSign",Constants.autoSign); + partyBJson.put("signDocDetails",partyB); + partyBJson.put("signOrder","1"); + + JSONObject partyAJson = new JSONObject(); + partyAJson.put("authorizationOrganizeNo",creditCode); + partyAJson.put("uniqueId",qsrJobNum); + partyAJson.put("accountType",Constants.partyAaccountType); + partyAJson.put("autoSign",Constants.autoSign); + partyAJson.put("signDocDetails",partyA); + partyAJson.put("signOrder","2"); + + signers.add(partyBJson); + signers.add(partyAJson); + return signers; + } + + + public JSONObject convertData(String msg){ + JSONObject dataObject = new JSONObject(); + + JSONObject bodyJson = JSONObject.parseObject(msg); + if(bodyJson.containsKey("errCode")){ + String errCode = bodyJson.getString("errCode"); + if("0".equals(errCode)){ + JSONObject dataJson = bodyJson.getJSONObject("data"); + if(dataJson.containsKey("signFlowId")){ + String signFlowId = dataJson.getString("signFlowId"); + dataObject.put("signFlowId",signFlowId); + JSONArray signUrlsArray = dataJson.getJSONArray("signUrls"); + String signUrls = ""; + String uniqueIds = ""; + String accountIds = ""; + for(int i=0;i createUser(String name,String mobile){ + + Map dataMap = new HashMap(); + JSONObject bodyJson = new JSONObject(); + bodyJson.put("contactsMobile",mobile); + bodyJson.put("name",name); + bodyJson.put("loginMobile",mobile); + bodyJson.put("uniqueId",mobile); + + String xTimevaleSignature = encryptionHmacSHA256(bodyJson.toJSONString()); + log.error("xTimevaleSignature:"+xTimevaleSignature); + + String msg = doHttpPost(xTimevaleSignature,bodyJson.toJSONString()); + if(StringUtils.isNotBlank(msg)){ + dataMap = convertData(msg); + } + return dataMap; + } + + + /** + * + * @param xTimevaleSignature + * @param bodyData + * @return + */ + public String doHttpPost(String xTimevaleSignature,String bodyData){ + String msg = ""; + OkHttpClient client = new OkHttpClient().newBuilder() + .build(); + MediaType mediaType = MediaType.parse("application/json"); + RequestBody body = RequestBody.create(mediaType, bodyData); + try { + Request request = new Request.Builder() + .url(Constants.eSignHost+Constants.previewUrl) + .method("POST", body) + .addHeader("x-timevale-project-id", Constants.xTimevaleProjectId) + .addHeader("x-timevale-signature", xTimevaleSignature) + .addHeader("Content-Type", "application/json") + .build(); + Response response = client.newCall(request).execute(); + int code = response.code(); + log.error("code:"+code); + msg = response.body().string(); + log.error("msg:"+msg); + } catch (IOException e) { + log.error("e:"+e.getMessage()); + throw new RuntimeException(e); + } + return msg; + } + + /*** + * + * @param bodyData + * @return + */ + public String encryptionHmacSHA256(String bodyData){ + String encryptionData = ""; +// String secretKey = "7f067a08f5c675137e6e72aa298e2c07"; + // 要签名的数据 +// JSONObject dataObject = new JSONObject(); +// dataObject.put("templateId","JMHT-ZXSJ"); +// String data = "{\"templateId\":\"JMHT-ZXSJ\"}" ; + try { + // 初始化Mac对象 + Mac sha256Hmac = Mac.getInstance("HmacSHA256"); + SecretKeySpec secretKeySpec = new SecretKeySpec(Constants.secretKey.getBytes(StandardCharsets.UTF_8), "HmacSHA256"); + sha256Hmac.init(secretKeySpec); + byte[] result = sha256Hmac.doFinal(bodyData.getBytes(StandardCharsets.UTF_8)); + encryptionData = Hex.encodeHexString(result); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + }catch (InvalidKeyException e) { + throw new RuntimeException(e); + } + return encryptionData; + } + + + public JSONArray appendSignersParty(String employeeMobile,String templateId,String sealId,String docFilekey,String creditCode,String qsrJobNum){ + JSONArray signers = new JSONArray(); + JSONObject detailJson = esb2EsignTemplateSealPostionUtil.getTemplateFormData(templateId,sealId,docFilekey); + JSONObject partyA = detailJson.getJSONObject("partyA"); + JSONObject partyB = detailJson.getJSONObject("partyB"); + JSONObject partyBJson = new JSONObject(); + partyBJson.put("authorizationOrganizeNo",""); + partyBJson.put("uniqueId",employeeMobile); + partyBJson.put("accountType",Constants.partyBaccountType); + partyBJson.put("autoSign",Constants.autoSign); + partyBJson.put("signDocDetails",partyB); + partyBJson.put("signOrder","1"); + + JSONObject partyAJson = new JSONObject(); + partyAJson.put("authorizationOrganizeNo",creditCode); + partyAJson.put("uniqueId",qsrJobNum); + partyAJson.put("accountType",Constants.partyAaccountType); + partyAJson.put("autoSign",Constants.autoSign); + partyAJson.put("signDocDetails",partyA); + partyAJson.put("signOrder","2"); + + signers.add(partyBJson); + signers.add(partyAJson); + return signers; + } + + + public Map convertData(String msg){ + Map dataMap = new HashMap(); + + JSONObject bodyJson = JSONObject.parseObject(msg); + if(bodyJson.containsKey("errCode")){ + String errCode = bodyJson.getString("errCode"); + if("0".equals(errCode)){ + JSONObject dataJson = bodyJson.getJSONObject("data"); + if(dataJson.containsKey("signFlowId")){ + String accountId = dataJson.getString("accountId"); + String esignAccountId = dataJson.getString("esignAccountId"); + String uniqueId = dataJson.getString("uniqueId"); + dataMap.put("accountId",accountId); + dataMap.put("esignAccountId",esignAccountId); + dataMap.put("uniqueId",uniqueId); + } + } + } + return dataMap; + } +} diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignPreviewUrlUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignPreviewUrlUtil.java index f468451..1fa58cf 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignPreviewUrlUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignPreviewUrlUtil.java @@ -54,7 +54,7 @@ public class Esb2EsignPreviewUrlUtil { try { Request request = new Request.Builder() - .url(Constants.eSignHost+Constants.querySealsUrl+"?fileKey="+fileKey) + .url(Constants.eSignHost+Constants.previewUrl+"?fileKey="+fileKey) .method("GET", null) .addHeader("x-timevale-project-id", Constants.xTimevaleProjectId) .addHeader("x-timevale-signature", xTimevaleSignature) diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignTemplateSealPostionUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignTemplateSealPostionUtil.java new file mode 100644 index 0000000..507cf89 --- /dev/null +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/esign/util/Esb2EsignTemplateSealPostionUtil.java @@ -0,0 +1,224 @@ +package com.weaver.seconddev.chapanda.esign.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.chapanda.esign.constant.Constants; +import okhttp3.*; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +@Component +public class Esb2EsignTemplateSealPostionUtil { + private final static Logger log = LoggerFactory.getLogger(Esb2EsignTemplateSealPostionUtil.class); + + public JSONObject getTemplateFormData(String templateId,String sealId,String docFilekey){ + + JSONObject detailJson = new JSONObject(); + + + JSONObject partyA = new JSONObject(); + JSONObject partyB = new JSONObject(); + + JSONObject bodyJson = new JSONObject(); + bodyJson.put("templateId", templateId); + + String xTimevaleSignature = encryptionHmacSHA256(bodyJson.toJSONString()); + log.error("xTimevaleSignature:"+xTimevaleSignature); + String msg = doPostHttp(xTimevaleSignature,bodyJson.toJSONString()); + log.error("msg:"+msg); + if(StringUtils.isNotBlank(msg)){ + JSONObject msgJson = JSONObject.parseObject(msg); + if(msgJson.containsKey("errCode")){ + String errCode = msgJson.getString("errCode"); + if("0".equals(errCode)){ + if(msgJson.containsKey("data")){ + JSONObject dataJson = msgJson.getJSONObject("data"); + if(dataJson.containsKey("template")){ + JSONObject templateJson = dataJson.getJSONObject("template"); + if(templateJson.containsKey("templateFlows")){ + JSONArray templateFlows = templateJson.getJSONArray("templateFlows"); + + for(int i=0;i paramList = new ArrayList<>(100); + paramList.add(employeeId); + paramList.add(Constants.TENANT_KEY); + paramList.add(Constants.TENANT_KEY); + + List sqlParamList = databaseUtils.querySqlParamEntity(paramList); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlParamList); + List> recordList = databaseUtils.getDataSourceList(result); + log.error("recordList:{}",recordList.size()); + if(recordList.size() > 0){ + openId = String.valueOf(recordList.get(0).get("open_id")); + } + }catch (Exception e){ + e.printStackTrace(); + log.error("e:" + e); + } + return openId; + } + +} diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/dao/HrmUserAvatarDao.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/dao/HrmUserAvatarDao.java new file mode 100644 index 0000000..32e54d9 --- /dev/null +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/dao/HrmUserAvatarDao.java @@ -0,0 +1,93 @@ +package com.weaver.seconddev.chapanda.feishu.dao; + +import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; +import com.weaver.seconddev.chapanda.cost.constant.Constants; +import com.weaver.seconddev.chapanda.cost.util.DatabaseUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Component +public class HrmUserAvatarDao { + + private final static Logger log = LoggerFactory.getLogger(HrmUserAvatarDao.class); + + @Autowired + private DatabaseUtils databaseUtils; + + /*** + * + * @return + */ + public List> queryHrmAvatarList(){ + String groupId = "weaver-workflow-report-serviceworkflowreport"; + String sourceType = "LOGIC"; + List> recordList = new ArrayList>(); + try{ + String dataSql =" select u.open_id,u.user_id,e.id,a.p1,a.p2,a.p3 " + + " from eb_hrm_user u\n" + + " left join eteams.employee e on e.mobile = u.mobile \n" + + " inner join eteams.avatar a on a.id = e.avatar \n" + + " where e.delete_type = 0\n" + + " and u.delete_type = 0 and u.tenant_key = ? and e.tenant_key = ? and a.tenant_key = ? \n" + + " and a.p1 is not null " ; + + log.error("dataSql:" + dataSql); + List paramList = new ArrayList<>(100); + paramList.add(Constants.TENANT_KEY); + paramList.add(Constants.TENANT_KEY); + paramList.add(Constants.TENANT_KEY); + List sqlParamList = databaseUtils.querySqlParamEntity(paramList); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlParamList); + recordList = databaseUtils.getDataSourceList(result); + log.error("recordList:{}",recordList.size()); + }catch (Exception e){ + e.printStackTrace(); + log.error("e:" + e); + } + return recordList; + } + + public List> queryHrmAvatarByDate(int days){ + String groupId = "weaver-workflow-report-serviceworkflowreport"; + String sourceType = "LOGIC"; + List> recordList = new ArrayList>(); + try{ + String dataSql =" select a.id,e.username,u.open_id ,u.user_id,e.id,a.P1,a.P2 ,a.p3,e.MOBILE \n" + + " from eb_hrm_user u\n" + + " inner join eteams.employee e on e.MOBILE = u.mobile \n" + + " inner join eteams.avatar a on a.id = e.avatar \n" + + " inner join fileobj f on f.id = a.P1 \n" + + " where e.delete_type = 0\n" + + " and u.delete_type = 0\n" + + " and a.p1 is not null and u.tenant_key = ? and e.tenant_key = ? and a.tenant_key = ? \n" + + " and (\n" + + " left(f.create_time,10) in(DATE_FORMAT(CURDATE(), '%Y-%m-%d'),DATE_FORMAT(CURDATE()-1, '%Y-%m-%d'))\n" + + " or left(f.UPLOAD_TIME ,10) in(DATE_FORMAT(CURDATE(), '%Y-%m-%d'),DATE_FORMAT(CURDATE()-1, '%Y-%m-%d'))\n" + + " )" ; + + log.error("dataSql:" + dataSql); + List paramList = new ArrayList<>(100); + paramList.add(Constants.TENANT_KEY); + paramList.add(Constants.TENANT_KEY); + paramList.add(Constants.TENANT_KEY); + List sqlParamList = databaseUtils.querySqlParamEntity(paramList); + Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql, sqlParamList); + recordList = databaseUtils.getDataSourceList(result); + log.error("recordList:{}",recordList.size()); + }catch (Exception e){ + e.printStackTrace(); + log.error("e:" + e); + } + return recordList; + } + + + + +} diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarAction.java new file mode 100644 index 0000000..3fc462e --- /dev/null +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarAction.java @@ -0,0 +1,57 @@ +package com.weaver.seconddev.chapanda.feishu.esb; + +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.seconddev.chapanda.feishu.dao.HrmQueryOpenIdDao; +import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuHrmAvatarUtil; +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.util.HashMap; +import java.util.Map; + +@Service("Esb2FeishuHrmAvatarAction") +public class Esb2FeishuHrmAvatarAction implements EsbServerlessRpcRemoteInterface { + private final static Logger log = LoggerFactory.getLogger(Esb2FeishuHrmAvatarAction.class); + + @Autowired + Esb2FeishuHrmAvatarUtil esb2FeishuHrmAvatarUtil; + + @Autowired + HrmQueryOpenIdDao hrmQueryOpenIdDao; + + @Override + public WeaResult> execute(Map params) { + + String employeeid = String.valueOf(params.get("employeeid")); + Long avatar = Long.valueOf(String.valueOf(params.get("avatar"))); + if(StringUtils.isBlank(employeeid)){ + return WeaResult.fail(500,"获取人员信息失败"); + } + if(StringUtils.isBlank(String.valueOf(avatar))){ + return WeaResult.fail(500,"获取人员头像信息失败"); + } + String openId = hrmQueryOpenIdDao.queryHrmOpenId(employeeid); + if(StringUtils.isBlank(openId)){ + return WeaResult.fail(500,"获取人员飞书信息失败"); + } + + Map avatarMap = esb2FeishuHrmAvatarUtil.syncHrmAvatarByEmployee(openId,avatar); + String avatarOrigin = String.valueOf(avatarMap.get("avatarOrigin")); + String avatarKey = String.valueOf(avatarMap.get("avatarKey")); + if(StringUtils.isBlank(avatarOrigin)){ + return WeaResult.fail(500,"更新飞书头像异常"); + } + + Map actionMap = new HashMap(); + actionMap.put("code",200); + actionMap.put("msg","成功"); + actionMap.put("avatarOrigin",avatarOrigin); + actionMap.put("avatarKey",avatarKey); + return WeaResult.success(actionMap); + } + +} diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarDateCron.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarDateCron.java index 33fadaa..c03c201 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarDateCron.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarDateCron.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.chapanda.feishu.esb; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.seconddev.chapanda.feishu.dao.HrmUserAvatarDao; import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuProfilePictureUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service("Esb2FeishuHrmAvatarDateCron") @@ -18,11 +20,14 @@ public class Esb2FeishuHrmAvatarDateCron implements EsbServerlessRpcRemoteInterf @Autowired Esb2FeishuProfilePictureUtil esb2FeishuProfilePictureUtil; + @Autowired + HrmUserAvatarDao hrmUserAvatarDao; @Override public WeaResult> execute(Map params) { - - Map dataMap = esb2FeishuProfilePictureUtil.syncHrmAvatarByDate(); + int days = 2; + List> avatarList = hrmUserAvatarDao.queryHrmAvatarByDate(days); + Map dataMap = esb2FeishuProfilePictureUtil.syncHrmAvatarByAvatarList(avatarList); Map actionMap = new HashMap(); actionMap.put("code",200); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarFullCron.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarFullCron.java index bd571d2..92ccc40 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarFullCron.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuHrmAvatarFullCron.java @@ -2,6 +2,7 @@ package com.weaver.seconddev.chapanda.feishu.esb; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface; +import com.weaver.seconddev.chapanda.feishu.dao.HrmUserAvatarDao; import com.weaver.seconddev.chapanda.feishu.util.Esb2FeishuProfilePictureUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service("Esb2FeishuHrmAvatarFullCron") @@ -18,10 +20,13 @@ public class Esb2FeishuHrmAvatarFullCron implements EsbServerlessRpcRemoteInterf @Autowired Esb2FeishuProfilePictureUtil esb2FeishuProfilePictureUtil; + @Autowired + HrmUserAvatarDao hrmUserAvatarDao; @Override public WeaResult> execute(Map params) { - Map dataMap = esb2FeishuProfilePictureUtil.syncHrmAvatarByFull(); + List> avatarList = hrmUserAvatarDao.queryHrmAvatarList(); + Map dataMap = esb2FeishuProfilePictureUtil.syncHrmAvatarByAvatarList(avatarList); Map actionMap = new HashMap(); actionMap.put("code",200); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendFinishAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendFinishAction.java index 1314c9d..4d680e7 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendFinishAction.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendFinishAction.java @@ -73,7 +73,7 @@ public class Esb2FeishuSendFinishAction implements EsbServerlessRpcRemoteInterfa log.error("msgType:{}",msgType); String cid = String.valueOf(params.get("cid")); - log.error("bot:requestid:{},nodeid:{},operatorid:{},cid{},msgType:{},todo",requestid,nodeId,operatorid,cid,msgType); + log.error("bot:requestid:{},nodeid:{},operatorid:{},cid{},msgType:{},fininsh",requestid,nodeId,operatorid,cid,msgType); String code = ""; if("5".equals(msgType)){ @@ -108,7 +108,7 @@ public class Esb2FeishuSendFinishAction implements EsbServerlessRpcRemoteInterfa log.error("operator_open_id:{}",operator_open_id); if(StringUtils.isNotBlank(create_open_id)){ if(StringUtils.isNotBlank(operator_open_id)){ - String status = "TERMINATED"; + String status = "APPROVED"; code = esb2FeishuSendFinishUtil.senTodoMessage( requestid,requestName,requestmark, creatorname,createTime, diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendMessageCardAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendMessageCardAction.java index 4a6737c..cfa5b53 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendMessageCardAction.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/esb/Esb2FeishuSendMessageCardAction.java @@ -50,7 +50,7 @@ public class Esb2FeishuSendMessageCardAction implements EsbServerlessRpcRemoteIn } if(StringUtils.isBlank(receiveId)){ - return WeaResult.fail(500,"receiveId is null"); + return WeaResult.fail(500,"1. is null"); } String openId = hrmQueryOpenIdDao.queryHrmOpenId(receiveId); @@ -58,7 +58,7 @@ public class Esb2FeishuSendMessageCardAction implements EsbServerlessRpcRemoteIn return WeaResult.fail(500,"openId is null"); } - Map dataMap = esb2FeishuSendMessageUtil.senCardMessage(openId,params); + Map dataMap = esb2FeishuSendMessageUtil.senCardMessage(templateId,templateVersionName,openId,params); String chat_id = (String) dataMap.get("chat_id"); String message_id = (String) dataMap.get("message_id"); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuHrmAvatarUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuHrmAvatarUtil.java new file mode 100644 index 0000000..49e1852 --- /dev/null +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuHrmAvatarUtil.java @@ -0,0 +1,101 @@ +package com.weaver.seconddev.chapanda.feishu.util; + +import com.alibaba.fastjson.JSONObject; +import com.weaver.seconddev.chapanda.feishu.constant.Constants; +import okhttp3.*; +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.Component; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + + +@Component +public class Esb2FeishuHrmAvatarUtil { + private final static Logger log = LoggerFactory.getLogger(Esb2FeishuHrmAvatarUtil.class); + + @Autowired + Esb2FeishuUploadImageUtil esb2FeishuUploadImageUtil; + + @Autowired + Esb2FeishuTokenUtil esb2FeishuTokenUtil; + + public Map syncHrmAvatarByEmployee(String open_id,Long avatar ) { + + Map dataMap = new HashMap(); + String avatarKey = esb2FeishuUploadImageUtil.uploadImage(avatar); + + log.error("avatarKeyr:{}",avatarKey); + + String avatar_origin = ""; + if(StringUtils.isNotBlank(avatarKey)){ + String token = esb2FeishuTokenUtil.getToken(); + log.error("token:"+token); + if(StringUtils.isNotBlank(token)){ + String message = doHttpPostByToken(avatarKey,open_id,token); + if(StringUtils.isNotBlank(message)){ + JSONObject returnData = JSONObject.parseObject(message); + if(returnData.containsKey("code")){ + String code = returnData.getString("code"); + if("0".equals(code)){ + JSONObject dataJson = returnData.getJSONObject("data"); + if(dataJson.containsKey("user")){ + JSONObject userJson = dataJson.getJSONObject("user"); + log.error("userJson:{}",userJson.toJSONString()); + if(userJson.containsKey("avatar")){ + JSONObject avatarJson = userJson.getJSONObject("avatar"); + if(avatarJson.containsKey("avatar_origin")){ + avatar_origin = avatarJson.getString("avatar_origin"); + log.error("avatar_origin:{}",avatar_origin); + } + } + } + } + } + } + } + } + dataMap.put("avatarOrigin",avatar_origin); + dataMap.put("avatarKey",avatarKey); + return dataMap; + } + + /** + * + * @param token + * @return + */ + public String doHttpPostByToken(String avatar_key,String open_id,String token){ + String msg = ""; + log.error("avatar_key:{}",avatar_key); + OkHttpClient client = new OkHttpClient().newBuilder() + .build(); + MediaType mediaType = MediaType.parse("application/json"); + JSONObject bodyData = new JSONObject(); + bodyData.put("avatar_key",avatar_key); + RequestBody body = RequestBody.create(mediaType, bodyData.toJSONString()); + log.error("update-avatar:{}",bodyData.toJSONString()); + try { + Request request = new Request.Builder() + .url(Constants.feishuHost+Constants.profileUrl+"/"+open_id+"?user_id_type=open_id") + .method("PATCH", body) + .addHeader("Authorization", "Bearer "+token) + .addHeader("Content-Type", "application/json") + .build(); + Response response = client.newCall(request).execute(); + int code = response.code(); + log.error("code:{}",code); + msg = response.body().string(); + log.error("msg:"+msg); + } catch (IOException e) { + log.error("e:"+e); + throw new RuntimeException(e); + } + return msg; + } + +} diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuProfilePictureUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuProfilePictureUtil.java index 03723f2..c210377 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuProfilePictureUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuProfilePictureUtil.java @@ -124,9 +124,9 @@ public class Esb2FeishuProfilePictureUtil { } - public Map syncHrmAvatarByDate() { + public Map syncHrmAvatarByDate(int days) { - List> avatarList = hrmUserAvatarDao.queryHrmAvatarByDate(); + List> avatarList = hrmUserAvatarDao.queryHrmAvatarByDate(days); log.error("avatarList:{}",avatarList.size()); Map messageMap = new HashMap(); int successTotal = 0; @@ -182,4 +182,61 @@ public class Esb2FeishuProfilePictureUtil { } + + public Map syncHrmAvatarByAvatarList(List> avatarList) { + + log.error("avatarList:{}",avatarList.size()); + Map messageMap = new HashMap(); + int successTotal = 0; + for(int i=0;i avatarMap = avatarList.get(i); + String open_id = String.valueOf(avatarMap.get("open_id")); + String user_id = String.valueOf(avatarMap.get("user_id")); + Long p1 = Long.valueOf(String.valueOf(avatarMap.get("p1"))); + Long p2 = Long.valueOf(String.valueOf(avatarMap.get("p2"))); + Long p3 = Long.valueOf(String.valueOf(avatarMap.get("p3"))); + log.error("p1:{}",p1); + log.error("p2:{}",p2); + log.error("open_id:{}",open_id); + + String avatarKey = ""; + if(p1 > 0){ + avatarKey = esb2FeishuUploadImageUtil.uploadImage(p1); + }else if(p2 > 0){ + avatarKey = esb2FeishuUploadImageUtil.uploadImage(p2); + }else if(p3 > 0){ + avatarKey = esb2FeishuUploadImageUtil.uploadImage(p3); + } + + log.error("avatarKeyr:{}",avatarKey); + + if(StringUtils.isNotBlank(avatarKey)){ + String token = esb2FeishuTokenUtil.getToken(); + log.error("token:"+token); + if(StringUtils.isNotBlank(token)){ + String message = doHttpPostByToken(avatarKey,open_id,token); + if(StringUtils.isNotBlank(message)){ + JSONObject returnData = JSONObject.parseObject(message); + if(returnData.containsKey("code")){ + String code = returnData.getString("code"); + if("0".equals(code)){ + successTotal++; + JSONObject dataJson = returnData.getJSONObject("data"); + if(dataJson.containsKey("user")){ + JSONObject userJson = dataJson.getJSONObject("user"); + log.error("userJson:{}",userJson.toJSONString()); + } + } + } + } + } + } + } + + messageMap.put("total",avatarList.size()); + messageMap.put("success",successTotal); + return messageMap; + } + } diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDeleteUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDeleteUtil.java index 3e57df4..f96185b 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDeleteUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDeleteUtil.java @@ -202,7 +202,10 @@ public class Esb2FeishuSendDeleteUtil { log.error("task_open_id:"+task_open_id); JSONObject taskListJson = new JSONObject(); - taskListJson.put("task_id","weaver_"+requestid+"_"+task_open_id+"_"+cid); + + // "weaver_"+requestid+"_"+task_open_id+"_"+cid + + taskListJson.put("task_id","weaver_"+requestid+"_"+cid); taskListJson.put("open_id",task_open_id); taskListJson.put("title","@i18n@title"); taskListJson.put("links",linksJson); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDoneUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDoneUtil.java index fa8b7f5..4b80614 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDoneUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendDoneUtil.java @@ -204,6 +204,9 @@ public class Esb2FeishuSendDoneUtil { JSONArray taskListArray = new JSONArray(); log.error("task_open_id:"+task_open_id); JSONObject taskListJson = new JSONObject(); + + // "weaver_"+requestid+"_"+task_open_id+"_"+cid + taskListJson.put("task_id","weaver_"+requestid+"_"+cid); taskListJson.put("open_id",task_open_id); taskListJson.put("title","@i18n@title"); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendFinishUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendFinishUtil.java index b85046c..fba9297 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendFinishUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendFinishUtil.java @@ -203,7 +203,8 @@ public class Esb2FeishuSendFinishUtil { JSONArray taskListArray = new JSONArray(); log.error("task_open_id:"+task_open_id); JSONObject taskListJson = new JSONObject(); - taskListJson.put("task_id","weaver_"+requestid+"_"+task_open_id+"_"+cid); + // "weaver_"+requestid+"_"+task_open_id+"_"+cid + taskListJson.put("task_id","weaver_"+requestid+"_"+cid); taskListJson.put("open_id",task_open_id); taskListJson.put("title","@i18n@title"); taskListJson.put("links",linksJson); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendMessageUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendMessageUtil.java index 5777423..9ef3fa8 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendMessageUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuSendMessageUtil.java @@ -20,9 +20,10 @@ public class Esb2FeishuSendMessageUtil{ @Autowired private Esb2FeishuTokenUtil esb2FeishuTokenUtil; - public Map senCardMessage(String openId, Map paraMap) { + public Map senCardMessage(String template_id,String template_version_name,String openId, Map paraMap) { Map messageMap = new HashMap(); + List defaultList = new ArrayList(); defaultList.add("templateId"); defaultList.add("templateVersionName"); @@ -50,13 +51,9 @@ public class Esb2FeishuSendMessageUtil{ // templateVariable.put("current_date,",sdf.format(new Date())); JSONObject data_Json = new JSONObject(); - for(String key : defaultList){ - String value = paraMap.get(key).toString(); - data_Json.put(key,value); - } -// data_Json.put("template_id",template_id); -// data_Json.put("template_version_name",template_version_name); -// data_Json.put("template_variable",templateVariable.toJSONString()); + data_Json.put("template_id",template_id); + data_Json.put("template_version_name",template_version_name); + data_Json.put("template_variable",templateVariable); JSONObject contentJson = new JSONObject(); contentJson.put("type","template"); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuUploadImageUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuUploadImageUtil.java index 7d914e5..0c7a87a 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuUploadImageUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/feishu/util/Esb2FeishuUploadImageUtil.java @@ -28,10 +28,13 @@ public class Esb2FeishuUploadImageUtil { @Autowired private FileDownloadService fileDownloadService; + @Autowired + Esb2FeishuTokenUtil esb2FeishuTokenUtil; + public String uploadImage(Long pvalue) { log.error("esb2feishuuploadimageutil start"); String imageKey = ""; - String token = getToken2(); + String token = esb2FeishuTokenUtil.getToken(); log.error("token:"+token); if(StringUtils.isNotBlank(token)){ InputStream fileInputStream = null; @@ -74,73 +77,73 @@ public class Esb2FeishuUploadImageUtil { } - public String getToken2() { - String token = ""; - JSONObject returnData = getAccessToken(); - if(returnData.containsKey("tenantAccessToken")){ - token = returnData.getString("tenantAccessToken"); - } - System.out.println("token:"+token); - return token; - } +// public String getToken2() { +// String token = ""; +// JSONObject returnData = getAccessToken(); +// if(returnData.containsKey("tenantAccessToken")){ +// token = returnData.getString("tenantAccessToken"); +// } +// System.out.println("token:"+token); +// return token; +// } /** * * @return */ - public JSONObject getAccessToken() { - - JSONObject returnData = new JSONObject(); - JSONObject dataJson = new JSONObject(); - dataJson.put("app_id", Constants.app_id); - dataJson.put("app_secret", Constants.app_secret); - - log.error("dataJson:{}",dataJson.toJSONString()); -// dataJson.put("app_id", "cli_a8d0ee6b667dd00e"); -// dataJson.put("app_secret", "UjShC4eY7vCgHsQvFWZZleVdCqSEWGD0"); - - try { - OkHttpClient client = new OkHttpClient().newBuilder() - .build(); - MediaType mediaType = MediaType.parse("application/json; charset=utf-8"); - RequestBody body = RequestBody.create(mediaType, dataJson.toJSONString()); - Request request = new Request.Builder() - .url(Constants.feishuHost+Constants.tokenUrl) - .method("POST", body) - .addHeader("Content-Type", "application/json; charset=utf-8") - .build(); - Response response = client.newCall(request).execute(); - int code = response.code(); - String msg = response.body().string(); - - log.error("code:{}",code); - log.error("msg:{}",msg); - - if(code == 200){ - if(StringUtils.isNotBlank(msg)){ - JSONObject returnJson = JSONObject.parseObject(msg); - if(returnJson.containsKey("code")){ - String dataCode = returnJson.getString("code"); - if("0".equals(dataCode)){ - String tenantAccessToken = returnJson.getString("tenant_access_token"); - int expire = returnJson.getInteger("expire"); - - log.error("tenantAccessToken:{}",tenantAccessToken); - log.error("expire:{}",expire); - - returnData.put("tenantAccessToken",tenantAccessToken); - } - } - } - }else{ - log.error("msg:{}",msg); - } - } catch (Exception e) { - log.error("msg:{}",e.getMessage()); - e.printStackTrace(); - } - return returnData; - } +// public JSONObject getAccessToken() { +// +// JSONObject returnData = new JSONObject(); +// JSONObject dataJson = new JSONObject(); +// dataJson.put("app_id", Constants.app_id); +// dataJson.put("app_secret", Constants.app_secret); +// +// log.error("dataJson:{}",dataJson.toJSONString()); +//// dataJson.put("app_id", "cli_a8d0ee6b667dd00e"); +//// dataJson.put("app_secret", "UjShC4eY7vCgHsQvFWZZleVdCqSEWGD0"); +// +// try { +// OkHttpClient client = new OkHttpClient().newBuilder() +// .build(); +// MediaType mediaType = MediaType.parse("application/json; charset=utf-8"); +// RequestBody body = RequestBody.create(mediaType, dataJson.toJSONString()); +// Request request = new Request.Builder() +// .url(Constants.feishuHost+Constants.tokenUrl) +// .method("POST", body) +// .addHeader("Content-Type", "application/json; charset=utf-8") +// .build(); +// Response response = client.newCall(request).execute(); +// int code = response.code(); +// String msg = response.body().string(); +// +// log.error("code:{}",code); +// log.error("msg:{}",msg); +// +// if(code == 200){ +// if(StringUtils.isNotBlank(msg)){ +// JSONObject returnJson = JSONObject.parseObject(msg); +// if(returnJson.containsKey("code")){ +// String dataCode = returnJson.getString("code"); +// if("0".equals(dataCode)){ +// String tenantAccessToken = returnJson.getString("tenant_access_token"); +// int expire = returnJson.getInteger("expire"); +// +// log.error("tenantAccessToken:{}",tenantAccessToken); +// log.error("expire:{}",expire); +// +// returnData.put("tenantAccessToken",tenantAccessToken); +// } +// } +// } +// }else{ +// log.error("msg:{}",msg); +// } +// } catch (Exception e) { +// log.error("msg:{}",e.getMessage()); +// e.printStackTrace(); +// } +// return returnData; +// } /** diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieEconomicCompensationAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieEconomicCompensationAction.java index 6eeb9c9..8912c43 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieEconomicCompensationAction.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieEconomicCompensationAction.java @@ -12,6 +12,11 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; + +/** + * 经济补偿 + */ + @Service("Esb2QunjieEconomicCompensationAction") public class Esb2QunjieEconomicCompensationAction implements EsbServerlessRpcRemoteInterface { private final static Logger log = LoggerFactory.getLogger(Esb2QunjieEconomicCompensationAction.class); diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieFinshSealApplyAction.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieFinshSealApplyAction.java index 7ed117f..cb42fd1 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieFinshSealApplyAction.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/esb/Esb2QunjieFinshSealApplyAction.java @@ -23,19 +23,19 @@ public class Esb2QunjieFinshSealApplyAction implements EsbServerlessRpcRemoteInt log.error("Esb2QunjieFinshSealApplyAction start"); String applyId = (String) params.get("applyId"); - String sealId = (String) params.get("sealId"); +// String sealId = (String) params.get("sealId"); log.error("applyId:{}",applyId); - log.error("sealId:{}",sealId); +// log.error("sealId:{}",sealId); if(StringUtils.isBlank(applyId)){ return WeaResult.fail(500,"用印申请流程获取失败"); } - if(StringUtils.isBlank(sealId)){ - return WeaResult.fail(500,"印章信息获取失败"); - } +// if(StringUtils.isBlank(sealId)){ +// return WeaResult.fail(500,"印章信息获取失败"); +// } - String message = esb2QunjieFinshSealApplyUtil.finshApplyRquest(applyId,sealId); + String message = esb2QunjieFinshSealApplyUtil.finshApplyRquest(applyId); if(StringUtils.isBlank(message)){ return WeaResult.fail(500,"关闭授权失败"); } diff --git a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/util/Esb2QunjieFinshSealApplyUtil.java b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/util/Esb2QunjieFinshSealApplyUtil.java index d5786d5..247fd4d 100644 --- a/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/util/Esb2QunjieFinshSealApplyUtil.java +++ b/secondev-chapanda-integration/src/main/java/com/weaver/seconddev/chapanda/qunjie/util/Esb2QunjieFinshSealApplyUtil.java @@ -8,14 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - -import java.io.File; import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; @Component @@ -25,7 +18,7 @@ public class Esb2QunjieFinshSealApplyUtil { @Autowired private Esb2QunjieTokenUtil esb2QunjieTokenUtil; - public String finshApplyRquest(String applyId,String sealId) { + public String finshApplyRquest(String applyId) { log.error("senCardMessage start"); String timestamp = ""; String token = esb2QunjieTokenUtil.getAccessToken(); @@ -34,8 +27,8 @@ public class Esb2QunjieFinshSealApplyUtil { JSONObject bodyJson = new JSONObject(); bodyJson.put("applyId",applyId); - String[] sealIdList = new String[]{sealId}; - bodyJson.put("sealIdList",sealIdList); +// String[] sealIdList = new String[]{sealId}; +// bodyJson.put("sealIdList",sealIdList); System.out.println("bodyJson:"+bodyJson.toJSONString());