1、新增轮播图

hx-admin/src/main/resources/application-dev.yml

@@ -6,21 +6,21 @@ spring:
       primary: base
       datasource:
         base:
-          url: jdbc:mysql://121.37.194.75:30102/bytesailing_xmhjc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: xmhjc
-          password: 2j^q9*DF
+          url: jdbc:mysql://139.9.102.170:30102/bytesailing_xmhjc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: 5fWD*oa^nso@kmKa
 
 
   # redis 配置
   redis:
     # 地址
-    host: 121.37.194.75
+    host: 139.9.102.170
     # 端口，默认为6379
-    port: 30103
+    port: 9673
     # 数据库索引
     database: 5
     # 密码
-    password: Fjhx@pwd123
+    password: ss34dsA3DdsF
     # 连接超时时间
     timeout: 10s
     lettuce:

hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/open/OpenCarouselController.java

@@ -1,14 +1,18 @@
 package com.fjhx.xmhjc.controller.open;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
+import com.fjhx.xmhjc.entity.browsing.dto.AddBrowsingDto;
 import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerSelectDto;
 import com.fjhx.xmhjc.entity.carousel.vo.CarouselManagerVo;
 import com.fjhx.xmhjc.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.xmhjc.entity.product.vo.ProductCategoryVo;
 import com.fjhx.xmhjc.entity.product.vo.ProductInfoVo;
+import com.fjhx.xmhjc.service.browsing.BrowsingHistoryService;
 import com.fjhx.xmhjc.service.carousel.CarouselManagerService;
 import com.fjhx.xmhjc.service.product.ProductCategoryService;
 import com.fjhx.xmhjc.service.product.ProductInfoService;
+import com.fjhx.xmhjc.utils.DictUtilsByOpen;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/carousel/impl/CarouselManagerServiceImpl.java

@@ -3,11 +3,17 @@ package com.fjhx.xmhjc.service.carousel.impl;
 import cn.hutool.core.util.StrUtil;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
+import com.fjhx.xmhjc.entity.browsing.dto.AddBrowsingDto;
 import com.fjhx.xmhjc.entity.carousel.po.CarouselManager;
+import com.fjhx.xmhjc.entity.column.vo.ColumnMenuVo;
 import com.fjhx.xmhjc.entity.home.po.HomeSetting;
 import com.fjhx.xmhjc.mapper.carousel.CarouselManagerMapper;
+import com.fjhx.xmhjc.service.browsing.BrowsingHistoryService;
 import com.fjhx.xmhjc.service.carousel.CarouselManagerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.xmhjc.service.column.ColumnMenuService;
+import com.fjhx.xmhjc.utils.DictUtilsByOpen;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,7 +23,9 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -33,10 +41,15 @@ import java.util.stream.Collectors;
 @Service
 public class CarouselManagerServiceImpl extends ServiceImpl<CarouselManagerMapper, CarouselManager> implements CarouselManagerService {
 
+    @Resource
+    private BrowsingHistoryService browsingHistoryService;
+    @Resource
+    private ColumnMenuService columnMenuService;
+
     @Override
     public List<CarouselManagerVo> getList(CarouselManagerSelectDto dto) {
         IWrapper<CarouselManager> wrapper = getWrapper();
-        wrapper.orderByDesc("cm", CarouselManager::getId);
+        wrapper.orderByAsc("cm", CarouselManager::getModules).orderByAsc("cm", CarouselManager::getSort);
         List<CarouselManagerVo> list = this.baseMapper.getList(wrapper);
         return list;
     }
@@ -44,7 +57,7 @@ public class CarouselManagerServiceImpl extends ServiceImpl<CarouselManagerMappe
     @Override
     public Page<CarouselManagerVo> getPage(CarouselManagerSelectDto dto) {
         IWrapper<CarouselManager> wrapper = getWrapper();
-        wrapper.orderByDesc("cm", CarouselManager::getId);
+        wrapper.orderByAsc("cm", CarouselManager::getModules).orderByAsc("cm", CarouselManager::getSort);
         wrapper.keyword(dto, new SqlField("cm", CarouselManager::getTitle));
 
         Page<CarouselManagerVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -98,6 +111,19 @@ public class CarouselManagerServiceImpl extends ServiceImpl<CarouselManagerMappe
             item.setCarouselUrlList(fileMap.get(item.getId()));
         });
         page.setRecords(list);
+
+        //浏览记录
+        AddBrowsingDto addBrowsingDto = new AddBrowsingDto();
+        if (dto.getModules().length() > 3){
+            ColumnMenuVo menuDetailByOpen = columnMenuService.getMenuDetailByOpen(Long.valueOf(dto.getModules()));
+            addBrowsingDto.setName(menuDetailByOpen.getName());
+        }else {
+            DictTenantDataVo dictObject = DictUtilsByOpen.getDictObject("carousel_modules", dto.getModules());
+            addBrowsingDto.setName(dictObject.getDictValue());
+        }
+        addBrowsingDto.setCreateTime(new Date());
+        browsingHistoryService.addBrowsingHistory(addBrowsingDto);
+
         return page;
     }
 

hx-xmhjc/src/main/java/com/fjhx/xmhjc/utils/DictUtilsByOpen.java

@@ -47,4 +47,24 @@ public class DictUtilsByOpen {
         TenantHolder.clear();
         return  afterSalesType;
     }
+
+
+    public static DictTenantDataVo getDictObject(String code,String key) {
+        TenantHolder.setIgnore(true);
+
+//        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        DictTenantDataSelectDto dto = new DictTenantDataSelectDto();
+        dto.setDictCode(code);
+        dto.setTenantId("xmhjc");
+        List<DictTenantDataVo> afterSalesType = dictTenantDataMapper.getList(dto)
+                .stream().filter(x -> x.getDictKey().equals(key)).collect(Collectors.toList());
+        DictTenantDataVo dictTenantDataVo = new DictTenantDataVo();
+        if (afterSalesType.size() >= 1){
+            dictTenantDataVo = afterSalesType.get(0);
+        }
+//        DynamicDataSourceContextHolder.poll();
+        //代码块
+        TenantHolder.clear();
+        return  dictTenantDataVo;
+    }
 }