diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseInquiryController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseInquiryController.java new file mode 100644 index 0000000..be221d9 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseInquiryController.java @@ -0,0 +1,74 @@ +package com.ruoyi.base.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +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.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.base.domain.BaseInquiry; +import com.ruoyi.base.service.IBaseInquiryService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 在线询盘设置Controller + * + * @author vinjor-m + * @date 2025-06-24 + */ +@RestController +@RequestMapping("/base/inquiry") +public class BaseInquiryController extends BaseController +{ + @Autowired + private IBaseInquiryService baseInquiryService; + + /** + * 获取在线询盘设置详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:inquiry:query')") + @GetMapping(value = "/getInquiry") + public AjaxResult getInquiry(String tenantId) + { + return success(baseInquiryService.getInquiry(tenantId)); + } + + /** + * 新增在线询盘设置 + */ + @PreAuthorize("@ss.hasPermi('base:inquiry:add')") + @Log(title = "在线询盘设置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseInquiry baseInquiry) + { + return toAjax(baseInquiryService.saveOrUpdate(baseInquiry)); + } + + /** + * 修改在线询盘设置 + */ + @PreAuthorize("@ss.hasPermi('base:inquiry:edit')") + @Log(title = "在线询盘设置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseInquiry baseInquiry) + { + return toAjax(baseInquiryService.saveOrUpdate(baseInquiry)); + } + +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BasePicController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BasePicController.java new file mode 100644 index 0000000..b760788 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BasePicController.java @@ -0,0 +1,112 @@ +package com.ruoyi.base.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +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.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.base.domain.BasePic; +import com.ruoyi.base.service.IBasePicService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 轮播图管理Controller + * + * @author vinjor-m + * @date 2025-06-23 + */ +@RestController +@RequestMapping("/base/pic") +public class BasePicController extends BaseController +{ + @Autowired + private IBasePicService basePicService; + + /** + * 查询轮播图管理列表 + */ + @PreAuthorize("@ss.hasPermi('base:pic:list')") + @GetMapping("/list") + public AjaxResult list(BasePic basePic, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) + { + Page page = new Page<>(pageNum, pageSize); + IPage list = basePicService.queryListPage(basePic,page); + return success(list); + } + + /** + * 导出轮播图管理列表 + */ + @PreAuthorize("@ss.hasPermi('base:pic:export')") + @Log(title = "轮播图管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasePic basePic) + { + List list = basePicService.list(); + ExcelUtil util = new ExcelUtil(BasePic.class); + util.exportExcel(response, list, "轮播图管理数据"); + } + + /** + * 获取轮播图管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:pic:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(basePicService.getById(id)); + } + + /** + * 新增轮播图管理 + */ + @PreAuthorize("@ss.hasPermi('base:pic:add')") + @Log(title = "轮播图管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasePic basePic) + { + return toAjax(basePicService.save(basePic)); + } + + /** + * 修改轮播图管理 + */ + @PreAuthorize("@ss.hasPermi('base:pic:edit')") + @Log(title = "轮播图管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasePic basePic) + { + return toAjax(basePicService.updateById(basePic)); + } + + /** + * 删除轮播图管理 + */ + @PreAuthorize("@ss.hasPermi('base:pic:remove')") + @Log(title = "轮播图管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + List list = new ArrayList<>(Arrays.asList(ids)); + return toAjax(basePicService.removeByIds(list)); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BasePicsController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BasePicsController.java new file mode 100644 index 0000000..7982696 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BasePicsController.java @@ -0,0 +1,118 @@ +package com.ruoyi.base.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.vo.PicsVO; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +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.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.base.domain.BasePics; +import com.ruoyi.base.service.IBasePicsService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 图片库Controller + * + * @author vinjor-m + * @date 2025-06-24 + */ +@RestController +@RequestMapping("/base/pics") +public class BasePicsController extends BaseController +{ + @Autowired + private IBasePicsService basePicsService; + + /** + * 查询图片库列表 + */ + @PreAuthorize("@ss.hasPermi('base:pics:list')") + @GetMapping("/list") + public AjaxResult list(BasePics basePics, + @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) + { + Page page = new Page<>(pageNum, pageSize); + IPage list = basePicsService.queryListPage(basePics,page); + return success(list); + } + + /** + * 导出图片库列表 + */ + @PreAuthorize("@ss.hasPermi('base:pics:export')") + @Log(title = "图片库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasePics basePics) + { + List list = basePicsService.list(); + ExcelUtil util = new ExcelUtil(BasePics.class); + util.exportExcel(response, list, "图片库数据"); + } + + /** + * 获取图片库详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:pics:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(basePicsService.getById(id)); + } + + /** + * 新增图片库 + */ + @PreAuthorize("@ss.hasPermi('base:pics:add')") + @Log(title = "图片库", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PicsVO basePics) + { + List basePicsList = basePics.getFileList(); + basePicsList.forEach(item->{ + item.setFileType(basePics.getFileType()); + item.setTenantId(basePics.getTenantId()); + }); + return toAjax(basePicsService.saveBatch(basePicsList)); + } + + /** + * 修改图片库 + */ + @PreAuthorize("@ss.hasPermi('base:pics:edit')") + @Log(title = "图片库", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasePics basePics) + { + return toAjax(basePicsService.updateById(basePics)); + } + + /** + * 删除图片库 + */ + @PreAuthorize("@ss.hasPermi('base:pics:remove')") + @Log(title = "图片库", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + List list = new ArrayList<>(Arrays.asList(ids)); + return toAjax(basePicsService.removeByIds(list)); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java index 895d73b..8e7add3 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseSiteInfoController.java @@ -39,32 +39,6 @@ public class BaseSiteInfoController extends BaseController @Autowired private IBaseSiteInfoService baseSiteInfoService; - /** - * 查询站点基础信息列表 - */ - @PreAuthorize("@ss.hasPermi('base:info:list')") - @GetMapping("/list") - public AjaxResult list(BaseSiteInfo baseSiteInfo, - @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) - { - Page page = new Page<>(pageNum, pageSize); - IPage list = baseSiteInfoService.queryListPage(baseSiteInfo,page); - return success(list); - } - - /** - * 导出站点基础信息列表 - */ - @PreAuthorize("@ss.hasPermi('base:info:export')") - @Log(title = "站点基础信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, BaseSiteInfo baseSiteInfo) - { - List list = baseSiteInfoService.list(); - ExcelUtil util = new ExcelUtil(BaseSiteInfo.class); - util.exportExcel(response, list, "站点基础信息数据"); - } /** * 获取站点基础信息详细信息 @@ -98,15 +72,4 @@ public class BaseSiteInfoController extends BaseController return toAjax(baseSiteInfoService.updateById(baseSiteInfo)); } - /** - * 删除站点基础信息 - */ - @PreAuthorize("@ss.hasPermi('base:info:remove')") - @Log(title = "站点基础信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { - List list = new ArrayList<>(Arrays.asList(ids)); - return toAjax(baseSiteInfoService.removeByIds(list)); - } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseInquiry.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseInquiry.java new file mode 100644 index 0000000..0b2f875 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseInquiry.java @@ -0,0 +1,71 @@ +package com.ruoyi.base.domain; + +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; +import com.ruoyi.common.core.domain.DlBaseEntity; + +/** + * 在线询盘设置对象 dl_base_inquiry + * + * @author vinjor-m + * @date 2025-06-24 + */ +@TableName("dl_base_inquiry") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BaseInquiry extends DlBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 是否开启填写公司名称 */ + @Excel(name = "公司名称") + private Boolean company; + + /** 公司名称是否必填 */ + @Excel(name = "公司名称是否必填") + private Boolean companyMust; + + /** 是否开启填写电话/WhatsApp */ + @Excel(name = "电话/WhatsApp") + private Boolean tel; + + /** 是否必填 */ + @Excel(name = "是否必填") + private Boolean telMust; + + /** 是否开启填写标题 */ + @Excel(name = "标题") + private Boolean title; + + /** 是否必填 */ + @Excel(name = "是否必填") + private Boolean titleMust; + + /** 是否开启填写姓名 */ + @Excel(name = "姓名") + private Boolean name; + + /** 是否必填 */ + @Excel(name = "是否必填") + private Boolean nameMust; + + /** 提示文字（内容） */ + @Excel(name = "提示文字", readConverterExp = "内=容") + private String content; + + /** 站点唯一编码（租户id） */ + @Excel(name = "站点唯一编码", readConverterExp = "租=户id") + private String tenantId; + +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BasePic.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BasePic.java new file mode 100644 index 0000000..f36bb11 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BasePic.java @@ -0,0 +1,47 @@ +package com.ruoyi.base.domain; + +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; +import com.ruoyi.common.core.domain.DlBaseEntity; + +/** + * 轮播图管理对象 dl_base_pic + * + * @author vinjor-m + * @date 2025-06-23 + */ +@TableName("dl_base_pic") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BasePic extends DlBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 标题 */ + @Excel(name = "标题") + private String title; + + /** 排序 */ + @Excel(name = "排序") + private Long sort; + + /** 图片 */ + @Excel(name = "图片") + private String pic; + + /** 站点唯一编码（租户id） */ + @Excel(name = "站点唯一编码", readConverterExp = "租=户id") + private String tenantId; + +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BasePics.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BasePics.java new file mode 100644 index 0000000..6b655e7 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BasePics.java @@ -0,0 +1,64 @@ +package com.ruoyi.base.domain; + +import java.math.BigDecimal; +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; +import com.ruoyi.common.core.domain.DlBaseEntity; + +/** + * 图片库对象 dl_base_pics + * + * @author vinjor-m + * @date 2025-06-24 + */ +@TableName("dl_base_pics") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BasePics extends DlBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 所属分类 */ + @Excel(name = "所属分类") + private String fileType; + + /** 图片名称 */ + @Excel(name = "图片名称") + private String name; + + /** 图片路径 */ + @Excel(name = "图片路径") + private String url; + + /** 图片大小 */ + @Excel(name = "图片大小") + private BigDecimal size; + + /** 图片宽 */ + @Excel(name = "图片宽") + private Long width; + + /** 图片高 */ + @Excel(name = "图片高") + private Long height; + + /** 备注 */ + @Excel(name = "备注") + private String remark; + + /** 站点唯一编码（租户id） */ + @Excel(name = "站点唯一编码", readConverterExp = "租=户id") + private String tenantId; + +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseInquiryMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseInquiryMapper.java new file mode 100644 index 0000000..b7a0d22 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BaseInquiryMapper.java @@ -0,0 +1,21 @@ +package com.ruoyi.base.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.domain.BaseInquiry; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 在线询盘设置Mapper接口 + * + * @author vinjor-m + * @date 2025-06-24 + */ +@Mapper +public interface BaseInquiryMapper extends BaseMapper +{ + IPage queryListPage(@Param("entity") BaseInquiry entity, Page page); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BasePicMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BasePicMapper.java new file mode 100644 index 0000000..7357591 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BasePicMapper.java @@ -0,0 +1,21 @@ +package com.ruoyi.base.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.domain.BasePic; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 轮播图管理Mapper接口 + * + * @author vinjor-m + * @date 2025-06-23 + */ +@Mapper +public interface BasePicMapper extends BaseMapper +{ + IPage queryListPage(@Param("entity") BasePic entity, Page page); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BasePicsMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BasePicsMapper.java new file mode 100644 index 0000000..04a95c9 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/mapper/BasePicsMapper.java @@ -0,0 +1,21 @@ +package com.ruoyi.base.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.domain.BasePics; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 图片库Mapper接口 + * + * @author vinjor-m + * @date 2025-06-24 + */ +@Mapper +public interface BasePicsMapper extends BaseMapper +{ + IPage queryListPage(@Param("entity") BasePics entity, Page page); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseInquiryService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseInquiryService.java new file mode 100644 index 0000000..1665c7c --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBaseInquiryService.java @@ -0,0 +1,27 @@ +package com.ruoyi.base.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.base.domain.BaseInquiry; + +/** + * 在线询盘设置Service接口 + * + * @author vinjor-m + * @date 2025-06-24 + */ +public interface IBaseInquiryService extends IService +{ + IPage queryListPage(BaseInquiry pageReqVO, Page page); + + /** + * 查询站点询盘设置 + * @author vinjor-M + * @date 11:01 2025/6/24 + * @param tenantId 租户id + * @return com.ruoyi.base.domain.BaseInquiry + **/ + BaseInquiry getInquiry(String tenantId); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBasePicService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBasePicService.java new file mode 100644 index 0000000..b04359b --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBasePicService.java @@ -0,0 +1,18 @@ +package com.ruoyi.base.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.base.domain.BasePic; + +/** + * 轮播图管理Service接口 + * + * @author vinjor-m + * @date 2025-06-23 + */ +public interface IBasePicService extends IService +{ + IPage queryListPage(BasePic pageReqVO, Page page); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBasePicsService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBasePicsService.java new file mode 100644 index 0000000..cc3c905 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/IBasePicsService.java @@ -0,0 +1,18 @@ +package com.ruoyi.base.service; + +import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.base.domain.BasePics; + +/** + * 图片库Service接口 + * + * @author vinjor-m + * @date 2025-06-24 + */ +public interface IBasePicsService extends IService +{ + IPage queryListPage(BasePics pageReqVO, Page page); +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseInquiryServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseInquiryServiceImpl.java new file mode 100644 index 0000000..a5da9d7 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseInquiryServiceImpl.java @@ -0,0 +1,49 @@ +package com.ruoyi.base.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.ruoyi.base.domain.BaseSiteInfo; +import com.ruoyi.common.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.base.mapper.BaseInquiryMapper; +import com.ruoyi.base.domain.BaseInquiry; +import com.ruoyi.base.service.IBaseInquiryService; + +/** + * 在线询盘设置Service业务层处理 + * + * @author vinjor-m + * @date 2025-06-24 + */ +@Service +public class BaseInquiryServiceImpl extends ServiceImpl implements IBaseInquiryService +{ + @Autowired + private BaseInquiryMapper baseInquiryMapper; + + @Override + public IPage queryListPage(BaseInquiry pageReqVO, Page page) { + return baseInquiryMapper.queryListPage(pageReqVO, page); + } + + /** + * 查询站点询盘设置 + * + * @param tenantId 租户id + * @return com.ruoyi.base.domain.BaseInquiry + * @author vinjor-M + * @date 11:01 2025/6/24 + **/ + @Override + public BaseInquiry getInquiry(String tenantId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(BaseInquiry::getTenantId,tenantId); + List list = this.list(queryWrapper); + return list.isEmpty()?null:list.get(0); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BasePicServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BasePicServiceImpl.java new file mode 100644 index 0000000..1fb3fdf --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BasePicServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.base.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.base.mapper.BasePicMapper; +import com.ruoyi.base.domain.BasePic; +import com.ruoyi.base.service.IBasePicService; + +/** + * 轮播图管理Service业务层处理 + * + * @author vinjor-m + * @date 2025-06-23 + */ +@Service +public class BasePicServiceImpl extends ServiceImpl implements IBasePicService +{ + @Autowired + private BasePicMapper basePicMapper; + + @Override + public IPage queryListPage(BasePic pageReqVO, Page page) { + return basePicMapper.queryListPage(pageReqVO, page); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BasePicsServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BasePicsServiceImpl.java new file mode 100644 index 0000000..9d805c2 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BasePicsServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.base.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.base.mapper.BasePicsMapper; +import com.ruoyi.base.domain.BasePics; +import com.ruoyi.base.service.IBasePicsService; + +/** + * 图片库Service业务层处理 + * + * @author vinjor-m + * @date 2025-06-24 + */ +@Service +public class BasePicsServiceImpl extends ServiceImpl implements IBasePicsService +{ + @Autowired + private BasePicsMapper basePicsMapper; + + @Override + public IPage queryListPage(BasePics pageReqVO, Page page) { + return basePicsMapper.queryListPage(pageReqVO, page); + } +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/vo/PicsVO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/vo/PicsVO.java new file mode 100644 index 0000000..a143262 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/vo/PicsVO.java @@ -0,0 +1,17 @@ +package com.ruoyi.base.vo; + +import com.ruoyi.base.domain.BasePics; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +public class PicsVO extends BasePics { + + /** + * 批量传的图片 + **/ + private List fileList; +} diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 8d86711..8174eb1 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -1,7 +1,12 @@ package com.ruoyi.web.controller.common; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; import java.util.ArrayList; import java.util.List; +import javax.imageio.ImageIO; +import javax.imageio.stream.ImageInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -99,6 +104,14 @@ public class CommonController }else if ("aliOss".equals(uploadType)){ //阿里oss上传方式 String fileUrl = fileService.upload(file); + long size = file.getSize()/1024; + BufferedImage bufferedImage = ImageIO.read(file.getInputStream()); + int width = bufferedImage.getWidth(); + int height = bufferedImage.getHeight(); + ajax.put("name", file.getOriginalFilename()); + ajax.put("size", size); + ajax.put("width", width); + ajax.put("height", height); ajax.put("url", fileUrl); ajax.put("fileName", fileUrl); } diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseInquiryMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseInquiryMapper.xml new file mode 100644 index 0000000..cb813a3 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseInquiryMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, company, company_must, tel, tel_must, title, title_must, name, name_must, content, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_inquiry + + + + \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BasePicMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BasePicMapper.xml new file mode 100644 index 0000000..2d611b4 --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BasePicMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + select id, title, sort, pic, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_pic + + + + \ No newline at end of file diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BasePicsMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BasePicsMapper.xml new file mode 100644 index 0000000..978aeee --- /dev/null +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BasePicsMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, file_type, name, url, size, width, height, remark, tenant_id, creator, create_time, updater, update_time, del_flag from dl_base_pics + + + + \ No newline at end of file diff --git a/dl_vue/src/api/base/inquiry.js b/dl_vue/src/api/base/inquiry.js new file mode 100644 index 0000000..ea8837a --- /dev/null +++ b/dl_vue/src/api/base/inquiry.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 查询在线询盘设置列表 +export function listInquiry(query) { + return request({ + url: '/base/inquiry/list', + method: 'get', + params: query + }) +} + +// 查询在线询盘设置详细 +export function getInquiry(query) { + return request({ + url: '/base/inquiry/getInquiry', + method: 'get', + params: query + }) +} + +// 新增在线询盘设置 +export function addInquiry(data) { + return request({ + url: '/base/inquiry', + method: 'post', + data: data + }) +} + +// 修改在线询盘设置 +export function updateInquiry(data) { + return request({ + url: '/base/inquiry', + method: 'put', + data: data + }) +} + +// 删除在线询盘设置 +export function delInquiry(id) { + return request({ + url: '/base/inquiry/' + id, + method: 'delete' + }) +} diff --git a/dl_vue/src/api/base/pic.js b/dl_vue/src/api/base/pic.js new file mode 100644 index 0000000..660c65e --- /dev/null +++ b/dl_vue/src/api/base/pic.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询轮播图管理列表 +export function listPic(query) { + return request({ + url: '/base/pic/list', + method: 'get', + params: query + }) +} + +// 查询轮播图管理详细 +export function getPic(id) { + return request({ + url: '/base/pic/' + id, + method: 'get' + }) +} + +// 新增轮播图管理 +export function addPic(data) { + return request({ + url: '/base/pic', + method: 'post', + data: data + }) +} + +// 修改轮播图管理 +export function updatePic(data) { + return request({ + url: '/base/pic', + method: 'put', + data: data + }) +} + +// 删除轮播图管理 +export function delPic(id) { + return request({ + url: '/base/pic/' + id, + method: 'delete' + }) +} diff --git a/dl_vue/src/api/base/pics.js b/dl_vue/src/api/base/pics.js new file mode 100644 index 0000000..bf06e51 --- /dev/null +++ b/dl_vue/src/api/base/pics.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询图片库列表 +export function listPics(query) { + return request({ + url: '/base/pics/list', + method: 'get', + params: query + }) +} + +// 查询图片库详细 +export function getPics(id) { + return request({ + url: '/base/pics/' + id, + method: 'get' + }) +} + +// 新增图片库 +export function addPics(data) { + return request({ + url: '/base/pics', + method: 'post', + data: data + }) +} + +// 修改图片库 +export function updatePics(data) { + return request({ + url: '/base/pics', + method: 'put', + data: data + }) +} + +// 删除图片库 +export function delPics(id) { + return request({ + url: '/base/pics/' + id, + method: 'delete' + }) +} diff --git a/dl_vue/src/components/ImageUpload/index.vue b/dl_vue/src/components/ImageUpload/index.vue index 173e741..836ca29 100644 --- a/dl_vue/src/components/ImageUpload/index.vue +++ b/dl_vue/src/components/ImageUpload/index.vue @@ -165,7 +165,7 @@ export default { // 上传成功回调 handleUploadSuccess(res, file) { if (res.code === 200) { - this.uploadList.push({ name: res.fileName, url: res.fileName }); + this.uploadList.push({ name: res.name, url: res.fileName,size:res.size,width:res.width,height:res.height }); this.uploadedSuccessfully(); } else { this.number--; @@ -192,6 +192,7 @@ export default { uploadedSuccessfully() { if (this.number > 0 && this.uploadList.length === this.number) { this.fileList = this.fileList.concat(this.uploadList); + this.$emit('uploadedImg',this.fileList) this.uploadList = []; this.number = 0; this.$emit("input", this.listToString(this.fileList)); diff --git a/dl_vue/src/layout/components/Navbar.vue b/dl_vue/src/layout/components/Navbar.vue index e74dd0b..05d2895 100644 --- a/dl_vue/src/layout/components/Navbar.vue +++ b/dl_vue/src/layout/components/Navbar.vue @@ -5,23 +5,24 @@ -
+
@@ -48,6 +49,7 @@ diff --git a/dl_vue/src/views/base/pic/index.vue b/dl_vue/src/views/base/pic/index.vue new file mode 100644 index 0000000..fdcba05 --- /dev/null +++ b/dl_vue/src/views/base/pic/index.vue @@ -0,0 +1,282 @@ + + + diff --git a/dl_vue/src/views/base/pics/index.vue b/dl_vue/src/views/base/pics/index.vue new file mode 100644 index 0000000..12180ab --- /dev/null +++ b/dl_vue/src/views/base/pics/index.vue @@ -0,0 +1,375 @@ + + + + + diff --git a/dl_vue/src/views/login.vue b/dl_vue/src/views/login.vue index bd22c18..63b1199 100644 --- a/dl_vue/src/views/login.vue +++ b/dl_vue/src/views/login.vue @@ -88,7 +88,7 @@