diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/PullSapDataTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/PullSapDataTask.java index 29308b56..ac8afe7e 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/PullSapDataTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/PullSapDataTask.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.core.dao.ConfirmDao; +import com.dxhy.core.dao.GsClientMapper; +import com.dxhy.core.entity.GsClient; import com.dxhy.core.job.entity.SNSAPObject; import com.dxhy.core.job.entity.ScheduleJobEntity; import com.dxhy.core.job.entity.TAcOrg; @@ -47,6 +49,8 @@ public class PullSapDataTask { @Value("${po.password}") private String password; + @Resource + GsClientMapper gsClientMapper; public void applyStat() { log.info("拉取sap数据获取"); @@ -64,7 +68,13 @@ public class PullSapDataTask { object.setSYSID("FPXT"); object.setIFYWID("FI842"); object.setBSKEY(UUID.randomUUID().toString().replace("-", "")); - object.setZFILED5(environment); + DynamicContextHolder.push(DbConstant.BASICS_READ); + List gsClients = gsClientMapper.selectByGsdm(tAcOrg.getOrgcode()); + if(gsClients!=null && gsClients.size()>0){ + object.setZFILED5(gsClients.get(0).getClient()); + }else { + object.setZFILED5(environment); + } Map requestMap = new HashMap<>(); //公司代码 requestMap.put("ZGSDM",tAcOrg.getOrgcode()); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java index 71adc061..85ff30e9 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java @@ -6,7 +6,11 @@ import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.nacos.common.http.HttpUtils; import com.dxhy.common.constant.CommonConstants; +import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.utils.R; +import com.dxhy.extend.dao.GsClientMapper; +import com.dxhy.extend.entity.GsClient; import com.dxhy.extend.model.SNSAPObject; import com.dxhy.extend.service.bb.VouncherSyncService; import lombok.extern.slf4j.Slf4j; @@ -32,6 +36,8 @@ public class VouncherSyncController { private VouncherSyncService vouncherSyncService; @Value("${sdny.record.environment}") private String environment; + @Resource + private GsClientMapper gsClientMapper; @PostMapping("getSapData") public Object getSapData(@RequestBody Map map){ //是否全量 X为全量推送,空为增量推送。 @@ -73,7 +79,13 @@ public class VouncherSyncController { // object.setZFILED2(""); // object.setZFILED3(""); // object.setZFILED4(""); - object.setZFILED5(environment); + DynamicContextHolder.push(DbConstant.BASICS_READ); + List gsClients = gsClientMapper.selectByGsdm(str); + if(gsClients!=null && gsClients.size()>0){ + object.setZFILED5(gsClients.get(0).getClient()); + }else { + object.setZFILED5(environment); + } Map requestMap = new HashMap<>(); List list = new ArrayList<>(); requestMap.put("ZGSDM",str); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/dao/GsClientMapper.java b/dxhy-extend/src/main/java/com/dxhy/extend/dao/GsClientMapper.java new file mode 100644 index 00000000..be424995 --- /dev/null +++ b/dxhy-extend/src/main/java/com/dxhy/extend/dao/GsClientMapper.java @@ -0,0 +1,31 @@ +package com.dxhy.extend.dao; + + +import com.dxhy.extend.entity.GsClient; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface GsClientMapper { + int deleteByPrimaryKey(Integer id); + + int deleteAll(); + + int insert(GsClient record); + + int insertSelective(GsClient record); + + int insertList(@Param("list") List recordList); + + GsClient selectByPrimaryKey(Integer id); + + + + List selectByGsdm(String gsdm); + + int updateByPrimaryKeySelective(GsClient record); + + int updateByPrimaryKey(GsClient record); +} \ No newline at end of file diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/GsClient.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/GsClient.java new file mode 100644 index 00000000..86b2ec92 --- /dev/null +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/GsClient.java @@ -0,0 +1,19 @@ +package com.dxhy.extend.entity; + +import lombok.Data; + +import java.util.Date; + +@Data +public class GsClient { + private Integer id; + + private String gsdm; + + private String gsmc; + + private String client; + + private Date createTime; + +} \ No newline at end of file diff --git a/dxhy-extend/src/main/resources/mapper/GsClientMapper.xml b/dxhy-extend/src/main/resources/mapper/GsClientMapper.xml new file mode 100644 index 00000000..0b3d1972 --- /dev/null +++ b/dxhy-extend/src/main/resources/mapper/GsClientMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + id, gsdm, gsmc, client, create_time + + + + + delete from gs_client + where id = #{id,jdbcType=INTEGER} + + + delete from gs_client + + + insert into gs_client (id, gsdm, gsmc, + client, create_time) + values (#{id,jdbcType=INTEGER}, #{gsdm,jdbcType=VARCHAR}, #{gsmc,jdbcType=VARCHAR}, + #{client,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}) + + + insert into gs_client + + + id, + + + gsdm, + + + gsmc, + + + client, + + + create_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{gsdm,jdbcType=VARCHAR}, + + + #{gsmc,jdbcType=VARCHAR}, + + + #{client,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + + + update gs_client + + + gsdm = #{gsdm,jdbcType=VARCHAR}, + + + gsmc = #{gsmc,jdbcType=VARCHAR}, + + + client = #{client,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update gs_client + set gsdm = #{gsdm,jdbcType=VARCHAR}, + gsmc = #{gsmc,jdbcType=VARCHAR}, + client = #{client,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + insert into gs_client (gsdm,gsmc,client,create_time) + values + + (#{item.gsdm,jdbcType=VARCHAR}, #{item.gsmc,jdbcType=VARCHAR}, + #{item.client,jdbcType=VARCHAR},#{item.createTime,jdbcType=TIMESTAMP}) + + + \ No newline at end of file