dianliang/dl_site_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:94540e4d640ef5d49e73f49ec7e9ffd62b9db836
Branches Tags
dianliang:master
dianliang:dev
...
compare: dianliang:19a68b314c395e2c7d2b996c7f523c21a0d95e73
Branches Tags
dianliang:master
dianliang:dev

2 Commits
94540e4d64 ... 19a68b314c

Author SHA1 Message Date
PQZ
19a68b314c Merge branch 'master' of http://124.222.105.7:3000/dianliang/dl_site_system 
# Conflicts:
#	dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
 2025-08-04 17:40:38 +08:00
PQZ
f9cdef026f 修改保存消息 2025-08-04 17:36:48 +08:00
6 changed files with 136 additions and 96 deletions
Show Stats Expand all files Collapse all files

204
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
View File

@ -1,5 +1,7 @@
package com.ruoyi.base.controller; package com.ruoyi.base.controller;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -27,6 +29,7 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.webSocket.Message;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -46,7 +49,7 @@ import static com.ruoyi.constant.DictConstants.CATG_TYPE_WZ;
/** /**
* Web 专用Controller * Web 专用Controller
* *
* @author vinjor-m * @author vinjor-m
* @date 2025-06-23 * @date 2025-06-23
*/ */
@ -75,14 +78,15 @@ public class WebController extends BaseController {
/** /**
* 导航栏接口--所有分类 * 导航栏接口--所有分类
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult **/
**/
@ApiOperation("获取站点分类树--所有分类") @ApiOperation("获取站点分类树--所有分类")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/category") @GetMapping("/category")
public R<List<BusiCategoryVO>> categoryList(@RequestParam(required = true) String tenantId){ public R<List<BusiCategoryVO>> categoryList(@RequestParam(required = true) String tenantId) {
BusiCategory category = new BusiCategory(); BusiCategory category = new BusiCategory();
category.setTenantId(tenantId); category.setTenantId(tenantId);
List<BusiCategoryVO> busiCategoryVOList = categoryService.treeCategory(category); List<BusiCategoryVO> busiCategoryVOList = categoryService.treeCategory(category);
@ -91,9 +95,10 @@ public class WebController extends BaseController {
/** /**
* 获取站点产品分类树--产品分类 * 获取站点产品分类树--产品分类
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("获取站点分类树--根据一级分类ID查询所有子级分类树") @ApiOperation("获取站点分类树--根据一级分类ID查询所有子级分类树")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ -101,12 +106,12 @@ public class WebController extends BaseController {
@ApiImplicitParam(name = "catgId", value = "一级分类ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "catgId", value = "一级分类ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
}) })
@GetMapping("/prodCategory") @GetMapping("/prodCategory")
public R<List<BusiCategoryVO>> prodCategoryList(@RequestParam(required = true) String tenantId,@RequestParam(required = true) String catgId){ public R<List<BusiCategoryVO>> prodCategoryList(@RequestParam(required = true) String tenantId, @RequestParam(required = true) String catgId) {
BusiCategory category = new BusiCategory(); BusiCategory category = new BusiCategory();
category.setTenantId(tenantId); category.setTenantId(tenantId);
List<BusiCategoryVO> busiCategoryVOList = categoryService.treeCategory(category); List<BusiCategoryVO> busiCategoryVOList = categoryService.treeCategory(category);
for (BusiCategoryVO categoryVO:busiCategoryVOList){ for (BusiCategoryVO categoryVO : busiCategoryVOList) {
if(catgId.equals(categoryVO.getId())){ if (catgId.equals(categoryVO.getId())) {
return R.ok(categoryVO.getChildren()); return R.ok(categoryVO.getChildren());
} }
} }
@ -115,108 +120,114 @@ public class WebController extends BaseController {
} }
/** /**
*
* @author vinjor-M
* @date 15:44 2025/7/8
* @param id 查询单个分类栏目详情--单页面栏目和询盘栏目使用 * @param id 查询单个分类栏目详情--单页面栏目和询盘栏目使用
* @return com.ruoyi.common.core.domain.R<com.ruoyi.busi.domain.BusiCategory> * @return com.ruoyi.common.core.domain.R<com.ruoyi.busi.domain.BusiCategory>
**/ * @author vinjor-M
* @date 15:44 2025/7/8
**/
@ApiOperation("查询单个分类栏目详情--单页面栏目和询盘栏目使用") @ApiOperation("查询单个分类栏目详情--单页面栏目和询盘栏目使用")
@ApiImplicitParam(name = "id", value = "主键ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "id", value = "主键ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/categoryInfo") @GetMapping("/categoryInfo")
public R<BusiCategory> categoryInfo(@RequestParam(required = true) String id){ public R<BusiCategory> categoryInfo(@RequestParam(required = true) String id) {
return R.ok(categoryService.getById(id)); return R.ok(categoryService.getById(id));
} }
/** /**
* 轮播图 * 轮播图
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("轮播图") @ApiOperation("轮播图")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/pic") @GetMapping("/pic")
public R<List<BasePic>> picList(@RequestParam(required = true) String tenantId){ public R<List<BasePic>> picList(@RequestParam(required = true) String tenantId) {
return R.ok(basePicService.list(tenantId)); return R.ok(basePicService.list(tenantId));
} }
/** /**
* 公司介绍-富文本-首页展示区域 * 公司介绍-富文本-首页展示区域
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("公司介绍-富文本-首页展示区域") @ApiOperation("公司介绍-富文本-首页展示区域")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/indexCompanyInfo") @GetMapping("/indexCompanyInfo")
public R<String> indexCompanyInfo(@RequestParam(required = true) String tenantId){ public R<String> indexCompanyInfo(@RequestParam(required = true) String tenantId) {
BaseSiteInfo baseSiteInfo = siteInfoService.getSiteInfo(tenantId); BaseSiteInfo baseSiteInfo = siteInfoService.getSiteInfo(tenantId);
return R.ok(baseSiteInfo.getCompanyInfo()); return R.ok(baseSiteInfo.getCompanyInfo());
} }
/** /**
* 热门产品-前10 * 热门产品-前10
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("热门产品-前10") @ApiOperation("热门产品-前10")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/hotProduct") @GetMapping("/hotProduct")
public R<List<BusiProdNew>> hotProduct(@RequestParam(required = true) String tenantId){ public R<List<BusiProdNew>> hotProduct(@RequestParam(required = true) String tenantId) {
return R.ok(prodNewService.hotProdOrNews(tenantId,DATA_TYPE_PRODUCT,true)); return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, true));
} }
/** /**
* 普通产品-前10 * 普通产品-前10
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("普通产品-前10") @ApiOperation("普通产品-前10")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/product") @GetMapping("/product")
public R<List<BusiProdNew>> product(@RequestParam(required = true) String tenantId){ public R<List<BusiProdNew>> product(@RequestParam(required = true) String tenantId) {
return R.ok(prodNewService.hotProdOrNews(tenantId,DATA_TYPE_PRODUCT,false)); return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, false));
} }
/** /**
* 热门新闻-前10 * 热门新闻-前10
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("热门新闻-前10") @ApiOperation("热门新闻-前10")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/hotNews") @GetMapping("/hotNews")
public R<List<BusiProdNew>> hotNews(@RequestParam(required = true) String tenantId){ public R<List<BusiProdNew>> hotNews(@RequestParam(required = true) String tenantId) {
return R.ok(prodNewService.hotProdOrNews(tenantId,DATA_TYPE_NEWS,true)); return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_NEWS, true));
} }
/** /**
* 页面底部 * 页面底部
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("页面底部") @ApiOperation("页面底部")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/footerInfo") @GetMapping("/footerInfo")
public R<BaseSiteInfo> footerInfo(@RequestParam(required = true) String tenantId){ public R<BaseSiteInfo> footerInfo(@RequestParam(required = true) String tenantId) {
return R.ok(siteInfoService.getSiteInfo(tenantId)); return R.ok(siteInfoService.getSiteInfo(tenantId));
} }
/** /**
* 产品列表分页 * 产品列表分页
* @author vinjor-M *
* @date 15:17 2025/7/8
* @param tenantId 租户id * @param tenantId 租户id
* @param catgId 分类ID * @param catgId 分类ID
* @param pageNum * @param pageNum
* @param pageSize * @param pageSize
* @return com.ruoyi.common.core.domain.AjaxResult * @return com.ruoyi.common.core.domain.AjaxResult
**/ * @author vinjor-M
* @date 15:17 2025/7/8
**/
@ApiOperation("产品列表分页") @ApiOperation("产品列表分页")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class),
@ -225,19 +236,19 @@ public class WebController extends BaseController {
@ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class)
}) })
@GetMapping("/prodPageList") @GetMapping("/prodPageList")
public R<IPage<BusiProdNew>> prodPageList(String tenantId,String catgId, public R<IPage<BusiProdNew>> prodPageList(String tenantId, String catgId,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<BusiProdNew> page = new Page<>(pageNum, pageSize); Page<BusiProdNew> page = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<BusiProdNew> queryWrapper = new LambdaQueryWrapper<BusiProdNew>() LambdaQueryWrapper<BusiProdNew> queryWrapper = new LambdaQueryWrapper<BusiProdNew>()
.eq(BusiProdNew::getDataType,DATA_TYPE_PRODUCT) .eq(BusiProdNew::getDataType, DATA_TYPE_PRODUCT)
.eq(BusiProdNew::getIfPublic,true) .eq(BusiProdNew::getIfPublic, true)
.eq(BusiProdNew::getTenantId,tenantId); .eq(BusiProdNew::getTenantId, tenantId);
if(StringUtils.isNotEmpty(catgId)){ if (StringUtils.isNotEmpty(catgId)) {
List<String> catgIdList= new ArrayList<>(); List<String> catgIdList = new ArrayList<>();
catgIdList.add(catgId); catgIdList.add(catgId);
catgIdList.addAll(categoryService.getAllChildrenId(catgId)); catgIdList.addAll(categoryService.getAllChildrenId(catgId));
queryWrapper.in(BusiProdNew::getCatgId,catgIdList); queryWrapper.in(BusiProdNew::getCatgId, catgIdList);
} }
queryWrapper.orderByDesc(BusiProdNew::getSort); queryWrapper.orderByDesc(BusiProdNew::getSort);
//查所有栏目 //查所有栏目
@ -254,13 +265,14 @@ public class WebController extends BaseController {
/** /**
* 新闻列表分页 * 新闻列表分页
* @author vinjor-M *
* @date 15:17 2025/7/8
* @param tenantId 租户id * @param tenantId 租户id
* @param catgId 分类ID * @param catgId 分类ID
* @param pageNum * @param pageNum
* @param pageSize * @param pageSize
* @return com.ruoyi.common.core.domain.AjaxResult * @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M
* @date 15:17 2025/7/8
**/ **/
@ApiOperation("新闻列表分页") @ApiOperation("新闻列表分页")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ -270,19 +282,19 @@ public class WebController extends BaseController {
@ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class)
}) })
@GetMapping("/newsPageList") @GetMapping("/newsPageList")
public R<IPage<BusiProdNew>> newsPageList(String tenantId,String catgId, public R<IPage<BusiProdNew>> newsPageList(String tenantId, String catgId,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<BusiProdNew> page = new Page<>(pageNum, pageSize); Page<BusiProdNew> page = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<BusiProdNew> queryWrapper = new LambdaQueryWrapper<BusiProdNew>() LambdaQueryWrapper<BusiProdNew> queryWrapper = new LambdaQueryWrapper<BusiProdNew>()
.eq(BusiProdNew::getDataType,DATA_TYPE_NEWS) .eq(BusiProdNew::getDataType, DATA_TYPE_NEWS)
.eq(BusiProdNew::getIfPublic,true) .eq(BusiProdNew::getIfPublic, true)
.eq(BusiProdNew::getTenantId,tenantId); .eq(BusiProdNew::getTenantId, tenantId);
if(StringUtils.isNotEmpty(catgId)){ if (StringUtils.isNotEmpty(catgId)) {
List<String> catgIdList= new ArrayList<>(); List<String> catgIdList = new ArrayList<>();
catgIdList.add(catgId); catgIdList.add(catgId);
catgIdList.addAll(categoryService.getAllChildrenId(catgId)); catgIdList.addAll(categoryService.getAllChildrenId(catgId));
queryWrapper.in(BusiProdNew::getCatgId,catgIdList); queryWrapper.in(BusiProdNew::getCatgId, catgIdList);
} }
queryWrapper.orderByDesc(BusiProdNew::getSort); queryWrapper.orderByDesc(BusiProdNew::getSort);
//查所有栏目 //查所有栏目
@ -292,29 +304,31 @@ public class WebController extends BaseController {
List<BusiCategoryVO> busiCategoryVOList = categoryService.treeCategory(category); List<BusiCategoryVO> busiCategoryVOList = categoryService.treeCategory(category);
//转map //转map
Map<String,String> catgMap = categoryService.dealFirstIdRtnMap(busiCategoryVOList); Map<String,String> catgMap = categoryService.dealFirstIdRtnMap(busiCategoryVOList);
IPage<BusiProdNew> rtnPage = prodNewService.page(page,queryWrapper); IPage<BusiProdNew> rtnPage = prodNewService.page(page, queryWrapper);
rtnPage.getRecords().forEach(item->item.setMaxCatgId(catgMap.getOrDefault(item.getCatgId(),""))); rtnPage.getRecords().forEach(item->item.setMaxCatgId(catgMap.getOrDefault(item.getCatgId(),"")));
return R.ok(rtnPage); return R.ok(rtnPage);
} }
/** /**
* 产品或新闻详情 * 产品或新闻详情
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("产品或新闻详情") @ApiOperation("产品或新闻详情")
@ApiImplicitParam(name = "id", value = "产品或新闻ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "id", value = "产品或新闻ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/prodNewsInfo") @GetMapping("/prodNewsInfo")
public R<WebDetailVO> prodNewsInfo(@RequestParam(required = true) String id){ public R<WebDetailVO> prodNewsInfo(@RequestParam(required = true) String id) {
return R.ok(prodNewService.getProdNewInfo(id)); return R.ok(prodNewService.getProdNewInfo(id));
} }
/** /**
* 全站搜索 * 全站搜索
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("全站搜索") @ApiOperation("全站搜索")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ -324,23 +338,24 @@ public class WebController extends BaseController {
@ApiImplicitParam(name = "text", value = "搜索内容", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "text", value = "搜索内容", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
}) })
@GetMapping("/searchText") @GetMapping("/searchText")
public R<IPage<BusiProdNew>> searchText(String tenantId,String text, public R<IPage<BusiProdNew>> searchText(String tenantId, String text,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize){ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<BusiProdNew> page = new Page<>(pageNum,pageSize); Page<BusiProdNew> page = new Page<>(pageNum, pageSize);
return R.ok(prodNewService.searchTextAll(tenantId,text,page)); return R.ok(prodNewService.searchTextAll(tenantId, text, page));
} }
/** /**
* 查询盘设置-都有哪些字段需要填写，是否必填 * 查询盘设置-都有哪些字段需要填写，是否必填
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("查询盘设置-都有哪些字段需要填写，是否必填") @ApiOperation("查询盘设置-都有哪些字段需要填写，是否必填")
@ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class)
@GetMapping("/inquirySet") @GetMapping("/inquirySet")
public R<BaseInquiry> inquirySet(@RequestParam(required = true) String tenantId, HttpServletRequest request){ public R<BaseInquiry> inquirySet(@RequestParam(required = true) String tenantId, HttpServletRequest request) {
String ip = CommonUtils.getIpAddr(request); String ip = CommonUtils.getIpAddr(request);
System.out.println(ip); System.out.println(ip);
System.out.println(CommonUtils.getAddr(ip)); System.out.println(CommonUtils.getAddr(ip));
@ -349,11 +364,12 @@ public class WebController extends BaseController {
/** /**
* 保存在线聊天内容 * 保存在线聊天内容
* @author PQZ *
* @date 15:24 2025/7/17
* @param busiChatMain {@link BusiChatMain} * @param busiChatMain {@link BusiChatMain}
* @return com.ruoyi.common.core.domain.AjaxResult * @return com.ruoyi.common.core.domain.AjaxResult
**/ * @author PQZ
* @date 15:24 2025/7/17
**/
@PostMapping("/chatMain") @PostMapping("/chatMain")
public AjaxResult saveChatMain(@RequestBody BusiChatMain busiChatMain, HttpServletRequest request) { public AjaxResult saveChatMain(@RequestBody BusiChatMain busiChatMain, HttpServletRequest request) {
String ip = ""; String ip = "";
@ -361,20 +377,24 @@ public class WebController extends BaseController {
try { try {
ip = CommonUtils.getIpAddr(request); ip = CommonUtils.getIpAddr(request);
nationalStr = CommonUtils.getAddr(ip); nationalStr = CommonUtils.getAddr(ip);
}catch (Exception e){ } catch (Exception e) {
logger.error("识别所属国家失败"); logger.error("识别所属国家失败");
} }
ip = StringUtils.isNotEmpty(ip)?ip:"未知"; ip = StringUtils.isNotEmpty(ip) ? ip : "未知";
BusiChatMain result = busiChatMainService.queryByIpAndCusCode(ip,busiChatMain.getCusCode()); BusiChatMain result = busiChatMainService.queryByIpAndCusCode(ip, busiChatMain.getCusCode(), busiChatMain.getProdId());
if (result != null){ if (result != null) {
if (StringUtils.isNotEmpty(result.getItemJson())) {
JSONArray array = new JSONArray(result.getItemJson());
result.setJsonArray(array);
}
return success(result); return success(result);
} else { } else {
nationalStr = StringUtils.isNotEmpty(nationalStr)?nationalStr:"未知"; nationalStr = StringUtils.isNotEmpty(nationalStr) ? nationalStr : "未知";
String national = nationalStr.split("\\|")[0]; String national = nationalStr.split("\\|")[0];
System.out.println(ip+"-----"+nationalStr); System.out.println(ip + "-----" + nationalStr);
String oceania = "未知"; String oceania = "未知";
Map<String,String> nationalMap = nationalService.getNationalMap(); Map<String, String> nationalMap = nationalService.getNationalMap();
if(nationalMap.containsKey(national)){ if (nationalMap.containsKey(national)) {
oceania = nationalMap.get(national); oceania = nationalMap.get(national);
} }
busiChatMain.setIp(ip); busiChatMain.setIp(ip);
@ -386,11 +406,27 @@ public class WebController extends BaseController {
} }
} }
/**
* 保存用户消息
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author PQZ
* @date 14:12 2025/8/4
**/
@PostMapping("/saveMessage")
public AjaxResult saveMessage(@RequestBody BusiChatMain busiChatMain) {
busiChatMain.setItemJson(busiChatMain.getJsonArray().toString());
busiChatMainService.updateById(busiChatMain);
return success();
}
/** /**
* 提交在线询盘表单 * 提交在线询盘表单
*
* @return com.ruoyi.common.core.domain.AjaxResult
* @author vinjor-M * @author vinjor-M
* @date 10:04 2025/7/8 * @date 10:04 2025/7/8
* @return com.ruoyi.common.core.domain.AjaxResult
**/ **/
@ApiOperation("提交在线询盘表单") @ApiOperation("提交在线询盘表单")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
@ -404,22 +440,22 @@ public class WebController extends BaseController {
@ApiImplicitParam(name = "equipment", value = "设备类型(移动端|电脑端)", required = true, paramType = "body") @ApiImplicitParam(name = "equipment", value = "设备类型(移动端|电脑端)", required = true, paramType = "body")
}) })
@PostMapping("/inquirySave") @PostMapping("/inquirySave")
public R<String> inquirySave(@ApiIgnore @RequestBody BusiInquiryItem inquiryItem, HttpServletRequest request){ public R<String> inquirySave(@ApiIgnore @RequestBody BusiInquiryItem inquiryItem, HttpServletRequest request) {
String ip = ""; String ip = "";
String nationalStr = ""; String nationalStr = "";
try { try {
ip = CommonUtils.getIpAddr(request); ip = CommonUtils.getIpAddr(request);
nationalStr = CommonUtils.getAddr(ip); nationalStr = CommonUtils.getAddr(ip);
}catch (Exception e){ } catch (Exception e) {
logger.error("识别所属国家失败"); logger.error("识别所属国家失败");
} }
ip = StringUtils.isNotEmpty(ip)?ip:"未知"; ip = StringUtils.isNotEmpty(ip) ? ip : "未知";
nationalStr = StringUtils.isNotEmpty(nationalStr)?nationalStr:"未知"; nationalStr = StringUtils.isNotEmpty(nationalStr) ? nationalStr : "未知";
String national = nationalStr.split("\\|")[0]; String national = nationalStr.split("\\|")[0];
System.out.println(ip+"-----"+nationalStr); System.out.println(ip + "-----" + nationalStr);
String oceania = "未知"; String oceania = "未知";
Map<String,String> nationalMap = nationalService.getNationalMap(); Map<String, String> nationalMap = nationalService.getNationalMap();
if(nationalMap.containsKey(national)){ if (nationalMap.containsKey(national)) {
oceania = nationalMap.get(national); oceania = nationalMap.get(national);
} }
inquiryItem.setIp(ip); inquiryItem.setIp(ip);
@ -430,7 +466,7 @@ public class WebController extends BaseController {
} }
@GetMapping("/test") @GetMapping("/test")
public R<?> test(){ public R<?> test() {
googleKeywordService.test(); googleKeywordService.test();
return R.ok(); return R.ok();
} }

8
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiChatMain.java
View File

@ -1,12 +1,17 @@
package com.ruoyi.busi.domain; package com.ruoyi.busi.domain;
import cn.hutool.json.JSONArray;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.webSocket.Message;
import lombok.*; import lombok.*;
import com.ruoyi.common.core.domain.DlBaseEntity; import com.ruoyi.common.core.domain.DlBaseEntity;
import java.util.List;
/** /**
* 在线聊天对象 dl_busi_chat_main * 在线聊天对象 dl_busi_chat_main
* *
@ -65,4 +70,7 @@ public class BusiChatMain extends DlBaseEntity
/** 聊天记录 */ /** 聊天记录 */
private String itemJson; private String itemJson;
@TableField(exist = false)
JSONArray jsonArray;
} }

