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

重点城市、资讯、标签、标签组

Browse Source
This commit is contained in:
苏竹红
2024-03-13 16:32:38 +08:00
parent abafd8de5c
commit a24a4dc4bd
9 changed files with 158 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java
View File

@@ -49,11 +49,11 @@ public class HyOpenAreaInfoDAO {
}
public List<HyOpenAreaInfoDO> getChildrenList(String type ,Long parentId){
public List<HyOpenAreaInfoDO> getChildrenList(Long parentId){
if (parentId==null){
return new ArrayList<>();
}
return hyOpenAreaInfoMapper.getChildrenList(type,parentId);
return hyOpenAreaInfoMapper.getChildrenList(parentId);
}
public Integer getChildrenCount(String type ,Long parentId){

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java
View File

@@ -59,8 +59,7 @@ public interface HyOpenAreaInfoMapper {
* 查询子列表
* @return
*/
List<HyOpenAreaInfoDO> getChildrenList(@Param("type") String type ,
@Param("parentId") Long parentId);
List<HyOpenAreaInfoDO> getChildrenList(@Param("parentId") Long parentId);
Integer getChildrenCount(@Param("type") String type ,
@Param("parentId") Long parentId);

6
coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
View File

@@ -234,12 +234,6 @@
<if test="parentId!=null">
and parent_id = #{parentId}
</if>
<if test="type!=null and type == 'apply'">
and (area_status = 'open' or area_status = 'keyOpen')
</if>
<if test="type!=null and type == 'reservation'">
and (area_status='notOpen' or area_status = 'saturated')
</if>
</where>
</select>

5
coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java
View File

@@ -23,6 +23,8 @@ public interface OpenAreaService {
*/
List<OpenAreaTreeVO> queryByKeyword(String keyword,String areaStatus,Boolean flag);
List<OpenAreaTreeVO> searchOpenArea(String keyword, Boolean applyFlag,Boolean flag);
/**
* 查询所有的开放区域 城市树
@@ -35,11 +37,10 @@ public interface OpenAreaService {
/**
* 查询字列表
* @param type
* @param parentId
* @return
*/
List<OpenAreaVO> getChildrenList(String type, Long parentId);
List<OpenAreaVO> getChildrenList(Long parentId);
/**
*

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java
View File

@@ -69,6 +69,15 @@ public class OpenAreaServiceImpl implements OpenAreaService {
return openAreaTreeVOS;
}
@Override
public List<OpenAreaTreeVO> searchOpenArea(String keyword,Boolean applyFlag, Boolean flag) {
long startTime = System.currentTimeMillis();
List<HyOpenAreaInfoDO> allAreaList = hyOpenAreaInfoDAO.getAllOpenArea();
log.info("11耗时：{}", System.currentTimeMillis() - startTime);
return OpenAreaTreeVO.convertTree(allAreaList, keyword, applyFlag);
}
@Override
public List<OpenAreaTreeVO> queryAllOpenAreaByKeyword(String keyword,Boolean applyFlag, Boolean flag) {
long startTime = System.currentTimeMillis();
@@ -123,8 +132,8 @@ public class OpenAreaServiceImpl implements OpenAreaService {
@Override
public List<OpenAreaVO> getChildrenList(String type, Long parentId) {
List<HyOpenAreaInfoDO> childrenList = hyOpenAreaInfoDAO.getChildrenList(type, parentId);
public List<OpenAreaVO> getChildrenList(Long parentId) {
List<HyOpenAreaInfoDO> childrenList = hyOpenAreaInfoDAO.getChildrenList( parentId);
List<OpenAreaVO> result = new ArrayList<>();
childrenList.stream().forEach(x->{
OpenAreaVO openAreaVO = convertDoToVo(x);
@@ -137,8 +146,8 @@ public class OpenAreaServiceImpl implements OpenAreaService {
public Boolean batchUpdate(String userId, OpenAreaRequest request) {
//修改选择的区域
hyOpenAreaInfoDAO.batchUpdateById(request.getBackgroundBanner(),request.getDetailBanner(),request.getStatus(),userId,request.getIdList());
//修改选择区域的子区域
hyOpenAreaInfoDAO.batchUpdateByParentId(request.getBackgroundBanner(),request.getDetailBanner(),request.getStatus(),userId,request.getIdList());
//修改选择区域的子区域 子区域不需要更新背景图和详情图
hyOpenAreaInfoDAO.batchUpdateByParentId(null,null,request.getStatus(),userId,request.getIdList());
return Boolean.TRUE;
}

24
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java
View File

@@ -1,11 +1,13 @@
package com.cool.store.controller.webb;
import com.cool.store.common.PageBasicInfo;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.request.OpenAreaRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.OpenAreaService;
import com.cool.store.vo.OpenAreaTreeVO;
import com.cool.store.vo.OpenAreaVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -20,6 +22,7 @@ import java.util.List;
* @Version 1.0
*/
@RestController
@RequestMapping("/openArea")
public class OpenAreaController {
@Resource
@@ -50,20 +53,25 @@ public class OpenAreaController {
@GetMapping(path = "/getOpenAreaList")
@ApiOperation("开放城市树-子列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "parentId", value = "父区域名称", required = false),
@ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false)
@ApiImplicitParam(name = "parentId", value = "父区域名称", required = false)
})
public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId,
@RequestParam(value = "type",required = false)String type){
return ResponseResult.success(openAreaService.getChildrenList(type,parentId));
public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId){
return ResponseResult.success(openAreaService.getChildrenList(parentId));
}
@PostMapping(path = "/changeOpenAreaStatus")
@ApiOperation("变更开放区域状态")
public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){
String userId = CurrentUserHolder.getUserId();
String userId = "";
return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest));
}
@GetMapping(path = "/getKeyOpenAreaList")
@ApiOperation("重点城市列表")
public ResponseResult<PageInfo<OpenAreaVO>> getKeyOpenAreaList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize ){
return ResponseResult.success(openAreaService.queryKeyOpenAreaList(pageSize,pageNumber));
}
}

