From f9cdef026fe36a849a5f9ef78d24a1ed44033a55 Mon Sep 17 00:00:00 2001 From: PQZ Date: Mon, 4 Aug 2025 17:36:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/base/controller/WebController.java | 206 ++++++++++-------- .../com/ruoyi/busi/domain/BusiChatMain.java | 8 + .../busi/service/IBusiChatMainService.java | 2 +- .../service/impl/BusiChatMainServiceImpl.java | 7 +- .../java/com/ruoyi/webSocket/Message.java | 6 - .../java/com/ruoyi/webSocket/MessageUtil.java | 5 +- 6 files changed, 137 insertions(+), 97 deletions(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java index 2b13766..9674085 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java @@ -1,5 +1,7 @@ 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.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,6 +28,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.webSocket.Message; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -45,7 +48,7 @@ import static com.ruoyi.constant.DictConstants.DATA_TYPE_PRODUCT; /** * Web 专用Controller - * + * * @author vinjor-m * @date 2025-06-23 */ @@ -74,14 +77,15 @@ public class WebController extends BaseController { /** * 导航栏接口--所有分类 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult - **/ + **/ @ApiOperation("获取站点分类树--所有分类") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/category") - public R> categoryList(@RequestParam(required = true) String tenantId){ + public R> categoryList(@RequestParam(required = true) String tenantId) { BusiCategory category = new BusiCategory(); category.setTenantId(tenantId); List busiCategoryVOList = categoryService.treeCategory(category); @@ -90,9 +94,10 @@ public class WebController extends BaseController { /** * 获取站点产品分类树--产品分类 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("获取站点分类树--根据一级分类ID查询所有子级分类树") @ApiImplicitParams(value = { @@ -100,12 +105,12 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "catgId", value = "一级分类ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) }) @GetMapping("/prodCategory") - public R> prodCategoryList(@RequestParam(required = true) String tenantId,@RequestParam(required = true) String catgId){ + public R> prodCategoryList(@RequestParam(required = true) String tenantId, @RequestParam(required = true) String catgId) { BusiCategory category = new BusiCategory(); category.setTenantId(tenantId); List busiCategoryVOList = categoryService.treeCategory(category); - for (BusiCategoryVO categoryVO:busiCategoryVOList){ - if(catgId.equals(categoryVO.getId())){ + for (BusiCategoryVO categoryVO : busiCategoryVOList) { + if (catgId.equals(categoryVO.getId())) { return R.ok(categoryVO.getChildren()); } } @@ -114,108 +119,114 @@ public class WebController extends BaseController { } /** - * - * @author vinjor-M - * @date 15:44 2025/7/8 * @param id 查询单个分类栏目详情--单页面栏目和询盘栏目使用 * @return com.ruoyi.common.core.domain.R - **/ + * @author vinjor-M + * @date 15:44 2025/7/8 + **/ @ApiOperation("查询单个分类栏目详情--单页面栏目和询盘栏目使用") @ApiImplicitParam(name = "id", value = "主键ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/categoryInfo") - public R categoryInfo(@RequestParam(required = true) String id){ + public R categoryInfo(@RequestParam(required = true) String id) { return R.ok(categoryService.getById(id)); } /** * 轮播图 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("轮播图") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/pic") - public R> picList(@RequestParam(required = true) String tenantId){ + public R> picList(@RequestParam(required = true) String tenantId) { return R.ok(basePicService.list(tenantId)); } /** * 公司介绍-富文本-首页展示区域 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("公司介绍-富文本-首页展示区域") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/indexCompanyInfo") - public R indexCompanyInfo(@RequestParam(required = true) String tenantId){ + public R indexCompanyInfo(@RequestParam(required = true) String tenantId) { BaseSiteInfo baseSiteInfo = siteInfoService.getSiteInfo(tenantId); return R.ok(baseSiteInfo.getCompanyInfo()); } /** * 热门产品-前10 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("热门产品-前10") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/hotProduct") - public R> hotProduct(@RequestParam(required = true) String tenantId){ - return R.ok(prodNewService.hotProdOrNews(tenantId,DATA_TYPE_PRODUCT,true)); + public R> hotProduct(@RequestParam(required = true) String tenantId) { + return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, true)); } /** * 普通产品-前10 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("普通产品-前10") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/product") - public R> product(@RequestParam(required = true) String tenantId){ - return R.ok(prodNewService.hotProdOrNews(tenantId,DATA_TYPE_PRODUCT,false)); + public R> product(@RequestParam(required = true) String tenantId) { + return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_PRODUCT, false)); } /** * 热门新闻-前10 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("热门新闻-前10") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/hotNews") - public R> hotNews(@RequestParam(required = true) String tenantId){ - return R.ok(prodNewService.hotProdOrNews(tenantId,DATA_TYPE_NEWS,true)); + public R> hotNews(@RequestParam(required = true) String tenantId) { + return R.ok(prodNewService.hotProdOrNews(tenantId, DATA_TYPE_NEWS, true)); } /** * 页面底部 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("页面底部") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/footerInfo") - public R footerInfo(@RequestParam(required = true) String tenantId){ + public R footerInfo(@RequestParam(required = true) String tenantId) { return R.ok(siteInfoService.getSiteInfo(tenantId)); } /** * 产品列表分页 - * @author vinjor-M - * @date 15:17 2025/7/8 + * * @param tenantId 租户id - * @param catgId 分类ID + * @param catgId 分类ID * @param pageNum * @param pageSize * @return com.ruoyi.common.core.domain.AjaxResult - **/ + * @author vinjor-M + * @date 15:17 2025/7/8 + **/ @ApiOperation("产品列表分页") @ApiImplicitParams(value = { @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class), @@ -224,33 +235,34 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class) }) @GetMapping("/prodPageList") - public R> prodPageList(String tenantId,String catgId, - @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + public R> prodPageList(String tenantId, String catgId, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(BusiProdNew::getDataType,DATA_TYPE_PRODUCT) - .eq(BusiProdNew::getIfPublic,true) - .eq(BusiProdNew::getTenantId,tenantId); - if(StringUtils.isNotEmpty(catgId)){ - List catgIdList= new ArrayList<>(); + .eq(BusiProdNew::getDataType, DATA_TYPE_PRODUCT) + .eq(BusiProdNew::getIfPublic, true) + .eq(BusiProdNew::getTenantId, tenantId); + if (StringUtils.isNotEmpty(catgId)) { + List catgIdList = new ArrayList<>(); catgIdList.add(catgId); catgIdList.addAll(categoryService.getAllChildrenId(catgId)); - queryWrapper.in(BusiProdNew::getCatgId,catgIdList); + queryWrapper.in(BusiProdNew::getCatgId, catgIdList); } queryWrapper.orderByDesc(BusiProdNew::getSort); - return R.ok(prodNewService.page(page,queryWrapper)); + return R.ok(prodNewService.page(page, queryWrapper)); } /** * 新闻列表分页 - * @author vinjor-M - * @date 15:17 2025/7/8 + * * @param tenantId 租户id - * @param catgId 分类ID + * @param catgId 分类ID * @param pageNum * @param pageSize * @return com.ruoyi.common.core.domain.AjaxResult + * @author vinjor-M + * @date 15:17 2025/7/8 **/ @ApiOperation("新闻列表分页") @ApiImplicitParams(value = { @@ -260,43 +272,45 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "catgId", value = "分类id", required = false, dataType = "string", paramType = "query", dataTypeClass = String.class) }) @GetMapping("/newsPageList") - public R> newsPageList(String tenantId,String catgId, - @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + public R> newsPageList(String tenantId, String catgId, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNum, pageSize); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(BusiProdNew::getDataType,DATA_TYPE_NEWS) - .eq(BusiProdNew::getIfPublic,true) - .eq(BusiProdNew::getTenantId,tenantId); - if(StringUtils.isNotEmpty(catgId)){ - List catgIdList= new ArrayList<>(); + .eq(BusiProdNew::getDataType, DATA_TYPE_NEWS) + .eq(BusiProdNew::getIfPublic, true) + .eq(BusiProdNew::getTenantId, tenantId); + if (StringUtils.isNotEmpty(catgId)) { + List catgIdList = new ArrayList<>(); catgIdList.add(catgId); catgIdList.addAll(categoryService.getAllChildrenId(catgId)); - queryWrapper.in(BusiProdNew::getCatgId,catgIdList); + queryWrapper.in(BusiProdNew::getCatgId, catgIdList); } queryWrapper.orderByDesc(BusiProdNew::getSort); - return R.ok(prodNewService.page(page,queryWrapper)); + return R.ok(prodNewService.page(page, queryWrapper)); } /** * 产品或新闻详情 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("产品或新闻详情") @ApiImplicitParam(name = "id", value = "产品或新闻ID", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/prodNewsInfo") - public R prodNewsInfo(@RequestParam(required = true) String id){ + public R prodNewsInfo(@RequestParam(required = true) String id) { WebDetailVO webDetailVO = new WebDetailVO(); return R.ok(prodNewService.getProdNewInfo(id)); } /** * 全站搜索 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("全站搜索") @ApiImplicitParams(value = { @@ -306,23 +320,24 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "text", value = "搜索内容", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) }) @GetMapping("/searchText") - public R> searchText(String tenantId,String text, - @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize){ - Page page = new Page<>(pageNum,pageSize); - return R.ok(prodNewService.searchTextAll(tenantId,text,page)); + public R> searchText(String tenantId, String text, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return R.ok(prodNewService.searchTextAll(tenantId, text, page)); } /** * 查询盘设置-都有哪些字段需要填写，是否必填 + * + * @return com.ruoyi.common.core.domain.AjaxResult * @author vinjor-M * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("查询盘设置-都有哪些字段需要填写，是否必填") @ApiImplicitParam(name = "tenantId", value = "站点唯一码", required = true, dataType = "string", paramType = "query", dataTypeClass = String.class) @GetMapping("/inquirySet") - public R inquirySet(@RequestParam(required = true) String tenantId, HttpServletRequest request){ + public R inquirySet(@RequestParam(required = true) String tenantId, HttpServletRequest request) { String ip = CommonUtils.getIpAddr(request); System.out.println(ip); System.out.println(CommonUtils.getAddr(ip)); @@ -331,11 +346,12 @@ public class WebController extends BaseController { /** * 保存在线聊天内容 - * @author PQZ - * @date 15:24 2025/7/17 + * * @param busiChatMain {@link BusiChatMain} * @return com.ruoyi.common.core.domain.AjaxResult - **/ + * @author PQZ + * @date 15:24 2025/7/17 + **/ @PostMapping("/chatMain") public AjaxResult saveChatMain(@RequestBody BusiChatMain busiChatMain, HttpServletRequest request) { String ip = ""; @@ -343,20 +359,24 @@ public class WebController extends BaseController { try { ip = CommonUtils.getIpAddr(request); nationalStr = CommonUtils.getAddr(ip); - }catch (Exception e){ + } catch (Exception e) { logger.error("识别所属国家失败"); } - ip = StringUtils.isNotEmpty(ip)?ip:"未知"; - BusiChatMain result = busiChatMainService.queryByIpAndCusCode(ip,busiChatMain.getCusCode()); - if (result != null){ + ip = StringUtils.isNotEmpty(ip) ? ip : "未知"; + BusiChatMain result = busiChatMainService.queryByIpAndCusCode(ip, busiChatMain.getCusCode(), busiChatMain.getProdId()); + if (result != null) { + if (StringUtils.isNotEmpty(result.getItemJson())) { + JSONArray array = new JSONArray(result.getItemJson()); + result.setJsonArray(array); + } return success(result); } else { - nationalStr = StringUtils.isNotEmpty(nationalStr)?nationalStr:"未知"; + nationalStr = StringUtils.isNotEmpty(nationalStr) ? nationalStr : "未知"; String national = nationalStr.split("\\|")[0]; - System.out.println(ip+"-----"+nationalStr); + System.out.println(ip + "-----" + nationalStr); String oceania = "未知"; - Map nationalMap = nationalService.getNationalMap(); - if(nationalMap.containsKey(national)){ + Map nationalMap = nationalService.getNationalMap(); + if (nationalMap.containsKey(national)) { oceania = nationalMap.get(national); } busiChatMain.setIp(ip); @@ -368,11 +388,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 * @date 10:04 2025/7/8 - * @return com.ruoyi.common.core.domain.AjaxResult **/ @ApiOperation("提交在线询盘表单") @ApiImplicitParams(value = { @@ -386,22 +422,22 @@ public class WebController extends BaseController { @ApiImplicitParam(name = "equipment", value = "设备类型(移动端|电脑端)", required = true, paramType = "body") }) @PostMapping("/inquirySave") - public R inquirySave(@ApiIgnore @RequestBody BusiInquiryItem inquiryItem, HttpServletRequest request){ + public R inquirySave(@ApiIgnore @RequestBody BusiInquiryItem inquiryItem, HttpServletRequest request) { String ip = ""; String nationalStr = ""; try { ip = CommonUtils.getIpAddr(request); nationalStr = CommonUtils.getAddr(ip); - }catch (Exception e){ + } catch (Exception e) { logger.error("识别所属国家失败"); } - ip = StringUtils.isNotEmpty(ip)?ip:"未知"; - nationalStr = StringUtils.isNotEmpty(nationalStr)?nationalStr:"未知"; + ip = StringUtils.isNotEmpty(ip) ? ip : "未知"; + nationalStr = StringUtils.isNotEmpty(nationalStr) ? nationalStr : "未知"; String national = nationalStr.split("\\|")[0]; - System.out.println(ip+"-----"+nationalStr); + System.out.println(ip + "-----" + nationalStr); String oceania = "未知"; - Map nationalMap = nationalService.getNationalMap(); - if(nationalMap.containsKey(national)){ + Map nationalMap = nationalService.getNationalMap(); + if (nationalMap.containsKey(national)) { oceania = nationalMap.get(national); } inquiryItem.setIp(ip); @@ -412,7 +448,7 @@ public class WebController extends BaseController { } @GetMapping("/test") - public R test(){ + public R test() { googleKeywordService.test(); return R.ok(); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiChatMain.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiChatMain.java index 40961d7..e9bff33 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiChatMain.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiChatMain.java @@ -1,12 +1,17 @@ package com.ruoyi.busi.domain; +import cn.hutool.json.JSONArray; +import com.baomidou.mybatisplus.annotation.TableField; import com.ruoyi.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.webSocket.Message; import lombok.*; import com.ruoyi.common.core.domain.DlBaseEntity; +import java.util.List; + /** * 在线聊天对象 dl_busi_chat_main * @@ -65,4 +70,7 @@ public class BusiChatMain extends DlBaseEntity /** 聊天记录 */ private String itemJson; + @TableField(exist = false) + JSONArray jsonArray; + } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiChatMainService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiChatMainService.java index 270283b..6ccb7e5 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiChatMainService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiChatMainService.java @@ -26,5 +26,5 @@ public interface IBusiChatMainService extends IService { * @author PQZ * @date 15:31 2025/7/17 **/ - BusiChatMain queryByIpAndCusCode(String ip, String cusCode); + BusiChatMain queryByIpAndCusCode(String ip, String cusCode,String prodId); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiChatMainServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiChatMainServiceImpl.java index 49141e9..c9f736e 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiChatMainServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiChatMainServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.busi.vo.ChatMainVO; import com.ruoyi.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -41,10 +42,14 @@ public class BusiChatMainServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(BusiChatMain::getCusCode,cusCode) .eq(BusiChatMain::getIp,ip); + //对应产品 + if (StringUtils.isNotEmpty(prodId)) { + lambdaQueryWrapper.eq(BusiChatMain::getProdId,prodId); + } BusiChatMain chatMain = getOne(lambdaQueryWrapper); return chatMain; } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java index 1e99637..0af5ade 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java @@ -6,12 +6,6 @@ import java.util.Date; @Data public class Message { - private Integer id; -// private String username; -// private String userface; -// private String text; -// private Date date; - /**发送方*/ private String dataFrom; /**聊天内容*/ diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java index d911050..d5aff88 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java @@ -5,16 +5,13 @@ import java.util.concurrent.atomic.AtomicInteger; public class MessageUtil { -// private static List messageList = new CopyOnWriteArrayList<>(); - private static AtomicInteger atomicInteger = new AtomicInteger(0); + public Message toMessage(String content){ Message message = new Message(); String[] contents=content.split(","); String name=contents[0]; String text=contents[1]; - int id = atomicInteger.incrementAndGet(); - message.setId(id); message.setDataFrom(name); message.setContent(text); message.setCreateTime(new Date());