diff --git a/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java b/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java index 21c44317..207ef9c8 100644 --- a/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java +++ b/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java @@ -16,6 +16,10 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "project") public class ProjectProperties { + private String birService; + + private String birServiceUrl; + private String hostUrl; private String webUrl; diff --git a/src/main/java/com/qs/serve/common/util/BirHttpUtil.java b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java new file mode 100644 index 00000000..18f0f844 --- /dev/null +++ b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java @@ -0,0 +1,96 @@ +package com.qs.serve.common.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.qs.serve.common.config.properties.ProjectProperties; +import com.qs.serve.common.model.consts.GySysConst; +import com.qs.serve.common.model.dto.R; +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.ParseException; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.protocol.HTTP; +import org.apache.http.util.EntityUtils; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +/** + * @author YenHex + * @since 2022/11/23 + */ +@Slf4j +@UtilityClass +public class BirHttpUtil { + + /** + * 判断当前环境是否请求bir + * @return + */ + public static boolean isRestBir(){ + ProjectProperties projectProperties = SpringUtils.getBean(ProjectProperties.class); + return projectProperties.getBirService().equals("true"); + } + + public static String getBaseUrl(){ + ProjectProperties projectProperties = SpringUtils.getBean(ProjectProperties.class); + boolean isRestBir = projectProperties.getBirService().equals("true"); + if(isRestBir){ + return projectProperties.getBirServiceUrl(); + } + return null; + } + + public static R get(String action){ + return get(action,null); + } + + public static R get(String action,Object query){ + String baseUrl = getBaseUrl(); + String url = baseUrl+"/"+action; + if(query!=null){ + Map map = JsonUtil.objectToMap(query); + String params = HttpUtil.createUrl(map); + if(url.contains("?")){ + url = url+params; + }else { + url = url+"?"+params; + } + } + HashMap hearders = new HashMap<>(); + HttpServletRequest request = ServletUtils.getRequest(); + String tenant = request.getHeader(GySysConst.TENANT_PROP); + String token = request.getHeader(GySysConst.AUTHORIZATION_PROP); + hearders.put(GySysConst.TENANT_PROP,tenant); + hearders.put(GySysConst.AUTHORIZATION_PROP,token); + //自动封装翻页参数 + if(!url.contains("?")){ + url += "?"; + } + if(PageUtil.getPageSize()!=null){ + url += "&pageSize="+PageUtil.getPageSize(); + } + if(PageUtil.getPageNum()!=null){ + url += "&pageNum="+PageUtil.getPageNum(); + } + String result = HttpUtil.doGet(url,hearders); + JSONObject object = JSON.parseObject(result); + Integer status = object.getInteger("status"); + String msg = object.getString("msg"); + Object data = object.get("data"); + R r = R.ok(data); + r.setStatus(status); + r.setMsg(msg); + return r; + } + +} diff --git a/src/main/java/com/qs/serve/common/util/HttpUtil.java b/src/main/java/com/qs/serve/common/util/HttpUtil.java index 33d22437..d6b8790f 100644 --- a/src/main/java/com/qs/serve/common/util/HttpUtil.java +++ b/src/main/java/com/qs/serve/common/util/HttpUtil.java @@ -20,6 +20,7 @@ import org.apache.http.util.EntityUtils; import java.io.IOException; import java.util.HashMap; +import java.util.Map; /** * @author YenHex @@ -109,10 +110,10 @@ public class HttpUtil { return null; } - public static String createUrl(HashMap param){ + public static String createUrl(Map param){ StringBuilder sb = new StringBuilder(); for (String key : param.keySet()) { - sb.append("&"+key+"="+param.get(key)); + sb.append("&").append(key).append("=").append(param.get(key)); } return sb.toString(); } diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java index 62046261..9f2bc46d 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java @@ -6,15 +6,13 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.aliyun.oss.OSS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.config.properties.AliYunOssProperties; +import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.CollectionUtil; -import com.qs.serve.common.util.IdUtil; -import com.qs.serve.common.util.PageUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.bir.entity.BirActivityCenterGoods; import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService; import com.qs.serve.modules.bms.common.MasterUserType; @@ -45,6 +43,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.Arrays; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -63,9 +62,14 @@ public class BirActivityCenterGoodsController { private AliYunOssProperties aliYunOSSProperties; private BirActivityCenterGoodsService centerGoodsService; private TbsCostApplyService tbsCostApplyService; + private ProjectProperties projectProperties; @GetMapping("/toSyncBir") public R syncBir(Long costId){ + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + return BirHttpUtil.get("/bir/centerGoods/toSyncBir?costId="+costId,null); + } centerGoodsService.rebuildBir(Arrays.asList(costId)); return R.ok(); } @@ -113,6 +117,10 @@ public class BirActivityCenterGoodsController { */ @GetMapping("/page") public R> getPage(BirActivityCenterGoods param){ + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + return BirHttpUtil.get("/bir/centerGoods/page",param); + } PageUtil.startPage(); LambdaQueryWrapper channelWrapper = new LambdaQueryWrapper<>(param); if(param.getKeyNumStart()!=null){ @@ -134,6 +142,10 @@ public class BirActivityCenterGoodsController { */ @GetMapping("/export") public R export(BirActivityCenterGoods param){ + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + return BirHttpUtil.get("/bir/centerGoods/export",param); + } LambdaQueryWrapper channelWrapper = new LambdaQueryWrapper<>(param); if(param.getKeyNumStart()!=null){ Integer keyNumStart = Integer.parseInt(param.getKeyNumStart().replace("-","")); diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 1bb823c3..91dfdc0e 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -8,10 +8,7 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; -import com.qs.serve.common.util.Assert; -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.common.util.CollectionUtil; -import com.qs.serve.common.util.StringUtils; +import com.qs.serve.common.util.*; import com.qs.serve.modules.bir.entity.BirBaseActivity; import com.qs.serve.modules.bir.entity.so.BirCostRoiSo; import com.qs.serve.modules.bir.entity.vo.*; @@ -109,6 +106,10 @@ public class BirRoiRateController { if(!StringUtils.hasText(year) || !StringUtils.hasText(type)){ Assert.throwEx("参数不能为空！"); } + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + return BirHttpUtil.get("/bir/roiRate/standingBook?type="+type+"&year="+year); + } return R.ok(birReportAccountBookService.getReportAccountBookData(type,year)); } @@ -121,6 +122,10 @@ public class BirRoiRateController { if(!StringUtils.hasText(year)){ Assert.throwEx("参数不能为空！"); } + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + return BirHttpUtil.get("/bir/roiRate/standingBookExport?year="+year); + } List vos = new ArrayList<>(); BirAccountReportVo center = birReportAccountBookService.getReportAccountBookData(TbsCenterType.center.name(),year); BirAccountReportVo customer = birReportAccountBookService.getReportAccountBookData(TbsCenterType.customer.name(),year); @@ -141,6 +146,10 @@ public class BirRoiRateController { @RepeatSubmit @GetMapping("/costYearMonth") public R getCostRoiOfYearMonth(BirCostRoiSo param){ + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + return BirHttpUtil.get("/bir/roiRate/costYearMonth",param); + } BirRoiVo vo = new BirRoiVo(); List itemList = birRoiRateService.getCostRoiOfYearMonth(param); vo.setItemList(itemList); @@ -164,6 +173,16 @@ public class BirRoiRateController { @RepeatSubmit @GetMapping("/centerRateByCostApplyId") public R> centerRateByCostApplyId(Long costApplyId,Long policyId){ + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + if(costApplyId!=null){ + return BirHttpUtil.get("/bir/roiRate/centerRateByCostApplyId?costApplyId="+costApplyId); + } + if(policyId!=null){ + return BirHttpUtil.get("/bir/roiRate/centerRateByCostApplyId?policyId="+policyId); + } + return R.ok(); + } return R.ok(birCenterRateService.findCostCenterDataByCostApplyId(costApplyId,policyId)); } @@ -176,6 +195,16 @@ public class BirRoiRateController { @RepeatSubmit @GetMapping("/centerRateByCostApplyIdv2") public R> centerRateByCostApplyIdv2(Long costApplyId,Long policyId){ + boolean isRestBir = BirHttpUtil.isRestBir(); + if(isRestBir){ + if(costApplyId!=null){ + return BirHttpUtil.get("/bir/roiRate/centerRateByCostApplyIdv2?costApplyId="+costApplyId,null); + } + if(policyId!=null){ + return BirHttpUtil.get("/bir/roiRate/centerRateByCostApplyIdv2?policyId="+policyId,null); + } + return R.ok(); + } return R.ok(birCenterRateService.selectCostApplyRateVoList(costApplyId,policyId)); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index dcf9f105..28a7c8aa 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -74,6 +74,14 @@ public class BmsSupplierController { private BmsSupplierMyController supplierMyController; private SysAttachService attachService; + @GetMapping("/queryList") + public R> getQueryList(BmsSupplier param){ + PageUtil.startPage(); + List list = bmsSupplierService.list(new QueryWrapper<>(param)); + return R.byPageHelperList(list); + } + + /** * 翻页查询 * @param param diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java index 58884931..7b7fface 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java @@ -55,7 +55,7 @@ public class GoodsRuleController { * @param param * @return */ - @GetMapping("/modify") + @PostMapping("/modify") @SysLog(module = SystemModule.GOODS, title = "规则", biz = BizType.INSERT) public R save(@RequestBody @Valid GoodsRuleBo param){ goodsRuleService.modify(param); diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsRuleItem.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsRuleItem.java index 265dd479..aaf2703a 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsRuleItem.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsRuleItem.java @@ -44,6 +44,7 @@ public class GoodsRuleItem implements Serializable { @Length(max = 255,message = "品类编码长度不能超过255字") private String targetCode; + /** 品类名称 */ private String targetName; /** 商品id */ diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java index ea698b0f..5b44ea2d 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java @@ -177,6 +177,7 @@ public class GoodsRuleServiceImpl extends ServiceImpl List ids = list4.stream().map(GoodsRuleItem::getTargetId).collect(Collectors.toList()); ruleVo.setOnlySpuList(spuMapper.selectBatchIds(ids)); } + return ruleVo; } return null; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2087c125..0cb201c8 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,7 @@ #项目配置 project: + bir-service: 'false' + bir-service-url: 'http://192.168.0.9:7400' web_url: 'http://192.168.0.9:6031' host_url: 'http://192.168.0.9:7400' pc-web-local: 'D:\Software\Nginx1.8\html\jslcrm3\'