feat: 版本迁移问题修改

liufeilong 2 years ago committed by WangQi
parent 9dfa0ec941
commit 9733964259
  1. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseOrderRabbitmqConfig.java
  2. 55
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseSwaggerConfig.java
  3. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java
  4. 55
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/SwaggerConfig.java
  5. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/job/YpyjTask.java
  6. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BaseInvoiceWarningInfoMapper.java
  7. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/dao/BasePushInfoMapper.java
  8. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/BasePushInfoService.java
  9. 12
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/AuthenticationServiceImpl.java
  10. 16
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/BaseBasePushInfoServiceImpl.java
  11. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/EnterpriseConfigServiceImpl.java
  12. 16
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/base/service/impl/YpWarningServiceImpl.java
  13. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/BaseEmailService.java
  14. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/email/service/impl/BaseBaseEmailServiceImpl.java
  15. 8
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/rabbitmq/service/impl/RabbitMqSendMessageServiceImpl.java
  16. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/api/BaseServiceApiForKfpt.java
  17. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/BaseCommonDisposeService.java
  18. 4
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/BaseBaseCommonDisposeServiceImpl.java
  19. 14
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/service/impl/InterfaceServiceForKfptImpl.java
  20. 2
      order-management-base-service/src/main/resources/mybatis/mapper/BaseInvoiceWarningInfoMapper.xml
  21. 2
      order-management-base-service/src/main/resources/mybatis/mapper/BasePushInfoMapper.xml
  22. 10
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/PollInvoiceServiceImpl.java
  23. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/rabbitmq/service/impl/RabbitMqStartListenerServiceImpl.java
  24. 16
      order-management-consumer/src/main/resources/generator.properties
  25. 257
      order-management-consumer/src/main/resources/mybatis/mapper/InvoiceWarningInfoMapper.xml