2
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiChatMainService.java
View File

@ -26,5 +26,5 @@ public interface IBusiChatMainService extends IService<BusiChatMain> {
* @author PQZ * @author PQZ
* @date 15:31 2025/7/17 * @date 15:31 2025/7/17
**/ **/
BusiChatMain queryByIpAndCusCode(String ip, String cusCode); BusiChatMain queryByIpAndCusCode(String ip, String cusCode,String prodId);
} }

7
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiChatMainServiceImpl.java
View File

@ -7,6 +7,7 @@ import com.ruoyi.busi.vo.ChatMainVO;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -41,10 +42,14 @@ public class BusiChatMainServiceImpl extends ServiceImpl<BusiChatMainMapper,Busi
* @date 15:31 2025/7/17 * @date 15:31 2025/7/17
**/ **/
@Override @Override
public BusiChatMain queryByIpAndCusCode(String ip, String cusCode) { public BusiChatMain queryByIpAndCusCode(String ip, String cusCode,String prodId) {
LambdaQueryWrapper<BusiChatMain> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BusiChatMain> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(BusiChatMain::getCusCode,cusCode) lambdaQueryWrapper.eq(BusiChatMain::getCusCode,cusCode)
.eq(BusiChatMain::getIp,ip); .eq(BusiChatMain::getIp,ip);
//对应产品
if (StringUtils.isNotEmpty(prodId)) {
lambdaQueryWrapper.eq(BusiChatMain::getProdId,prodId);
}
BusiChatMain chatMain = getOne(lambdaQueryWrapper); BusiChatMain chatMain = getOne(lambdaQueryWrapper);
return chatMain; return chatMain;
} }

6
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java
View File

@ -6,12 +6,6 @@ import java.util.Date;
@Data @Data
public class Message { public class Message {
private Integer id;
// private String username;
// private String userface;
// private String text;
// private Date date;
/**发送方*/ /**发送方*/
private String dataFrom; private String dataFrom;
/**聊天内容*/ /**聊天内容*/

5
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java
View File

@ -5,16 +5,13 @@ import java.util.concurrent.atomic.AtomicInteger;
public class MessageUtil { public class MessageUtil {
// private static List<Message> messageList = new CopyOnWriteArrayList<>();
private static AtomicInteger atomicInteger = new AtomicInteger(0);
public Message toMessage(String content){ public Message toMessage(String content){
Message message = new Message(); Message message = new Message();
String[] contents=content.split(","); String[] contents=content.split(",");
String name=contents[0]; String name=contents[0];
String text=contents[1]; String text=contents[1];
int id = atomicInteger.incrementAndGet();
message.setId(id);
message.setDataFrom(name); message.setDataFrom(name);
message.setContent(text); message.setContent(text);
message.setCreateTime(new Date()); message.setCreateTime(new Date());