49
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniContentController.java Normal file
View File

@@ -0,0 +1,49 @@
package com.cool.store.controller.webc;
import com.cool.store.dto.content.ContentQueryDetailDto;
import com.cool.store.dto.content.ContentQueryListDto;
import com.cool.store.entity.HyContentInfoDO;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.ContentService;
import com.cool.store.vo.HyContentInfoVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/3/13 14:33
* @Version 1.0
*/
@RestController
@RequestMapping("mini/news")
@Api(tags = "动态")
@Slf4j
public class MiniContentController {
@Autowired
private ContentService contentService;
@PostMapping("/queryContentList")
@ApiOperation("查询动态列表")
public ResponseResult<PageInfo<HyContentInfoVO>> queryContentList(@RequestBody ContentQueryListDto dto) {
PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
List<HyContentInfoVO> list = contentService.queryContentListToC(dto);
PageInfo<HyContentInfoVO> page = new PageInfo<>(list);
return ResponseResult.success(page);
}
@PostMapping("/detail")
@ApiOperation("动态详情")
public ResponseResult<HyContentInfoDO> queryContentInfo(@RequestBody ContentQueryDetailDto dto) {
return ResponseResult.success(contentService.queryContentInfo(dto.getContentId()));
}
}

67
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAreaController.java Normal file
View File

@@ -0,0 +1,67 @@
package com.cool.store.controller.webc;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.OpenAreaService;
import com.cool.store.vo.OpenAreaTreeVO;
import com.cool.store.vo.OpenAreaVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/3/13 14:37
* @Version 1.0
*/
@RestController
@RequestMapping({"/mini/openArea" })
@Slf4j
@Api(tags = "小程序开发区域城市")
public class MiniOpenAreaController {
@Resource
OpenAreaService openAreaService;
@GetMapping(path = "/getOpenAreaList")
@ApiOperation("点击重点城市 子列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "parentId", value = "父区域ID", required = false),
})
public ResponseResult<List<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "parentId",required = false)Long parentId){
return ResponseResult.success(openAreaService.getChildrenList(parentId));
}
@GetMapping(path = "/areaApplyQuery")
@ApiOperation("区域申请搜索 树形结构")
@ApiImplicitParams({
@ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false)
})
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaList(@RequestParam(value = "keyword",required = false)String keyword){
List<OpenAreaTreeVO> openAreaTreeVOS = openAreaService.searchOpenArea(keyword,null,Boolean.FALSE);
return ResponseResult.success(openAreaTreeVOS);
}
@GetMapping(path = "/getKeyOpenAreaList")
@ApiOperation("重点开放城市列表)")
public ResponseResult<PageInfo<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
PageInfo<OpenAreaVO> openAreaVOPageInfo = openAreaService.queryKeyOpenAreaList(pageSize, pageNumber);
return ResponseResult.success(openAreaVOPageInfo);
}
}

14
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -68,13 +68,13 @@ signKey=77fea013c3a6459685b83c21a2fc3411
fixMobileOpenid=HSAY5531DA7
#xxljob配置
#xxljob配置
xxl.job.admin.addresses=http://10.7.53.224:10001/xxl-job-admin
xxl.job.executor.appname=${spring.application.name}
xxl.job.executor.ip=
xxl.job.executor.port=40001
xxl.job.executor.logpath=logs/xxl-job/jobhandler
xxl.job.executor.logretentiondays=3
xxl.job.accessToken=25365115eed84e9ba5e0040abb255a09
xxl.job.admin.addresses = https://tjob.coolstore.cn/xxl-job-admin
xxl.job.executor.appname = ${spring.application.name}
xxl.job.executor.ip =
xxl.job.executor.port = 30201
xxl.job.executor.logpath = logs/xxl-job/jobhandler
xxl.job.executor.logretentiondays = 30
xxl.job.accessToken =
exhibition.channel.id=52399
recommended.channel.id=52400