Skip to content

C
config-server-api
Commit 309244d6 by zhaoxiaolei
Options

增加token

parent 43598ab9
Showing with 94 additions and 44 deletions
src/main/java/cn/com/uitech/authorization/pojo/dto/GetConfigurationInputDTO.java
......@@ -25,4 +25,5 @@ public class GetConfigurationInputDTO {
private List<String> configIds;
private String skuCode;
private String token;
}
src/main/java/cn/com/uitech/authorization/pojo/entity/SuperBomEntity.java
......@@ -21,5 +21,6 @@ public class SuperBomEntity {
String h3cpn;
String unisSalesName;
String configId;
String token;
List<Characteristics> characteristicList;
}
src/main/java/cn/com/uitech/authorization/service/impl/CtoBomServiceImpl.java
package cn.com.uitech.authorization.service.impl;
import cn.com.uitech.authorization.exception.BusinessException;
import cn.com.uitech.authorization.mapper.BomStatusMapper;
import cn.com.uitech.authorization.mapper.CtoBomMapper;
import cn.com.uitech.authorization.pojo.dto.ConfigurableBomLogOpera;
import cn.com.uitech.authorization.pojo.dto.CtoBomRequestParamDto;
import cn.com.uitech.authorization.pojo.dto.GetProductOutDto;
import cn.com.uitech.authorization.pojo.entity.ConfigurableBom;
import cn.com.uitech.authorization.pojo.entity.ProductGroup;
import cn.com.uitech.authorization.service.CtoBomService;
import cn.com.uitech.authorization.utils.ApiResult;
import cn.com.uitech.authorization.utils.RedisHelper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -33,7 +36,7 @@ public class CtoBomServiceImpl implements CtoBomService {
@Autowired
private CtoBomMapper ctoBomMapper;
@Autowired
private BomStatusMapper bomStatusMapper;
private IntegrateServiceImpl integrateService;
@Resource
private RedisHelper redisHelper;
......@@ -46,20 +49,13 @@ public class CtoBomServiceImpl implements CtoBomService {
*/
@Override
public Object getCtoBoms(CtoBomRequestParamDto ctoBomRequestParamDto) {
if (!org.springframework.util.StringUtils.isEmpty(ctoBomRequestParamDto.getToken())) {
String redisToken = redisHelper.get("unis_cpq:" + ctoBomRequestParamDto.getToken());
if (!org.springframework.util.StringUtils.isEmpty(redisToken)) {
GetProductOutDto getProductOutDto = integrateService.checkToken(ctoBomRequestParamDto.getToken());
if(getProductOutDto.getCode().equals(200)){
PageHelper.startPage(ctoBomRequestParamDto.getPage(), ctoBomRequestParamDto.getPerPage());
List<ConfigurableBom> ctoBoms = ctoBomMapper.getCtoBoms(ctoBomRequestParamDto);
return new PageInfo(ctoBoms);
} else {
ctoBomRequestParamDto.setToken(ctoBomRequestParamDto.getToken() + "token已失效,请重新申请");
return ctoBomRequestParamDto;
}
} else {
ctoBomRequestParamDto.setToken("请传入正确的token");
return ctoBomRequestParamDto;
}else{
throw new BusinessException(ApiResult.UNAUTHORIZED.getCode(),"token失效!");
}
}
......@@ -149,9 +145,11 @@ public class CtoBomServiceImpl implements CtoBomService {
@Override
public PageInfo<ConfigurableBom> getCtoBom(CtoBomRequestParamDto ctoBomRequestParamDto) {
PageHelper.startPage(ctoBomRequestParamDto.getPage(), ctoBomRequestParamDto.getPerPage());
List<ConfigurableBom> ctoBoms = ctoBomMapper.getCtoBoms(ctoBomRequestParamDto);
return new PageInfo(ctoBoms);
}
......
src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java
......@@ -405,7 +405,8 @@ public class IntegrateServiceImpl implements IntegrateService {
public Object GetSKUByConfigInfo(SuperBomSkuInfo superBomSkuInfo, HttpServletRequest request,Integer temp) {
GetProductOutDto result = new GetProductOutDto();
//checkToken(superBomSkuInfo.getToken());
GetProductOutDto getProductOutDto = checkToken(superBomSkuInfo.getToken());
if (getProductOutDto.getCode().equals(200)) {
if (!ObjectUtils.isEmpty(superBomSkuInfo)) {
/**
1.申请SKU->验证配置是否存在->存在->是否生成SKU->生成SKU->返回SKU信息
......@@ -421,15 +422,15 @@ public class IntegrateServiceImpl implements IntegrateService {
//撞配不通过 保存SKU信息&config信息 调用申请SKU接口 applySkuCode
superBomSkuInfo.setId(sequence.nextId());
SuperBomSkuInfoLogOpera logOpera = new SuperBomSkuInfoLogOpera();
BeanUtils.copyProperties(superBomSkuInfo,logOpera);
BeanUtils.copyProperties(superBomSkuInfo, logOpera);
logOpera.setUpdateUser(request.getHeader("UserCode"));
if(temp==1){
if (temp == 1) {
logOpera.setOpera("/integrate/saveSukInfo");
}else if(temp == 2){
} else if (temp == 2) {
logOpera.setOpera("/integrate/GetSKUByH3CConfigInfo");
}else if(temp == 3){
} else if (temp == 3) {
logOpera.setOpera("/integrate/GetConfigBySUKINFO");
}else if(temp == 0){
} else if (temp == 0) {
logOpera.setOpera("/integrate/GetSKUByConfigInfo");
}
superBomSkuInfoMapper.saveLogOpera(logOpera);
......@@ -453,6 +454,10 @@ public class IntegrateServiceImpl implements IntegrateService {
characteristicMapper.updateSuperBomSkuInfo(data);
superBomSkuInfo.setSkuCode(data.getSkuCode());
superBomSkuInfo.setSkuName(data.getSkuName());
superBomSkuInfo.setDescription(data.getDescription());
superBomSkuInfo.setSncode(data.getSnCode());
superBomSkuInfo.setProductType(data.getProductType());
superBomSkuInfo.setProductSmallType(data.getProductSmallType());
result.setMsg(applySkuCodeResultDto.getMsg());
result.setCode(applySkuCodeResultDto.getCode());
result.setData(superBomSkuInfo);
......@@ -508,6 +513,10 @@ public class IntegrateServiceImpl implements IntegrateService {
characteristicMapper.updateSuperBomSkuInfo(data);
superBomSkuInfo.setSkuCode(data.getSkuCode());
superBomSkuInfo.setSkuName(data.getSkuName());
superBomSkuInfo.setDescription(data.getDescription());
superBomSkuInfo.setSncode(data.getSnCode());
superBomSkuInfo.setProductType(data.getProductType());
superBomSkuInfo.setProductSmallType(data.getProductSmallType());
// result.setMsg(applySkuCodeResultDto.getMsg());
result.setMsg(applySkuCodeResultDto.getMsg());
result.setCode(200);
......@@ -537,15 +546,15 @@ public class IntegrateServiceImpl implements IntegrateService {
//撞配不通过 保存SKU信息&config信息 调用申请SKU接口 applySkuCode
superBomSkuInfo.setId(sequence.nextId());
SuperBomSkuInfoLogOpera logOpera = new SuperBomSkuInfoLogOpera();
BeanUtils.copyProperties(superBomSkuInfo,logOpera);
BeanUtils.copyProperties(superBomSkuInfo, logOpera);
logOpera.setUpdateUser(request.getHeader("UserCode"));
if(temp==1){
if (temp == 1) {
logOpera.setOpera("/integrate/saveSukInfo");
}else if(temp == 2){
} else if (temp == 2) {
logOpera.setOpera("/integrate/GetSKUByH3CConfigInfo");
}else if(temp == 3){
} else if (temp == 3) {
logOpera.setOpera("/integrate/GetConfigBySUKINFO");
}else if(temp == 0){
} else if (temp == 0) {
logOpera.setOpera("/integrate/GetSKUByConfigInfo");
}
superBomSkuInfoMapper.saveLogOpera(logOpera);
......@@ -569,6 +578,10 @@ public class IntegrateServiceImpl implements IntegrateService {
characteristicMapper.updateSuperBomSkuInfo(data);
superBomSkuInfo.setSkuCode(data.getSkuCode());
superBomSkuInfo.setSkuName(data.getSkuName());
superBomSkuInfo.setDescription(data.getDescription());
superBomSkuInfo.setSncode(data.getSnCode());
superBomSkuInfo.setProductType(data.getProductType());
superBomSkuInfo.setProductSmallType(data.getProductSmallType());
result.setMsg(applySkuCodeResultDto.getMsg());
result.setCode(applySkuCodeResultDto.getCode());
result.setData(superBomSkuInfo);
......@@ -595,15 +608,15 @@ public class IntegrateServiceImpl implements IntegrateService {
if (flag.equals(false)) {
superBomSkuInfo.setId(sequence.nextId());
SuperBomSkuInfoLogOpera logOpera = new SuperBomSkuInfoLogOpera();
BeanUtils.copyProperties(superBomSkuInfo,logOpera);
BeanUtils.copyProperties(superBomSkuInfo, logOpera);
logOpera.setUpdateUser(request.getHeader("UserCode"));
if(temp==1){
if (temp == 1) {
logOpera.setOpera("/integrate/saveSukInfo");
}else if(temp == 2){
} else if (temp == 2) {
logOpera.setOpera("/integrate/GetSKUByH3CConfigInfo");
}else if(temp == 3){
} else if (temp == 3) {
logOpera.setOpera("/integrate/GetConfigBySUKINFO");
}else if(temp == 0){
} else if (temp == 0) {
logOpera.setOpera("/integrate/GetSKUByConfigInfo");
}
superBomSkuInfoMapper.saveLogOpera(logOpera);
......@@ -627,6 +640,10 @@ public class IntegrateServiceImpl implements IntegrateService {
characteristicMapper.updateSuperBomSkuInfo(data);
superBomSkuInfo.setSkuCode(data.getSkuCode());
superBomSkuInfo.setSkuName(data.getSkuName());
superBomSkuInfo.setDescription(data.getDescription());
superBomSkuInfo.setSncode(data.getSnCode());
superBomSkuInfo.setProductType(data.getProductType());
superBomSkuInfo.setProductSmallType(data.getProductSmallType());
result.setMsg(applySkuCodeResultDto.getMsg());
result.setCode(applySkuCodeResultDto.getCode());
result.setData(superBomSkuInfo);
......@@ -663,6 +680,9 @@ public class IntegrateServiceImpl implements IntegrateService {
}
}
} else {
return getProductOutDto;
}
return result;
}
......@@ -677,10 +697,11 @@ public class IntegrateServiceImpl implements IntegrateService {
**/
public Object GetConfigBySUKINFO(SuperBomSkuInfo superBomSkuInfo, HttpServletRequest request) {
GetProductOutDto result = new GetProductOutDto();
//checkToken(superBomSkuInfo.getToken());
GetProductOutDto getProductOutDto = checkToken(superBomSkuInfo.getToken());
if (getProductOutDto.getCode().equals(200)) {
//撞配
Object ob = GetSKUByConfigInfo(superBomSkuInfo, request,3);
superBomSkuInfo.setIsConfig("否");
Object ob = GetSKUByConfigInfo(superBomSkuInfo, request, 3);
boolean flag = ob instanceof GetProductOutDto;
if (flag) {
Object o = JSONObject.toJSON(ob);
......@@ -702,7 +723,9 @@ public class IntegrateServiceImpl implements IntegrateService {
result.setMsg(ss.getMsg());
return result;
}
} else {
return getProductOutDto;
}
}
/**
......@@ -712,22 +735,23 @@ public class IntegrateServiceImpl implements IntegrateService {
* @Date 2021/12/29 14:23
* @Param
**/
private GetProductOutDto checkToken(String token) {
GetProductOutDto checkToken(String token) {
GetProductOutDto result = new GetProductOutDto();
if (!StringUtils.isEmpty(token)) {
String redisToken = redisHelper.get("unis_cpq:" + token);
if (!StringUtils.isEmpty(redisToken)) {
result.setCode(200);
return result;
} else {
result.setMsg(token + "token已失效,请重新申请");
result.setCode(500);
result.setMsg(token + " token已失效,请重新申请");
result.setCode(ApiResult.UNAUTHORIZED.getCode());
return result;
}
} else {
result.setMsg("请传入正确的token");
result.setCode(500);
result.setCode(ApiResult.UNAUTHORIZED.getCode());
return result;
}
return result;
}
......@@ -770,7 +794,8 @@ public class IntegrateServiceImpl implements IntegrateService {
String doubleMd5 = MD5Util.getMD5Str(md5Str);
result.setData(doubleMd5);
result.setCode(200);
redisHelper.set("unis_cpq:" + getOne.getUserCode().toUpperCase(), doubleMd5, 86400);
//用于代码校验token
redisHelper.set("unis_cpq:" + doubleMd5, doubleMd5, 86400);
} else {
result.setData(redis);
result.setCode(200);
......@@ -855,7 +880,7 @@ public class IntegrateServiceImpl implements IntegrateService {
result.setCode(200);
redisHelper.set("unis_cpq:" + userinfo.getUserCode().toUpperCase(), doubleMd5, 86400);
//用于代码校验token
//redisHelper.set("unis_cpq:" + doubleMd5, doubleMd5, 86400);
redisHelper.set("unis_cpq:" + doubleMd5, doubleMd5, 86400);
} else {
result.setMsg(null);
result.setCode(200);
......@@ -1069,7 +1094,8 @@ public class IntegrateServiceImpl implements IntegrateService {
**/
public Object GetSKUByH3CConfigInfo(GetSKUByH3CConfigInfo configSkuInfo, HttpServletRequest request) {
//checkToken(configSkuInfo.getToken());
GetProductOutDto getProductOutDto = checkToken(configSkuInfo.getToken());
if (getProductOutDto.getCode().equals(200)) {
/*
1.使用H3CPN匹配SKU表中SuperBOM
2.比对SKU下的所有配置，都在H3C清单中，就算匹配成功
......@@ -1170,10 +1196,11 @@ public class IntegrateServiceImpl implements IntegrateService {
ArrayList<SuperBomSkuConfigInfo> configs = new ArrayList<>();
superBomSkuInfo.setSuperBomCode(configurableBom.getSuperBomCode());
superBomSkuInfo.setConfigId(configurableBom.getConfigId());
//H3C 过来写死 CTO
//H3C 过来写死 CTO 不是特配
BeanUtils.copyProperties(superBomInfo, superBomSkuInfo);
superBomSkuInfo.setToken(configSkuInfo.getToken());
superBomSkuInfo.setPatern("CTO");
superBomSkuInfo.setIsConfig("否");
Integer politicalMiningId = cpnList.getPoliticalMiningId();
if (politicalMiningId.equals(1)) {
superBomSkuInfo.setPoliticalMiningId("是");
......@@ -1259,7 +1286,7 @@ public class IntegrateServiceImpl implements IntegrateService {
Map<String, Object> preVerifyMap = (Map<String, Object>) JSONObject.toJSON(preVerify);
if (preVerifyMap.get("result").equals(true)) {
//撞配 找PLM申请SKU
Object ob = GetSKUByConfigInfo(superBomSkuInfo, request,2);
Object ob = GetSKUByConfigInfo(superBomSkuInfo, request, 2);
boolean flag1 = ob instanceof GetProductOutDto;
if (flag1) {
Object o1 = JSONObject.toJSON(ob);
......@@ -1293,7 +1320,7 @@ public class IntegrateServiceImpl implements IntegrateService {
cpnList.setMsg("配置结果违反约束冲突" + (String) preVerifyMap.get("message"));
}
}
}else{
} else {
if (!ObjectUtils.isEmpty(configurableBom)) {
if (!ObjectUtils.isEmpty(configurableBom.getConfigId())) {
//查询出superBom下所有isH3C的数据
......@@ -1326,7 +1353,15 @@ public class IntegrateServiceImpl implements IntegrateService {
}
}
}
characteristicMapper.saveApplyOpera(configSkuInfo.toString(),request.getHeader("UserCode"),"H3C-撞配");
characteristicMapper.saveApplyOpera(configSkuInfo.toString(), request.getHeader("UserCode"), "H3C-撞配");
} else {
List<GetSKUByH3CConfigInfo.H3CPNList> h3CPNList = configSkuInfo.getH3CPNList();
h3CPNList.forEach(item -> {
item.setCode(getProductOutDto.getCode());
item.setMsg(getProductOutDto.getMsg());
});
return configSkuInfo;
}
return configSkuInfo;
}
......@@ -1339,6 +1374,9 @@ public class IntegrateServiceImpl implements IntegrateService {
* @return java.lang.Object
**/
public Object getConfigInfo(GetConfigurationInputDTO getConfigurationInputDTO) {
GetProductOutDto getProductOutDto = checkToken(getConfigurationInputDTO.getToken());
if (getProductOutDto.getCode().equals(200)) {
if (CollectionUtils.isEmpty(getConfigurationInputDTO.getConfigIds())) {
if (!StringUtils.isEmpty(getConfigurationInputDTO.getSkuCode())) {
String configId = superBomSkuInfoMapper.getConfigId(getConfigurationInputDTO.getSkuCode());
......@@ -1365,6 +1403,10 @@ public class IntegrateServiceImpl implements IntegrateService {
}
}
return object.get("data");
} else {
return getProductOutDto;
}
}
@Override
......
src/main/java/cn/com/uitech/authorization/service/impl/SuperBomPriceCalculateServiceImpl.java
......@@ -22,6 +22,7 @@ import org.apache.poi.openxml4j.util.ZipSecureFile;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -53,6 +54,8 @@ public class SuperBomPriceCalculateServiceImpl implements SuperBomPriceCalculate
private SuperBomPriceCalculateMapper superBomPriceCalculateMapper;
@Resource
private BasicsPriceInfoMapper basicsPriceInfoMapper;
@Autowired
private IntegrateServiceImpl integrateService;
/**
......@@ -63,6 +66,8 @@ public class SuperBomPriceCalculateServiceImpl implements SuperBomPriceCalculate
*/
@Override
public Object getPriceByConfigInfo(SuperBomEntity superBomEntity) {
GetProductOutDto getProductOutDto = integrateService.checkToken(superBomEntity.getToken());
if (getProductOutDto.getCode().equals(200)) {
// 1、获取cto价格信息
SuperBomPriceInfoEntity superBomPriceInfoEntity = new SuperBomPriceInfoEntity();
GetProductOutDto result = new GetProductOutDto();
......@@ -151,6 +156,9 @@ public class SuperBomPriceCalculateServiceImpl implements SuperBomPriceCalculate
superBomPriceInfoEntity.setSelectedCharacteristicList(selectedCharacteristicList);
return superBomPriceInfoEntity;
} else {
return getProductOutDto;
}
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment