修改
This commit is contained in:
@ -1,9 +1,9 @@
|
||||
package com.xjrsoft.module.fssp.client;
|
||||
package com.xjrsoft.module.externalApi.client;
|
||||
|
||||
import com.pictc.enums.BusinessCode;
|
||||
import com.xjrsoft.common.exception.BusinessException;
|
||||
import com.xjrsoft.module.fssp.callback.FsspCallback;
|
||||
import com.xjrsoft.module.fssp.response.BaseResponse;
|
||||
import com.xjrsoft.module.externalApi.callback.FsspCallback;
|
||||
import com.xjrsoft.module.externalApi.response.BaseResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.stereotype.Component;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xjrsoft.module.fssp.config;
|
||||
package com.xjrsoft.module.externalApi.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xjrsoft.module.fssp.entity;
|
||||
package com.xjrsoft.module.externalApi.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xjrsoft.module.fssp.entity;
|
||||
package com.xjrsoft.module.externalApi.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.xjrsoft.module.fssp.handler;
|
||||
package com.xjrsoft.module.externalApi.handler;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
@ -8,16 +8,16 @@ import com.pictc.enums.BusinessCode;
|
||||
import com.xjrsoft.common.exception.BusinessException;
|
||||
import com.xjrsoft.common.utils.CollectionUtils;
|
||||
import com.xjrsoft.common.utils.RedisUtil;
|
||||
import com.xjrsoft.module.fssp.client.FsspHttpClient;
|
||||
import com.xjrsoft.module.fssp.config.FsspConfig;
|
||||
import com.xjrsoft.module.fssp.dto.LngJkRpBillDto;
|
||||
import com.xjrsoft.module.fssp.dto.LngJkRpDto;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRp;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRpBill;
|
||||
import com.xjrsoft.module.fssp.request.*;
|
||||
import com.xjrsoft.module.fssp.response.*;
|
||||
import com.xjrsoft.module.fssp.service.LngJkRpBillService;
|
||||
import com.xjrsoft.module.fssp.service.LngJkRpService;
|
||||
import com.xjrsoft.module.externalApi.client.FsspHttpClient;
|
||||
import com.xjrsoft.module.externalApi.config.FsspConfig;
|
||||
import com.xjrsoft.module.externalApi.dto.LngJkRpBillDto;
|
||||
import com.xjrsoft.module.externalApi.dto.LngJkRpDto;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRp;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRpBill;
|
||||
import com.xjrsoft.module.externalApi.request.*;
|
||||
import com.xjrsoft.module.externalApi.response.*;
|
||||
import com.xjrsoft.module.externalApi.service.LngJkRpBillService;
|
||||
import com.xjrsoft.module.externalApi.service.LngJkRpService;
|
||||
import com.xjrsoft.module.system.client.IFileClient;
|
||||
import com.xjrsoft.module.system.dto.FileUploadDto;
|
||||
import com.xjrsoft.module.system.vo.LngFileUploadVo;
|
||||
@ -71,8 +71,8 @@ public class FsspJobHandler {
|
||||
appTokenReq.setAccountId(config.getAccountId());
|
||||
appTokenReq.setLanguage(config.getLanguage());
|
||||
AtomicReference<String> appToken = new AtomicReference<>();
|
||||
FsspHttpClient.post(appTokenReq, config.getAppTokenUrl(), TokenResp.class, resp -> {
|
||||
AppTokenResp data = (AppTokenResp) resp.getData();
|
||||
FsspHttpClient.post(appTokenReq, config.getAppTokenUrl(), TokenResponse.class, resp -> {
|
||||
AppTokenResponse data = (AppTokenResponse) resp.getData();
|
||||
if ("0".equals(data.getErrorCode())) {
|
||||
appToken.set(data.getAppToken());
|
||||
redisUtil.set(FSSP_APP_TOKEN, data.getAppToken(), data.getExpireTime());
|
||||
@ -93,8 +93,8 @@ public class FsspJobHandler {
|
||||
accessTokenReq.setUsertype(config.getUsertype());
|
||||
accessTokenReq.setLanguage(config.getLanguage());
|
||||
AtomicReference<String> accessToken = new AtomicReference<>();
|
||||
FsspHttpClient.post(accessTokenReq, config.getLoginUrl(), TokenResp.class, resp -> {
|
||||
AccessTokenResp data = (AccessTokenResp) resp.getData();
|
||||
FsspHttpClient.post(accessTokenReq, config.getLoginUrl(), TokenResponse.class, resp -> {
|
||||
AccessTokenResponse data = (AccessTokenResponse) resp.getData();
|
||||
if ("0".equals(data.getErrorCode())) {
|
||||
accessToken.set(data.getAccessToken());
|
||||
redisUtil.set(FSSP_ACCESS_TOKEN, data.getAccessToken(), data.getExpireTime());
|
||||
@ -121,8 +121,8 @@ public class FsspJobHandler {
|
||||
Map<String, String> headers = Maps.newHashMap();
|
||||
String accesstoken = redisUtil.get(FSSP_ACCESS_TOKEN);
|
||||
headers.put(ACCESSTOKEN, StringUtils.isNotBlank(accesstoken) ? accesstoken : this.getAccessToken());
|
||||
FsspHttpClient.post(fsspYhjymxReq, config.getYhjymxUrl(), FsspResp.class, headers, resp -> {
|
||||
FsspDataResp data = resp.getData();
|
||||
FsspHttpClient.post(fsspYhjymxReq, config.getYhjymxUrl(), FsspResponse.class, headers, resp -> {
|
||||
FsspDataResponse data = resp.getData();
|
||||
if (data != null) {
|
||||
data.getRows().forEach(row -> {
|
||||
LngJkRpDto lngJkRpDto = (LngJkRpDto) row;
|
||||
@ -157,8 +157,8 @@ public class FsspJobHandler {
|
||||
Map<String, String> headers = Maps.newHashMap();
|
||||
String accesstoken = redisUtil.get(FSSP_ACCESS_TOKEN);
|
||||
headers.put(ACCESSTOKEN, StringUtils.isNotBlank(accesstoken) ? accesstoken : this.getAccessToken());
|
||||
FsspHttpClient.post(fsspDzhdxxReq, config.getDzhdxxUrl(), FsspResp.class, headers, resp -> {
|
||||
FsspDataResp data = resp.getData();
|
||||
FsspHttpClient.post(fsspDzhdxxReq, config.getDzhdxxUrl(), FsspResponse.class, headers, resp -> {
|
||||
FsspDataResponse data = resp.getData();
|
||||
if (data != null) {
|
||||
data.getRows().forEach(row -> {
|
||||
LngJkRpBillDto lngJkRpBillDto = (LngJkRpBillDto) row;
|
||||
@ -230,8 +230,8 @@ public class FsspJobHandler {
|
||||
Map<String, String> headers = Maps.newHashMap();
|
||||
String accesstoken = redisUtil.get(FSSP_ACCESS_TOKEN);
|
||||
headers.put(ACCESSTOKEN, StringUtils.isNotBlank(accesstoken) ? accesstoken : this.getAccessToken());
|
||||
FsspHttpClient.post(fsspPzReq, config.getPzUrl(), FsspResp.class, headers, resp -> {
|
||||
FsspDataResp data = resp.getData();
|
||||
FsspHttpClient.post(fsspPzReq, config.getPzUrl(), FsspResponse.class, headers, resp -> {
|
||||
FsspDataResponse data = resp.getData();
|
||||
data.getRows().forEach(row -> {
|
||||
PzResp pzResp = (PzResp) row;
|
||||
list.add(pzResp);
|
||||
@ -1,8 +1,8 @@
|
||||
package com.xjrsoft.module.fssp.mapper;
|
||||
package com.xjrsoft.module.externalApi.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRpBill;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRpBill;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@ -1,8 +1,8 @@
|
||||
package com.xjrsoft.module.fssp.mapper;
|
||||
package com.xjrsoft.module.externalApi.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRp;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRp;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@ -1,9 +1,9 @@
|
||||
package com.xjrsoft.module.fssp.service;
|
||||
package com.xjrsoft.module.externalApi.service;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRpBill;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRpBill;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
@ -1,9 +1,9 @@
|
||||
package com.xjrsoft.module.fssp.service;
|
||||
package com.xjrsoft.module.externalApi.service;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRp;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRp;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
@ -1,9 +1,9 @@
|
||||
package com.xjrsoft.module.fssp.service.impl;
|
||||
package com.xjrsoft.module.externalApi.service.impl;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRpBill;
|
||||
import com.xjrsoft.module.fssp.mapper.LngJkRpBillMapper;
|
||||
import com.xjrsoft.module.fssp.service.LngJkRpBillService;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRpBill;
|
||||
import com.xjrsoft.module.externalApi.mapper.LngJkRpBillMapper;
|
||||
import com.xjrsoft.module.externalApi.service.LngJkRpBillService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.xjrsoft.module.fssp.service.impl;
|
||||
package com.xjrsoft.module.externalApi.service.impl;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||
import com.xjrsoft.module.fssp.entity.LngJkRp;
|
||||
import com.xjrsoft.module.fssp.mapper.LngJkRpMapper;
|
||||
import com.xjrsoft.module.fssp.service.LngJkRpService;
|
||||
import com.xjrsoft.module.externalApi.entity.LngJkRp;
|
||||
import com.xjrsoft.module.externalApi.mapper.LngJkRpMapper;
|
||||
import com.xjrsoft.module.externalApi.service.LngJkRpService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
Reference in New Issue
Block a user