diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IOaDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IOaDao.java new file mode 100644 index 00000000..8ef3c4fa --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/IOaDao.java @@ -0,0 +1,45 @@ +package com.hzya.frame.plugin.dgx.u9c.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.dgx.u9c.entity.OaEntity; + +import java.util.List; + + +public interface IOaDao extends IBaseDao { + /** + * @Author lvleigang + * @Description 查询oa请款单 + * @Date 2:56 下午 2024/11/14 + * @param oaEntity + * @return java.util.List + **/ + List queryQkdList(OaEntity oaEntity); + + /** + * @Author lvleigang + * @Description 修改oa请款单 + * @Date 2:56 下午 2024/11/14 + * @param oaEntity + * @return java.util.List + **/ + Integer updateQkd(OaEntity oaEntity); + + + /** + * @Author lvleigang + * @Description 查询oa请购单 + * @Date 2:56 下午 2024/11/14 + * @param oaEntity + * @return java.util.List + **/ + List queryQgdList(OaEntity oaEntity); + /** + * @Author lvleigang + * @Description 修改oa请购单 + * @Date 2:56 下午 2024/11/14 + * @param oaEntity + * @return java.util.List + **/ + Integer updateQgd(OaEntity oaEntity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/OaDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/OaDaoImpl.java new file mode 100644 index 00000000..79d81183 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/dao/impl/OaDaoImpl.java @@ -0,0 +1,67 @@ +package com.hzya.frame.plugin.dgx.u9c.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.dgx.u9c.dao.IOaDao; +import com.hzya.frame.plugin.dgx.u9c.entity.OaEntity; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiVo; + +import java.util.List; + +public class OaDaoImpl extends MybatisGenericDao implements IOaDao { + /** + * @param entity + * @return java.util.List + * @Author lvleigang + * @Description 查询oa请款单 + * @Date 2:56 下午 2024/11/14 + **/ + @Override + @DS("#entity.dataSourceCode") + public List queryQkdList(OaEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryQkdList", entity); + return o; + } + + /** + * @param entity + * @return java.util.List + * @Author lvleigang + * @Description 修改oa请款单 + * @Date 2:56 下午 2024/11/14 + **/ + @Override + @DS("#entity.dataSourceCode") + public Integer updateQkd(OaEntity entity) { + Integer o = super.update(getSqlIdPrifx() + "updateQkd", entity); + return o; + } + + /** + * @param entity + * @return java.util.List + * @Author lvleigang + * @Description 查询oa请购单 + * @Date 2:56 下午 2024/11/14 + **/ + @Override + @DS("#entity.dataSourceCode") + public List queryQgdList(OaEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryQgdList", entity); + return o; + } + + /** + * @param entity + * @return java.util.List + * @Author lvleigang + * @Description 修改oa请购单 + * @Date 2:56 下午 2024/11/14 + **/ + @Override + @DS("#entity.dataSourceCode") + public Integer updateQgd(OaEntity entity) { + Integer o = super.update(getSqlIdPrifx() + "updateQgd", entity); + return o; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.java new file mode 100644 index 00000000..426a77f3 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.java @@ -0,0 +1,65 @@ +package com.hzya.frame.plugin.dgx.u9c.entity; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * @Description Oa + * @Author xiangerlin + * @Date 2024/9/18 14:08 + **/ +public class OaEntity extends BaseEntity { + + //id + private String id; + //单号 + private String docNo; + //单据状态code + private String status; + //推送状态 + private String sendStatus; + //推送描述 + private String sendMsg; + + + @Override + public String getId() { + return id; + } + + @Override + public void setId(String id) { + this.id = id; + } + + public String getDocNo() { + return docNo; + } + + public void setDocNo(String docNo) { + this.docNo = docNo; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getSendStatus() { + return sendStatus; + } + + public void setSendStatus(String sendStatus) { + this.sendStatus = sendStatus; + } + + public String getSendMsg() { + return sendMsg; + } + + public void setSendMsg(String sendMsg) { + this.sendMsg = sendMsg; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml new file mode 100644 index 00000000..c49a6e7c --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/OaEntity.xml @@ -0,0 +1,48 @@ + + + + + + + + + update formmain_0664 set + + field0074 = #{sendStatus}, + field0075 = #{sendMsg}, + + where id = #{id} + + + + + + + + update formmain_0673 set + + field0032 = #{sendStatus}, + field0033 = #{sendMsg}, + + where id = #{id} + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.xml index faa53702..5135fb25 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/PrepaymentEntity.xml @@ -90,7 +90,7 @@ and createdOn = #{createdOn} and modifiedOn >= #{startTime} - and dataStatus is null + and dataStatus is null or dataStatus = '' order by v_hzya_u9c_payreq.modifiedOn desc @@ -121,25 +121,17 @@ and createdOn = #{createdOn} and modifiedOn >= #{startTime} - and dataStatus is null + and dataStatus is null or dataStatus = '' - update v_hzya_u9c_payreq set + update AP_PayReqBillHead set - dataStatus = #{dataStatus}, - dataMsg = #{dataMsg}, + DescFlexField_PrivateDescSeg2 = #{dataStatus}, + DescFlexField_PrivateDescSeg1 = #{dataMsg}, where id = #{id} - - - - - - - - diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.java index 7582180e..20eeea88 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.java @@ -35,8 +35,6 @@ public class RequisitionEntity extends BaseEntity { private String reqDepartmentName; //来源类型code private String sourceTypeCode; - //来源类型名字 - private String sourceTypeName; //单据状态code private String status; //单据状态name @@ -58,8 +56,6 @@ public class RequisitionEntity extends BaseEntity { //数据状态描述 private String dataMsg; //用户手机号 - private String userPhone; - //用户手机号 private String sendPhone; public String getStartTime() { @@ -174,13 +170,7 @@ public class RequisitionEntity extends BaseEntity { this.sourceTypeCode = sourceTypeCode; } - public String getSourceTypeName() { - return sourceTypeName; - } - public void setSourceTypeName(String sourceTypeName) { - this.sourceTypeName = sourceTypeName; - } public String getStatus() { return status; @@ -230,13 +220,6 @@ public class RequisitionEntity extends BaseEntity { this.dataMsg = dataMsg; } - public String getUserPhone() { - return userPhone; - } - - public void setUserPhone(String userPhone) { - this.userPhone = userPhone; - } public String getSendPhone() { return sendPhone; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml index d16f2f62..0f40f611 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/entity/RequisitionEntity.xml @@ -16,12 +16,10 @@ - - @@ -41,15 +39,13 @@ reqDepartmentCode, reqDepartmentName, sourceTypeCode, - sourceTypeName, status, statusName, modifiedOn, createdOn, dataStatus, dataMsg, - sendPhone, - userPhone + sendPhone @@ -99,31 +94,21 @@ and reqDepartmentCode = #{reqDepartmentCode} and reqDepartmentName = #{reqDepartmentName} and sourceTypeCode = #{sourceTypeCode} - and sourceTypeName = #{sourceTypeName} and status = #{status} and statusName = #{statusName} and modifiedOn = #{modifiedOn} and createdOn = #{createdOn} - and dataStatus is null + and dataStatus is null or dataStatus = '' - update v_hzya_u9c_pr_pr set + update PR_PR set - dataStatus = #{dataStatus}, - dataMsg = #{dataMsg}, + DescFlexField_PrivateDescSeg2 = #{dataStatus}, + DescFlexField_PrivateDescSeg1 = #{dataMsg}, where id = #{id} - - - - - - - - - diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/AcquireTokenServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/AcquireTokenServiceImpl.java index 31e3f364..fead84ca 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/AcquireTokenServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/AcquireTokenServiceImpl.java @@ -24,7 +24,7 @@ public class AcquireTokenServiceImpl extends BaseService implements IAcquireToke @Override public String getToken() { String clientid="001"; - String clientsecret="1f8b947a5e7543d09ebb2a051d1725da"; + String clientsecret="8364356273724b499fb840efbc53edb4"; String entCode="002"; String userCode="OA"; String orgCode="1001"; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java index 4fd4f38e..b6ef6642 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/dgx/u9c/service/impl/U9CPluginServiceImpl.java @@ -4,7 +4,9 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.plugin.dgx.u9c.dao.IOaDao; import com.hzya.frame.plugin.dgx.u9c.entity.*; import com.hzya.frame.plugin.dgx.u9c.service.*; import com.hzya.frame.sysnew.application.entity.SysApplicationEntity; @@ -17,9 +19,11 @@ import org.apache.commons.collections.CollectionUtils; import org.bson.types.Code; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -44,6 +48,10 @@ public class U9CPluginServiceImpl implements IU9CPluginService { private IRequisitionDetailService requisitionDetailServiceImpl; @Resource private IIntegrationTaskLivingDetailsService taskLivingDetailsService; + @Autowired + private AcquireTokenServiceImpl acquireTokenService; + @Resource + private IOaDao oaDao; @Value("${zt.url}") private String url; @@ -65,11 +73,8 @@ public class U9CPluginServiceImpl implements IU9CPluginService { String taskId = requestJson.getString("integration_task_living_details_id"); //查询U9C预付单 PrepaymentEntity prepaymentEntity = new PrepaymentEntity(); - //prepaymentEntity.setDocNo("RE-1563"); prepaymentEntity.setDataSourceCode(datasourceCode); if (StrUtil.isEmpty(taskId)) { - //prepaymentEntity.setStartTime(startTime); - //prepaymentEntity.setEndTime(endTime); } else { prepaymentEntity.setId(taskId); } @@ -666,42 +671,70 @@ public class U9CPluginServiceImpl implements IU9CPluginService { **/ @Override public JsonResultEntity backPrepaymentStartFlow(JSONObject requestJson) { - //WHERE formmain_0049.field0044 is NULL and COL_SUMMARY.STATE in ( '1','3','0') - //and formmain_0049.finishedflag = 1 //数据源编码 String datasourceCode = requestJson.getString("sourceCode"); //重试id String taskId = requestJson.getString("integration_task_living_details_id"); //查询OA预付单 - PrepaymentEntity prepaymentEntity = new PrepaymentEntity(); - //todo 查询数据 - prepaymentEntity.setDataSourceCode(datasourceCode); + OaEntity oaEntity = new OaEntity(); + oaEntity.setDataSourceCode(datasourceCode); if (!StrUtil.isEmpty(taskId)) { - prepaymentEntity.setId(taskId); + oaEntity.setId(taskId); } - List prepaymentList = prepaymentService.queryList(prepaymentEntity); - + List oaEntities = oaDao.queryQkdList(oaEntity); //发送数据 - if (CollectionUtils.isNotEmpty(prepaymentList)) { - for (PrepaymentEntity prepayment : prepaymentList) { - //todo 组装数据 + if (CollectionUtils.isNotEmpty(oaEntities)) { + for (OaEntity oaEntity1 : oaEntities) { + if(oaEntity1.getDocNo() == null || "".equals(oaEntity1.getDocNo())){ + OaEntity updateOa = new OaEntity(); + updateOa.setDataSourceCode(datasourceCode); + updateOa.setId(oaEntity1.getId()); + updateOa.setSendStatus("2"); + updateOa.setSendMsg("失败:单据号为空"); + oaDao.updateQkd(updateOa); + continue; + } + + JSONArray senddataList = new JSONArray(); JSONObject senddata = new JSONObject(); - logger.info("德广信OA回传预付单状态到U9C参数:{}", senddata.toString()); + senddata.put("Code",oaEntity1.getDocNo()); + senddataList.add(senddata); + logger.info("德广信OA回传预付单状态到U9C参数:{}", senddataList.toString()); String res = null; Boolean flag = false; try { //todo调用接口 - + String token = acquireTokenService.getToken(); + if(StrUtil.isEmpty(token)){ + continue; + } + String apicode = "8000440005"; + if(oaEntity1.getStatus() != null && "3".equals(oaEntity1.getStatus())){ + apicode ="8000440004"; + } + String result = HttpRequest.post(url) + .header("token", token)//目标应用 + .header("appId", "800044")//目标应用 + .header("apiCode", apicode)//目标api + .header("publicKey", "ZJYAdmAd+G+wwPab5xb6R6a/n+AJoLcXTWy4IYUJSsIZCkxCe7eDIk+3zDUT+v578prj")//调用方key + .header("secretKey", "5oaeo0y2U+3ocl2dbvvStTINXKUNXyiDwiwkim0v/DG4WrdQ97jMoE2/za5T5GcFj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")//调用方密钥 + .body(senddataList.toString()) + .timeout(30000) + .execute() + .body(); + JSONObject jsonObject = JSONObject.parseObject(result); + flag = jsonObject.getBoolean("flag"); + res = result; } catch (Exception e) { - logger.error("调用oa接口出错:{}", e); + logger.error("调用U9接口出错:{}", e); res = e.getMessage(); } //保存日志 IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); taskLivingDetail.setCreate_time(new Date()); taskLivingDetail.setModify_time(new Date()); - taskLivingDetail.setRootAppPk(prepayment.getId());// todo - taskLivingDetail.setRootAppBill(prepayment.getDocNo());// todo + taskLivingDetail.setRootAppPk(oaEntity1.getId()); + taskLivingDetail.setRootAppBill(oaEntity1.getDocNo()); taskLivingDetail.setPluginId("BackStatusPrepaymentPlugin"); taskLivingDetail.setRootAppNewData(senddata.toString()); taskLivingDetail.setNewTransmitInfo(res); @@ -710,21 +743,19 @@ public class U9CPluginServiceImpl implements IU9CPluginService { logger.info("OA回传预付单状态到U9C流程返回结果:{}", res); // 发送完成修改主表状态 已完成或发送失败 flag判断 if (flag) { - // todo - PrepaymentEntity updatePrepayment = new PrepaymentEntity(); - updatePrepayment.setDataSourceCode(datasourceCode); - updatePrepayment.setId(prepayment.getId()); - updatePrepayment.setDataStatus("1"); - updatePrepayment.setDataMsg("成功"); - prepaymentService.updateStatus(updatePrepayment); + OaEntity updateOa = new OaEntity(); + updateOa.setDataSourceCode(datasourceCode); + updateOa.setId(oaEntity1.getId()); + updateOa.setSendStatus("1"); + updateOa.setSendMsg("成功"); + oaDao.updateQkd(updateOa); } else { - // todo - PrepaymentEntity updatePrepayment = new PrepaymentEntity(); - updatePrepayment.setDataSourceCode(datasourceCode); - updatePrepayment.setId(prepayment.getId()); - updatePrepayment.setDataStatus("1"); - updatePrepayment.setDataMsg("失败:" + res); - prepaymentService.updateStatus(updatePrepayment); + OaEntity updateOa = new OaEntity(); + updateOa.setDataSourceCode(datasourceCode); + updateOa.setId(oaEntity1.getId()); + updateOa.setSendStatus("2"); + updateOa.setSendMsg("失败:" + res); + oaDao.updateQkd(updateOa); } } } @@ -740,41 +771,72 @@ public class U9CPluginServiceImpl implements IU9CPluginService { **/ @Override public JsonResultEntity backRequisitionStartFlow(JSONObject requestJson) { - //WHERE formmain_0049.field0044 is NULL and COL_SUMMARY.STATE in ( '1','3','0') - //and formmain_0049.finishedflag = 1 //数据源编码 String datasourceCode = requestJson.getString("sourceCode"); //重试id String taskId = requestJson.getString("integration_task_living_details_id"); //查询OA预付单 - PrepaymentEntity prepaymentEntity = new PrepaymentEntity(); - //todo 查询数据 - prepaymentEntity.setDataSourceCode(datasourceCode); + OaEntity oaEntity = new OaEntity(); + oaEntity.setDataSourceCode(datasourceCode); if (!StrUtil.isEmpty(taskId)) { - prepaymentEntity.setId(taskId); + oaEntity.setId(taskId); } - List prepaymentList = prepaymentService.queryList(prepaymentEntity); + List oaEntities = oaDao.queryQgdList(oaEntity); //发送数据 - if (CollectionUtils.isNotEmpty(prepaymentList)) { - for (PrepaymentEntity prepayment : prepaymentList) { - //todo 组装数据 + if (CollectionUtils.isNotEmpty(oaEntities)) { + for (OaEntity oaEntity1 : oaEntities) { + if(oaEntity1.getDocNo() == null || "".equals(oaEntity1.getDocNo())){ + OaEntity updateOa = new OaEntity(); + updateOa.setDataSourceCode(datasourceCode); + updateOa.setId(oaEntity1.getId()); + updateOa.setSendStatus("2"); + updateOa.setSendMsg("失败:单据号为空"); + oaDao.updateQkd(updateOa); + continue; + } + JSONArray senddataList = new JSONArray(); + JSONObject PRData = new JSONObject(); JSONObject senddata = new JSONObject(); - logger.info("德广信OA回传请购单状态到U9C参数:{}", senddata.toString()); + senddata.put("Code",oaEntity1.getDocNo()); + PRData.put("PRData",senddata); + senddataList.add(PRData); + logger.info("德广信OA回传请购单状态到U9C参数:{}", senddataList.toString()); String res = null; Boolean flag = false; try { //todo调用接口 + String token = acquireTokenService.getToken(); + if(StrUtil.isEmpty(token)){ + continue; + } + String apicode = "8000440007"; + if(oaEntity1.getStatus() != null && "3".equals(oaEntity1.getStatus())){ + apicode ="8000440006"; + } + String result = HttpRequest.post(url) + .header("token", token)//目标应用 + .header("appId", "800044")//目标应用 + .header("apiCode", apicode)//目标api + .header("publicKey", "ZJYAdmAd+G+wwPab5xb6R6a/n+AJoLcXTWy4IYUJSsIZCkxCe7eDIk+3zDUT+v578prj")//调用方key + .header("secretKey", "5oaeo0y2U+3ocl2dbvvStTINXKUNXyiDwiwkim0v/DG4WrdQ97jMoE2/za5T5GcFj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")//调用方密钥 + .body(senddataList.toString()) + .timeout(30000) + .execute() + .body(); + JSONObject jsonObject = JSONObject.parseObject(result); + flag = jsonObject.getBoolean("flag"); + res = result; } catch (Exception e) { - logger.error("调用oa接口出错:{}", e); + logger.error("调用U9接口出错:{}", e); res = e.getMessage(); } //保存日志 IntegrationTaskLivingDetailsEntity taskLivingDetail = new IntegrationTaskLivingDetailsEntity(); taskLivingDetail.setCreate_time(new Date()); taskLivingDetail.setModify_time(new Date()); - taskLivingDetail.setRootAppPk(prepayment.getId());// todo - taskLivingDetail.setRootAppBill(prepayment.getDocNo());// todo + taskLivingDetail.setRootAppPk(oaEntity1.getId()); + taskLivingDetail.setRootAppBill(oaEntity1.getDocNo()); taskLivingDetail.setPluginId("BackStatusRequisitionPlugin"); taskLivingDetail.setRootAppNewData(senddata.toString()); taskLivingDetail.setNewTransmitInfo(res); @@ -783,23 +845,20 @@ public class U9CPluginServiceImpl implements IU9CPluginService { logger.info("OA回传请购单状态到U9C流程返回结果:{}", res); // 发送完成修改主表状态 已完成或发送失败 flag判断 if (flag) { - // todo - PrepaymentEntity updatePrepayment = new PrepaymentEntity(); - updatePrepayment.setDataSourceCode(datasourceCode); - updatePrepayment.setId(prepayment.getId()); - updatePrepayment.setDataStatus("1"); - updatePrepayment.setDataMsg("成功"); - prepaymentService.updateStatus(updatePrepayment); + OaEntity updateOa = new OaEntity(); + updateOa.setDataSourceCode(datasourceCode); + updateOa.setId(oaEntity1.getId()); + updateOa.setSendStatus("1"); + updateOa.setSendMsg("成功"); + oaDao.updateQgd(updateOa); } else { - // todo - PrepaymentEntity updatePrepayment = new PrepaymentEntity(); - updatePrepayment.setDataSourceCode(datasourceCode); - updatePrepayment.setId(prepayment.getId()); - updatePrepayment.setDataStatus("1"); - updatePrepayment.setDataMsg("失败:" + res); - prepaymentService.updateStatus(updatePrepayment); + OaEntity updateOa = new OaEntity(); + updateOa.setDataSourceCode(datasourceCode); + updateOa.setId(oaEntity1.getId()); + updateOa.setSendStatus("2"); + updateOa.setSendMsg("失败:" + res); + oaDao.updateQgd(updateOa); } - } } return BaseResult.getSuccessMessageEntity("德广信OA回传请购单状态到U9C插件执行成功"); diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml index 58a0c89a..2b5e3682 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/dgx/spring/spring-buildpackage-dao.xml @@ -6,4 +6,5 @@ + diff --git a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java index 6bfc4164..d927d012 100644 --- a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java +++ b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java @@ -20,7 +20,7 @@ public class temButtom { public void test01() { String a = AESUtil.encrypt("dgx@2018"); System.out.println(a); - String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b"); + String b = AESUtil.decrypt("f571f73abf62eeef41f0a0993bb01db9"); System.out.println(b); } diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index 706cf221..ebb087f8 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -2575,7 +2575,11 @@ public class SysApplicationServiceImpl extends BaseService