From 39514e53925e4276768c0cf238b12407803e1c59 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 09:43:57 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/base/controller/BaseInvoiceController.java | 4 ++-- .../main/java/com/dxhy/base/model/BaseFpRzRespVO.java | 2 +- .../base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 7 ++++--- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 8 ++++---- .../src/main/resources/mapper/CustomsRecordMapper.xml | 10 +++++----- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 3994343d..572eb3bd 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -127,14 +127,14 @@ public class BaseInvoiceController extends AbstractController { String businessCode = (String)map.get("businessCode"); String qsr = (String)map.get("qsr"); String rzhr = (String)map.get("rzhr"); - String inAccountStatus = (String)map.get("inaccountStatus"); + String inAccountStatus = (String)map.get("inAccountStatus"); int curr = (int)map.get("curr"); int size = (int)map.get("size"); String bzdh = (String) map.get("bzdh"); Map pramsMap = new HashMap<>(25); pramsMap.put("bzdh", bzdh); - pramsMap.put("inaccountStatus", inAccountStatus); + pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("qszt", map.get("qszt")); pramsMap.put("wrzfpStart", map.get("wrzfpStart")); pramsMap.put("wrzfpEnd", map.get("wrzfpEnd")); diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index 8879c776..580ed7c0 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -171,7 +171,7 @@ public class BaseFpRzRespVO implements Serializable { private String rzlx; private String rzhBackMsg; - private String inaccountStatus; + private String inAccountStatus; /** * 付款状态 */ diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index 842bbc68..04f48389 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -137,7 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl resultList = pageInfo.getList(); + log.info("resultList {}",resultList); json.put("datalist", resultList); } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index f9dd7133..4498312d 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -42,7 +42,7 @@ - + @@ -89,7 +89,7 @@ and t.bzdh = #{bzdh} - and t.inaccount_status = #{inaccountStatus} + and t.inaccount_status = #{inAccountStatus} and t.qs_status = #{qszt} @@ -342,8 +342,8 @@ and t.bzdh = #{bzdh} - - and t.inaccount_status = #{inaccountStatus} + + and t.inaccount_status = #{inAccountStatus} and t.qs_status = #{qszt} diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml index eb0b6636..081ae266 100644 --- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml +++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml @@ -256,7 +256,7 @@ p.check_status as checkStatus, p.dept_name as businessName, p.inaccount_status as inaccountStatus, - p.bzdh + p.bzdh as bzdh FROM t_dx_customs_record p where @@ -277,10 +277,10 @@ and p.gf_tax_no = #{queryParams.gfsh} - + and p.bzdh = #{bzdh} - + and p.inaccount_status = #{inaccountStatus} @@ -369,10 +369,10 @@ and p.gf_tax_no = #{queryParams.gfsh} - + and p.bzdh = #{bzdh} - + and p.inaccount_status = #{inaccountStatus} From 09da84e4a56c2645fe0fb7c63fe69c539f61b547 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 11:12:36 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 2 +- .../BaseInvoiceManualCheckServiceImpl.java | 2 +- .../impl/CustomsCustomsJkszhcxServiceImpl.java | 2 ++ .../service/impl/CustomsRecordDkrzServiceImpl.java | 4 ++++ .../com/dxhy/extend/model/ExtBbfpzhcxRespVO.java | 2 +- .../extend/service/bb/impl/ExtFpzhcxServiceImpl.java | 4 ++-- .../extend/service/bb/impl/ExtYcfpcxServiceImpl.java | 3 +++ .../src/main/resources/mapper/ExtBbfpzhMapper.xml | 12 ++++++------ 8 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index 04f48389..b7317f65 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -182,7 +182,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectByPramsMap(pramsMap); + log.info("数据库查询结果pageList {}",pageList); PageInfo pageInfo = new PageInfo<>(pageList); // 用于页面返回list对象 if (pageList.size() > 0) { @@ -104,6 +105,8 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl - + @@ -35,7 +35,7 @@ - + @@ -76,8 +76,8 @@ and t.bzdh = #{bzdh} - - and t.inaccount_status = #{inaccountStatus} + + and t.inaccount_status = #{inAccountStatus} @@ -335,8 +335,8 @@ and t.bzdh = #{bzdh} - - and t.in_account_status = #{inaccountStatus} + + and t.in_account_status = #{inAccountStatus} and t.qs_status = #{qszt} From 1be6af9c100b1150c1be096e6ab9b6da517e3c79 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 11:34:19 +0800 Subject: [PATCH 03/13] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/dao/GsClientMapper.java | 27 ++++ .../java/com/dxhy/core/entity/EsOutput.java | 32 +++++ .../java/com/dxhy/core/entity/GsClient.java | 19 +++ .../core/entity/PoCommonResponseParam.java | 16 +++ .../export/impl/PoolPaperServiceImpl.java | 5 + .../com/dxhy/core/task/SdnyClientTask.java | 136 ++++++++++++++++++ .../dxhy/core/thread/PoolAddTaxThread.java | 5 +- .../java/com/dxhy/core/util/HttpUtils.java | 88 ++++++++++++ .../java/com/dxhy/core/util/JsonUtils.java | 90 ++++++++++++ .../main/resources/mapper/GsClientMapper.xml | 111 ++++++++++++++ .../controller/SDNYMainProcessController.java | 12 +- .../java/com/dxhy/erp/dao/GsClientMapper.java | 27 ++++ .../java/com/dxhy/erp/entity/GsClient.java | 19 +++ .../main/resources/mapper/GsClientMapper.xml | 111 ++++++++++++++ 14 files changed, 696 insertions(+), 2 deletions(-) create mode 100644 dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java create mode 100644 dxhy-core/src/main/java/com/dxhy/core/entity/EsOutput.java create mode 100644 dxhy-core/src/main/java/com/dxhy/core/entity/GsClient.java create mode 100644 dxhy-core/src/main/java/com/dxhy/core/entity/PoCommonResponseParam.java create mode 100644 dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java create mode 100644 dxhy-core/src/main/java/com/dxhy/core/util/HttpUtils.java create mode 100644 dxhy-core/src/main/java/com/dxhy/core/util/JsonUtils.java create mode 100644 dxhy-core/src/main/resources/mapper/GsClientMapper.xml create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/entity/GsClient.java create mode 100644 dxhy-erp/src/main/resources/mapper/GsClientMapper.xml diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java new file mode 100644 index 00000000..aa4d5827 --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java @@ -0,0 +1,27 @@ +package com.dxhy.core.dao; + + +import com.dxhy.core.entity.GsClient; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +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-core/src/main/java/com/dxhy/core/entity/EsOutput.java b/dxhy-core/src/main/java/com/dxhy/core/entity/EsOutput.java new file mode 100644 index 00000000..2c7bcab9 --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/EsOutput.java @@ -0,0 +1,32 @@ +package com.dxhy.core.entity; + +import lombok.Data; + +/** + * @Description: PO输出参数 + * @Author liufeilong + * @Date 2023-02-06 + **/ +@Data +public class EsOutput { + /** + * 外围系统数据唯一标识 + */ + private String BSKEY; + /** + * SAP数据唯一标识 + */ + private String SAPKEY; + /** + * 数据处理标识(S：成功，E：失败) + */ + private String ZTYPE; + /** + * 数据处理描述 + */ + private String ZMESSAGE; + /** + * 业务报文 + */ + private Object ZDATA; +} diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/GsClient.java b/dxhy-core/src/main/java/com/dxhy/core/entity/GsClient.java new file mode 100644 index 00000000..804ab320 --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/GsClient.java @@ -0,0 +1,19 @@ +package com.dxhy.core.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-core/src/main/java/com/dxhy/core/entity/PoCommonResponseParam.java b/dxhy-core/src/main/java/com/dxhy/core/entity/PoCommonResponseParam.java new file mode 100644 index 00000000..be26e600 --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/PoCommonResponseParam.java @@ -0,0 +1,16 @@ +package com.dxhy.core.entity; + +import lombok.Data; + +/** + * @Description: PO接口公共响应参数 + * @Author liufeilong + * @Date 2023-02-06 + **/ +@Data +public class PoCommonResponseParam { + /** + * ES_OUTPUT + */ + private EsOutput ES_OUTPUT; +} diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java index 687543b5..52b0cf06 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java @@ -5,7 +5,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dxhy.common.util.StringHelper; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -35,6 +37,7 @@ import com.github.pagehelper.PageInfo; */ @SuppressWarnings("AlibabaMethodTooLong") +@Slf4j @Service public class PoolPaperServiceImpl extends MpBaseServiceImpl implements PoolPaperService { @@ -179,7 +182,9 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.listAddTaxInvoice(pramsMap); + log.info("pageList={}",pageList.size()); PageInfo pageInfo = new PageInfo<>(pageList); + log.info("pageInfo={}",pageInfo); json.put("hasNext", pageInfo.isHasNextPage()); json.put("nextPage", pageInfo.getNextPage()); List returnList = new ArrayList<>(); diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java new file mode 100644 index 00000000..dad62fa6 --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/task/SdnyClientTask.java @@ -0,0 +1,136 @@ +package com.dxhy.core.task; + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.datasource.config.DynamicContextHolder; +import com.dxhy.core.dao.ConfirmDao; +import com.dxhy.core.dao.GsClientMapper; +import com.dxhy.core.entity.EsOutput; +import com.dxhy.core.entity.GsClient; +import com.dxhy.core.entity.PoCommonResponseParam; +import com.dxhy.core.job.entity.SNSAPObject; +import com.dxhy.core.job.entity.ScheduleJobEntity; +import com.dxhy.core.job.service.InvoiceInterfaceService; +import com.dxhy.core.job.service.ScheduleJobService; +import com.dxhy.core.util.HttpUtils; +import com.dxhy.core.util.JsonUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.*; + +/** + * @author fth + * @date 2018年04月13日 下午10:57:22 + */ +@SuppressWarnings({"rawtypes", "DuplicatedCode"}) +@Component("sdnyClientTask") +@Slf4j +public class SdnyClientTask extends AbstractController { + + private static final String LOGGER_MSG = "(SAP获取公司client)"; + + @Value("${sdny.snYxUrl}") + private String snYxUrl; + + @Value("${po.userName}") + private String userName; + + @Value("${po.password}") + private String password; + + @Resource + private GsClientMapper gsClientMapper; + + @Resource + private InvoiceInterfaceService invoiceInterfaceService; + @Resource + private ConfirmDao confirmDao; + @Resource + private ScheduleJobService scheduleJobService; + + /** + * 核心线程池大小 + */ + private int corePoolSize = 10; + /** + * 最大线程池大小 + */ + + private int maximumPoolSize = 20; + + /** + * @throws InterruptedException 异常 + * @Desc 发票获取接口 + */ + + public void getSdnyClient() throws InterruptedException { + log.info("获取山东能源Client定时任务开始"); + DynamicContextHolder.push(DbConstant.BASICS_READ); + ScheduleJobEntity scheduleJobEntity = scheduleJobService.queryByBeanName("sdnyClientTask", "getSdnyClient"); + if (scheduleJobEntity != null && "0".equals(scheduleJobEntity.getJobStatus())) { + try { + scheduleJobEntity.setJobStatus("1"); + DynamicContextHolder.push(DbConstant.BASICS_WRITE); + scheduleJobService.updateById(scheduleJobEntity); + // 准备请求参数 + // 需判断 设置不认证状态 + + List list = new ArrayList<>(); + long startTime = System.currentTimeMillis(); + SNSAPObject object = new SNSAPObject(); + object.setSYSID("FPXT"); + object.setIFYWID("FI846"); + object.setBSKEY(UUID.randomUUID().toString().replace("-", "")); + object.setZFILED5("200"); + object.setZDATA(""); + + //推送到SAP + log.info("推送山能数据:{}", JSONObject.toJSONString(object)); + JSONObject request = new JSONObject(); + request.put("IS_INPUT", object); + + log.info("{}获取公司client入参:{}", LOGGER_MSG, request.toJSONString()); + String result = HttpUtils.sendPo(snYxUrl, request.toJSONString(), userName, password); + log.info("{}获取公司client出参:{}", LOGGER_MSG, result); + PoCommonResponseParam poCommonResponseParam = JsonUtils.getInstance().parseObject(result, PoCommonResponseParam.class); + EsOutput es_output = poCommonResponseParam.getES_OUTPUT(); + String ztype = es_output.getZTYPE(); + String zmessage = es_output.getZMESSAGE(); + Object zdata = es_output.getZDATA(); + if ("s".equals(ztype)) { + List> gsClientList = JsonUtils.getInstance().parseObject(zdata.toString(), List.class); + gsClientList.stream().forEach(f -> { + GsClient gsClient = new GsClient(); + gsClient.setGsdm(ObjectUtil.isNull(f.get("BUKRS")) ? "" : f.get("BUKRS").toString()); + gsClient.setGsmc(ObjectUtil.isNull(f.get("BUTXT")) ? "" : f.get("BUTXT").toString()); + gsClient.setClient(ObjectUtil.isNull(f.get("MANDT")) ? "" : f.get("MANDT").toString()); + gsClient.setCreateTime(new Date()); + list.add(gsClient); + }); + } else { + log.error("{}client:{},获取公司client出错:{}", LOGGER_MSG, "200", zmessage); + } + log.info("{}删除gs_client表数据", LOGGER_MSG); + gsClientMapper.deleteAll(); + log.info("{}插入gs_client表", LOGGER_MSG); + gsClientMapper.insertList(list); + long endTime = System.currentTimeMillis(); + log.debug("{}任务结束，耗时:{}", LOGGER_MSG, endTime - startTime); + + } catch (Exception e) { + e.printStackTrace(); + } finally { + log.info("获取山东能源Client定时任务--重置执行状态"); + scheduleJobEntity.setJobStatus("0"); + DynamicContextHolder.push(DbConstant.BASICS_WRITE); + scheduleJobService.updateById(scheduleJobEntity); + } + } + } + +} \ No newline at end of file diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index ba3ceaa9..f7bf54ff 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -197,6 +197,7 @@ public class PoolAddTaxThread extends BaseThread { pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("invoiceSource",prams.getString("invoiceSource")); + log.info("传入的参数为:{}",pramsMap); // 导出文件名 StringBuilder ftpFileName = new StringBuilder(); ftpFileName.append(fileNamePrefix); @@ -224,6 +225,7 @@ public class PoolAddTaxThread extends BaseThread { StringBuilder excelFile = new StringBuilder(); excelFile.append(fileService.getLocalPathDefault()); excelFile.append(ftpFileName.toString()); + log.info("导出的文件名字为:{}",excelFile.toString()); File filePath = new File(getFilePath(excelFile.toString())); if (!filePath.exists()) { filePath.mkdirs(); @@ -386,8 +388,9 @@ public class PoolAddTaxThread extends BaseThread { String titleColumn = datas[var12]; titles.add(Collections.singletonList(titleColumn)); } - + log.info("导出文件的标头为:{}",titles); writeTable.setHead(titles); + List> list = new ArrayList<>(); for (String[] strings : dataList) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/util/HttpUtils.java b/dxhy-core/src/main/java/com/dxhy/core/util/HttpUtils.java new file mode 100644 index 00000000..877357a4 --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/util/HttpUtils.java @@ -0,0 +1,88 @@ +package com.dxhy.core.util; + +import cn.hutool.http.HttpRequest; +import lombok.extern.slf4j.Slf4j; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +/** + * @author ZSC-DXHY + */ +@Slf4j +public class HttpUtils { + + private static final String LOGGER_MSG = "(请求http访问)"; + + /** + * 执行post请求 + * + * @param url + * @param paramMap + * @return + * @throws IOException + */ + public static String doPost(String url, Map paramMap) { + Map requestMap = new HashMap<>(paramMap); + long startTime = System.currentTimeMillis(); + String body = HttpRequest.post(url).form(requestMap).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}以Map调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } + + public static String doPost(String url, String request) { + long startTime = System.currentTimeMillis(); + String body = HttpRequest.post(url).body(request).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } + + public static String doPostWithHeader(String url, String data, Map header) { + long startTime = System.currentTimeMillis(); + String body = HttpRequest.post(url).addHeaders(header).body(data).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}带head调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } + + public static String doPostFormWithHeader(String url, Map paramMap, Map header) { + Map requestMap = new HashMap<>(paramMap); + long startTime = System.currentTimeMillis(); + String body = HttpRequest.post(url).addHeaders(header).form(requestMap).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}带head和form调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } + + public static String doGetWithHeader(String url, Map header) { + long startTime = System.currentTimeMillis(); + String body = HttpRequest.get(url).addHeaders(header).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}带head调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } + + public static String doGet(String url, String request) { + long startTime = System.currentTimeMillis(); + String body = HttpRequest.get(url).body(request).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}以字符串调用get请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } + + //请求山能PO + public static String sendPo(String url, String request,String userName,String password) { + long startTime = System.currentTimeMillis(); + HttpRequest httpRequest = new HttpRequest(url); + httpRequest.basicAuth(userName,password); + String body = httpRequest.body(request).timeout(300000).execute().body(); + long endTime = System.currentTimeMillis(); + log.debug("{}以字符串调用post请求url:{},耗时:{}", LOGGER_MSG, url, endTime - startTime); + return body; + } + +} + diff --git a/dxhy-core/src/main/java/com/dxhy/core/util/JsonUtils.java b/dxhy-core/src/main/java/com/dxhy/core/util/JsonUtils.java new file mode 100644 index 00000000..0dfa262c --- /dev/null +++ b/dxhy-core/src/main/java/com/dxhy/core/util/JsonUtils.java @@ -0,0 +1,90 @@ +package com.dxhy.core.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializeConfig; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; +import com.alibaba.fastjson.util.TypeUtils; + +import java.sql.Timestamp; +import java.util.Date; +import java.util.List; + +/** + * @author: chendognzhi + * @Date: 2017年10月17日 + * @Description: json转换工具 + */ +public class JsonUtils { + private JsonUtils() { + } + + private static final SerializeConfig SERIALIZE_CONFIG = new SerializeConfig(); + + static { + SERIALIZE_CONFIG.put(Date.class, new SimpleDateFormatSerializer("yyyy-MM-dd HH:mm:ss")); + SERIALIZE_CONFIG.put(Timestamp.class, new SimpleDateFormatSerializer("yyyy-MM-dd HH:mm:ss")); + /** + * 设置json格式化第一个字母大写 + */ + TypeUtils.compatibleWithJavaBean = true; + } + + private static final JsonUtils HELPER = new JsonUtils(); + + public static JsonUtils getInstance() { + return HELPER; + } + + /** + * parseObject(json转换为java bean) + */ + public T parseObject(String text, Class clazz) { + return JSON.parseObject(text, clazz); + } + + /** + * toJsonString(对象转换为json字符串) + */ + public String toJsonString(T obj) { + return toJsonString(obj, SERIALIZE_CONFIG); + } + + /** + * toJsonString(对象转换为自定义格式的json字符串) + */ + public String toJsonString(T obj, SerializeConfig serializeConfig) { + return JSON.toJSONString(obj, serializeConfig, SerializerFeature.DisableCircularReferenceDetect); + } + + /** + * 把json串转为指定的对象 + */ + public T fromJson(String str, Class clazz) { + return JSON.parseObject(str, clazz); + } + + /** + * 把对象转换 为json字符串 null的字符串转换为"" + */ + + public String toJsonStringNullToEmpty(T obj) { + return JSON.toJSONString(obj, SerializerFeature.WriteNullStringAsEmpty); + } + + /** + * json字符串转list + */ + public List jsonToList(String text, Class clazz) { + + return JSON.parseArray(text, clazz); + } + + /** + * json字符串转list + */ + public List listBeanCopy(Object text, Class clazz) { + return JSON.parseArray(JSON.toJSONString(text), clazz); + } + +} diff --git a/dxhy-core/src/main/resources/mapper/GsClientMapper.xml b/dxhy-core/src/main/resources/mapper/GsClientMapper.xml new file mode 100644 index 00000000..a5324ea4 --- /dev/null +++ b/dxhy-core/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 diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index ee913bab..9b4d8a5e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -14,6 +14,7 @@ import com.dxhy.common.util.InvoiceUtil; import com.dxhy.common.util.UserInfoUtil; import com.dxhy.common.utils.R; import com.dxhy.erp.dao.CustomsRecordDao; +import com.dxhy.erp.dao.GsClientMapper; import com.dxhy.erp.dao.RecordInvoiceDao; import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao; import com.dxhy.erp.entity.*; @@ -52,6 +53,9 @@ public class SDNYMainProcessController extends AbstractController { @Value("${sdny.environment}") private String environment; + @Resource + private GsClientMapper gsClientMapper; + @Resource private InvoiceQueryService invoiceQueryService; @@ -375,6 +379,7 @@ public class SDNYMainProcessController extends AbstractController { String dbName = "business"; String company = "BIGB"; String taxNo = "9111112222333344DD"; + String orgCode = "1010"; // // 入参统一在入口处理 // String userid = getLoginName(); @@ -409,7 +414,12 @@ public class SDNYMainProcessController extends AbstractController { object.setZFILED2(""); object.setZFILED3(""); object.setZFILED4(""); - object.setZFILED5(environment); + List gsClients = gsClientMapper.selectByGsdm(orgCode); + if(gsClients != null && gsClients.size() > 0) { + object.setZFILED5(gsClients.get(0).getClient()); + }else{ + object.setZFILED5(environment); + } List sapInvoiceInfos = new ArrayList<>(); if (invoiceInfoList != null && invoiceInfoList.size() > 0) { for (SNInvoice invoice : invoiceInfoList) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java new file mode 100644 index 00000000..9782db98 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java @@ -0,0 +1,27 @@ +package com.dxhy.erp.dao; + + +import com.dxhy.erp.entity.GsClient; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +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-erp/src/main/java/com/dxhy/erp/entity/GsClient.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/GsClient.java new file mode 100644 index 00000000..c5211347 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/GsClient.java @@ -0,0 +1,19 @@ +package com.dxhy.erp.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-erp/src/main/resources/mapper/GsClientMapper.xml b/dxhy-erp/src/main/resources/mapper/GsClientMapper.xml new file mode 100644 index 00000000..1dad4035 --- /dev/null +++ b/dxhy-erp/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 From a5c5134e7b0a364863dd035430267b775f7d5013 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 11:37:22 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java | 2 +- .../com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java index 150ba6d1..3060ad40 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java @@ -275,7 +275,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl {}0",note); + log.info("note======> {}",note); if(pramsMap.get("eleInvoiceNo") != null){ note = null; } diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java index 18d0642a..658c3982 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java @@ -1503,6 +1503,8 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl {}",invoiceCode); + log.info("invoiceNo=====> {}",invoiceNo); } From 1991657b6fe7a51e7ced7ef11372a8463b8937d4 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 24 Apr 2023 14:35:56 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-admin/src/main/resources/bootstrap-test.yaml | 14 ++++++++------ dxhy-core/src/main/resources/bootstrap-test.yaml | 14 ++++++++------ dxhy-erp/src/main/resources/bootstrap-test.yaml | 4 ++-- .../src/main/resources/bootstrap-test.yaml | 14 ++++++++------ .../src/main/resources/bootstrap-test.yaml | 14 ++++++++------ 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dxhy-admin/src/main/resources/bootstrap-test.yaml b/dxhy-admin/src/main/resources/bootstrap-test.yaml index ad8a9954..54878275 100644 --- a/dxhy-admin/src/main/resources/bootstrap-test.yaml +++ b/dxhy-admin/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-admin-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-admin # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.3.224:8848 - username: nacos - password: nacos + server-addr: 172.31.36.143:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file diff --git a/dxhy-core/src/main/resources/bootstrap-test.yaml b/dxhy-core/src/main/resources/bootstrap-test.yaml index 15638ac1..a9fd38b4 100644 --- a/dxhy-core/src/main/resources/bootstrap-test.yaml +++ b/dxhy-core/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-core # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.3.224:8848 - username: nacos - password: nacos + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file diff --git a/dxhy-erp/src/main/resources/bootstrap-test.yaml b/dxhy-erp/src/main/resources/bootstrap-test.yaml index b9a78c6c..fdf23215 100644 --- a/dxhy-erp/src/main/resources/bootstrap-test.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-test.yaml @@ -4,7 +4,7 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 @@ -12,7 +12,7 @@ spring: # Nacos config 登录用户名 username: nacos # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} diff --git a/dxhy-gateway/src/main/resources/bootstrap-test.yaml b/dxhy-gateway/src/main/resources/bootstrap-test.yaml index b25feb9d..ec92f982 100644 --- a/dxhy-gateway/src/main/resources/bootstrap-test.yaml +++ b/dxhy-gateway/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.3.224:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-gateway-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: nacos + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-gateway # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.3.224:8848 - username: nacos - password: nacos + server-addr: 172.31.36.143:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file diff --git a/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml index 780b661c..9bb0a7aa 100644 --- a/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml +++ b/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-flow-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: admin # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-flow # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt + server-addr: 172.31.36.143:33000 + # Nacos config 登录用户名 + username: admin + # Nacos config 登录密码 + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file From 00df0f468c93f9ba551758fe214bd2283f54aad6 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 14:44:38 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java | 2 +- .../dxhy/extend/service/bb/impl/ViolationLogServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index f76776ed..5d30c3ef 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -186,7 +186,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl Date: Mon, 24 Apr 2023 14:46:46 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/bootstrap-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/resources/bootstrap-test.yaml b/dxhy-core/src/main/resources/bootstrap-test.yaml index a9fd38b4..76a3f1d5 100644 --- a/dxhy-core/src/main/resources/bootstrap-test.yaml +++ b/dxhy-core/src/main/resources/bootstrap-test.yaml @@ -4,7 +4,7 @@ spring: nacos: config: # Nacos config 地址 - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 From b08c6b7f69b4b49afe3b15758d87e23a2d8e2792 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 14:59:38 +0800 Subject: [PATCH 08/13] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/bootstrap-std.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index 7b344d4c..02862826 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -6,13 +6,13 @@ spring: # Nacos config 地址 server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 + namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: FaP!a0_NacOs + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-core # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} @@ -21,7 +21,7 @@ spring: discovery: server-addr: nacos-1.itax.local:33000 # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 - password: FaP!a0_NacOs - namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 \ No newline at end of file + password: Invoice.nacos.!1 + namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file From b385d26a560fc39de8671f15e99c1b0cccb082c8 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:11:57 +0800 Subject: [PATCH 09/13] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java index aa4d5827..a710f830 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java @@ -19,6 +19,8 @@ public interface GsClientMapper { GsClient selectByPrimaryKey(Integer id); + + List selectByGsdm(String gsdm); int updateByPrimaryKeySelective(GsClient record); From e2ba51b97505c72a3d69f3826fff770f08116681 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:15:18 +0800 Subject: [PATCH 10/13] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java index a710f830..599a4dce 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java +++ b/dxhy-core/src/main/java/com/dxhy/core/dao/GsClientMapper.java @@ -2,10 +2,12 @@ package com.dxhy.core.dao; import com.dxhy.core.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); From dd0a4490bad7ac79aec802e9f432241b78080298 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:45:02 +0800 Subject: [PATCH 11/13] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java | 2 +- dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index f7bf54ff..07ce17d1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -247,7 +247,7 @@ public class PoolAddTaxThread extends BaseThread { // 递归导出数据到excel 发票信息 this.cicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); - this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); +// this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); // writer.finish(); // FTP文件存储路径 String[] toDay = DateUtil.today().split("-"); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java index 9782db98..dc2bf73a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/GsClientMapper.java @@ -2,10 +2,12 @@ package com.dxhy.erp.dao; import com.dxhy.erp.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); From 949bd6c18ab9b9e1c9aa6ec7cfa5560e7668ae93 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 24 Apr 2023 15:54:57 +0800 Subject: [PATCH 12/13] =?UTF-8?q?ariesy=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/bootstrap-std.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index 02862826..c4522dab 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -4,7 +4,7 @@ spring: nacos: config: # Nacos config 地址 - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） namespace: b271ba8e-84d9-4393-88b8-9271aff9465c # Nacos config 分组 @@ -19,7 +19,7 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.143:33000 # Nacos config 登录用户名 username: admin # Nacos config 登录密码 From 77421b8215bad9da01cafa676ce37d140afb21eb Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 16:11:02 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 9b4d8a5e..36aab5da 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -538,6 +538,8 @@ public class SDNYMainProcessController extends AbstractController { info.setZDJZH(snInvoice.getCertificateNo()); info.setZGFMC(snInvoice.getPurchaserName()); info.setSORT(snInvoice.getSort()); + //机打代码 + info.setZJDDM(snInvoice.getMachineCode()); if (snInvoice.getTotalAmount() != null) { BigDecimal total = new BigDecimal(snInvoice.getTotalAmount()); // BigDecimal tax = new BigDecimal(snInvoice.getTotalTax());