From 34486b14dd302b23d4baea8194f45cff9a429d73 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 26 七月 2024 17:40:22 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/ShopService.java | 2 +
server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 10 +++++
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 40 ++++++++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 5 ++
7 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index a236b56..c58b046 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -695,7 +695,7 @@
Response response = client.newCall(request).execute();
if (response.isSuccessful()) {
InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
- /* ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ /*ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int len = -1;
while ((len = inputStream.read(buffer)) != -1) {
diff --git a/server/service/src/main/java/com/doumee/service/business/ShopService.java b/server/service/src/main/java/com/doumee/service/business/ShopService.java
index 33c3568..8160c27 100644
--- a/server/service/src/main/java/com/doumee/service/business/ShopService.java
+++ b/server/service/src/main/java/com/doumee/service/business/ShopService.java
@@ -93,6 +93,8 @@
*/
PageData<Shop> findPage(PageWrap<Shop> pageWrap);
+ List<Shop> getUserShopList(Long userId);
+
/**
* 鏉′欢缁熻
*
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
index 0afa131..f3dd58e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
@@ -216,7 +216,7 @@
public BjParamConfigResponse getBjParamConfig(){
BjParamConfigResponse bjParamConfigResponse = new BjParamConfigResponse();
List<BjParam> bjParamList = bjParamMapper.selectList(new QueryWrapper<BjParam>()
- .lambda().eq(BjParam::getIsdeleted,Constants.ZERO));
+ .lambda().eq(BjParam::getIsdeleted,Constants.ZERO).orderByAsc(BjParam::getSortnum));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO+"")&& StringUtils.isEmpty(i.getParentId())).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(roughList)){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 10cdaf7..a57de5b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -338,6 +338,11 @@
ztContentListRequest.setId(id);
ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
if(Objects.nonNull(response)){
+// if(StringUtils.isNotBlank(response.getPanorama())){
+// response.setPanorama(
+// response.getPanorama().replace("https://720.","https://720-3.").replace("https://720-2.","https://720-3.")
+// );
+// }
//鏌ヨ瀵艰喘淇℃伅 杩涜淇℃伅缁戝畾涓庤繑鍥�
if(StringUtils.isNotBlank(salesId)){
Users users = usersMapper.selectById(salesId);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index a1c246c..41cfa35 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -1032,4 +1032,44 @@
);
}
+ @Override
+ public List<Shop> getUserShopList(Long userId) {
+ Users users = usersMapper.selectById(userId);
+ if(Objects.isNull(users)){
+ return new ArrayList<>();
+ }
+ Shop userShop = shopMapper.selectById(users.getDepartmentId());
+ if(Objects.isNull(userShop)){
+ return new ArrayList<>();
+ }
+ List<Shop> shopList = shopMapper.selectList(new QueryWrapper<Shop>()
+ .lambda()
+ .eq(Shop::getScode,userShop.getScode())
+ .eq(Shop::getType,Constants.TWO)
+ .eq(Shop::getSecondType,Constants.THREE)
+ );
+ //鏌ヨ缁忚惀鑼冨洿淇℃伅
+ List<CategorySeg> categorySegAllList = categorySegMapper.selectList(new QueryWrapper<CategorySeg>().lambda()
+ .isNotNull(CategorySeg::getOrgId)
+ .eq(CategorySeg::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categorySegAllList)){
+ for (Shop shop:shopList) {
+ if(StringUtils.isBlank(shop.getOrgId())){
+ continue;
+ }
+ List<CategorySeg> categorySegList = categorySegAllList.stream().filter(i->i.getOrgId().equals(shop.getOrgId())).collect(Collectors.toList());
+ List<UnitCodeVo> unitCodeVoList =systemDictDataBiz.getUnitList();
+ List<String> seqNameList = new ArrayList<>();
+ for(CategorySeg model : categorySegList){
+ String seqName = systemDictDataBiz.getUnitName(model.getUnitCode(),unitCodeVoList);
+ if(Objects.nonNull(seqName)){
+ seqNameList.add(seqName);
+ }
+ }
+ shop.setSeqNameList(seqNameList);
+ }
+ }
+ return shopList;
+ }
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 6429dc8..c0e13d1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -441,7 +441,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏇存柊鎵嬫満鍙峰け璐�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇鎵嬫満鍙峰け璐�");
}
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index bbe8434..4899dd7 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -151,6 +151,16 @@
}
@UserLoginRequired
+ @ApiOperation(value = "鑾峰彇鍛樺伐绠＄悊闂ㄥ簵鍒楄〃", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/userShopList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<Shop>> userShopList () {
+ return ApiResponse.success(shopService.getUserShopList(getMemberId()));
+ }
+
+ @UserLoginRequired
@ApiOperation(value = "闂ㄥ簵璇︽儏", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/shopDetail")
@ApiImplicitParams({
--
Gitblit v1.9.3