diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/c4project/plugin/LexmisC4ProjectPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/c4project/plugin/LexmisC4ProjectPluginInitializer.java index b14381b2..84bbbcd5 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/c4project/plugin/LexmisC4ProjectPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/c4project/plugin/LexmisC4ProjectPluginInitializer.java @@ -1,6 +1,9 @@ package com.hzya.frame.plugin.c4project.plugin; +import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; @@ -8,8 +11,12 @@ import com.hzya.frame.plugin.c4project.dao.IC4ProjectDao; import com.hzya.frame.plugin.c4project.entity.C4ProjectXmDetailEntity; import com.hzya.frame.plugin.c4project.entity.C4ProjectXmEntity; import com.hzya.frame.plugin.c4project.entity.LexmisC4ProjectEntity; +import com.hzya.frame.seeyon.entity.CollAttachmentResDTO; +import com.hzya.frame.sysnew.application.api.entity.SysApplicationApiEntity; +import com.hzya.frame.sysnew.application.api.service.ISysApplicationApiService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import com.hzya.frame.web.exception.BaseSystemException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +34,8 @@ public class LexmisC4ProjectPluginInitializer extends PluginBaseEntity{ Logger logger = LoggerFactory.getLogger(LexmisC4ProjectPluginInitializer.class); @Autowired private IC4ProjectDao ic4ProjectDao; + @Autowired + private ISysApplicationApiService sysApplicationApiService; @Value("${zt.url}") private String url; @Override @@ -280,7 +289,7 @@ public class LexmisC4ProjectPluginInitializer extends PluginBaseEntity{ } String sendResult = HttpRequest.post(url). header("appId", "800051"). - header("apiCode", "8000510001"). + header("apiCode", ""). header("token", token). header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). @@ -290,46 +299,39 @@ public class LexmisC4ProjectPluginInitializer extends PluginBaseEntity{ logger.error("同步"+jdmz+"单据发送返回：" + sendResult); JSONObject sendJson = JSONObject.parseObject(sendResult); if (sendJson.getBoolean("flag")) { - JSONObject attribute = sendJson.getJSONObject("attribute"); - JSONObject attributeData = attribute.getJSONObject("data"); - JSONArray workitems = attributeData.getJSONArray("workitems"); - if(workitems == null || workitems.size() == 0){ - return BaseResult.getFailureMessageEntity("同步"+jdmz+"发送错误返回没有流程信息，无法自动提交"); - } - JSONObject workitemsis = workitems.getJSONObject(0); - JSONObject tjData = new JSONObject(); - tjData.put("appName","collaboration"); - tjData.put("workitemId",workitemsis.getString("id")); - JSONObject da = new JSONObject(); - da.put("submitType","1"); - JSONObject comment_deal = new JSONObject(); - comment_deal.put("attitude","2"); - comment_deal.put("content","同意"); - da.put("comment_deal",comment_deal); - tjData.put("data",da); - return BaseResult.getSuccessMessageEntity("同步"+jdmz+"发送成功"); + String attType = "0"; + String url = "/seeyon/rest/coll/attachments/@SummaryID@/@attType@"; + url = url.replaceAll("@SummaryID@",businessDataStr.getString("SummaryID")).replaceAll("@attType@",attType); + String body = HttpRequest.get(url).header("token", token).execute().body(); + if (StrUtil.isNotEmpty(body) && JSONUtil.isTypeJSON(body)){ + List list = JSON.parseArray(body,CollAttachmentResDTO.class); - //String tjResult = HttpRequest.post(url). - // header("appId", "800051"). - // header("apiCode", "8000510018"). - // header("token", token). - // header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). - // header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). - // body(tjData.toJSONString()). - // execute(). - // body(); - //logger.error("同步"+jdmz+"单据提交返回：" + tjResult); - //JSONObject tjJson = JSONObject.parseObject(tjResult); - //if (tjJson.getBoolean("flag")) { - // return BaseResult.getSuccessMessageEntity("同步"+jdmz+"发送成功"); - //} else { - // return BaseResult.getFailureMessageEntity("同步"+jdmz+"提交错误："+tjJson.getString("msg")); - //} + + } + + + + return BaseResult.getSuccessMessageEntity("同步"+jdmz+"发送成功"); } else { return BaseResult.getFailureMessageEntity("同步"+jdmz+"发送错误："+sendJson.getString("msg")); } } - + private SysApplicationApiEntity getByCode(String api_code){ + if (StrUtil.isNotEmpty(api_code)){ + SysApplicationApiEntity sysApp = new SysApplicationApiEntity(); + sysApp.setApiCode(Long.valueOf(api_code)); + sysApp = sysApplicationApiService.queryOne(sysApp); + if (null != sysApp && StrUtil.isNotEmpty(sysApp.getId())){ + sysApp = sysApplicationApiService.get(sysApp.getId()); + if (null != sysApp){ + return sysApp; + } + } + }else { + throw new BaseSystemException("api_code不能为空"); + } + return null; + } /** * @Author lvleigang * @Description 浙江三维通信研究院有限公司 diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/IComplianceSupplierDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/IComplianceSupplierDao.java index 2dc8836e..c204fa49 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/IComplianceSupplierDao.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/IComplianceSupplierDao.java @@ -1,14 +1,22 @@ -package com.hzya.frame.plugin.nuonuo.dao; +package com.hzya.frame.plugin.complianceSupplier.dao; import com.hzya.frame.basedao.dao.IBaseDao; -import com.hzya.frame.plugin.nuonuo.entity.NuoNuoEntity; +import com.hzya.frame.plugin.complianceSupplier.entity.ComplianceSupplierEntity; import java.util.List; -public interface INuoNuoDao extends IBaseDao { - int updateHpdata(NuoNuoEntity nuoNuoEntity); +public interface IComplianceSupplierDao extends IBaseDao { - List queryAffair(NuoNuoEntity nuoNuoEntity); + + List queryAffair(ComplianceSupplierEntity complianceSupplierEntity); + + List querySqr(ComplianceSupplierEntity sqrEntity); + + List querySqbm(ComplianceSupplierEntity sqbmEntity); + + int updateData(ComplianceSupplierEntity entity1); + + List getQueryData(ComplianceSupplierEntity complianceSupplierEntity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/impl/ComplianceSupplierDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/impl/ComplianceSupplierDaoImpl.java index 9a0c1075..80fc5c1b 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/impl/ComplianceSupplierDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/dao/impl/ComplianceSupplierDaoImpl.java @@ -1,26 +1,42 @@ -package com.hzya.frame.plugin.nuonuo.dao.impl; +package com.hzya.frame.plugin.complianceSupplier.dao.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.hzya.frame.basedao.dao.MybatisGenericDao; -import com.hzya.frame.plugin.nuonuo.dao.INuoNuoDao; +import com.hzya.frame.plugin.complianceSupplier.dao.IComplianceSupplierDao; +import com.hzya.frame.plugin.complianceSupplier.entity.ComplianceSupplierEntity; import com.hzya.frame.plugin.nuonuo.entity.NuoNuoEntity; -import com.hzya.frame.seeyon.entity.NuoNuoCallbackEntity; import java.util.List; -public class NuoNuoDaoImpl extends MybatisGenericDao implements INuoNuoDao { +public class ComplianceSupplierDaoImpl extends MybatisGenericDao implements IComplianceSupplierDao { @DS("#entity.dataSourceCode") @Override - public int updateHpdata(NuoNuoEntity entity) { - return super.update(getSqlIdPrifx()+"updateHpdata",entity); + public List queryAffair(ComplianceSupplierEntity entity) { + return (List) super.selectList(getSqlIdPrifx()+"queryAffair",entity); } @DS("#entity.dataSourceCode") @Override - public List queryAffair(NuoNuoEntity entity) { - return (List) super.selectList(getSqlIdPrifx()+"queryAffair",entity); + public List querySqr(ComplianceSupplierEntity entity) { + return (List) super.selectList(getSqlIdPrifx()+"querySqr",entity); } + @DS("#entity.dataSourceCode") + @Override + public List querySqbm(ComplianceSupplierEntity entity) { + return (List) super.selectList(getSqlIdPrifx()+"querySqbm",entity); + + } + @DS("#entity.dataSourceCode") + @Override + public int updateData(ComplianceSupplierEntity entity) { + return super.update(getSqlIdPrifx()+"updateData",entity); + } + @DS("#entity.dataSourceCode") + @Override + public List getQueryData(ComplianceSupplierEntity entity) { + return (List) super.selectList(getSqlIdPrifx()+"getQueryData",entity); + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.java index 9e1aa7cd..e45de101 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.java @@ -1,25 +1,30 @@ -package com.hzya.frame.plugin.nuonuo.entity; +package com.hzya.frame.plugin.complianceSupplier.entity; import com.hzya.frame.web.entity.BaseEntity; -public class NuoNuoEntity extends BaseEntity { +public class ComplianceSupplierEntity extends BaseEntity { - private String id; - private String field0191;//申请编号 - private String field0192;//红字确认单状态 - private String field0193;//红字确认单描述 - private String field0194;//红冲状态 - private String field0195;//红冲描述 + private String sqr; + private String sqbm; private String affairId; private String noname; private String nodename; - public String getNodename() { - return nodename; + private String id; + private String sqjg; + private String cljg; + private String sqjgField; + private String cljgField; + private String dhField; + private String dh; + private String tableName; + + public String getAffairId() { + return affairId; } - public void setNodename(String nodename) { - this.nodename = nodename; + public void setAffairId(String affairId) { + this.affairId = affairId; } public String getNoname() { @@ -30,12 +35,28 @@ public class NuoNuoEntity extends BaseEntity { this.noname = noname; } - public String getAffairId() { - return affairId; + public String getNodename() { + return nodename; } - public void setAffairId(String affairId) { - this.affairId = affairId; + public void setNodename(String nodename) { + this.nodename = nodename; + } + + public String getSqr() { + return sqr; + } + + public void setSqr(String sqr) { + this.sqr = sqr; + } + + public String getSqbm() { + return sqbm; + } + + public void setSqbm(String sqbm) { + this.sqbm = sqbm; } @Override @@ -48,44 +69,60 @@ public class NuoNuoEntity extends BaseEntity { this.id = id; } - public String getField0191() { - return field0191; + public String getSqjg() { + return sqjg; } - public void setField0191(String field0191) { - this.field0191 = field0191; + public void setSqjg(String sqjg) { + this.sqjg = sqjg; } - public String getField0192() { - return field0192; + public String getCljg() { + return cljg; } - public void setField0192(String field0192) { - this.field0192 = field0192; + public void setCljg(String cljg) { + this.cljg = cljg; } - public String getField0193() { - return field0193; + public String getSqjgField() { + return sqjgField; } - public void setField0193(String field0193) { - this.field0193 = field0193; + public void setSqjgField(String sqjgField) { + this.sqjgField = sqjgField; } - public String getField0194() { - return field0194; + public String getCljgField() { + return cljgField; } - public void setField0194(String field0194) { - this.field0194 = field0194; + public void setCljgField(String cljgField) { + this.cljgField = cljgField; } - public String getField0195() { - return field0195; + public String getTableName() { + return tableName; } - public void setField0195(String field0195) { - this.field0195 = field0195; + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getDhField() { + return dhField; + } + + public void setDhField(String dhField) { + this.dhField = dhField; + } + + public String getDh() { + return dh; + } + + public void setDh(String dh) { + this.dh = dh; } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.xml index d5661b79..12c8f76c 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/entity/ComplianceSupplierEntity.xml @@ -1,25 +1,39 @@ - + - - update formmain_11970 set - - field0191 = #{field0191}, - field0192 = #{field0192}, - field0193 = #{field0193}, - field0194 = #{field0194}, - field0195 = #{field0195}, - - where id = #{id} - - - - select NODE_NAME as noname,NODE_POLICY as nodename from ctp_affair id = #{affairId} + + + + + + update ${tableName} set + + ${sqjgField} = #{sqjg}, + ${cljgField} = #{cljg}, + + where id = #{id} + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/plugin/ComplianceSupplierDataPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/plugin/ComplianceSupplierDataPluginInitializer.java new file mode 100644 index 00000000..36052908 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/plugin/ComplianceSupplierDataPluginInitializer.java @@ -0,0 +1,61 @@ +package com.hzya.frame.plugin.complianceSupplier.plugin; + +import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.complianceSupplier.service.IComplianceSupplierService; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class ComplianceSupplierDataPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(ComplianceSupplierDataPluginInitializer.class); + @Autowired + private IComplianceSupplierService complianceSupplierService; + + @Override + public void initialize() { + logger.info(getPluginLabel() + "执行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "执行销毁方法destroy()"); + } + + @Override + public String getPluginId() { + return "ComplianceSupplierDataPlugin"; + } + + @Override + public String getPluginName() { + return "ComplianceSupplierDataPlugin插件"; + } + + @Override + public String getPluginLabel() { + return "ComplianceSupplierDataPlugin"; + } + + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) { + try { + logger.info("======开始执行合规同步========"); + //return complianceSupplierService.sendComplianceSupplier(requestJson); + return complianceSupplierService.doSendComplianceSupplierData(requestJson); + } catch (Exception e) { + logger.info("======执行合规同步失败:{}========", e.getMessage()); + } + return null; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/plugin/ComplianceSupplierPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/plugin/ComplianceSupplierPluginInitializer.java index 4727560d..343413ee 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/plugin/ComplianceSupplierPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/plugin/ComplianceSupplierPluginInitializer.java @@ -1,26 +1,23 @@ -package com.hzya.frame.plugin.nuonuo.plugin; +package com.hzya.frame.plugin.complianceSupplier.plugin; + import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.plugin.masterData.plugin.MdmPluginInitializer; -import com.hzya.frame.plugin.nuonuo.service.INuoNuoService; -import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService; +import com.hzya.frame.plugin.complianceSupplier.service.IComplianceSupplierService; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; /** - * 诺诺发票 - * * @author makejava * @since 2024-06-21 13:52:35 */ -public class NuoNuoPluginInitializer extends PluginBaseEntity{ - Logger logger = LoggerFactory.getLogger(NuoNuoPluginInitializer.class); +public class ComplianceSupplierPluginInitializer extends PluginBaseEntity { + Logger logger = LoggerFactory.getLogger(ComplianceSupplierPluginInitializer.class); @Autowired - private INuoNuoService nuoNuoService; + private IComplianceSupplierService complianceSupplierService; - @Override + @Override public void initialize() { logger.info(getPluginLabel() + "执行初始化方法initialize()"); } @@ -32,30 +29,32 @@ public class NuoNuoPluginInitializer extends PluginBaseEntity{ @Override public String getPluginId() { - return "NuoNuoPlugin"; + return "ComplianceSupplierPlugin"; } @Override public String getPluginName() { - return "NuoNuoPlugin插件"; + return "ComplianceSupplierPlugin插件"; } @Override public String getPluginLabel() { - return "NuoNuoPlugin"; + return "ComplianceSupplierPlugin"; } @Override public String getPluginType() { return "1"; } + @Override public JsonResultEntity executeBusiness(JSONObject requestJson) { try { - logger.info("======开始执行诺诺发票同步========"); - return nuoNuoService.sendNuoNuoFaPiao(requestJson); - }catch (Exception e){ - logger.info("======执行诺诺发票同步失败:{}========",e.getMessage()); + logger.info("======开始执行合规同步========"); + //return complianceSupplierService.sendComplianceSupplier(requestJson); + return complianceSupplierService.doSendComplianceSupplier(requestJson); + } catch (Exception e) { + logger.info("======执行合规同步失败:{}========", e.getMessage()); } return null; } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/IComplianceSupplierService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/IComplianceSupplierService.java index 560d1fdf..2a07d125 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/IComplianceSupplierService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/IComplianceSupplierService.java @@ -1,37 +1,22 @@ -package com.hzya.frame.plugin.nuonuo.service; +package com.hzya.frame.plugin.complianceSupplier.service; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.IBaseService; -import com.hzya.frame.plugin.nuonuo.entity.NuoNuoEntity; +import com.hzya.frame.plugin.complianceSupplier.entity.ComplianceSupplierEntity; import com.hzya.frame.web.entity.JsonResultEntity; -public interface INuoNuoService extends IBaseService{ - /** - * @Author lvleigang - * @Description 同步诺诺发票蓝字 - * @Date 5:31 下午 2025/6/26 - * @param requestJson - * @return com.hzya.frame.web.entity.JsonResultEntity - **/ - JsonResultEntity sendNuoNuoFaPiao(JSONObject requestJson); +public interface IComplianceSupplierService extends IBaseService{ /** * @Author lvleigang - * @Description 诺诺发票确认单 - * @Date 4:35 下午 2025/7/2 + * @Description 合规同步 + * @Date 2:21 下午 2025/7/28 * @param requestJson * @return com.hzya.frame.web.entity.JsonResultEntity **/ - JsonResultEntity sendNuoNuoFaPiaoQrd(JSONObject requestJson); + JsonResultEntity sendComplianceSupplier(JSONObject requestJson); - /** - * @Author lvleigang - * @Description 诺诺发票红冲 - * @Date 4:35 下午 2025/7/2 - * @param requestJson - * @return com.hzya.frame.web.entity.JsonResultEntity - **/ - JsonResultEntity sendNuoNuoFaPiaoHc(JSONObject requestJson); + JsonResultEntity doSendComplianceSupplier(JSONObject requestJson); - JsonResultEntity sendNuoNuoFaPiaoHp(JSONObject requestJson); + JsonResultEntity doSendComplianceSupplierData(JSONObject requestJson); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/impl/ComplianceSupplierServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/impl/ComplianceSupplierServiceImpl.java index aad0c615..b916243a 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/impl/ComplianceSupplierServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/complianceSupplier/service/impl/ComplianceSupplierServiceImpl.java @@ -1,50 +1,43 @@ -package com.hzya.frame.plugin.nuonuo.service.impl; +package com.hzya.frame.plugin.complianceSupplier.service.impl; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; +import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.hzya.frame.plugin.nuonuo.dao.INuoNuoDao; -import com.hzya.frame.plugin.nuonuo.entity.NuoNuoEntity; -import com.hzya.frame.plugin.nuonuo.service.INuoNuoService; -import com.hzya.frame.seeyon.enums.ColEventTypeEnum; +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.plugin.complianceSupplier.dao.IComplianceSupplierDao; +import com.hzya.frame.plugin.complianceSupplier.entity.ComplianceSupplierEntity; +import com.hzya.frame.plugin.complianceSupplier.service.IComplianceSupplierService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; -import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.hzya.frame.basedao.service.impl.BaseService; import org.springframework.beans.factory.annotation.Value; -import java.math.BigDecimal; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; -public class NuoNuoServiceImpl extends BaseService implements INuoNuoService { +public class ComplianceSupplierServiceImpl extends BaseService implements IComplianceSupplierService { @Value("${zt.url}") private String url; - private INuoNuoDao nuoNuoDao; + private IComplianceSupplierDao complianceSupplierDao; @Autowired - public void setNuoNuoCustomerDao(INuoNuoDao dao) { - this.nuoNuoDao = dao; + public void setComplianceSupplierCustomerDao(IComplianceSupplierDao dao) { + this.complianceSupplierDao = dao; this.dao = dao; } + /** * @param requestJson * @return com.hzya.frame.web.entity.JsonResultEntity * @Author lvleigang - * @Description 同步发票 - * @Date 5:31 下午 2025/6/26 + * @Description 合规同步 + * @Date 2:21 下午 2025/7/28 **/ @Override - public JsonResultEntity sendNuoNuoFaPiao(JSONObject requestJson) { - logger.error("诺诺发票蓝票节点参数：" + requestJson.toJSONString()); + public JsonResultEntity sendComplianceSupplier(JSONObject requestJson) { + logger.error("合规同步节点参数：" + requestJson.toJSONString()); JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); if (jsonStr == null) { return BaseResult.getFailureMessageEntity("系统错误"); @@ -55,16 +48,14 @@ public class NuoNuoServiceImpl extends BaseService impleme } String affairId = jsonStr.getString("affairId"); if (affairId != null && !"".equals(affairId)) { - NuoNuoEntity nuoNuoEntity = new NuoNuoEntity(); - nuoNuoEntity.setDataSourceCode("SW-OA"); - nuoNuoEntity.setAffairId(affairId); - List nuoNuoEntities = nuoNuoDao.queryAffair(nuoNuoEntity); + ComplianceSupplierEntity complianceSupplierEntity = new ComplianceSupplierEntity(); + complianceSupplierEntity.setDataSourceCode("SW-OA"); + complianceSupplierEntity.setAffairId(affairId); + List nuoNuoEntities = complianceSupplierDao.queryAffair(complianceSupplierEntity); if (nuoNuoEntities != null && nuoNuoEntities.size() == 1) { if (nuoNuoEntities.get(0).getNoname() != null) { - if ("确认申请".equals(nuoNuoEntities.get(0).getNoname()) || "确认申请".equals(nuoNuoEntities.get(0).getNodename())) { - return sendNuoNuoFaPiaolp(requestJson); - } else if ("ERP审批".equals(nuoNuoEntities.get(0).getNoname()) || "ERP审批".equals(nuoNuoEntities.get(0).getNodename())) { - return sendBipFaPiaolp(requestJson); + if ("合规同步".equals(nuoNuoEntities.get(0).getNoname()) || "合规同步".equals(nuoNuoEntities.get(0).getNodename())) { + return doSendComplianceSupplier(requestJson); } else { return BaseResult.getFailureMessageEntity("节点查找失败"); } @@ -84,11 +75,11 @@ public class NuoNuoServiceImpl extends BaseService impleme * @param requestJson * @return com.hzya.frame.web.entity.JsonResultEntity * @Author lvleigang - * @Description 发送Bip - * @Date 1:44 下午 2025/7/9 + * @Description 同步合规 + * @Date 2:31 下午 2025/7/28 **/ - private JsonResultEntity sendBipFaPiaolp(JSONObject requestJson) { - logger.error("同步应收单:" + requestJson.toJSONString()); + public JsonResultEntity doSendComplianceSupplier(JSONObject requestJson) { + logger.error("同步合规:" + requestJson.toJSONString()); JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); if (jsonStr == null) { return BaseResult.getFailureMessageEntity("系统错误"); @@ -97,667 +88,319 @@ public class NuoNuoServiceImpl extends BaseService impleme if (businessDataStr == null) { return BaseResult.getFailureMessageEntity("系统错误"); } - JSONObject mainData = businessDataStr.getJSONObject("formmain_11951"); - if (mainData == null) { + String tableName = null; + String id = null; + String gj = null; + String dh = null; + String gys = null; + String sqr = null; + String sqbm = null; + String sqjg = null; + String cljg = null; + if (businessDataStr.containsKey("formmain_11208")) { + + tableName = "formmain_11208"; + JSONObject mainData = businessDataStr.getJSONObject(tableName); + id = mainData.getString("id"); + gj = mainData.getString("field0174"); + dh = mainData.getString("field0114"); + gys = mainData.getString("field0124"); + sqr = mainData.getString("field0118"); + sqbm = mainData.getString("field0120"); + sqjg = "field0172"; + cljg = "field0173"; + } else if (businessDataStr.containsKey("formmain_7220")) { + tableName = "formmain_7220"; + JSONObject mainData = businessDataStr.getJSONObject(tableName); + id = mainData.getString("id"); + gj = mainData.getString("field0056"); + dh = mainData.getString("field0001"); + gys = mainData.getString("field0009"); + sqr = mainData.getString("field0002"); + sqbm = mainData.getString("field0004"); + sqjg = "field0058"; + cljg = "field0059"; + } else if (businessDataStr.containsKey("formmain_8694")) { + + tableName = "formmain_8694"; + JSONObject mainData = businessDataStr.getJSONObject(tableName); + id = mainData.getString("id"); + gj = mainData.getString("field0159"); + dh = mainData.getString("field0001"); + gys = mainData.getString("field0008"); + sqr = mainData.getString("field0002"); + sqbm = mainData.getString("field0004"); + sqjg = "field0157"; + cljg = "field0158"; + } else { return BaseResult.getFailureMessageEntity("系统错误"); } - JSONArray detailArray = businessDataStr.getJSONArray("formson_11953"); - //组装发送数据 - JSONObject sendData = null; - try { - sendData = getSendYsdData(mainData, detailArray); - } catch (ParseException e) { - e.printStackTrace(); - return BaseResult.getFailureMessageEntity("推送应收单失败：组装数据失败"); + if (gj == null || "".equals(gj) || gys == null || "".equals(gys)) { + logger.error("国家或者供应商名称不允许为空"); + + return BaseResult.getFailureMessageEntity("国家或者供应商名称不允许为空"); } - //发送数据 - logger.error("推送应收单推送：" + sendData.toJSONString()); - - String tokenResult = HttpRequest.post(url). - header("appId", "800050"). - header("apiCode", "8000500023"). - header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). - header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). - body(sendData.toJSONString()). - execute(). - body(); - logger.error("推送应收单返回：" + tokenResult); - JSONObject resoutJson = JSONObject.parseObject(tokenResult); - if (resoutJson.getBoolean("flag")) { - return BaseResult.getSuccessMessageEntity("推送应收单成功"); - } else { - return BaseResult.getFailureMessageEntity("推送应收单失败：" + resoutJson.getString("msg")); - } - } - - /** - * @param mainData - * @param detailArray - * @return com.alibaba.fastjson.JSONObject - * @Author lvleigang - * @Description 组装数据 - * @Date 6:12 下午 2025/6/27 - **/ - private JSONObject getSendYsdData(JSONObject mainData, JSONArray detailArray) throws ParseException { - // 创建主JSONObject - JSONObject mainJson = new JSONObject(); - mainJson.put("billtype", "ys"); - // 创建data JSONObject - JSONObject data = new JSONObject(); - data.put("sourceSystem", "OA"); - data.put("billcode", mainData.getString("field0001")); - if ("cs199".equals(mainData.getString("field0130"))) { - data.put("orgcode", "666"); - } else { - data.put("orgcode", mainData.getString("field0130")); - } - data.put("billdate", mainData.getString("field0151")); - data.put("busidate", mainData.getString("field0151")); - data.put("pk_psndoc", mainData.getString("field0006")); - data.put("scomment", ""); - data.put("objtype", "0"); - data.put("tradingCode", mainData.getString("field0091")); - data.put("amount", mainData.getString("field0174")); - data.put("usercode", "OA01"); - data.put("deptcode", mainData.getString("field0124")); - data.put("projectno", null); - data.put("paytype", null); - data.put("fkxz", null); - //data.put("ipo", ""); - //data.put("cpo", ""); - data.put("recaccount", mainData.getString("field0165")); - data.put("currency", "CNY"); - //data.put("bankSeq", ""); - data.put("localAmount", mainData.getString("field0174")); - data.put("rate", "1"); - data.put("creator", "OA01"); - JSONArray expenseList = new JSONArray(); - - if (detailArray != null && detailArray.size() > 0) { - for (int i = 0; i < detailArray.size(); i++) { - // 创建expenseList JSONArray - JSONObject expenseItem = new JSONObject(); - expenseItem.put("materialCode", ""); - expenseItem.put("invoiceno", mainData.getString("field0150")); - expenseItem.put("sklx", ""); - expenseItem.put("buysellflag", "1"); - expenseItem.put("szxm", ""); - expenseItem.put("notaxAmount", detailArray.getJSONObject(i).getString("field0160")); - expenseItem.put("localNotaxAmount", detailArray.getJSONObject(i).getString("field0160")); - expenseItem.put("srcDetailId", null); - expenseItem.put("balatype", null); - expenseItem.put("cashaccount", null); - expenseItem.put("scomment", mainData.getString("field0191")); - expenseItem.put("amount", detailArray.getJSONObject(i).getString("field0149")); - expenseItem.put("deptcode", detailArray.getJSONObject(i).getString("field0124")); - expenseItem.put("recaccount", detailArray.getJSONObject(i).getString("field0165")); - expenseItem.put("taxAmount", detailArray.getJSONObject(i).getString("field0159")); - expenseItem.put("quantity", detailArray.getJSONObject(i).getString("field0157")); - expenseItem.put("localAmount", detailArray.getJSONObject(i).getString("field0149")); - expenseItem.put("detailId", detailArray.getJSONObject(i).getString("field0192")); - if(detailArray.getJSONObject(i).getString("field0156") != null && !"".equals(detailArray.getJSONObject(i).getString("field0156"))){ - BigDecimal value = detailArray.getJSONObject(i).getBigDecimal("field0156"); - int result = value.multiply(BigDecimal.valueOf(100)).intValue(); // 结果：5 - expenseItem.put("taxRate", String.valueOf(result)); - }else { - expenseItem.put("taxRate", "0"); - - } - expenseItem.put("kplx", detailArray.getJSONObject(i).getString("field0148")); - //expenseItem.put("areacl", ""); - expenseItem.put("subjectCode", "1122"); - expenseItem.put("projectCode", detailArray.getJSONObject(i).getString("field0190")); // 项目号 - expenseItem.put("ghNo", ""); // 收入确认单号 - expenseItem.put("ghNo", detailArray.getJSONObject(i).getString("field0148")); // 应收业务性质 - - expenseList.add(expenseItem); + if (sqr != null && !"".equals(sqr)) { + ComplianceSupplierEntity sqrEntity = new ComplianceSupplierEntity(); + sqrEntity.setDataSourceCode("SW-OA"); + sqrEntity.setSqr(sqr); + List sqrList = complianceSupplierDao.querySqr(sqrEntity); + if (sqrList != null && sqrList.size() > 0) { + sqr = sqrList.get(0).getSqr(); + } else { + sqr = ""; + } + } + if (sqbm != null && !"".equals(sqbm)) { + ComplianceSupplierEntity sqbmEntity = new ComplianceSupplierEntity(); + sqbmEntity.setDataSourceCode("SW-OA"); + sqbmEntity.setSqbm(sqbm); + List sqbmList = complianceSupplierDao.querySqbm(sqbmEntity); + if (sqbmList != null && sqbmList.size() > 0) { + sqbm = sqbmList.get(0).getSqbm(); + } else { + sqbm = ""; } } - // 将expenseList添加到data - data.put("expenseList", expenseList); - // 将data添加到主JSONObject - mainJson.put("data", data); - return mainJson; - } + //获取token + String token = getToken(); + if (token == null || "".equals(token)) { + logger.error("合规系统token获取失败"); - /** - * @param requestJson - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 发送蓝票 - * @Date 1:44 下午 2025/7/9 - **/ - public JsonResultEntity sendNuoNuoFaPiaolp(JSONObject requestJson) { - logger.error("同步诺诺发票蓝字:" + requestJson.toJSONString()); - JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); - if (jsonStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr"); - if (businessDataStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONObject mainData = businessDataStr.getJSONObject("formmain_11951"); - if (mainData == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONArray detailArray = businessDataStr.getJSONArray("formson_11953"); - if (mainData.getString("field0168") != null && "SJ".equals(mainData.getString("field0168"))) { - return BaseResult.getSuccessMessageEntity("发票类型为SJ，不传诺税通"); - } - if (mainData.getString("field0150") != null && !"".equals(mainData.getString("field0150"))) { - return BaseResult.getSuccessMessageEntity("发票号码已存在，不传诺税通"); + return BaseResult.getFailureMessageEntity("合规系统token获取失败"); } //组装发送数据 - JSONObject sendData = null; - try { - sendData = getSendData(mainData, detailArray); - } catch (ParseException e) { - e.printStackTrace(); - return BaseResult.getFailureMessageEntity("推送诺诺发票失败：组装数据失败"); + JSONObject sendData = new JSONObject(); + // ClientContext 对象 + JSONObject clientContext = new JSONObject(); + clientContext.put("ClientReference", dh); // 单号 + sendData.put("ClientContext", clientContext); + + // AssignResultTo 对象 + JSONObject assignResultTo = new JSONObject(); + assignResultTo.put("Division", "供应商审查组"); + assignResultTo.put("EmailNotification", "false"); + + JSONArray rolesOrUsers = new JSONArray(); + rolesOrUsers.add("合规专员"); + assignResultTo.put("RolesOrUsers", rolesOrUsers); + + assignResultTo.put("Type", "Role"); + + // SearchConfiguration 对象 + JSONObject searchConfiguration = new JSONObject(); + searchConfiguration.put("AssignResultTo", assignResultTo); + searchConfiguration.put("PredefinedSearchName", "供应商审查"); + searchConfiguration.put("WriteResultsToDatabase", true); + searchConfiguration.put("ExcludeScreeningListMatches", "false"); + sendData.put("SearchConfiguration", searchConfiguration); + + // Address 对象 + JSONObject address = new JSONObject(); + address.put("Country", gj);//国家三位码 + address.put("Type", "Current"); + + // Addresses 数组 + JSONArray addresses = new JSONArray(); + addresses.add(address); + + // Name 对象 + JSONObject name = new JSONObject(); + name.put("Full", gys);//供应商 + + // Account 对象 + JSONObject account = new JSONObject(); + account.put("OtherData", sqr + " " + sqbm);//申请人 申请部门 + + // Entity 对象 + JSONObject entity = new JSONObject(); + entity.put("EntityType", "Individual"); + entity.put("Addresses", addresses); + entity.put("Account", account); + entity.put("Name", name); + + // Record 对象 + JSONObject record = new JSONObject(); + record.put("Entity", entity); + + // Records 数组 + JSONArray records = new JSONArray(); + records.add(record); + + // SearchInput 对象 + JSONObject searchInput = new JSONObject(); + searchInput.put("Records", records); + sendData.put("SearchInput", searchInput); - } //发送数据 - logger.error("推送诺诺发票推送：" + sendData.toJSONString()); + logger.error("推送合规推送数据：" + sendData.toJSONString()); String tokenResult = HttpRequest.post(url). header("appId", "800051"). - header("apiCode", "8000510012"). + header("apiCode", "8000510019"). + header("Accept", "application/json"). + header("X-API-Key", "984fcd60-ea94-4217-9457-dce67b051038"). + header("Authorization", "Bearer " + token). header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). body(sendData.toJSONString()). execute(). body(); - logger.error("推送诺诺发票返回：" + tokenResult); + logger.error("推送合规返回：" + tokenResult); JSONObject resoutJson = JSONObject.parseObject(tokenResult); if (resoutJson.getBoolean("flag")) { - return BaseResult.getSuccessMessageEntity("推送诺诺发票成功"); + JSONObject attribute = resoutJson.getJSONObject("attribute"); + if (attribute.containsKey("Records")) { + JSONArray recordss = attribute.getJSONArray("Records"); + if (recordss == null || recordss.size() == 0) { + return BaseResult.getFailureMessageEntity("推送合规失败"); + } + JSONObject Records = recordss.getJSONObject(0); + String ResultID = Records.getString("ResultID"); + ComplianceSupplierEntity entity1 = new ComplianceSupplierEntity(); + entity1.setDataSourceCode("SW-OA"); + entity1.setId(id); + entity1.setTableName(tableName); + entity1.setSqjg(ResultID); + entity1.setSqjgField(sqjg); + complianceSupplierDao.updateData(entity1); + } else { + ComplianceSupplierEntity entity1 = new ComplianceSupplierEntity(); + entity1.setDataSourceCode("SW-OA"); + entity1.setId(id); + entity1.setTableName(tableName); + entity1.setSqjg("合规"); + entity1.setSqjgField(sqjg); + entity1.setCljg("合规"); + entity1.setCljgField(cljg); + complianceSupplierDao.updateData(entity1); + } + return BaseResult.getSuccessMessageEntity("推送合规成功"); } else { - return BaseResult.getFailureMessageEntity("推送诺诺发票失败：" + resoutJson.getString("msg")); + return BaseResult.getFailureMessageEntity("推送合规失败：" + resoutJson.getString("msg")); } } - /** - * @param mainData - * @param detailArray - * @return com.alibaba.fastjson.JSONObject - * @Author lvleigang - * @Description 组装数据 - * @Date 6:12 下午 2025/6/27 - **/ - private JSONObject getSendData(JSONObject mainData, JSONArray detailArray) throws ParseException { - JSONObject sendData = new JSONObject(); - sendData.put("buyerName", mainData.getString("field0092"));//购方名称 - sendData.put("buyerTaxnum", mainData.getString("field0146"));//购方税号 - sendData.put("buyerAddress", mainData.getString("field0134"));//购方地址 - sendData.put("buyerPhone", mainData.getString("field0135"));//购方电话 - sendData.put("buyerBank", mainData.getString("field0128"));//购方开户行 - sendData.put("buyerAccount", mainData.getString("field0139"));//购方银行账号 - sendData.put("orderNo", mainData.getString("field0001"));//订单编号 - //sendData.put("bizCallbackUrl", "http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoCallback");//回调地址测试 - sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoCallback");//回调地址正式 - sendData.put("sellerName", mainData.getString("field0129"));//销方名称 - sendData.put("sellerTaxnum", mainData.getString("field0162"));//销方税号 - sendData.put("sellerAddress", mainData.getString("field0161"));//销方地址 - sendData.put("sellerPhone", mainData.getString("field0163"));//销方电话 - sendData.put("sellerBank", mainData.getString("field0164"));//销方开户银行 - sendData.put("sellerAccount", mainData.getString("field0165"));//销方银行账号 - sendData.put("invoiceLine", mainData.getString("field0168"));//发票种类，bs:数电专票(电子),pc:数电普票(电子) - sendData.put("invoiceType", 1);//开票类型，1:蓝票；2:红票 - sendData.put("substituteFlag", 0);//代开标志，0:非代开;1:代开。 - sendData.put("listFlag", 0);//清单标志，0:非清单；1:清单 - sendData.put("notifyType", -1);//推送方式，-1:不推送;0:邮箱;1:手机(默认);2:邮箱、手机;3:根据交付手机、邮箱动态交付 - sendData.put("requestSrc", 0);//请求来源，0 :api接口 - sendData.put("checkBlue", 0);//开具红票时是否校验蓝票 0.校验蓝票是否存在诺税通 1.不校验蓝票是否存在诺税通但校验可冲红金额 2.不校验蓝票是否存在诺税通且不校验可冲红金额 - JSONArray sendArray = new JSONArray(); - - String ys = null; - String field0177 = null; - String field0190 = null; - if (detailArray != null && detailArray.size() > 0) { - for (int i = 0; i < detailArray.size(); i++) { - if (detailArray.getJSONObject(i).getString("field0193") != null && "06".equals(detailArray.getJSONObject(i).getString("field0193"))) { - ys = "06"; - field0177 = detailArray.getJSONObject(i).getString("field0177"); - } - if (detailArray.getJSONObject(i).getString("field0193") != null && "03".equals(detailArray.getJSONObject(i).getString("field0193"))) { - ys = "03"; - field0190 = detailArray.getJSONObject(i).getString("field0190"); - } - JSONObject detail = new JSONObject(); - detail.put("detailIndex", detailArray.getJSONObject(i).getString("field0147"));//明细序号数电票明细行必须从1开始编号 - detail.put("detailType", 0);//明细行性质:0,正常行;1,折扣行;2,被折扣行 - detail.put("goodsName", detailArray.getJSONObject(i).getString("field0148"));//商品名称 - if (detailArray.getJSONObject(i).getString("field0159") != null && !"".equals(detailArray.getJSONObject(i).getString("field0159")) - && detailArray.getJSONObject(i).getBigDecimal("field0159").compareTo(BigDecimal.ONE) == 0 //税额 - ) { - detail.put("withTaxFlag", 0);//含税标志，0:不含税,1:含税 - } else { - detail.put("withTaxFlag", 1);//含税标志，0:不含税,1:含税 - } - if(ys == null || !"03".equals(ys)){ - detail.put("goodsPrice", detailArray.getJSONObject(i).getString("field0154"));//含税单价 - detail.put("taxFreePrice", detailArray.getJSONObject(i).getString("field0155"));//不含税单价 - detail.put("goodsNum", detailArray.getJSONObject(i).getString("field0157"));//数量 - } - detail.put("taxrate", detailArray.getJSONObject(i).getString("field0156"));//税率 - detail.put("goodsCode", detailArray.getJSONObject(i).getString("field0158"));//税收分类编码 - detail.put("favouredPolicyCode", detailArray.getJSONObject(i).getString("field0170"));//优惠政策编码 - detail.put("deduction", detailArray.getJSONObject(i).getString("field0172"));//扣除额 - detail.put("taxFreeAmount", detailArray.getJSONObject(i).getString("field0160"));//不含税金额 - detail.put("tax", detailArray.getJSONObject(i).getString("field0159"));//税额 - detail.put("taxAmount", detailArray.getJSONObject(i).getString("field0149"));//含税金额 - if (detailArray.getJSONObject(i).getString("field0147") != null && !"".equals(detailArray.getJSONObject(i).getString("field0147"))) { - detail.put("favouredPolicyFlag", "1");//优惠政策标识，0:不使用;1:使用 数电发票时为空，仅传入优惠政策编码即可 - } else { - detail.put("favouredPolicyFlag", "0");//优惠政策标识，0:不使用;1:使用 数电发票时为空，仅传入优惠政策编码即可 - } - sendArray.add(detail); - } - } - sendData.put("detail", sendArray); - if ("06".equals(ys)) { - sendData.put("specificFactor", "06");//不动产租赁发票 - JSONArray realPropertyRentInfoList = new JSONArray(); - JSONObject detail = new JSONObject(); - detail.put("realPropertyAddress", mainData.getString("field0182"));//不动产地址 - detail.put("detailAddress", mainData.getString("field0180"));//不动产详细地址 - detail.put("realPropertyCertificate", field0177);//规格型号/不动产权证 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = inputFormat.parse(mainData.getString("field0183")); - detail.put("rentStartDate", sdf.format(date));//租赁期起期，停车费业务支持yyyy-MM-dd HH:mm格式 - Date date1 = inputFormat.parse(mainData.getString("field0184")); - detail.put("rentEndDate", sdf.format(date1));//租赁期止期支持yyyy-MM-dd HH:mm格式 - if (mainData.getString("field0185") != null && "1".equals(mainData.getString("field0185"))) { - detail.put("crossCityFlag", 1);//跨地市标志 - } else { - detail.put("crossCityFlag", 0);//跨地市标志 - } - detail.put("unit", mainData.getString("field0186"));//面积单位（默认平方米） - realPropertyRentInfoList.add(detail); - sendData.put("realPropertyRentInfoList", realPropertyRentInfoList);//不动产租赁发票 - }else if ("03".equals(ys)) { - sendData.put("specificFactor", "03");//建筑服务 - JSONObject detail = new JSONObject(); - detail.put("buildingAddress", mainData.getString("field0182"));//建筑服务发生地 - detail.put("detailedAddress", mainData.getString("field0180"));//不动产详细地址 - detail.put("landVatItemNo", mainData.getString("field0194"));//土地增值税项目编号 - detail.put("itemName", field0190);//项目名称 - detail.put("taxRelatedNumber", mainData.getString("field0196"));//跨区域涉税事项报验管理编号 - - if (mainData.getString("field0185") != null && "1".equals(mainData.getString("field0185"))) { - detail.put("crossCityFlag", 1);//跨地市标志 - } else { - detail.put("crossCityFlag", 0);//跨地市标志 - } - sendData.put("invoiceBuildingInfo", detail);//不动产租赁发票 - }else { - StringBuffer asd = new StringBuffer(); - if(mainData.getString("field0179") != null){ - asd.append(mainData.getString("field0179")); - asd.append(" "); - } - if(mainData.getString("field0180") != null){ - asd.append(mainData.getString("field0180")); - asd.append(" "); - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if(mainData.getString("field0183") != null){ - Date date = inputFormat.parse(mainData.getString("field0183")); - asd.append(sdf.format(date)); - asd.append(" "); - } - if(mainData.getString("field0184") != null){ - Date date = inputFormat.parse(mainData.getString("field0184")); - asd.append(sdf.format(date)); - asd.append(" "); - } - if(asd != null && !"".equals(asd.toString())){ - sendData.put("remark",asd.toString()); - } - } - return sendData; - } - - /** - * @param requestJson - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 诺诺发票确认单 - * @Date 4:35 下午 2025/7/2 - **/ @Override - public JsonResultEntity sendNuoNuoFaPiaoQrd(JSONObject requestJson) { - logger.error("同步诺诺发票确认单:" + requestJson.toJSONString()); - JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); - if (jsonStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); + public JsonResultEntity doSendComplianceSupplierData(JSONObject requestJson) { + //获取token + String token = getToken(); + if (token == null || "".equals(token)) { + return BaseResult.getFailureMessageEntity("合规系统token获取失败"); } - JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr"); - if (businessDataStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); + // 获取待查询数据 + List get11208 = getQueryData("formmain_11208", "field0172", "field0173", ""); + if (get11208 != null && get11208.size() > 0) { + for (int i = 0; i < get11208.size(); i++) { + sendAndSetData(get11208.get(i), token); + } } - JSONObject mainData = businessDataStr.getJSONObject("formmain_11970"); - if (mainData == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONArray detailArray = businessDataStr.getJSONArray("formson_11971"); - if (mainData.getString("field0168") != null && "SJ".equals(mainData.getString("field0168"))) { - return BaseResult.getSuccessMessageEntity("发票类型为SJ，不传诺税通"); - } - //组装发送数据 - JSONObject sendData = getSendDataQrd(mainData, detailArray); - //发送数据 - logger.error("推送诺诺发票确认单推送：" + sendData.toJSONString()); - String tokenResult = HttpRequest.post(url). - header("appId", "800051"). - header("apiCode", "8000510013"). - header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). - header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). + List get7220 = getQueryData("formmain_7220", "field0058", "field0059", ""); + if (get7220 != null && get7220.size() > 0) { + for (int i = 0; i < get7220.size(); i++) { + sendAndSetData(get7220.get(i), token); + } + } + List get8694 = getQueryData("formmain_8694", "field0157", "field0158", ""); + if (get8694 != null && get8694.size() > 0) { + for (int i = 0; i < get8694.size(); i++) { + sendAndSetData(get8694.get(i), token); + } + } + return BaseResult.getSuccessMessageEntity("查询合规结果成功"); + } + + private void sendAndSetData(ComplianceSupplierEntity complianceSupplierEntity, String token) { + //组装发送数据 + JSONObject sendData = new JSONObject(); + // 创建 ClientContext 对象并设置 ClientReference + JSONObject clientContext = new JSONObject(); + clientContext.put("ClientReference", complianceSupplierEntity.getDh()); + // 创建 Ids 数组并添加元素 + JSONArray idsArray = new JSONArray(); + idsArray.add(complianceSupplierEntity.getSqjg()); + // 将 ClientContext 和 Ids 添加到主对象 + sendData.put("ClientContext", clientContext); + sendData.put("Ids", idsArray); + logger.error("合规系统获取结果参数" + sendData.toJSONString()); + + String tokenResult = HttpRequest.post("https://10.0.3.120/LN.Webservices/api/Results/Records").//TODO 正式 + header("Accept", "application/json"). + header("X-API-Key", "984fcd60-ea94-4217-9457-dce67b051038"). + header("Authorization", "Bearer " + token). body(sendData.toJSONString()). execute(). body(); - logger.error("推送诺诺发票确认单返回1：" + tokenResult); - try { - JSONObject resoutJson = JSONObject.parseObject(tokenResult); - logger.error("推送诺诺发票确认单返回2：" + resoutJson.toJSONString()); - - if (resoutJson.getBoolean("flag")) { - try { - JSONObject attribute = resoutJson.getJSONObject("attribute"); - logger.error("推送诺诺发票确认单返回3：" + attribute.toJSONString()); - NuoNuoEntity nuoNuoEntity = new NuoNuoEntity(); - nuoNuoEntity.setDataSourceCode("SW-OA"); - nuoNuoEntity.setId(mainData.getString("id")); - nuoNuoEntity.setField0191(attribute.getString("data")); - nuoNuoDao.updateHpdata(nuoNuoEntity); - } catch (Exception e) { - e.printStackTrace(); - logger.error("推送诺诺发票确认单保存错误" + e.getMessage()); - } - return BaseResult.getSuccessMessageEntity("推送诺诺发票确认单成功"); - } else { - return BaseResult.getFailureMessageEntity("推送诺诺发票确认单失败：" + resoutJson.getString("msg")); - } - } catch (Exception e) { - logger.error("推送诺诺发票确认单保存错误1" + e.getMessage()); - return BaseResult.getFailureMessageEntity("推送诺诺发票确认单失败：" + e.getMessage()); - } - } - - private JSONObject getSendDataQrd(JSONObject mainData, JSONArray detailArray) { - JSONObject sendData = new JSONObject(); - sendData.put("applySource", 0);//申请方身份：0 销方 - sendData.put("taxNum", mainData.getString("field0162"));//销方税号 - sendData.put("blueInvoiceNumber", mainData.getString("field0178"));//蓝子发票号 - if (mainData.getString("field0190") != null) { - if ("6299379468699910521".equals(mainData.getString("field0190"))) { - sendData.put("redReason", "2");//冲红原因：1销货退回2开票有误3服务中止4销售折让 - } else if ("1471920473864226411".equals(mainData.getString("field0190"))) { - sendData.put("redReason", "3");//冲红原因：1销货退回2开票有误3服务中止4销售折让 - } else if ("2608861944110465928".equals(mainData.getString("field0190"))) { - sendData.put("redReason", "4");//冲红原因：1销货退回2开票有误3服务中止4销售折让 - } else if ("-2754201006580086516".equals(mainData.getString("field0190"))) { - sendData.put("redReason", "1");//冲红原因：1销货退回2开票有误3服务中止4销售折让 - } - } - //sendData.put("bizCallbackUrl", "http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoQrdCallback");//回调地址测试 - sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoQrdCallback");//回调地址正式 - return sendData; - } - - /** - * @param requestJson - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 诺诺发票红冲 - * @Date 4:35 下午 2025/7/2 - **/ - @Override - public JsonResultEntity sendNuoNuoFaPiaoHc(JSONObject requestJson) { - logger.error("同步诺诺发票红冲:" + requestJson.toJSONString()); - JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); - if (jsonStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr"); - if (businessDataStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONObject mainData = businessDataStr.getJSONObject("formmain_11970"); - if (mainData == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONArray detailArray = businessDataStr.getJSONArray("formson_11971"); - if (mainData.getString("field0168") != null && "SJ".equals(mainData.getString("field0168"))) { - return BaseResult.getSuccessMessageEntity("发票类型为SJ，不传诺税通"); - } - if (mainData.getString("field0192") == null) { - return BaseResult.getSuccessMessageEntity("红字确认单状态为空"); - } - if ("01".equals(mainData.getString("field0192")) || "04".equals(mainData.getString("field0192"))) { - //组装发送数据 - JSONObject sendData = getSendDataHc(mainData, detailArray); - //发送数据 - logger.error("推送诺诺发票红冲推送：" + sendData.toJSONString()); - - String tokenResult = HttpRequest.post(url). - header("appId", "800051"). - header("apiCode", "8000510014"). - header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). - header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). - body(sendData.toJSONString()). - execute(). - body(); - logger.error("推送诺诺发票红冲返回：" + tokenResult); - JSONObject resoutJson = JSONObject.parseObject(tokenResult); - if (resoutJson.getBoolean("flag")) { - return BaseResult.getSuccessMessageEntity("推送诺诺发票红冲成功"); - } else { - return BaseResult.getFailureMessageEntity("推送诺诺发票红冲失败：" + resoutJson.getString("msg")); - } - } else { - return BaseResult.getFailureMessageEntity("红字确认单状态错误"); - } - - } - - private JSONObject getSendDataHc(JSONObject mainData, JSONArray detailArray) { - JSONObject sendData = new JSONObject(); - sendData.put("fastRedType", 1);//快捷冲红类型 不填或者0为普通快捷冲红 1:数电发票快捷冲红(数电发票必传1) - sendData.put("sellerTaxnum", mainData.getString("field0162"));//销方税号 - sendData.put("invoiceNumber", mainData.getString("field0178"));//蓝票发票号码 - //sendData.put("invoiceCode",mainData.getString("field0178"));//蓝票发票代码 - //可能需要转换 - sendData.put("billId", mainData.getString("field0191"));//红字确认单申请单号 - //sendData.put("bizCallbackUrl", "http://10.0.2.112:9021/kangarooDataCenterV3/entranceController/nuoNuoHcCallback");//回调地址测试 - sendData.put("bizCallbackUrl","http://10.0.2.112:9011/kangarooDataCenterV3/entranceController/nuoNuoHcCallback");//回调地址正式 - return sendData; - } - - - @Override - public JsonResultEntity sendNuoNuoFaPiaoHp(JSONObject requestJson) { - logger.error("诺诺发票红冲节点参数：" + requestJson.toJSONString()); - JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); - if (jsonStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr"); - if (businessDataStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - - String affairId = jsonStr.getString("affairId"); - if (affairId != null && !"".equals(affairId)) { - NuoNuoEntity nuoNuoEntity = new NuoNuoEntity(); - nuoNuoEntity.setDataSourceCode("SW-OA"); - nuoNuoEntity.setAffairId(affairId); - List nuoNuoEntities = nuoNuoDao.queryAffair(nuoNuoEntity); - if (nuoNuoEntities != null && nuoNuoEntities.size() == 1) { - if (nuoNuoEntities.get(0).getNoname() != null) { - if ("确认申请".equals(nuoNuoEntities.get(0).getNoname()) || "确认申请".equals(nuoNuoEntities.get(0).getNodename())) { - return sendNuoNuoFaPiaoQrd(requestJson); - } else if ("红字开票".equals(nuoNuoEntities.get(0).getNoname()) || "红字开票".equals(nuoNuoEntities.get(0).getNodename())) { - return sendNuoNuoFaPiaoHc(requestJson); - } else if ("ERP审批".equals(nuoNuoEntities.get(0).getNoname()) || "ERP审批".equals(nuoNuoEntities.get(0).getNodename())) { - return sendBipFaPiaoHc(requestJson); - } else { - return BaseResult.getFailureMessageEntity("节点查找失败"); + logger.error("合规系统获取结果参数：" + tokenResult); + JSONArray jsonArray = JSONArray.parseArray(tokenResult); + if (jsonArray != null && jsonArray.size() > 0) { + JSONObject attribute = jsonArray.getJSONObject(0); + if (attribute.containsKey("RecordDetails")) { + JSONObject RecordDetails = attribute.getJSONObject("RecordDetails"); + if (RecordDetails.containsKey("RecordState")) { + JSONObject RecordState = RecordDetails.getJSONObject("RecordState"); + if (RecordState.getString("AlertState") != null && "Closed".equals(RecordState.getString("AlertState"))) { + if (RecordState.containsKey("Status")) { + ComplianceSupplierEntity entity1 = new ComplianceSupplierEntity(); + entity1.setDataSourceCode("SW-OA"); + entity1.setId(complianceSupplierEntity.getId()); + entity1.setTableName(complianceSupplierEntity.getTableName()); + entity1.setSqjg(RecordState.getString("Status")); + entity1.setSqjgField(complianceSupplierEntity.getSqjgField()); + complianceSupplierDao.updateData(entity1); + } else { + ComplianceSupplierEntity entity1 = new ComplianceSupplierEntity(); + entity1.setDataSourceCode("SW-OA"); + entity1.setId(complianceSupplierEntity.getId()); + entity1.setTableName(complianceSupplierEntity.getTableName()); + entity1.setSqjg("返回AlertState为Closed，但是Status没有值"); + entity1.setSqjgField(complianceSupplierEntity.getSqjgField()); + complianceSupplierDao.updateData(entity1); + } } - } else { - return BaseResult.getFailureMessageEntity("节点查找失败"); - } - } else { - return BaseResult.getFailureMessageEntity("节点查找失败"); } - } else { - return BaseResult.getFailureMessageEntity("节点查找失败"); } } - /** - * @param requestJson - * @return com.hzya.frame.web.entity.JsonResultEntity - * @Author lvleigang - * @Description 发送BIP红冲 - * @Date 1:49 下午 2025/7/9 - **/ - private JsonResultEntity sendBipFaPiaoHc(JSONObject requestJson) { - logger.error("同步红冲应收单:" + requestJson.toJSONString()); - JSONObject jsonStr = requestJson.getJSONObject("jsonStr"); - if (jsonStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONObject businessDataStr = jsonStr.getJSONObject("businessDataStr"); - if (businessDataStr == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONObject mainData = businessDataStr.getJSONObject("formmain_11970"); - if (mainData == null) { - return BaseResult.getFailureMessageEntity("系统错误"); - } - JSONArray detailArray = businessDataStr.getJSONArray("formson_11971"); - //组装发送数据 - JSONObject sendData = null; - try { - sendData = getSendHcYsdData(mainData, detailArray); - } catch (ParseException e) { - e.printStackTrace(); - return BaseResult.getFailureMessageEntity("推送红冲应收单失败：组装数据失败"); - } - //发送数据 - logger.error("推送红冲应收单推送：" + sendData.toJSONString()); + private List getQueryData(String tableName, String sqjgField, String cljgField, String dhField) { + ComplianceSupplierEntity complianceSupplierEntity = new ComplianceSupplierEntity(); + complianceSupplierEntity.setDataSourceCode("SW-OA"); + complianceSupplierEntity.setTableName(tableName); + complianceSupplierEntity.setSqjgField(sqjgField); + complianceSupplierEntity.setCljgField(cljgField); + complianceSupplierEntity.setDhField(dhField); + List list = complianceSupplierDao.getQueryData(complianceSupplierEntity); + return list; + } - String tokenResult = HttpRequest.post(url). - header("appId", "800050"). - header("apiCode", "8000500024"). - header("publicKey", "ZJYAM2YFEIsIaI1e4wMagkS2Q7SFgGk0RvsPhEES45m/OVFCe7eDIk+3zDUT+v578prj"). - header("secretKey", "lR6+uf94mvNMclAB43oIwmhJSMDzQaViTkfXLeNvmGdpLfbFiUvbgbU+p43zO25Zj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA="). + private String getToken() { + String token = null; + JSONObject sendData = new JSONObject(); + // 向 JSON 对象中添加键值对 + sendData.put("client_id", "984fcd60-ea94-4217-9457-dce67b051038"); + sendData.put("client_secret", "k_b1E3YUIGv!PtiaeY$JR_Jb&lJ*0FTy"); + sendData.put("resource", "webservice1"); + sendData.put("grant_type", "client_credentials"); + + String tokenResult = HttpRequest.post("https://10.0.3.120/LN.Webservices/api/oauth2/token").// todo 正式 + header("Accept", "application/json"). + header("Content-Type", "text/html;charset=utf-8"). body(sendData.toJSONString()). execute(). body(); - logger.error("推送红冲应收单返回：" + tokenResult); - JSONObject resoutJson = JSONObject.parseObject(tokenResult); - if (resoutJson.getBoolean("flag")) { - return BaseResult.getSuccessMessageEntity("推送红冲应收单成功"); - } else { - return BaseResult.getFailureMessageEntity("推送红冲应收单失败：" + resoutJson.getString("msg")); - } - } - - /** - * @param mainData - * @param detailArray - * @return com.alibaba.fastjson.JSONObject - * @Author lvleigang - * @Description 组装数据 - * @Date 6:12 下午 2025/6/27 - **/ - private JSONObject getSendHcYsdData(JSONObject mainData, JSONArray detailArray) throws ParseException { - // 创建主JSONObject - JSONObject mainJson = new JSONObject(); - mainJson.put("billtype", "ys"); - // 创建data JSONObject - JSONObject data = new JSONObject(); - data.put("sourceSystem", "OA"); - data.put("billcode", mainData.getString("field0001")); - if ("cs199".equals(mainData.getString("field0130"))) { - data.put("orgcode", "666"); - } else { - data.put("orgcode", mainData.getString("field0130")); - } - data.put("billdate", mainData.getString("field0151")); - data.put("busidate", mainData.getString("field0151")); - data.put("pk_psndoc", mainData.getString("field0006")); - data.put("scomment", ""); - data.put("objtype", "0"); - data.put("tradingCode", mainData.getString("field0091")); - data.put("amount", mainData.getString("field0174") != null ? mainData.getBigDecimal("field0174") : "0"); - data.put("usercode", "OA01"); - data.put("deptcode", mainData.getString("field0124")); - data.put("projectno", null); - data.put("paytype", null); - data.put("fkxz", null); - //data.put("ipo", ""); - //data.put("cpo", ""); - data.put("recaccount", mainData.getString("field0165")); - data.put("currency", "CNY"); - //data.put("bankSeq", ""); - data.put("localAmount", mainData.getString("field0174") != null ? mainData.getBigDecimal("field0174") : "0"); - data.put("rate", "1"); - data.put("creator", "OA01"); - JSONArray expenseList = new JSONArray(); - - if (detailArray != null && detailArray.size() > 0) { - for (int i = 0; i < detailArray.size(); i++) { - // 创建expenseList JSONArray - JSONObject expenseItem = new JSONObject(); - expenseItem.put("materialCode", ""); - expenseItem.put("invoiceno", mainData.getString("field0150")); - expenseItem.put("sklx", ""); - expenseItem.put("buysellflag", "1"); - expenseItem.put("szxm", ""); - expenseItem.put("notaxAmount", detailArray.getJSONObject(i).getString("field0160") != null ? detailArray.getJSONObject(i).getBigDecimal("field0160") : "0"); - expenseItem.put("localNotaxAmount", detailArray.getJSONObject(i).getString("field0160") != null ? detailArray.getJSONObject(i).getBigDecimal("field0160") : "0"); - expenseItem.put("srcDetailId", null); - expenseItem.put("balatype", null); - expenseItem.put("cashaccount", null); - expenseItem.put("scomment", mainData.getString("field0178")); - expenseItem.put("amount", detailArray.getJSONObject(i).getString("field0149") != null ? detailArray.getJSONObject(i).getBigDecimal("field0149") : "0"); - expenseItem.put("deptcode", detailArray.getJSONObject(i).getString("field0124")); - expenseItem.put("recaccount", detailArray.getJSONObject(i).getString("field0165")); - expenseItem.put("taxAmount", detailArray.getJSONObject(i).getString("field0159") != null ? detailArray.getJSONObject(i).getBigDecimal("field0159") : "0"); - expenseItem.put("quantity", detailArray.getJSONObject(i).getString("field0157")); - expenseItem.put("localAmount", detailArray.getJSONObject(i).getString("field0149") != null ? detailArray.getJSONObject(i).getBigDecimal("field0149") : "0"); - expenseItem.put("detailId", detailArray.getJSONObject(i).getString("field0197")); - if(detailArray.getJSONObject(i).getString("field0156") != null && !"".equals(detailArray.getJSONObject(i).getString("field0156"))){ - BigDecimal value = detailArray.getJSONObject(i).getBigDecimal("field0156"); - int result = value.multiply(BigDecimal.valueOf(100)).intValue(); // 结果：5 - expenseItem.put("taxRate", String.valueOf(result)); - }else { - expenseItem.put("taxRate", "0"); + logger.error("推送合规推送token返回：" + tokenResult); + if (tokenResult != null && !"".equals(tokenResult)) { + if (JSONUtil.isTypeJSON(tokenResult)) { + JSONObject data = JSONObject.parseObject(tokenResult); + if (data.containsKey("access_token")) { + token = data.getString("access_token"); } - expenseItem.put("kplx", detailArray.getJSONObject(i).getString("field0148")); - //expenseItem.put("areacl", ""); - expenseItem.put("subjectCode", "1122"); - expenseItem.put("projectCode", detailArray.getJSONObject(i).getString("field0188")); // 项目号 - expenseItem.put("ghNo", ""); // 收入确认单号 - expenseItem.put("ghNo", detailArray.getJSONObject(i).getString("field0148")); // 应收业务性质 - expenseList.add(expenseItem); } } - // 将expenseList添加到data - data.put("expenseList", expenseList); - // 将data添加到主JSONObject - mainJson.put("data", data); - return mainJson; + return token; } - } diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/pluginCfg.xml new file mode 100644 index 00000000..9b5c34ce --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/pluginCfg.xml @@ -0,0 +1,6 @@ + + +ComplianceSupplierPlugin +ComplianceSupplierPlugin插件 +20250728001 + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-dao.xml new file mode 100644 index 00000000..edd14437 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-dao.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..3f7b9b04 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-service.xml new file mode 100644 index 00000000..7cd9fceb --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/complianceSupplier/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + +