suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

高级设置

Browse Source
This commit is contained in:
苏竹红
2023-06-15 09:39:56 +08:00
parent 3e6801f522
commit c8914d554f
12 changed files with 268 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
coolstore-partner-service/src/main/java/com/cool/store/service/AdvanceSettingService.java Normal file
View File

@@ -0,0 +1,33 @@
package com.cool.store.service;
import com.cool.store.request.AdvancedSettingRequest;
import com.cool.store.vo.AdvancedSettingVO;
/**
* @Author suzhuhong
* @Date 2023/6/14 20:31
* @Version 1.0
*/
public interface AdvanceSettingService {
/**
* addAdvanceSetting
* @param userId
* @param advancedSettingRequest
* @return
*/
Boolean addOrUpdateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest);
/**
* 查询高级设置详情
* @return
*/
AdvancedSettingVO getAdvancedSettingDetail();
}

63
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdvanceSettingServiceImpl.java Normal file
View File

@@ -0,0 +1,63 @@
package com.cool.store.service.impl;
import com.cool.store.dao.HyAdvancedSettingDAO;
import com.cool.store.entity.HyAdvancedSettingDO;
import com.cool.store.request.AdvancedSettingRequest;
import com.cool.store.service.AdvanceSettingService;
import com.cool.store.vo.AdvancedSettingVO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* @Author suzhuhong
* @Date 2023/6/14 20:31
* @Version 1.0
*/
@Service
public class AdvanceSettingServiceImpl implements AdvanceSettingService {
@Resource
HyAdvancedSettingDAO hyAdvancedSettingDAO;
@Override
public Boolean addOrUpdateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest) {
if (advancedSettingRequest.getId()!=null){
//修改
updateAdvanceSetting(userId,advancedSettingRequest);
}
HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO();
hyAdvancedSettingDO.setCreateUserId(userId);
hyAdvancedSettingDO.setPartnerUrl(advancedSettingRequest.getPartnerUrl());
hyAdvancedSettingDO.setTencentVideoAccount(advancedSettingRequest.getTencentVideoAccount());
hyAdvancedSettingDO.setTencentVideoKey(advancedSettingRequest.getTencentVideoKey());
hyAdvancedSettingDAO.insertSelective(hyAdvancedSettingDO);
return Boolean.TRUE;
}
private Boolean updateAdvanceSetting(String userId, AdvancedSettingRequest advancedSettingRequest) {
HyAdvancedSettingDO hyAdvancedSettingDO = new HyAdvancedSettingDO();
hyAdvancedSettingDO.setCreateUserId(userId);
hyAdvancedSettingDO.setId(advancedSettingRequest.getId());
hyAdvancedSettingDO.setPartnerUrl(advancedSettingRequest.getPartnerUrl());
hyAdvancedSettingDO.setTencentVideoAccount(advancedSettingRequest.getTencentVideoAccount());
hyAdvancedSettingDO.setTencentVideoKey(advancedSettingRequest.getTencentVideoKey());
hyAdvancedSettingDAO.updateByPrimaryKeySelective(hyAdvancedSettingDO);
return Boolean.TRUE;
}
@Override
public AdvancedSettingVO getAdvancedSettingDetail() {
HyAdvancedSettingDO hyAdvancedSettingDO = hyAdvancedSettingDAO.selectAdvanceSetting();
if (hyAdvancedSettingDO==null){
return null;
}
AdvancedSettingVO advancedSettingVO = new AdvancedSettingVO();
advancedSettingVO.setId(hyAdvancedSettingDO.getId());
advancedSettingVO.setPartnerUrl(hyAdvancedSettingDO.getPartnerUrl());
advancedSettingVO.setTencentVideoAccount(hyAdvancedSettingDO.getTencentVideoAccount());
advancedSettingVO.setTencentVideoKey(hyAdvancedSettingDO.getTencentVideoKey());
return advancedSettingVO;
}
}

70
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java
View File