@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration
@ConfigurationProperties(prefix = "order.rabbitmq")
@RefreshScope
public class OrderRabbitmqConfig {
public class BaseOrderRabbitmqConfig {
/**
* rabbitMq自动创建队列方式

@ -0,0 +1,55 @@
//package com.dxhy.order.baseservice.config;
//
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.web.context.request.async.DeferredResult;
//import springfox.documentation.builders.ApiInfoBuilder;
//import springfox.documentation.service.ApiInfo;
//import springfox.documentation.spi.DocumentationType;
//import springfox.documentation.spring.web.plugins.Docket;
//import springfox.documentation.swagger2.annotations.EnableSwagger2;
//
//import static springfox.documentation.builders.PathSelectors.regex;
//
///**
// * swagger配置
// * 1.全局配置,所有订单相关的,大而全的东西
// * 2.订单相关配置
// * 3.发票相关配置
// * 4.税控底层相关配置
// *
// * @author ZSC-DXHY
// */
//@Configuration
//@EnableSwagger2
//public class BaseSwaggerConfig {
//
//
// @Bean
// public Docket simsOrderSwagger() {
// return new Docket(DocumentationType.SWAGGER_2)
// .groupName("base-service-swagger")
// .genericModelSubstitutes(DeferredResult.class)
// .useDefaultResponseMessages(false)
// .forCodeGeneration(true)
// // base,最终调用接口后会和paths拼接在一起
// .pathMapping("/")
// .select()
// .paths(regex("/.*"))
// .build()
// .apiInfo(apiInfo());
// }
//
// private ApiInfo apiInfo() {
// // 大标题
// return new ApiInfoBuilder().title("销项基础服务")
// // 详细描述
// .description("基础服务系统")
// // 版本
// .version("1.0")
// // 作者
//// .contact(new Contact("chengyafu", "", "chengyafu@ele-cloud.com"))
// .build();
// }
//
//}

@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
@ComponentScan(basePackages = "com.dxhy.order.baseservice.job")
@Slf4j
@RefreshScope
public class XxlJobConfig {
public class BaseXxlJobConfig {
@Value("${xxl.job.admin.addresses}")
private String adminAddresses;

@ -1,55 +0,0 @@
package com.dxhy.order.baseservice.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.request.async.DeferredResult;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import static springfox.documentation.builders.PathSelectors.regex;
/**
* swagger配置
* 1.全局配置,所有订单相关的,大而全的东西
* 2.订单相关配置
* 3.发票相关配置
* 4.税控底层相关配置
*
* @author ZSC-DXHY
*/
@Configuration
@EnableSwagger2
public class SwaggerConfig {
@Bean
public Docket simsOrderSwagger() {
return new Docket(DocumentationType.SWAGGER_2)
.groupName("base-service-swagger")
.genericModelSubstitutes(DeferredResult.class)
.useDefaultResponseMessages(false)
.forCodeGeneration(true)
// base,最终调用接口后会和paths拼接在一起
.pathMapping("/")
.select()
.paths(regex("/.*"))
.build()
.apiInfo(apiInfo());
}
private ApiInfo apiInfo() {
// 大标题
return new ApiInfoBuilder().title("销项基础服务")
// 详细描述
.description("基础服务系统")
// 版本
.version("1.0")
// 作者
// .contact(new Contact("chengyafu", "", "chengyafu@ele-cloud.com"))
.build();
}
}

@ -14,7 +14,7 @@ import com.dxhy.order.utils.NsrsbhUtils;
import com.dxhy.order.baseservice.config.BaseServiceConfig;
import com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo;
import com.dxhy.order.baseservice.module.base.service.YpWarningService;
import com.dxhy.order.baseservice.module.thirdservice.email.service.EmailService;
import com.dxhy.order.baseservice.module.thirdservice.email.service.BaseEmailService;
import com.dxhy.order.baseservice.module.thirdservice.itaxmsg.service.ItaxMsgService;
import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService;
import com.dxhy.order.baseservice.utils.HttpInvoiceRequestUtil;
@ -51,7 +51,7 @@ public class YpyjTask extends IJobHandler {
@Resource
private ItaxMsgService itaxMsgService;
@Resource
private EmailService emailService;
private BaseEmailService emailService;
@Resource
private SimsBackService simsBackService;
@Resource

@ -11,7 +11,7 @@ import java.util.List;
* @author ZSC-DXHY
* @date 创建时间: 2020-08-14 11:32
*/
public interface InvoiceWarningInfoMapper {
public interface BaseInvoiceWarningInfoMapper {
/**
* 新增发票预警数据

@ -12,7 +12,7 @@ import java.util.Map;
* @author ZSC-DXHY
* @date 创建时间: 2020-08-14 11:53
*/
public interface PushInfoMapper {
public interface BasePushInfoMapper {
/**
* 根据条件查询

@ -10,7 +10,7 @@ import java.util.List;
* @Description 推送业务api类
* @date 2018年10月17日 下午6:01:48
*/
public interface PushInfoService {
public interface BasePushInfoService {
/**
* 推送地址配置列表

@ -3,7 +3,7 @@ package com.dxhy.order.baseservice.module.base.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import com.dxhy.order.baseservice.module.base.dao.AuthenticationInfoMapper;
import com.dxhy.order.baseservice.module.base.dao.PushInfoMapper;
import com.dxhy.order.baseservice.module.base.dao.BasePushInfoMapper;
import com.dxhy.order.baseservice.module.base.model.AuthenticationInfo;
import com.dxhy.order.baseservice.module.base.model.InterfaceConfigDetail;
import com.dxhy.order.baseservice.module.base.model.PushInfo;
@ -43,7 +43,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
AuthenticationInfoMapper authenticationInfoMapper;
@Resource
PushInfoMapper pushInfoMapper;
BasePushInfoMapper basePushInfoMapper;
@Resource
private BaseService baseService;
@ -119,7 +119,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
interfaceType.add(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_9.getKey());
queryMap.put("interfaceType", interfaceType);
queryMap.put("status", "0");
pushInfos = pushInfoMapper.queryPushInfoListByMap(queryMap, shList);
pushInfos = basePushInfoMapper.queryPushInfoListByMap(queryMap, shList);
}
@ -139,7 +139,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
Map<String, List<PushInfo>> pushInfoMap = new HashMap<>(100);
PushInfo pushInfo = new PushInfo();
pushInfo.setStatus(ConfigureConstant.STRING_0);
List<PushInfo> pushInfoList = pushInfoMapper.queryPushInfoList(pushInfo, shList);
List<PushInfo> pushInfoList = basePushInfoMapper.queryPushInfoList(pushInfo, shList);
if (ObjectUtil.isNotEmpty(pushInfoList)) {
for (PushInfo info : pushInfoList) {
List<PushInfo> resultList = pushInfoMap.get(info.getNsrsbh());
@ -407,10 +407,10 @@ public class AuthenticationServiceImpl implements AuthenticationService {
//批量删除税号推送数据,然后批量插入税号数据添加事物
if (ObjectUtil.isNotEmpty(resultShList)) {
pushInfoMapper.deletePushInfoByShList(resultShList);
basePushInfoMapper.deletePushInfoByShList(resultShList);
}
if (ObjectUtil.isNotEmpty(pushInfoList)) {
pushInfoMapper.insertPushInfoByList(pushInfoList);
basePushInfoMapper.insertPushInfoByList(pushInfoList);
}
}

@ -1,8 +1,8 @@
package com.dxhy.order.baseservice.module.base.service.impl;
import com.dxhy.order.baseservice.module.base.dao.PushInfoMapper;
import com.dxhy.order.baseservice.module.base.dao.BasePushInfoMapper;
import com.dxhy.order.baseservice.module.base.model.PushInfo;
import com.dxhy.order.baseservice.module.base.service.PushInfoService;
import com.dxhy.order.baseservice.module.base.service.BasePushInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -20,32 +20,32 @@ import java.util.List;
@SuppressWarnings("AlibabaMethodTooLong")
@Service
@Slf4j
public class PushInfoServiceImpl implements PushInfoService {
public class BaseBasePushInfoServiceImpl implements BasePushInfoService {
private static final String LOGGER_MSG = "(推送实现类)";
@Resource
private PushInfoMapper pushInfoMapper;
private BasePushInfoMapper basePushInfoMapper;
@Override
public List<PushInfo> queryPushInfoList(PushInfo pushInfo, List<String> shList) {
return pushInfoMapper.queryPushInfoList(pushInfo, shList);
return basePushInfoMapper.queryPushInfoList(pushInfo, shList);
}
@Override
public PushInfo queryPushInfo(PushInfo pushInfo) {
return pushInfoMapper.selectByPushInfo(pushInfo);
return basePushInfoMapper.selectByPushInfo(pushInfo);
}
@Override
public int updatePushInfo(PushInfo pushInfo) {
return pushInfoMapper.updateByPrimaryKeySelective(pushInfo);
return basePushInfoMapper.updateByPrimaryKeySelective(pushInfo);
}
@Override
public int addPushInfo(PushInfo insertPushInfo) {
return pushInfoMapper.insertSelective(insertPushInfo);
return basePushInfoMapper.insertSelective(insertPushInfo);
}
}

@ -14,7 +14,7 @@ import com.dxhy.order.baseservice.module.base.model.InterfaceConfigDetail;
import com.dxhy.order.baseservice.module.base.model.PushInfo;
import com.dxhy.order.baseservice.module.base.service.AuthenticationService;
import com.dxhy.order.baseservice.module.base.service.EnterpriseConfigService;
import com.dxhy.order.baseservice.module.base.service.PushInfoService;
import com.dxhy.order.baseservice.module.base.service.BasePushInfoService;
import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@ -44,7 +44,7 @@ public class EnterpriseConfigServiceImpl implements EnterpriseConfigService {
private AuthenticationService authenticationService;
@Resource
private PushInfoService pushInfoService;
private BasePushInfoService pushInfoService;
@Resource
private BaseServiceConfig baseServiceConfig;

@ -5,7 +5,7 @@ import com.dxhy.order.model.PageUtils;
import com.dxhy.order.model.R;
import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.utils.NsrsbhUtils;
import com.dxhy.order.baseservice.module.base.dao.InvoiceWarningInfoMapper;
import com.dxhy.order.baseservice.module.base.dao.BaseInvoiceWarningInfoMapper;
import com.dxhy.order.baseservice.module.base.model.Fpzldm;
import com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo;
import com.dxhy.order.baseservice.module.base.model.YpYjFront;
@ -33,7 +33,7 @@ public class YpWarningServiceImpl implements YpWarningService {
private final static String LOGGER_MSG = "(余票预警实现类)";
@Resource
private InvoiceWarningInfoMapper invoiceWarningInfoMapper;
private BaseInvoiceWarningInfoMapper baseInvoiceWarningInfoMapper;
@Resource
private BaseService baseService;
@ -48,7 +48,7 @@ public class YpWarningServiceImpl implements YpWarningService {
@Override
public List<InvoiceWarningInfo> selectYpWarning(InvoiceWarningInfo invoiceWarningInfo, List<String> shList, List<String> entList) {
log.info("{}余票预警列表查询 参数 {}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(invoiceWarningInfo));
return invoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList);
return baseInvoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList);
}
@Override
@ -56,7 +56,7 @@ public class YpWarningServiceImpl implements YpWarningService {
log.info("查询纸电票传入参数为{}", JsonUtils.getInstance().toJsonString(invoiceWarningInfo));
//这里前端从1开始需要进行-1操作
PageHelper.startPage(currPage, pageSize);
List<InvoiceWarningInfo> list = invoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList);
List<InvoiceWarningInfo> list = baseInvoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList);
PageInfo<InvoiceWarningInfo> pageInfo = new PageInfo<>(list);
return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
}
@ -79,7 +79,7 @@ public class YpWarningServiceImpl implements YpWarningService {
invoiceWarningInfo.setFpzlDm(fpzldm.getFpzldm());
invoiceWarningInfo.setXhfNsrsbh(ypYjFront.getXhfNsrsbh());
List<InvoiceWarningInfo> invoiceWarningInfos = invoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList1);
List<InvoiceWarningInfo> invoiceWarningInfos = baseInvoiceWarningInfoMapper.selectYpWarning(invoiceWarningInfo, shList, entList1);
invoiceWarningInfo.setXhfMc(ypYjFront.getXhfMc());
invoiceWarningInfo.setSbMc(fpzldm.getSbMc());
invoiceWarningInfo.setYjfs(fpzldm.getYjfs());
@ -94,12 +94,12 @@ public class YpWarningServiceImpl implements YpWarningService {
invoiceWarningInfo.setEntId(ypYjFront.getEntId());
if (invoiceWarningInfos != null && invoiceWarningInfos.size() > 0) {
invoiceWarningInfo.setId(invoiceWarningInfos.get(0).getId());
int i = invoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList);
int i = baseInvoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList);
log.info("{}保存余票预警信息 更新结果 {}", LOGGER_MSG, i);
} else {
invoiceWarningInfo.setId(baseService.getGenerateShotKey());
invoiceWarningInfo.setDeleteStatus(ConfigureConstant.STRING_0);
int i = invoiceWarningInfoMapper.insertInvoiceWarning(invoiceWarningInfo);
int i = baseInvoiceWarningInfoMapper.insertInvoiceWarning(invoiceWarningInfo);
log.info("{}保存余票预警信息 更新结果 {}", LOGGER_MSG, i);
}
@ -111,7 +111,7 @@ public class YpWarningServiceImpl implements YpWarningService {
@Override
public int updateYpWarnInfo(InvoiceWarningInfo invoiceWarningInfo, List<String> shList) {
return invoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList);
return baseInvoiceWarningInfoMapper.updateYpWarnInfo(invoiceWarningInfo, shList);
}
}

@ -7,7 +7,7 @@ package com.dxhy.order.baseservice.module.thirdservice.email.service;
* @date 2019年3月7日 下午2:59:31
*/
public interface EmailService {
public interface BaseEmailService {
/**
* 余票预警

@ -11,7 +11,7 @@ import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.baseservice.config.BaseServiceConfig;
import com.dxhy.order.baseservice.module.thirdservice.email.model.Attachments;
import com.dxhy.order.baseservice.module.thirdservice.email.model.EmailContent;
import com.dxhy.order.baseservice.module.thirdservice.email.service.EmailService;
import com.dxhy.order.baseservice.module.thirdservice.email.service.BaseEmailService;
import com.dxhy.order.baseservice.module.thirdservice.openapi.service.OpenApiService;
import com.dxhy.base.sms.utils.MessageSenderUtil;
import com.dxhy.base.sms.vo.AttachmentVo;
@ -33,7 +33,7 @@ import java.util.*;
*/
@Service
@Slf4j
public class EmailServiceImpl implements EmailService {
public class BaseBaseEmailServiceImpl implements BaseEmailService {
private static final String LOGGER_MSG = "(发送邮件业务)";
/**

@ -6,7 +6,7 @@ import cn.hutool.core.util.RandomUtil;
import com.dxhy.base.rabbitmq.rabbit.config.RabbitConfig;
import com.dxhy.base.rabbitmq.rabbitplugin.core.QueueDeclare;
import com.dxhy.order.baseservice.config.BaseServiceConfig;
import com.dxhy.order.baseservice.config.OrderRabbitmqConfig;
import com.dxhy.order.baseservice.config.BaseOrderRabbitmqConfig;
import com.dxhy.order.baseservice.module.base.dao.SysNsrQueueMapper;
import com.dxhy.order.baseservice.module.base.model.PageRabbitQueue;
import com.dxhy.order.baseservice.module.base.model.SysQdQueueConfig;
@ -62,7 +62,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
private BaseService baseService;
@Resource
private OrderRabbitmqConfig orderRabbitmqConfig;
private BaseOrderRabbitmqConfig baseOrderRabbitmqConfig;
@Resource
private SimsBackService simsBackService;
@ -311,7 +311,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
*/
private String getQueueName(String nsrsbh, String entId) {
String queueName = nsrsbh;
if (ConfigureConstant.STRING_1.equals(orderRabbitmqConfig.getRabbitMqQueueType())) {
if (ConfigureConstant.STRING_1.equals(baseOrderRabbitmqConfig.getRabbitMqQueueType())) {
/**
* 读取数据库缓存,判断税号是否配置过指定队列,如果配置需要使用指定配置
* 如果税号未配置,使用渠道去查询,是否按照渠道配置队列,如果按照渠道队列,使用渠道队列数据
@ -369,7 +369,7 @@ public class RabbitMqSendMessageServiceImpl implements RabbitMqSendMessageServic
*/
int random = ConfigureConstant.INT_10;
try {
random = RandomUtil.randomInt(Integer.parseInt(orderRabbitmqConfig.getMaxRabbitMqQueue()));
random = RandomUtil.randomInt(Integer.parseInt(baseOrderRabbitmqConfig.getMaxRabbitMqQueue()));
} catch (NumberFormatException e) {
log.error("{}消息数据存入队列,获取随机数异常,使用默认值", LOGGER_MSG);
}

@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
* @author ZSC-DXHY
* @date 创建时间: 2023-01-10 10:04
*/
@RestController
//@RestController
@Slf4j
@Api(value = "基础服务对接开放平台", tags = {"基础服务接口模块"})
public class BaseServiceApiForKfpt {

@ -5,7 +5,7 @@ package com.dxhy.order.baseservice.openapi.service;
*
* @author ZSC-DXHY
*/
public interface CommonDisposeService {
public interface BaseCommonDisposeService {
/**

@ -4,7 +4,7 @@ import com.dxhy.order.constant.RedisConstant;
import com.dxhy.order.baseservice.module.base.model.AuthenticationInfo;
import com.dxhy.order.baseservice.module.base.service.AuthenticationService;
import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService;
import com.dxhy.order.baseservice.openapi.service.CommonDisposeService;
import com.dxhy.order.baseservice.openapi.service.BaseCommonDisposeService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -19,7 +19,7 @@ import java.util.List;
*/
@Service
@Slf4j
public class CommonDisposeServiceImpl implements CommonDisposeService {
public class BaseBaseCommonDisposeServiceImpl implements BaseCommonDisposeService {
private static final String LOGGER_MSG = "(加解密接口)";

@ -29,7 +29,7 @@ import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxBO;
import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxcxRspBO;
import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxtbReqBO;
import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxtbRspBO;
import com.dxhy.order.baseservice.openapi.service.CommonDisposeService;
import com.dxhy.order.baseservice.openapi.service.BaseCommonDisposeService;
import com.dxhy.order.baseservice.openapi.service.InterfaceServiceForKfpt;
import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils;
import lombok.extern.slf4j.Slf4j;
@ -70,7 +70,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt {
private VerifyBuyerManageInfoService verifyBuyerManageInfoService;
@Resource
private CommonDisposeService commonDisposeService;
private BaseCommonDisposeService baseCommonDisposeService;
@Resource
private EnterpriseConfigService enterpriseConfigService;
@ -154,7 +154,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt {
* 1.校验当前税号secretId和数据库维护的数据是否一致
*/
if (StringUtils.isNotBlank(secretId)) {
String dbSecretId = commonDisposeService.getAuthMap(spxxcxReq.getXHFSBH());
String dbSecretId = baseCommonDisposeService.getAuthMap(spxxcxReq.getXHFSBH());
if (!secretId.equals(dbSecretId)) {
log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG);
spxxcxRsp.setZTDM(OrderInfoContentEnum.COMMODITY_MESSAGE_QUERY_NULL.getKey());
@ -245,7 +245,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt {
* 1.校验当前税号secretId和数据库维护的数据是否一致
*/
if (StringUtils.isNotBlank(secretId)) {
String dbSecretId = commonDisposeService.getAuthMap(spxxtbRsp.getXHFSBH());
String dbSecretId = baseCommonDisposeService.getAuthMap(spxxtbRsp.getXHFSBH());
if (!secretId.equals(dbSecretId)) {
log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG);
spxxtbRsp.setZTDM(OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL2.getKey());
@ -294,7 +294,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt {
* 1.校验当前税号secretId和数据库维护的数据是否一致
*/
if (StringUtils.isNotBlank(secretId)) {
String dbSecretId = commonDisposeService.getAuthMap(gmfxxcxReq.getXHFSBH());
String dbSecretId = baseCommonDisposeService.getAuthMap(gmfxxcxReq.getXHFSBH());
if (!secretId.equals(dbSecretId)) {
log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG);
gmfxxcxRsp.setZTDM(OrderInfoContentEnum.BUYER_MESSAGE_QUERY_NULL.getKey());
@ -380,7 +380,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt {
* 1.校验当前税号secretId和数据库维护的数据是否一致
*/
if (StringUtils.isNotBlank(secretId)) {
String dbSecretId = commonDisposeService.getAuthMap(gmfxxtbReq.getXHFSBH());
String dbSecretId = baseCommonDisposeService.getAuthMap(gmfxxtbReq.getXHFSBH());
if (!secretId.equals(dbSecretId)) {
log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG);
gmfxxtbRsp.setZTDM(OrderInfoContentEnum.BUYER_MESSAGE_SYNC_NULL.getKey());
@ -439,7 +439,7 @@ public class InterfaceServiceForKfptImpl implements InterfaceServiceForKfpt {
* 1.校验当前税号secretId和数据库维护的数据是否一致
*/
if (StringUtils.isNotBlank(secretId)) {
String dbSecretId = commonDisposeService.getAuthMap(sksbxxtbReq.getXHFSBH());
String dbSecretId = baseCommonDisposeService.getAuthMap(sksbxxtbReq.getXHFSBH());
if (!secretId.equals(dbSecretId)) {
log.error("{}请求税号与企业维护secretId不一致!", LOGGER_MSG);
sksbxxtbRsp.setZTDM(OrderInfoContentEnum.TAX_EQUIPMENT_INFO_193001.getKey());

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.dxhy.order.baseservice.module.base.dao.InvoiceWarningInfoMapper">
<mapper namespace="com.dxhy.order.baseservice.module.base.dao.BaseInvoiceWarningInfoMapper">
<resultMap id="BaseResultMap" type="com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="xhf_nsrsbh" property="xhfNsrsbh" jdbcType="VARCHAR"/>

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.dxhy.order.baseservice.module.base.dao.PushInfoMapper">
<mapper namespace="com.dxhy.order.baseservice.module.base.dao.BasePushInfoMapper">
<resultMap id="BaseResultMap" type="com.dxhy.order.baseservice.module.base.model.PushInfo">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="nsrsbh" property="nsrsbh" jdbcType="VARCHAR"/>

@ -24,7 +24,7 @@ import com.dxhy.order.utils.DecimalCalculateUtil;
import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.utils.NsrsbhUtils;
import com.dxhy.order.baseservice.config.BaseServiceConfig;
import com.dxhy.order.baseservice.config.OrderRabbitmqConfig;
import com.dxhy.order.baseservice.config.BaseOrderRabbitmqConfig;
import com.dxhy.order.baseservice.module.base.service.BaseService;
import com.dxhy.order.baseservice.module.thirdservice.rabbitmq.service.RabbitMqSendMessageService;
import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService;
@ -108,7 +108,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
private OpenApiConfig openApiConfig;
@Resource
private OrderRabbitmqConfig orderRabbitmqConfig;
private BaseOrderRabbitmqConfig baseOrderRabbitmqConfig;
@Resource
private SimsBackService simsBackService;
@ -620,7 +620,7 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
if (ConfigureConstant.INT_0 == lxsc) {
//离线票创建队列调整,如果所在渠道在配置文件中,队列名称重新定义
boolean useQd = false;
String configLxpQdList = orderRabbitmqConfig.getConfigLxpQdList();
String configLxpQdList = baseOrderRabbitmqConfig.getConfigLxpQdList();
if (StringUtils.isNotBlank(configLxpQdList)) {
String simsBackQd = simsBackService.getSimsBackQd(fpkjMqData.getNsrsbh(), fpkjMqData.getEntId());
String[] configLxpQdList1 = configLxpQdList.split(ConfigureConstant.STRING_POINT2);
@ -642,8 +642,8 @@ public class PollInvoiceServiceImpl implements PollInvoiceService {
if(useQd){
int random = ConfigureConstant.INT_10;
try {
if(StringUtils.isNotBlank(orderRabbitmqConfig.getConfigLxpMaxLxpSize())){
random = RandomUtil.randomInt(Integer.parseInt(orderRabbitmqConfig.getConfigLxpMaxLxpSize()));
if(StringUtils.isNotBlank(baseOrderRabbitmqConfig.getConfigLxpMaxLxpSize())){
random = RandomUtil.randomInt(Integer.parseInt(baseOrderRabbitmqConfig.getConfigLxpMaxLxpSize()));
}
} catch (NumberFormatException e) {
log.error("{}消息数据存入离线票队列,获取随机数异常,使用默认值", LOGGER_MSG);

@ -6,7 +6,7 @@ import com.dxhy.base.rabbitmq.rabbitplugin.core.ConnectionForFactory;
import com.dxhy.base.rabbitmq.rabbitplugin.core.ListenerDeclare;
import com.dxhy.base.rabbitmq.rabbitplugin.core.ListenerFactory;
import com.dxhy.base.rabbitmq.rabbitplugin.core.QueueDeclare;
import com.dxhy.order.baseservice.config.OrderRabbitmqConfig;
import com.dxhy.order.baseservice.config.BaseOrderRabbitmqConfig;
import com.dxhy.order.baseservice.module.base.dao.SysNsrQueueMapper;
import com.dxhy.order.baseservice.module.thirdservice.rabbitmq.service.RabbitMqSendMessageService;
import com.dxhy.order.constant.ConfigureConstant;
@ -79,7 +79,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
private OrderReceiveInvoiceHandler orderReceiveInvoiceHandler;
@Resource
private OrderRabbitmqConfig orderRabbitmqConfig;
private BaseOrderRabbitmqConfig baseOrderRabbitmqConfig;
/**
* 启动rabbitmq监听
@ -95,7 +95,7 @@ public class RabbitMqStartListenerServiceImpl implements RabbitMqStartListenerSe
Set<String> queueSetList = new HashSet<>();
List<SysNsrQueue> queueList = new ArrayList<>();
//通过配置文件获取需要初始化的队列
String businessRabbitMqQueue = orderRabbitmqConfig.getBusinessRabbitMqQueue();
String businessRabbitMqQueue = baseOrderRabbitmqConfig.getBusinessRabbitMqQueue();
String[] rabbitMqList = businessRabbitMqQueue.split(ConfigureConstant.STRING_POINT2);
List<String> configList = Arrays.asList(rabbitMqList);

@ -1,18 +1,18 @@
#Mybatis Generator configuration
#\u751F\u6210\u6570\u636E\u7684\u4E3B\u76EE\u5F55
projectPath=src/main/java
projectPath=src/main/java/sn
#\u751F\u6210\u6570\u636E\u7684\u8D44\u6E90\u76EE\u5F55
mapLocation=src/main/resources
mapLocation=src/main/resources/sn
#\u6570\u636E\u5E93\u9A71\u52A8\u5305\u8DEF\u5F84
mysqlConJarPath=E:/maven/repository/mysql/mysql-connector-java/5.1.23/mysql-connector-java-5.1.23.jar
mysqlConJarPath=C:/Users/liufeilong/.m2/repository/mysql/mysql-connector-java/5.1.35/mysql-connector-java-5.1.35.jar
#\u6570\u636E\u5E93\u9A71\u52A8\u8DEF\u5F84
jdbc_driver=com.mysql.jdbc.Driver
#\u6570\u636E\u5E93\u5730\u5740
jdbc_url=jdbc:mysql://10.1.1.224:3306/sales_order?useUnicode=true&characterEncoding=utf8&useSSL=false
jdbc_url=jdbc:mysql://10.1.1.76:3306/sales_order_sdenergy?useUnicode=true&characterEncoding=utf8&useSSL=false
#\u6570\u636E\u5E93\u7528\u6237
jdbc_user=dxhy
jdbc_user=root
#\u6570\u636E\u5E93\u5BC6\u7801
jdbc_password=Dxhy@123
jdbc_password=dxhydever
#\u5B9E\u4F53\u5BF9\u8C61\u751F\u6210\u8DEF\u5F84
javaModelTargetPath=com.dxhy.order.model
#xml\u751F\u6210\u8DEF\u5F84
@ -20,6 +20,6 @@ xmlTargetPath=mybatis.mapper
#\u6570\u636E\u5E93dao\u5C42
daoTargetPath=com.dxhy.order.dao
#\u9700\u8981\u751F\u6210\u6570\u636E\u7684\u8868\u540D
tableName=sys_queue_config
tableName=invoice_remark_set
#\u9700\u8981\u751F\u6210\u6570\u636E\u7684\u5B9E\u4F53\u5BF9\u8C61\u540D\u79F0
domainObjectName=SysQueueConfig
domainObjectName=InvoiceRemarkSet

@ -1,257 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.dxhy.order.baseservice.module.base.dao.InvoiceWarningInfoMapper">
<resultMap id="BaseResultMap" type="com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="xhf_nsrsbh" property="xhfNsrsbh" jdbcType="VARCHAR"/>
<result column="xhf_mc" property="xhfMc" jdbcType="VARCHAR"/>
<result column="sbbh" property="sbbh" jdbcType="VARCHAR"/>
<result column="sb_mc" property="sbMc" jdbcType="VARCHAR"/>
<result column="fpzl_dm" property="fpzlDm" jdbcType="VARCHAR"/>
<result column="yjfs" property="yjfs" jdbcType="VARCHAR"/>
<result column="phone" property="phone" jdbcType="VARCHAR"/>
<result column="e_mail" property="eMail" jdbcType="VARCHAR"/>
<result column="user_id" property="userId" jdbcType="VARCHAR"/>
<result column="yjcs" property="yjcs" jdbcType="VARCHAR"/>
<result column="sfyj" property="sfyj" jdbcType="VARCHAR"/>
<result column="ent_id" property="entId" jdbcType="VARCHAR"/>
<result column="delete_status" property="deleteStatus" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
id
, xhf_nsrsbh, xhf_mc, sbbh, sb_mc, fpzl_dm, yjfs, phone, e_mail, user_id, yjcs,
sfyj, ent_id,delete_status, create_time, update_time
</sql>
<!-- 查询预警信息列表 -->
<select id="selectYpWarning" parameterType="String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from invoice_warning_info
<where>
and delete_status = '0'
<if test="shList != null and shList.size() == 0">
and xhf_nsrsbh = ''
</if>
<if test="shList != null and shList.size() == 1">
and xhf_nsrsbh =
<foreach collection="shList" index="index" item="item">
#{item}
</foreach>
</if>
<if test="shList != null and shList.size() > 1">
and xhf_nsrsbh in
<foreach collection="shList" index="index" item="item"
open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="entList != null and entList.size() == 1">
and (ent_id =
<foreach collection="entList" index="index" item="item">
#{item}
</foreach> or ent_id is null)
</if>
<if test="entList != null and entList.size() > 1">
and (ent_id in
<foreach collection="entList" index="index" item="item"
open="(" separator="," close=")">
#{item}
</foreach> or ent_id is null)
</if>
<if test="invoiceWarning.sbbh != null and invoiceWarning.sbbh != ''">
and sbbh=#{invoiceWarning.sbbh,jdbcType=VARCHAR}
</if>
<if test="invoiceWarning.fpzlDm != null and invoiceWarning.fpzlDm != ''">
and fpzl_dm=#{invoiceWarning.fpzlDm,jdbcType=VARCHAR}
</if>
<if test="invoiceWarning.userId != null and invoiceWarning.userId != ''">
and user_id=#{invoiceWarning.userId,jdbcType=VARCHAR}
</if>
<if test="invoiceWarning.sfyj != null and invoiceWarning.sfyj != ''">
and sfyj=#{invoiceWarning.sfyj,jdbcType=VARCHAR}
</if>
<if test="invoiceWarning.id != null and invoiceWarning.id != ''">
and id=#{invoiceWarning.id,jdbcType=VARCHAR}
</if>
</where>
order by update_time desc
</select>
<insert id="insertInvoiceWarning" parameterType="com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo">
insert into invoice_warning_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="xhfNsrsbh != null">
xhf_nsrsbh,
</if>
<if test="xhfMc != null">
xhf_mc,
</if>
<if test="sbbh != null">
sbbh,
</if>
<if test="sbMc != null">
sb_mc,
</if>
<if test="fpzlDm != null">
fpzl_dm,
</if>
<if test="yjfs != null">
yjfs,
</if>
<if test="phone != null">
phone,
</if>
<if test="eMail != null">
e_mail,
</if>
<if test="userId != null">
user_id,
</if>
<if test="yjcs != null">
yjcs,
</if>
<if test="sfyj != null">
sfyj,
</if>
<if test="entId != null">
ent_id,
</if>
<if test="deleteStatus != null">
delete_status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=VARCHAR},
</if>
<if test="xhfNsrsbh != null">
#{xhfNsrsbh,jdbcType=VARCHAR},
</if>
<if test="xhfMc != null">
#{xhfMc,jdbcType=VARCHAR},
</if>
<if test="sbbh != null">
#{sbbh,jdbcType=VARCHAR},
</if>
<if test="sbMc != null">
#{sbMc,jdbcType=VARCHAR},
</if>
<if test="fpzlDm != null">
#{fpzlDm,jdbcType=VARCHAR},
</if>
<if test="yjfs != null">
#{yjfs,jdbcType=VARCHAR},
</if>
<if test="phone != null">
#{phone,jdbcType=VARCHAR},
</if>
<if test="eMail != null">
#{eMail,jdbcType=VARCHAR},
</if>
<if test="userId != null">
#{userId,jdbcType=VARCHAR},
</if>
<if test="yjcs != null">
#{yjcs,jdbcType=VARCHAR},
</if>
<if test="sfyj != null">
#{sfyj,jdbcType=VARCHAR},
</if>
<if test="entId != null">
#{entId,jdbcType=VARCHAR},
</if>
<if test="deleteStatus != null">
#{deleteStatus,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateYpWarnInfo" parameterType="com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo">
update invoice_warning_info
<set>
<if test="invoiceWarning.xhfNsrsbh != null">
xhf_nsrsbh = #{invoiceWarning.xhfNsrsbh,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.xhfMc != null">
xhf_mc = #{invoiceWarning.xhfMc,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.sbbh != null">
sbbh = #{invoiceWarning.sbbh,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.sbMc != null">
sb_mc = #{invoiceWarning.sbMc,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.fpzlDm != null">
fpzl_dm = #{invoiceWarning.fpzlDm,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.yjfs != null">
yjfs = #{invoiceWarning.yjfs,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.phone != null">
phone = #{invoiceWarning.phone,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.eMail != null">
e_mail = #{invoiceWarning.eMail,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.userId != null">
user_id = #{invoiceWarning.userId,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.yjcs != null">
yjcs = #{invoiceWarning.yjcs,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.sfyj != null">
sfyj = #{invoiceWarning.sfyj,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.entId != null">
ent_id = #{invoiceWarning.entId,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.deleteStatus != null">
delete_status = #{invoiceWarning.deleteStatus,jdbcType=VARCHAR},
</if>
<if test="invoiceWarning.createTime != null">
create_time = #{invoiceWarning.createTime,jdbcType=TIMESTAMP},
</if>
<if test="invoiceWarning.updateTime != null">
update_time = #{invoiceWarning.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{invoiceWarning.id,jdbcType=VARCHAR}
<if test="shList != null and shList.size() == 0">
and xhf_nsrsbh = ''
</if>
<if test="shList != null and shList.size() == 1">
and xhf_nsrsbh =
<foreach collection="shList" index="index" item="item">
#{item}
</foreach>
</if>
<if test="shList != null and shList.size() > 1">
and xhf_nsrsbh in
<foreach collection="shList" index="index" item="item"
open="(" separator="," close=")">
#{item}
</foreach>
</if>
</update>
</mapper>
Loading…
Cancel
Save