From 84b1de6f3bb114d607b5a2982d0954dfcb0139a0 Mon Sep 17 00:00:00 2001 From: xs Date: Wed, 25 Dec 2024 11:22:02 +0800 Subject: [PATCH] =?UTF-8?q?3.0.1=20=E9=97=A8=E6=88=B7=E7=BD=91=E7=AB=99?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=92=8C=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/HwPortalConstants.java | 38 + .../controller/LayoutConfigController.java | 5 +- .../controller/LayoutDescController.java | 2 +- .../com/ruoyi/basic/domain/LayoutConfig.java | 2 +- .../com/ruoyi/basic/domain/LayoutDesc.java | 2 +- .../ruoyi/basic/mapper/LayoutConfigDao.java | 2 +- .../mapper/basic/LayoutConfigDao.xml | 2 +- .../resources/mapper/basic/LayoutDescDao.xml | 2 +- .../service/IHwDeviceModeService.java | 2 +- .../service/impl/HwDeviceModeServiceImpl.java | 16 +- .../service/impl/HwDeviceServiceImpl.java | 15 +- .../controller/HwAboutUsInfoController.java | 25 +- .../HwAboutUsInfoDetailController.java | 25 +- .../controller/HwContactUsInfoController.java | 25 +- .../controller/HwPortalConfigController.java | 25 +- .../HwPortalConfigTypeController.java | 23 +- .../portal/controller/HwPortalController.java | 178 +++++ .../HwProductCaseInfoController.java | 25 +- .../controller/HwProductInfoController.java | 25 +- .../HwProductInfoDetailController.java | 23 +- .../ruoyi/portal/domain/HwAboutUsInfo.java | 4 +- .../portal/domain/HwAboutUsInfoDetail.java | 4 +- .../ruoyi/portal/domain/HwContactUsInfo.java | 16 +- .../ruoyi/portal/domain/HwPortalConfig.java | 18 +- .../portal/domain/HwPortalConfigType.java | 17 +- .../portal/domain/HwProductCaseInfo.java | 33 +- .../ruoyi/portal/domain/HwProductInfo.java | 54 +- .../portal/domain/HwProductInfoDetail.java | 4 +- .../mapper/HwAboutUsInfoDetailMapper.java | 3 +- .../portal/mapper/HwAboutUsInfoMapper.java | 3 +- .../portal/mapper/HwContactUsInfoMapper.java | 3 +- .../portal/mapper/HwPortalConfigMapper.java | 3 +- .../mapper/HwPortalConfigTypeMapper.java | 3 +- .../mapper/HwProductCaseInfoMapper.java | 3 +- .../mapper/HwProductInfoDetailMapper.java | 3 +- .../portal/mapper/HwProductInfoMapper.java | 12 +- .../service/IHwAboutUsInfoDetailService.java | 3 +- .../portal/service/IHwAboutUsInfoService.java | 3 +- .../service/IHwContactUsInfoService.java | 3 +- .../service/IHwPortalConfigService.java | 3 +- .../service/IHwPortalConfigTypeService.java | 3 +- .../service/IHwProductCaseInfoService.java | 10 +- .../service/IHwProductInfoDetailService.java | 3 +- .../portal/service/IHwProductInfoService.java | 11 +- .../impl/HwAboutUsInfoDetailServiceImpl.java | 9 +- .../impl/HwAboutUsInfoServiceImpl.java | 9 +- .../impl/HwContactUsInfoServiceImpl.java | 9 +- .../impl/HwPortalConfigServiceImpl.java | 9 +- .../impl/HwPortalConfigTypeServiceImpl.java | 9 +- .../impl/HwProductCaseInfoServiceImpl.java | 28 +- .../impl/HwProductInfoDetailServiceImpl.java | 9 +- .../impl/HwProductInfoServiceImpl.java | 91 ++- .../mapper/portal/HwContactUsInfoMapper.xml | 6 +- .../mapper/portal/HwPortalConfigMapper.xml | 7 +- .../mapper/portal/HwProductCaseInfoMapper.xml | 24 +- .../mapper/portal/HwProductInfoMapper.xml | 41 ++ ruoyi-ui/src/api/portal/aboutUsInfo.js | 44 ++ ruoyi-ui/src/api/portal/aboutUsInfoDetail.js | 44 ++ ruoyi-ui/src/api/portal/contactUsInfo.js | 44 ++ ruoyi-ui/src/api/portal/portalConfig.js | 44 ++ ruoyi-ui/src/api/portal/portalConfigType.js | 44 ++ ruoyi-ui/src/api/portal/productCaseInfo.js | 44 ++ ruoyi-ui/src/api/portal/productInfo.js | 44 ++ ruoyi-ui/src/api/portal/productInfoDetail.js | 44 ++ ruoyi-ui/src/router/index.js | 30 + .../src/views/portal/aboutUsInfo/index.vue | 501 +++++++++++++ .../views/portal/aboutUsInfoDetail/index.vue | 487 +++++++++++++ .../src/views/portal/contactUsInfo/index.vue | 294 ++++++++ .../src/views/portal/portalConfig/index.vue | 514 ++++++++++++++ .../views/portal/portalConfigType/index.vue | 659 ++++++++++++++++++ .../views/portal/productCaseInfo/index.vue | 491 +++++++++++++ .../src/views/portal/productInfo/index.vue | 354 ++++++++++ .../views/portal/productInfoDetail/index.vue | 543 +++++++++++++++ 73 files changed, 4908 insertions(+), 252 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwPortalConstants.java create mode 100644 ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java create mode 100644 ruoyi-ui/src/api/portal/aboutUsInfo.js create mode 100644 ruoyi-ui/src/api/portal/aboutUsInfoDetail.js create mode 100644 ruoyi-ui/src/api/portal/contactUsInfo.js create mode 100644 ruoyi-ui/src/api/portal/portalConfig.js create mode 100644 ruoyi-ui/src/api/portal/portalConfigType.js create mode 100644 ruoyi-ui/src/api/portal/productCaseInfo.js create mode 100644 ruoyi-ui/src/api/portal/productInfo.js create mode 100644 ruoyi-ui/src/api/portal/productInfoDetail.js create mode 100644 ruoyi-ui/src/views/portal/aboutUsInfo/index.vue create mode 100644 ruoyi-ui/src/views/portal/aboutUsInfoDetail/index.vue create mode 100644 ruoyi-ui/src/views/portal/contactUsInfo/index.vue create mode 100644 ruoyi-ui/src/views/portal/portalConfig/index.vue create mode 100644 ruoyi-ui/src/views/portal/portalConfigType/index.vue create mode 100644 ruoyi-ui/src/views/portal/productCaseInfo/index.vue create mode 100644 ruoyi-ui/src/views/portal/productInfo/index.vue create mode 100644 ruoyi-ui/src/views/portal/productInfoDetail/index.vue diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwPortalConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwPortalConstants.java new file mode 100644 index 0000000..82c1063 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwPortalConstants.java @@ -0,0 +1,38 @@ +package com.ruoyi.common.core.constant; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description: 门户网站服务常量 + * @ClassName: HwPortalConstants + * @Author : xins + * @Date :2023-12-18 15:20 + * @Version :1.0 + */ +public class HwPortalConstants { + + /** + * 产品信息配置配置模式 + * 配置模式(1图标 +文字+内容横铺4个2左标题+内容，右图片；3左图标，右标题+内容，一行2个；4左大图右标题+内容，一行2个；5上标题+下图片，6上标题+内容，下图片；7图标标题内容，一行3个,8一张图9上图下内容，一行4个) + */ + public static final String PRODUCT_INFO_CONFIG_MODAL_ONE = "1"; + public static final String PRODUCT_INFO_CONFIG_MODAL_TWO = "2"; + + +// public static final List ABNDON_FUNCTION_IDENTIFIERS = Arrays.asList("ts","value1","type"); +// +// public static final String DEFAULT_FIRST_FIELD_NAME_DISPLAY = "时间";//timestamp格式首字段的显示名称 +// public static final Map DEVICE_DATA_COLUMN_MAP = new HashMap(); +// +// static { +// DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICECODE, "设备编号"); +// DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICENAME, "设备名称"); +// DEVICE_DATA_COLUMN_MAP.put(DEFAULT_FIRST_FIELD_NAME, DEFAULT_FIRST_FIELD_NAME_DISPLAY); +// } + + + +} diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutConfigController.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutConfigController.java index f7c55cc..4f318dc 100644 --- a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutConfigController.java +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutConfigController.java @@ -9,10 +9,8 @@ import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourcePrope import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.basic.domain.HwTemplate; import com.ruoyi.basic.domain.LayoutConfig; import com.ruoyi.basic.domain.LayoutDesc; -import com.ruoyi.basic.service.HwTemplateService; import com.ruoyi.basic.service.LayoutConfigService; import com.ruoyi.basic.service.LayoutDescService; @@ -44,8 +42,7 @@ public class LayoutConfigController { private LayoutConfigService layoutConfigService; @Autowired private LayoutDescService layoutDescService; - @Autowired - private HwTemplateService hwTemplateService; + /** * 分页查询 diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutDescController.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutDescController.java index ebcad5b..9429963 100644 --- a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutDescController.java +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutDescController.java @@ -81,4 +81,4 @@ public class LayoutDescController { return ResponseEntity.ok(this.layoutDescService.deleteById(id)); } -} +} \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutConfig.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutConfig.java index 4905a2f..dcb2493 100644 --- a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutConfig.java +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutConfig.java @@ -116,4 +116,4 @@ public class LayoutConfig implements Serializable { // this.updateTime = updateTime; // } -} +} \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutDesc.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutDesc.java index c539678..ccfbd32 100644 --- a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutDesc.java +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutDesc.java @@ -104,4 +104,4 @@ public class LayoutDesc implements Serializable { // this.updateTime = updateTime; // } -} +} \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutConfigDao.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutConfigDao.java index b2951ce..af8efe9 100644 --- a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutConfigDao.java +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutConfigDao.java @@ -84,4 +84,4 @@ public interface LayoutConfigDao { List selectConfigById(String sceneId); List selectAllScenes(); -} +} \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutConfigDao.xml b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutConfigDao.xml index ac96dcf..3ea8402 100644 --- a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutConfigDao.xml +++ b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutConfigDao.xml @@ -157,4 +157,4 @@ delete from layout_config where config_id = #{configId} - + \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutDescDao.xml b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutDescDao.xml index 2bc4d19..f692f51 100644 --- a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutDescDao.xml +++ b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutDescDao.xml @@ -133,4 +133,4 @@ delete from layout_desc where layout_id = #{layoutId} - + \ No newline at end of file diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwDeviceModeService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwDeviceModeService.java index 2570515..6dc0f7d 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwDeviceModeService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwDeviceModeService.java @@ -139,5 +139,5 @@ public interface IHwDeviceModeService List getDeviceByModel(Long modelId); - Map getDeviceLocation(Long deviceId); +// Map getDeviceLocation(Long deviceId); } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java index 0eea3a2..4a5ad53 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceModeServiceImpl.java @@ -450,14 +450,14 @@ public class HwDeviceModeServiceImpl implements IHwDeviceModeService { System.out.println(hwDeviceMapper.getDeviceByModel(modelId)); return hwDeviceMapper.getDeviceByModel(modelId); } - public Map getDeviceLocation(Long deviceId) { - TdSelectDto tdSelectDto = new TdSelectDto(); - tdSelectDto.setDatabaseName("db_hwsaas"); - tdSelectDto.setTableName("t_device_"+deviceId); - R> deviceLocation = remoteTdEngineService.getDeviceLocation(tdSelectDto, SecurityConstants.FROM_SOURCE); - Map data = deviceLocation.getData(); - return data; - } +// public Map getDeviceLocation(Long deviceId) { +// TdSelectDto tdSelectDto = new TdSelectDto(); +// tdSelectDto.setDatabaseName("db_hwsaas"); +// tdSelectDto.setTableName("t_device_"+deviceId); +// R> deviceLocation = remoteTdEngineService.getDeviceLocation(tdSelectDto, SecurityConstants.FROM_SOURCE); +// Map data = deviceLocation.getData(); +// return data; +// } /** diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java index 55ab9e9..33ea550 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwDeviceServiceImpl.java @@ -8,7 +8,7 @@ import com.ruoyi.business.domain.*; import com.ruoyi.business.domain.VO.*; import com.ruoyi.business.mapper.*; import com.ruoyi.business.service.IHwDeviceService; -import com.ruoyi.business.utils.GpsCoordinateUtils; +//import com.ruoyi.business.utils.GpsCoordinateUtils; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.HwDictConstants; import com.ruoyi.common.core.constant.SecurityConstants; @@ -27,20 +27,13 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.tdengine.api.RemoteTdEngineService; import com.ruoyi.tdengine.api.domain.*; -import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; -import org.springframework.data.redis.cache.RedisCache; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.reflect.generics.tree.Tree; import javax.annotation.Resource; -import java.io.File; import java.sql.Timestamp; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -1683,9 +1676,9 @@ public class HwDeviceServiceImpl implements IHwDeviceService { TdSelectDto tdSelectDto = new TdSelectDto(); tdSelectDto.setDatabaseName("db_hwsaas"); tdSelectDto.setTableName("t_device_"+deviceId); - R> deviceLocation = remoteTdEngineService.getDeviceLocation(tdSelectDto, SecurityConstants.INNER); - Map data = deviceLocation.getData(); - return data; +// R> deviceLocation = remoteTdEngineService.getDeviceLocation(tdSelectDto, SecurityConstants.INNER); +// Map data = deviceLocation.getData(); + return null; } /** diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java index 0b6b00e..3e3f3a6 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoController.java @@ -1,26 +1,19 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwAboutUsInfo; import com.ruoyi.portal.service.IHwAboutUsInfoService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 关于我们信息Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java index abf2b81..a59c987 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwAboutUsInfoDetailController.java @@ -1,26 +1,19 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwAboutUsInfoDetail; import com.ruoyi.portal.service.IHwAboutUsInfoDetailService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 关于我们信息明细Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java index 62b7b68..10c39d1 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwContactUsInfoController.java @@ -1,26 +1,19 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwContactUsInfo; import com.ruoyi.portal.service.IHwContactUsInfoService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 联系我们信息Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java index 29c96fd..97ac1ef 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigController.java @@ -1,26 +1,19 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwPortalConfig; import com.ruoyi.portal.service.IHwPortalConfigService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 门户网站配置Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java index 2af2c42..d181403 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalConfigTypeController.java @@ -1,25 +1,18 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwPortalConfigType; import com.ruoyi.portal.service.IHwPortalConfigTypeService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 门户网站配置类型Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java new file mode 100644 index 0000000..091c75e --- /dev/null +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwPortalController.java @@ -0,0 +1,178 @@ +package com.ruoyi.portal.controller; + +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.portal.domain.*; +import com.ruoyi.portal.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 门户网站前端Controller + * + * @author xins + * @date 2024-12-12 + */ +@RestController +@RequestMapping("/portal") +public class HwPortalController extends BaseController +{ + @Autowired + private IHwPortalConfigService hwPortalConfigService; + + @Autowired + private IHwPortalConfigTypeService hwPortalConfigTypeService; + + @Autowired + private IHwProductCaseInfoService hwProductCaseInfoService; + + @Autowired + private IHwContactUsInfoService hwContactUsInfoService; + + @Autowired + private IHwProductInfoService productInfoService; + + @Autowired + private IHwProductInfoDetailService hwProductInfoDetailService; + + @Autowired + private IHwAboutUsInfoService hwAboutUsInfoService; + + @Autowired + private IHwAboutUsInfoDetailService hwAboutUsInfoDetailService; + + + /** + * 查询门户网站配置列表（首页大图，portal_config_type为1;产品中心大图，portal_config_type为2,并且需要根据portalConfigTypeId获取） + */ + @GetMapping("/getPortalConfigList") + public TableDataInfo getPortalConfigList(HwPortalConfig hwPortalConfig) + { + startPage(); + List list = hwPortalConfigService.selectHwPortalConfigList(hwPortalConfig); + return getDataTable(list); + } + + + /** + * 门户网站配置类型（首页产品中心，config_type_classfication为1，按homeConfigTypeName显示；产品中心页面上面的按configTypeName显示） + */ + @GetMapping("/getPortalConfigTypeList") + public TableDataInfo getPortalConfigTypeList(HwPortalConfigType hwPortalConfigType) + { + startPage(); + List list = hwPortalConfigTypeService.selectHwPortalConfigTypeList(hwPortalConfigType); + return getDataTable(list); + } + + /** + * 获取首页案例tab title(例如物联网、制造中心和快递物流) + */ + @GetMapping("/getHomeCaseTitleList") + public TableDataInfo getHomeCaseTitleList(HwPortalConfigType hwPortalConfigType) + { + startPage(); + List list = hwPortalConfigTypeService.selectHwPortalConfigTypeList(hwPortalConfigType); + return getDataTable(list); + } + + + /** + * 获取首页案例信息 + */ + @GetMapping("/getTypicalHomeCaseInfo") + public AjaxResult getTypicalHomeCaseInfo(HwProductCaseInfo queryProductCaseInfo) + { + HwProductCaseInfo hwProductCaseInfo = hwProductCaseInfoService.getTypicalHomeCaseInfo(queryProductCaseInfo); + + return success(hwProductCaseInfo); + } + + + + /** + * 新增联系我们 + */ + @Log(title = "联系我们", businessType = BusinessType.INSERT) + @PostMapping("/addContactUsInfo") + public AjaxResult addContactUsInfo(@RequestBody HwContactUsInfo hwContactUsInfo) + { + return toAjax(hwContactUsInfoService.insertHwContactUsInfo(hwContactUsInfo)); + } + + + + /** + * 获取产品中心产品信息(平台简介,hw_product_info获取，（配置模式2左标题+内容，右图片）读取中文标题和英文标题，下面内容从hw_product_info_detail获取，读取标题，内容和图片) + */ + @GetMapping("/getProductCenterProductInfos") + public AjaxResult getProductCenterProductInfos(HwProductInfo hwProductInfo) + { +// 配置模式(1图标 +文字+内容横铺4个2左标题+内容，右图片；3左图标，右标题+内容，一行2个；4左大图右标题+内容，一行2个；5上标题+下图片，6上标题+内容，下图片；7图标标题内容，一行3个,8左图右列表9上图下内容，一行4个) + return success(productInfoService.selectHwProductInfoJoinDetailList(hwProductInfo)); + } + + /** + * 产品中心如果tab的话，根据tab的product_info_detail_id获取children productinfodetail + * @param hwProductInfoDetail + * @return + */ + @GetMapping("/getProductCenterProductDetailInfos") + public AjaxResult getProductCenterProductDetailInfos(HwProductInfoDetail hwProductInfoDetail) + { +// productinfodetail的config_modal 配置模式(1图标 +文字+内容横铺4个2左标题+内容，右图片；3左图标，右标题+内容，一行2个；4左大图右标题+内容，一行2个；5上标题+下图片，6上标题+内容，下图片；7图标标题内容，一行3个,8一张图9上图下内容，一行4个) + return success(hwProductInfoDetailService.selectHwProductInfoDetailList(hwProductInfoDetail)); + } + + + /** + * 产品中心如果tab的话，根据tab的portalconfigtypeid获取productcaseinfo + * @param hwProductCaseInfo + * @return + */ + @GetMapping("/getCaseCenterCaseInfos") + public AjaxResult getCaseCenterCaseInfos(HwProductCaseInfo hwProductCaseInfo) + { + return success(hwProductCaseInfoService.selectHwProductCaseInfoList(hwProductCaseInfo)); + } + + /** + * 根据案例ID获取案例详情 + * @param caseInfoId + * @return + */ + @GetMapping("/getCaseCenterCaseInfo/{caseInfoId}") + public AjaxResult getCaseCenterCaseInfo(@PathVariable("caseInfoId") Long caseInfoId) + { + return success(hwProductCaseInfoService.selectHwProductCaseInfoByCaseInfoId(caseInfoId)); + } + + + /** + * 获取关于我们信息 + * @param hwAboutUsInfo + * @return + */ + @GetMapping("/getAboutUsInfo") + public AjaxResult getAboutUsInfo(HwAboutUsInfo hwAboutUsInfo) + { + return success(hwAboutUsInfoService.selectHwAboutUsInfoList(hwAboutUsInfo)); + } + + + /** + * 获取关于我们信息详情 + * @param hwAboutUsInfoDetail + * @return + */ + @GetMapping("/getAboutUsInfoDetails") + public AjaxResult getAboutUsInfoDetails(HwAboutUsInfoDetail hwAboutUsInfoDetail) + { + return success(hwAboutUsInfoDetailService.selectHwAboutUsInfoDetailList(hwAboutUsInfoDetail)); + } +} diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java index 7abde7a..84ce2cd 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductCaseInfoController.java @@ -1,26 +1,19 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwProductCaseInfo; import com.ruoyi.portal.service.IHwProductCaseInfoService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 案例内容Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java index 5c3e721..1d7c867 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoController.java @@ -1,26 +1,19 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwProductInfo; import com.ruoyi.portal.service.IHwProductInfoService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 产品信息配置Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java index 605ecf3..772d3c0 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwProductInfoDetailController.java @@ -1,25 +1,18 @@ package com.ruoyi.portal.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.portal.domain.HwProductInfoDetail; import com.ruoyi.portal.service.IHwProductInfoDetailService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 产品信息明细配置Controller diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfo.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfo.java index 528f73d..9b4739d 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfo.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfo.java @@ -1,9 +1,9 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 关于我们信息对象 hw_about_us_info diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfoDetail.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfoDetail.java index ee32ecb..334318c 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfoDetail.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwAboutUsInfoDetail.java @@ -1,9 +1,9 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 关于我们信息明细对象 hw_about_us_info_detail diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwContactUsInfo.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwContactUsInfo.java index cf06a57..a0efe46 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwContactUsInfo.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwContactUsInfo.java @@ -1,9 +1,9 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 联系我们信息对象 hw_contact_us_info @@ -34,6 +34,8 @@ public class HwContactUsInfo extends BaseEntity @Excel(name = "IP地址") private String userIp; + private String remark; + public void setContactUsInfoId(Long contactUsInfoId) { this.contactUsInfoId = contactUsInfoId; @@ -80,6 +82,16 @@ public class HwContactUsInfo extends BaseEntity return userIp; } + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java index 586ee9d..58dce9d 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfig.java @@ -1,9 +1,9 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 门户网站配置对象 hw_portal_config @@ -22,6 +22,9 @@ public class HwPortalConfig extends BaseEntity @Excel(name = "类型(1首页大图 2产品中心大图)") private String portalConfigType; + /**如果类型是2的，则需要关联hw_portal_config_type*/ + private Long portalConfigTypeId; + /** 标题 */ @Excel(name = "标题") private String portalConfigTitle; @@ -64,7 +67,16 @@ public class HwPortalConfig extends BaseEntity { return portalConfigType; } - public void setPortalConfigTitle(String portalConfigTitle) + + public Long getPortalConfigTypeId() { + return portalConfigTypeId; + } + + public void setPortalConfigTypeId(Long portalConfigTypeId) { + this.portalConfigTypeId = portalConfigTypeId; + } + + public void setPortalConfigTitle(String portalConfigTitle) { this.portalConfigTitle = portalConfigTitle; } diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java index deb8247..fec425d 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwPortalConfigType.java @@ -1,9 +1,11 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.TreeEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.List; /** * 门户网站配置类型对象 hw_portal_config_type @@ -42,6 +44,9 @@ public class HwPortalConfigType extends TreeEntity @Excel(name = "首页图片地址") private String homeConfigTypePic; + private List hwProductCaseInfoList; + + public void setConfigTypeId(Long configTypeId) { this.configTypeId = configTypeId; @@ -106,6 +111,14 @@ public class HwPortalConfigType extends TreeEntity return homeConfigTypePic; } + public List getHwProductCaseInfoList() { + return hwProductCaseInfoList; + } + + public void setHwProductCaseInfoList(List hwProductCaseInfoList) { + this.hwProductCaseInfoList = hwProductCaseInfoList; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductCaseInfo.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductCaseInfo.java index 2d9d773..403c360 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductCaseInfo.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductCaseInfo.java @@ -1,9 +1,9 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 案例内容对象 hw_product_case_info @@ -24,7 +24,7 @@ public class HwProductCaseInfo extends BaseEntity /** 配置类型ID */ @Excel(name = "配置类型ID") - private Long caseTypeId; + private Long configTypeId; /** 典型案例标识(1是0否) */ @Excel(name = "典型案例标识(1是0否)") @@ -42,6 +42,9 @@ public class HwProductCaseInfo extends BaseEntity @Excel(name = "案例详情") private String caseInfoHtml; + private String homeTypicalFlag; + + public void setCaseInfoId(Long caseInfoId) { this.caseInfoId = caseInfoId; @@ -60,16 +63,16 @@ public class HwProductCaseInfo extends BaseEntity { return caseInfoTitle; } - public void setCaseTypeId(Long caseTypeId) - { - this.caseTypeId = caseTypeId; + + public Long getConfigTypeId() { + return configTypeId; } - public Long getCaseTypeId() - { - return caseTypeId; + public void setConfigTypeId(Long configTypeId) { + this.configTypeId = configTypeId; } - public void setTypicalFlag(String typicalFlag) + + public void setTypicalFlag(String typicalFlag) { this.typicalFlag = typicalFlag; } @@ -106,12 +109,20 @@ public class HwProductCaseInfo extends BaseEntity return caseInfoHtml; } + public String getHomeTypicalFlag() { + return homeTypicalFlag; + } + + public void setHomeTypicalFlag(String homeTypicalFlag) { + this.homeTypicalFlag = homeTypicalFlag; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("caseInfoId", getCaseInfoId()) .append("caseInfoTitle", getCaseInfoTitle()) - .append("caseTypeId", getCaseTypeId()) + .append("configTypeId", getConfigTypeId()) .append("typicalFlag", getTypicalFlag()) .append("caseInfoDesc", getCaseInfoDesc()) .append("caseInfoPic", getCaseInfoPic()) diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfo.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfo.java index f021f4b..685cb80 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfo.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfo.java @@ -1,9 +1,11 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.List; /** * 产品信息配置对象 hw_product_info @@ -42,6 +44,11 @@ public class HwProductInfo extends BaseEntity @Excel(name = "顺序") private Long productInfoOrder; + /** 产品信息明细配置信息 */ + private List hwProductInfoDetailList; + + private Long parentId; + public void setProductInfoId(Long productInfoId) { this.productInfoId = productInfoId; @@ -106,20 +113,39 @@ public class HwProductInfo extends BaseEntity return productInfoOrder; } + public List getHwProductInfoDetailList() + { + return hwProductInfoDetailList; + } + + public void setHwProductInfoDetailList(List hwProductInfoDetailList) + { + this.hwProductInfoDetailList = hwProductInfoDetailList; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("productInfoId", getProductInfoId()) - .append("configTypeId", getConfigTypeId()) - .append("tabFlag", getTabFlag()) - .append("configModal", getConfigModal()) - .append("productInfoEtitle", getProductInfoEtitle()) - .append("productInfoCtitle", getProductInfoCtitle()) - .append("productInfoOrder", getProductInfoOrder()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .toString(); + .append("productInfoId", getProductInfoId()) + .append("configTypeId", getConfigTypeId()) + .append("tabFlag", getTabFlag()) + .append("configModal", getConfigModal()) + .append("productInfoEtitle", getProductInfoEtitle()) + .append("productInfoCtitle", getProductInfoCtitle()) + .append("productInfoOrder", getProductInfoOrder()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("hwProductInfoDetailList", getHwProductInfoDetailList()) + .toString(); } } diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfoDetail.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfoDetail.java index 80bde59..b543000 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfoDetail.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwProductInfoDetail.java @@ -1,9 +1,9 @@ package com.ruoyi.portal.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.TreeEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 产品信息明细配置对象 hw_product_info_detail diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoDetailMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoDetailMapper.java index 12bf14d..80211ca 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoDetailMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoDetailMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwAboutUsInfoDetail; +import java.util.List; + /** * 关于我们信息明细Mapper接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoMapper.java index 8460df5..a04d21d 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwAboutUsInfoMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwAboutUsInfo; +import java.util.List; + /** * 关于我们信息Mapper接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwContactUsInfoMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwContactUsInfoMapper.java index 8d03dfc..aba791f 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwContactUsInfoMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwContactUsInfoMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwContactUsInfo; +import java.util.List; + /** * 联系我们信息Mapper接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigMapper.java index b08acb1..b104877 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwPortalConfig; +import java.util.List; + /** * 门户网站配置Mapper接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigTypeMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigTypeMapper.java index a32de85..de83bf6 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigTypeMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwPortalConfigTypeMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwPortalConfigType; +import java.util.List; + /** * 门户网站配置类型Mapper接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductCaseInfoMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductCaseInfoMapper.java index f22aa2c..ca3668c 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductCaseInfoMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductCaseInfoMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwProductCaseInfo; +import java.util.List; + /** * 案例内容Mapper接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoDetailMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoDetailMapper.java index 1a97e09..69f52ec 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoDetailMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoDetailMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwProductInfoDetail; +import java.util.List; + /** * 产品信息明细配置Mapper接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoMapper.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoMapper.java index 6ccd7e1..95cb22d 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoMapper.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwProductInfoMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.mapper; -import java.util.List; import com.ruoyi.portal.domain.HwProductInfo; +import java.util.List; + /** * 产品信息配置Mapper接口 * @@ -58,4 +59,13 @@ public interface HwProductInfoMapper * @return 结果 */ public int deleteHwProductInfoByProductInfoIds(Long[] productInfoIds); + + /** + * 查询产品信息配置列表,join product info detail + * + * @param hwProductInfo 产品信息配置 + * @return 产品信息配置集合 + */ + public List selectHwProductInfoJoinDetailList(HwProductInfo hwProductInfo); + } diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoDetailService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoDetailService.java index 29f94cd..3abcb00 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoDetailService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoDetailService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwAboutUsInfoDetail; +import java.util.List; + /** * 关于我们信息明细Service接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoService.java index 8435265..9baf7a3 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwAboutUsInfoService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwAboutUsInfo; +import java.util.List; + /** * 关于我们信息Service接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwContactUsInfoService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwContactUsInfoService.java index 382f843..3f8ae56 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwContactUsInfoService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwContactUsInfoService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwContactUsInfo; +import java.util.List; + /** * 联系我们信息Service接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigService.java index 361b67d..2894a95 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwPortalConfig; +import java.util.List; + /** * 门户网站配置Service接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigTypeService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigTypeService.java index bc1afb8..41cb672 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigTypeService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwPortalConfigTypeService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwPortalConfigType; +import java.util.List; + /** * 门户网站配置类型Service接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductCaseInfoService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductCaseInfoService.java index e1cfa59..b229a24 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductCaseInfoService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductCaseInfoService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwProductCaseInfo; +import java.util.List; + /** * 案例内容Service接口 * @@ -58,4 +59,11 @@ public interface IHwProductCaseInfoService * @return 结果 */ public int deleteHwProductCaseInfoByCaseInfoId(Long caseInfoId); + + /** + * 根据configTypeId获取首页典型案例 + * @param hwProductCaseInfo + * @return + */ + public HwProductCaseInfo getTypicalHomeCaseInfo(HwProductCaseInfo hwProductCaseInfo); } diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoDetailService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoDetailService.java index e56ab4b..afe5a16 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoDetailService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoDetailService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwProductInfoDetail; +import java.util.List; + /** * 产品信息明细配置Service接口 * diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoService.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoService.java index 0bd2f1c..640cf39 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoService.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwProductInfoService.java @@ -1,8 +1,9 @@ package com.ruoyi.portal.service; -import java.util.List; import com.ruoyi.portal.domain.HwProductInfo; +import java.util.List; + /** * 产品信息配置Service接口 * @@ -58,4 +59,12 @@ public interface IHwProductInfoService * @return 结果 */ public int deleteHwProductInfoByProductInfoId(Long productInfoId); + + /** + * 获取产品中心产品信息(平台简介,hw_product_info获取，（配置模式2左标题+内容，右图片）读取中文标题和英文标题，下面内容从hw_product_info_detail获取，读取标题，内容和图片) + * + * @param hwProductInfo 产品信息配置 + * @return 产品信息配置 + */ + public List selectHwProductInfoJoinDetailList(HwProductInfo hwProductInfo); } diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoDetailServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoDetailServiceImpl.java index 479221e..a54a307 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoDetailServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoDetailServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.portal.domain.HwAboutUsInfoDetail; +import com.ruoyi.portal.mapper.HwAboutUsInfoDetailMapper; +import com.ruoyi.portal.service.IHwAboutUsInfoDetailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwAboutUsInfoDetailMapper; -import com.ruoyi.portal.domain.HwAboutUsInfoDetail; -import com.ruoyi.portal.service.IHwAboutUsInfoDetailService; + +import java.util.List; /** * 关于我们信息明细Service业务层处理 diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoServiceImpl.java index 5c24391..3be1c1a 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwAboutUsInfoServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.portal.domain.HwAboutUsInfo; +import com.ruoyi.portal.mapper.HwAboutUsInfoMapper; +import com.ruoyi.portal.service.IHwAboutUsInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwAboutUsInfoMapper; -import com.ruoyi.portal.domain.HwAboutUsInfo; -import com.ruoyi.portal.service.IHwAboutUsInfoService; + +import java.util.List; /** * 关于我们信息Service业务层处理 diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwContactUsInfoServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwContactUsInfoServiceImpl.java index 1ff9677..b2c3776 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwContactUsInfoServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwContactUsInfoServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.portal.domain.HwContactUsInfo; +import com.ruoyi.portal.mapper.HwContactUsInfoMapper; +import com.ruoyi.portal.service.IHwContactUsInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwContactUsInfoMapper; -import com.ruoyi.portal.domain.HwContactUsInfo; -import com.ruoyi.portal.service.IHwContactUsInfoService; + +import java.util.List; /** * 联系我们信息Service业务层处理 diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigServiceImpl.java index 6b4a5e0..0ae8927 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.portal.domain.HwPortalConfig; +import com.ruoyi.portal.mapper.HwPortalConfigMapper; +import com.ruoyi.portal.service.IHwPortalConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwPortalConfigMapper; -import com.ruoyi.portal.domain.HwPortalConfig; -import com.ruoyi.portal.service.IHwPortalConfigService; + +import java.util.List; /** * 门户网站配置Service业务层处理 diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java index e42a62a..61fbdaf 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwPortalConfigTypeServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.portal.domain.HwPortalConfigType; +import com.ruoyi.portal.mapper.HwPortalConfigTypeMapper; +import com.ruoyi.portal.service.IHwPortalConfigTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwPortalConfigTypeMapper; -import com.ruoyi.portal.domain.HwPortalConfigType; -import com.ruoyi.portal.service.IHwPortalConfigTypeService; + +import java.util.List; /** * 门户网站配置类型Service业务层处理 diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductCaseInfoServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductCaseInfoServiceImpl.java index 829aaa6..c36954d 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductCaseInfoServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductCaseInfoServiceImpl.java @@ -1,12 +1,14 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.portal.domain.HwProductCaseInfo; +import com.ruoyi.portal.mapper.HwProductCaseInfoMapper; +import com.ruoyi.portal.service.IHwProductCaseInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwProductCaseInfoMapper; -import com.ruoyi.portal.domain.HwProductCaseInfo; -import com.ruoyi.portal.service.IHwProductCaseInfoService; + +import java.util.List; +import java.util.stream.Collectors; /** * 案例内容Service业务层处理 @@ -93,4 +95,22 @@ public class HwProductCaseInfoServiceImpl implements IHwProductCaseInfoService { return hwProductCaseInfoMapper.deleteHwProductCaseInfoByCaseInfoId(caseInfoId); } + + /** + * 根据configTypeId获取首页典型案例 + * @param hwProductCaseInfo + * @return + */ + @Override + public HwProductCaseInfo getTypicalHomeCaseInfo(HwProductCaseInfo hwProductCaseInfo){ + hwProductCaseInfo.setHomeTypicalFlag("1"); + List productCaseInfoList = hwProductCaseInfoMapper.selectHwProductCaseInfoList(hwProductCaseInfo); + List typicalProductCaseInfoList = productCaseInfoList.stream().filter(pci -> pci.getTypicalFlag().equals("1")).collect(Collectors.toList()); + if(typicalProductCaseInfoList!=null && ! typicalProductCaseInfoList.isEmpty()){ + return typicalProductCaseInfoList.get(0); + }else if (productCaseInfoList!=null && !productCaseInfoList.isEmpty()){ + return productCaseInfoList.get(0); + } + return new HwProductCaseInfo(); + } } diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java index b3ca46f..4628754 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoDetailServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.portal.service.impl; -import java.util.List; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.portal.domain.HwProductInfoDetail; +import com.ruoyi.portal.mapper.HwProductInfoDetailMapper; +import com.ruoyi.portal.service.IHwProductInfoDetailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwProductInfoDetailMapper; -import com.ruoyi.portal.domain.HwProductInfoDetail; -import com.ruoyi.portal.service.IHwProductInfoDetailService; + +import java.util.List; /** * 产品信息明细配置Service业务层处理 diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java index b89915c..c545ce4 100644 --- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java +++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwProductInfoServiceImpl.java @@ -1,12 +1,19 @@ package com.ruoyi.portal.service.impl; -import java.util.List; +import com.ruoyi.common.core.constant.HwPortalConstants; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.portal.domain.HwProductInfo; +import com.ruoyi.portal.domain.HwProductInfoDetail; +import com.ruoyi.portal.mapper.HwProductInfoMapper; +import com.ruoyi.portal.service.IHwProductInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.portal.mapper.HwProductInfoMapper; -import com.ruoyi.portal.domain.HwProductInfo; -import com.ruoyi.portal.service.IHwProductInfoService; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; /** * 产品信息配置Service业务层处理 @@ -93,4 +100,80 @@ public class HwProductInfoServiceImpl implements IHwProductInfoService { return hwProductInfoMapper.deleteHwProductInfoByProductInfoId(productInfoId); } + + + /** + * 获取产品中心产品信息(平台简介,hw_product_info获取，（配置模式2左标题+内容，右图片）读取中文标题和英文标题，下面内容从hw_product_info_detail获取，读取标题，内容和图片) + * + * @param hwProductInfo 产品信息配置 + * @return 产品信息配置 + */ + @Override + public List selectHwProductInfoJoinDetailList(HwProductInfo hwProductInfo) + { + List hwProductInfoJoinDetailList = hwProductInfoMapper.selectHwProductInfoJoinDetailList(hwProductInfo); + return hwProductInfoJoinDetailList; + } + + + + /** + * 构建前端所需要树结构 + * + * @param productInfoDetails 产品明细列表 + * @return 树结构列表 + */ +// @Override + public List buildProductInfoDetailTree(List productInfoDetails) { + List returnList = new ArrayList<>(); + List tempList = productInfoDetails.stream().map(HwProductInfoDetail::getProductInfoDetailId).collect(Collectors.toList()); + for (HwProductInfoDetail hwProductInfoDetail : productInfoDetails) { + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(hwProductInfoDetail.getParentId())) { + recursionFn(productInfoDetails, hwProductInfoDetail); + returnList.add(hwProductInfoDetail); + } + } + if (returnList.isEmpty()) { + returnList = productInfoDetails; + } + return returnList; + } + + /** + * 递归列表 + */ + private void recursionFn(List list, HwProductInfoDetail t) { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (HwProductInfoDetail tChild : childList) { + if (hasChild(list, tChild)) { + recursionFn(list, tChild); + } + } + } + + + /** + * 得到子节点列表 + */ + private List getChildList(List list, HwProductInfoDetail t) { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) { + HwProductInfoDetail n = (HwProductInfoDetail) it.next(); + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getProductInfoDetailId().longValue()) { + tlist.add(n); + } + } + return tlist; + } + + /** + * 判断是否有子节点 + */ + private boolean hasChild(List list, HwProductInfoDetail t) { + return getChildList(list, t).size() > 0 ? true : false; + } } diff --git a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwContactUsInfoMapper.xml b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwContactUsInfoMapper.xml index 5b42004..055adc4 100644 --- a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwContactUsInfoMapper.xml +++ b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwContactUsInfoMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select contact_us_info_id, user_name, user_email, user_phone, user_ip, create_time, create_by, update_time, update_by from hw_contact_us_info + select contact_us_info_id, user_name, user_email, user_phone, user_ip, remark,create_time, create_by, update_time, update_by from hw_contact_us_info and portal_config_type = #{portalConfigType} + and portal_config_type_id = #{portalConfigTypeId} and portal_config_title = #{portalConfigTitle} and portal_config_order = #{portalConfigOrder} and portal_config_desc = #{portalConfigDesc} @@ -45,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into hw_portal_config portal_config_type, + portal_config_type_id, portal_config_title, portal_config_order, portal_config_desc, @@ -58,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{portalConfigType}, + #{portalConfigTypeId}, #{portalConfigTitle}, #{portalConfigOrder}, #{portalConfigDesc}, @@ -75,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update hw_portal_config portal_config_type = #{portalConfigType}, + portal_config_type_id = #{portalConfigTypeId}, portal_config_title = #{portalConfigTitle}, portal_config_order = #{portalConfigOrder}, portal_config_desc = #{portalConfigDesc}, diff --git a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductCaseInfoMapper.xml b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductCaseInfoMapper.xml index deb78b2..40000c3 100644 --- a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductCaseInfoMapper.xml +++ b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductCaseInfoMapper.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -18,24 +18,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select case_info_id, case_info_title, case_type_id, typical_flag, case_info_desc, case_info_pic, case_info_html, create_time, create_by, update_time, update_by from hw_product_case_info + + select case_info_id, case_info_title, config_type_id, typical_flag, case_info_desc, case_info_pic, case_info_html, create_time, create_by, update_time, update_by from hw_product_case_info hpci + + select case_info_id, case_info_title, config_type_id, typical_flag, case_info_desc, case_info_pic, create_time, create_by, update_time, update_by from hw_product_case_info hpci + + + @@ -43,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into hw_product_case_info case_info_title, - case_type_id, + config_type_id, typical_flag, case_info_desc, case_info_pic, @@ -55,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{caseInfoTitle}, - #{caseTypeId}, + #{configTypeId}, #{typicalFlag}, #{caseInfoDesc}, #{caseInfoPic}, @@ -71,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update hw_product_case_info case_info_title = #{caseInfoTitle}, - case_type_id = #{caseTypeId}, + config_type_id = #{configTypeId}, typical_flag = #{typicalFlag}, case_info_desc = #{caseInfoDesc}, case_info_pic = #{caseInfoPic}, diff --git a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductInfoMapper.xml b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductInfoMapper.xml index 5d248bc..4e3d3aa 100644 --- a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductInfoMapper.xml +++ b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwProductInfoMapper.xml @@ -16,6 +16,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + @@ -94,4 +115,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{productInfoId} + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/portal/aboutUsInfo.js b/ruoyi-ui/src/api/portal/aboutUsInfo.js new file mode 100644 index 0000000..c285190 --- /dev/null +++ b/ruoyi-ui/src/api/portal/aboutUsInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询关于我们信息列表 +export function listAboutUsInfo(query) { + return request({ + url: '/portal/aboutUsInfo/list', + method: 'get', + params: query + }) +} + +// 查询关于我们信息详细 +export function getAboutUsInfo(aboutUsInfoId) { + return request({ + url: '/portal/aboutUsInfo/' + aboutUsInfoId, + method: 'get' + }) +} + +// 新增关于我们信息 +export function addAboutUsInfo(data) { + return request({ + url: '/portal/aboutUsInfo', + method: 'post', + data: data + }) +} + +// 修改关于我们信息 +export function updateAboutUsInfo(data) { + return request({ + url: '/portal/aboutUsInfo', + method: 'put', + data: data + }) +} + +// 删除关于我们信息 +export function delAboutUsInfo(aboutUsInfoId) { + return request({ + url: '/portal/aboutUsInfo/' + aboutUsInfoId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/aboutUsInfoDetail.js b/ruoyi-ui/src/api/portal/aboutUsInfoDetail.js new file mode 100644 index 0000000..dd4526f --- /dev/null +++ b/ruoyi-ui/src/api/portal/aboutUsInfoDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询关于我们信息明细列表 +export function listAboutUsInfoDetail(query) { + return request({ + url: '/portal/aboutUsInfoDetail/list', + method: 'get', + params: query + }) +} + +// 查询关于我们信息明细详细 +export function getAboutUsInfoDetail(usInfoDetailId) { + return request({ + url: '/portal/aboutUsInfoDetail/' + usInfoDetailId, + method: 'get' + }) +} + +// 新增关于我们信息明细 +export function addAboutUsInfoDetail(data) { + return request({ + url: '/portal/aboutUsInfoDetail', + method: 'post', + data: data + }) +} + +// 修改关于我们信息明细 +export function updateAboutUsInfoDetail(data) { + return request({ + url: '/portal/aboutUsInfoDetail', + method: 'put', + data: data + }) +} + +// 删除关于我们信息明细 +export function delAboutUsInfoDetail(usInfoDetailId) { + return request({ + url: '/portal/aboutUsInfoDetail/' + usInfoDetailId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/contactUsInfo.js b/ruoyi-ui/src/api/portal/contactUsInfo.js new file mode 100644 index 0000000..c794154 --- /dev/null +++ b/ruoyi-ui/src/api/portal/contactUsInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询联系我们信息列表 +export function listContactUsInfo(query) { + return request({ + url: '/portal/contactUsInfo/list', + method: 'get', + params: query + }) +} + +// 查询联系我们信息详细 +export function getContactUsInfo(contactUsInfoId) { + return request({ + url: '/portal/contactUsInfo/' + contactUsInfoId, + method: 'get' + }) +} + +// 新增联系我们信息 +export function addContactUsInfo(data) { + return request({ + url: '/portal/contactUsInfo', + method: 'post', + data: data + }) +} + +// 修改联系我们信息 +export function updateContactUsInfo(data) { + return request({ + url: '/portal/contactUsInfo', + method: 'put', + data: data + }) +} + +// 删除联系我们信息 +export function delContactUsInfo(contactUsInfoId) { + return request({ + url: '/portal/contactUsInfo/' + contactUsInfoId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/portalConfig.js b/ruoyi-ui/src/api/portal/portalConfig.js new file mode 100644 index 0000000..4eb1382 --- /dev/null +++ b/ruoyi-ui/src/api/portal/portalConfig.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询门户网站配置列表 +export function listPortalConfig(query) { + return request({ + url: '/portal/portalConfig/list', + method: 'get', + params: query + }) +} + +// 查询门户网站配置详细 +export function getPortalConfig(portalConfigId) { + return request({ + url: '/portal/portalConfig/' + portalConfigId, + method: 'get' + }) +} + +// 新增门户网站配置 +export function addPortalConfig(data) { + return request({ + url: '/portal/portalConfig', + method: 'post', + data: data + }) +} + +// 修改门户网站配置 +export function updatePortalConfig(data) { + return request({ + url: '/portal/portalConfig', + method: 'put', + data: data + }) +} + +// 删除门户网站配置 +export function delPortalConfig(portalConfigId) { + return request({ + url: '/portal/portalConfig/' + portalConfigId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/portalConfigType.js b/ruoyi-ui/src/api/portal/portalConfigType.js new file mode 100644 index 0000000..c71f615 --- /dev/null +++ b/ruoyi-ui/src/api/portal/portalConfigType.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询门户网站配置类型列表 +export function listPortalConfigType(query) { + return request({ + url: '/portal/portalConfigType/list', + method: 'get', + params: query + }) +} + +// 查询门户网站配置类型详细 +export function getPortalConfigType(configTypeId) { + return request({ + url: '/portal/portalConfigType/' + configTypeId, + method: 'get' + }) +} + +// 新增门户网站配置类型 +export function addPortalConfigType(data) { + return request({ + url: '/portal/portalConfigType', + method: 'post', + data: data + }) +} + +// 修改门户网站配置类型 +export function updatePortalConfigType(data) { + return request({ + url: '/portal/portalConfigType', + method: 'put', + data: data + }) +} + +// 删除门户网站配置类型 +export function delPortalConfigType(configTypeId) { + return request({ + url: '/portal/portalConfigType/' + configTypeId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/productCaseInfo.js b/ruoyi-ui/src/api/portal/productCaseInfo.js new file mode 100644 index 0000000..ff55da2 --- /dev/null +++ b/ruoyi-ui/src/api/portal/productCaseInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询案例内容列表 +export function listProductCaseInfo(query) { + return request({ + url: '/portal/productCaseInfo/list', + method: 'get', + params: query + }) +} + +// 查询案例内容详细 +export function getProductCaseInfo(caseInfoId) { + return request({ + url: '/portal/productCaseInfo/' + caseInfoId, + method: 'get' + }) +} + +// 新增案例内容 +export function addProductCaseInfo(data) { + return request({ + url: '/portal/productCaseInfo', + method: 'post', + data: data + }) +} + +// 修改案例内容 +export function updateProductCaseInfo(data) { + return request({ + url: '/portal/productCaseInfo', + method: 'put', + data: data + }) +} + +// 删除案例内容 +export function delProductCaseInfo(caseInfoId) { + return request({ + url: '/portal/productCaseInfo/' + caseInfoId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/productInfo.js b/ruoyi-ui/src/api/portal/productInfo.js new file mode 100644 index 0000000..2bdc9cf --- /dev/null +++ b/ruoyi-ui/src/api/portal/productInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询产品信息配置列表 +export function listProductInfo(query) { + return request({ + url: '/portal/productInfo/list', + method: 'get', + params: query + }) +} + +// 查询产品信息配置详细 +export function getProductInfo(productInfoId) { + return request({ + url: '/portal/productInfo/' + productInfoId, + method: 'get' + }) +} + +// 新增产品信息配置 +export function addProductInfo(data) { + return request({ + url: '/portal/productInfo', + method: 'post', + data: data + }) +} + +// 修改产品信息配置 +export function updateProductInfo(data) { + return request({ + url: '/portal/productInfo', + method: 'put', + data: data + }) +} + +// 删除产品信息配置 +export function delProductInfo(productInfoId) { + return request({ + url: '/portal/productInfo/' + productInfoId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/portal/productInfoDetail.js b/ruoyi-ui/src/api/portal/productInfoDetail.js new file mode 100644 index 0000000..fe582ab --- /dev/null +++ b/ruoyi-ui/src/api/portal/productInfoDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询产品信息明细配置列表 +export function listProductInfoDetail(query) { + return request({ + url: '/portal/productInfoDetail/list', + method: 'get', + params: query + }) +} + +// 查询产品信息明细配置详细 +export function getProductInfoDetail(productInfoDetailId) { + return request({ + url: '/portal/productInfoDetail/' + productInfoDetailId, + method: 'get' + }) +} + +// 新增产品信息明细配置 +export function addProductInfoDetail(data) { + return request({ + url: '/portal/productInfoDetail', + method: 'post', + data: data + }) +} + +// 修改产品信息明细配置 +export function updateProductInfoDetail(data) { + return request({ + url: '/portal/productInfoDetail', + method: 'put', + data: data + }) +} + +// 删除产品信息明细配置 +export function delProductInfoDetail(productInfoDetailId) { + return request({ + url: '/portal/productInfoDetail/' + productInfoDetailId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 544df16..0551bd9 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -289,6 +289,36 @@ export const dynamicRoutes = [ ] }, + { + path: '/portal/product-info-detail', + component: Layout, + hidden: true, + permissions: ['portal:productInfo:edit'], + children: [ + { + path: 'index/:productInfoId(\\d+)', + component: () => import('@/views/portal/productInfoDetail/index.vue'), + name: 'ProductInfoDetail', + meta: { title: '产品配置详情', activeMenu: '/portal/productInfo' } + } + ] + }, + + { + path: '/portal/about-us-info-detail', + component: Layout, + hidden: true, + permissions: ['portal:aboutUsInfo:edit'], + children: [ + { + path: 'index/:aboutUsInfoId(\\d+)', + component: () => import('@/views/portal/aboutUsInfoDetail/index.vue'), + name: 'AboutUsInfoDetail', + meta: { title: '关于我们配置详情', activeMenu: '/portal/aboutUsInfo' } + } + ] + }, + ] // 防止连续点击多次路由报错 diff --git a/ruoyi-ui/src/views/portal/aboutUsInfo/index.vue b/ruoyi-ui/src/views/portal/aboutUsInfo/index.vue new file mode 100644 index 0000000..305729c --- /dev/null +++ b/ruoyi-ui/src/views/portal/aboutUsInfo/index.vue @@ -0,0 +1,501 @@ + + + diff --git a/ruoyi-ui/src/views/portal/aboutUsInfoDetail/index.vue b/ruoyi-ui/src/views/portal/aboutUsInfoDetail/index.vue new file mode 100644 index 0000000..851d262 --- /dev/null +++ b/ruoyi-ui/src/views/portal/aboutUsInfoDetail/index.vue @@ -0,0 +1,487 @@ + + + diff --git a/ruoyi-ui/src/views/portal/contactUsInfo/index.vue b/ruoyi-ui/src/views/portal/contactUsInfo/index.vue new file mode 100644 index 0000000..7c41f04 --- /dev/null +++ b/ruoyi-ui/src/views/portal/contactUsInfo/index.vue @@ -0,0 +1,294 @@ + + + diff --git a/ruoyi-ui/src/views/portal/portalConfig/index.vue b/ruoyi-ui/src/views/portal/portalConfig/index.vue new file mode 100644 index 0000000..979c907 --- /dev/null +++ b/ruoyi-ui/src/views/portal/portalConfig/index.vue @@ -0,0 +1,514 @@ + + + diff --git a/ruoyi-ui/src/views/portal/portalConfigType/index.vue b/ruoyi-ui/src/views/portal/portalConfigType/index.vue new file mode 100644 index 0000000..bb8e98d --- /dev/null +++ b/ruoyi-ui/src/views/portal/portalConfigType/index.vue @@ -0,0 +1,659 @@ + + + diff --git a/ruoyi-ui/src/views/portal/productCaseInfo/index.vue b/ruoyi-ui/src/views/portal/productCaseInfo/index.vue new file mode 100644 index 0000000..eddbb73 --- /dev/null +++ b/ruoyi-ui/src/views/portal/productCaseInfo/index.vue @@ -0,0 +1,491 @@ + + + diff --git a/ruoyi-ui/src/views/portal/productInfo/index.vue b/ruoyi-ui/src/views/portal/productInfo/index.vue new file mode 100644 index 0000000..892636c --- /dev/null +++ b/ruoyi-ui/src/views/portal/productInfo/index.vue @@ -0,0 +1,354 @@ + + + diff --git a/ruoyi-ui/src/views/portal/productInfoDetail/index.vue b/ruoyi-ui/src/views/portal/productInfoDetail/index.vue new file mode 100644 index 0000000..01fa0df --- /dev/null +++ b/ruoyi-ui/src/views/portal/productInfoDetail/index.vue @@ -0,0 +1,543 @@ + + +