@@ -1,10 +1,7 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.HyIntendDevMappingDAO;
import com.cool.store.dao.HyIntendDevZoneInfoDAO;
import com.cool.store.dao.HyOpenAreaInfoDAO;
import com.cool.store.dao.*;
import com.cool.store.dto.partner.ZoneCheckDTO;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.HyIntendDevZoneInfoDO;
@@ -14,6 +11,9 @@ import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.request.IntentAreaSettingRequest;
import com.cool.store.service.ZoneService;
import com.cool.store.utils.StringUtil;
import com.cool.store.vo.OpenAreaSingleVO;
import com.cool.store.vo.OrganizationVO;
import com.cool.store.vo.ZoneCheckVO;
import com.cool.store.vo.ZoneVO;
import com.github.pagehelper.PageHelper;
@@ -22,10 +22,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -47,6 +44,8 @@ public class ZoneServiceImpl implements ZoneService {
HyOpenAreaInfoDAO openAreaInfoDAO;
@Resource
EnterpriseUserDAO enterpriseUserDAO;
@Resource
RegionDAO regionDAO;
@@ -116,14 +115,19 @@ public class ZoneServiceImpl implements ZoneService {
List<String> updateUserIdList = list.stream().map(HyIntendDevZoneInfoDO::getUpdateUserId).collect(Collectors.toList());
List<EnterpriseUserDO> updateUserList = enterpriseUserDAO.getUserInfoByUserIds(updateUserIdList);
Map<String, String> updateUserNameMap = updateUserList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, EnterpriseUserDO::getName));
list.forEach(x->{
ZoneVO zoneVO = new ZoneVO();
zoneVO.setZoneName(x.getZoneName());
zoneVO.setId(x.getId());
zoneVO.setUpdateTime(x.getUpdateTime());
zoneVO.setUpdateUserId(x.getUpdateUserId());
Set<String> regionSet = new HashSet<>();
list.stream().forEach(x->{
if (StringUtil.isNotEmpty(x.getAssociatedRegionId())){
List<String> regionIds = JSONObject.parseArray(x.getAssociatedRegionId(), String.class);
regionSet.addAll(regionIds);
}
});
Map<String, String> regionMap = regionDAO.getRegionMap(new ArrayList<>(regionSet));
list.forEach(x->{
ZoneVO zoneVO = handleZoneVO(regionMap, x);
zoneVO.setUpdateUserName(updateUserNameMap.get(x.getUpdateUserId()));
result.add(zoneVO);
});
hyIntendDevZoneInfoList.setList(result);
return hyIntendDevZoneInfoList;
@@ -135,8 +139,44 @@ public class ZoneServiceImpl implements ZoneService {
if (hyIntendDevZoneInfoDO==null){
throw new ServiceException(ErrorCodeEnum.ZONE_NOT_EXIST);
}
ZoneVO zoneVO = null;
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(hyIntendDevZoneInfoDO.getUpdateUserId());
if (StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())){
List<String> regionIds = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class);
Map<String, String> regionMap = regionDAO.getRegionMap(regionIds);
zoneVO = handleZoneVO(regionMap, hyIntendDevZoneInfoDO);
zoneVO.setUpdateUserName(enterpriseUserDO.getName());
}
List<ZoneCheckDTO> zoneCheckDTOS = hyIntendDevMappingDAO.selectByMappingIdList(Arrays.asList(zoneId));
List<OpenAreaSingleVO> openAreaVOS = new ArrayList<>();
zoneCheckDTOS.forEach(x->{
OpenAreaSingleVO openAreaSingleVO = new OpenAreaSingleVO();
openAreaSingleVO.setId(x.getOpenAreaMappingId());
openAreaVOS.add(openAreaSingleVO);
});
zoneVO.setOpenAreaVOS(openAreaVOS);
return zoneVO;
}
return null;
private ZoneVO handleZoneVO(Map<String, String> regionMap,HyIntendDevZoneInfoDO hyIntendDevZoneInfoDO){
ZoneVO zoneVO = new ZoneVO();
zoneVO.setZoneName(hyIntendDevZoneInfoDO.getZoneName());
zoneVO.setId(hyIntendDevZoneInfoDO.getId());
zoneVO.setUpdateTime(hyIntendDevZoneInfoDO.getUpdateTime());
List<OrganizationVO> organizationVOS = new ArrayList<>();
if (StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())){
List<String> regionIds = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class);
regionIds.forEach(regionId->{
OrganizationVO organizationVO = new OrganizationVO();
organizationVO.setId(regionId);
organizationVO.setName(regionMap.get(regionId));
organizationVOS.add(organizationVO);
});
}
zoneVO.setOrgVos(organizationVOS);
zoneVO.setUpdateUserId(hyIntendDevZoneInfoDO.getUpdateUserId());
return zoneVO;
}
@Override