From e90151755c2b534bd509cf93daa55147d61cb7da Mon Sep 17 00:00:00 2001
From: 18582019636 <1657978663@qq.com>
Date: 星期二, 25 六月 2024 18:28:12 +0800
Subject: [PATCH] feat: 代码初始化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Rotate.java | 6 ++
ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/RotateMapper.xml | 11 +++++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/RotateMapper.java | 9 ++++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RotateController.java | 21 ++++++++--
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/RotateResultVO.java | 32 ++++++++++++++++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RotateServiceImpl.java | 6 +++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RotateService.java | 9 ++++
7 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RotateController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RotateController.java
index b192505..dbdbe92 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RotateController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RotateController.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.RecoveryServe;
import com.ruoyi.admin.entity.Rotate;
+import com.ruoyi.admin.service.RecoveryServeService;
import com.ruoyi.admin.service.RotateService;
+import com.ruoyi.admin.vo.RotateResultVO;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -32,6 +35,8 @@
@Resource
private RotateService rotateService;
+ @Resource
+ private RecoveryServeService recoveryServeService;
/**
* 轮播图图片分页列表
@@ -48,8 +53,7 @@
})
public R<IPage<Rotate>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return R.ok(rotateService.lambdaQuery().eq(Rotate::getIsDelete, 0)
- .orderByDesc(Rotate::getCreateTime).page(Page.of(pageNum, pageSize)));
+ return R.ok(rotateService.queryPage(Page.of(pageNum, pageSize)));
}
/**
@@ -72,8 +76,17 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "轮播图id", name = "id", dataType = "Integer", required = true)
})
- public R<Rotate> detail(@RequestParam Integer id) {
- return R.ok(rotateService.getById(id));
+ public R<RotateResultVO> detail(@RequestParam Integer id) {
+ RotateResultVO rotateResultVO = new RotateResultVO();
+ Rotate rotate = rotateService.getById(id);
+ rotateResultVO.setRotate(rotate);
+ if (null != rotate.getRotateServeId()) {
+ RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
+ .eq(RecoveryServe::getId, rotate.getRotateServeId())
+ .eq(RecoveryServe::getIsDelete, 0).one();
+ rotateResultVO.setRecoveryServe(recoveryServe);
+ }
+ return R.ok(rotateResultVO);
}
/**
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Rotate.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Rotate.java
index 7bfc9c7..e47df16 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Rotate.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Rotate.java
@@ -24,7 +24,7 @@
@ApiModel(value = "Rotate对象", description = "轮播图图片管理")
public class Rotate extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("轮播图图片")
@@ -43,4 +43,8 @@
@TableField("is_rotate")
private Integer isRotate;
+ @ApiModelProperty("跳转服务内容")
+ @TableField(exist = false)
+ private String serveName;
+
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/RotateMapper.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/RotateMapper.java
index bbea421..c755ecc 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/RotateMapper.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/RotateMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.admin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.Rotate;
/**
@@ -13,4 +15,11 @@
*/
public interface RotateMapper extends BaseMapper<Rotate> {
+ /**
+ * 轮播图图片分页列表
+ *
+ * @param page 分页
+ * @return 封装分页数据
+ */
+ IPage<Rotate> queryPage(Page<Rotate> page);
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RotateService.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RotateService.java
index 27f6b2e..08d7de7 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RotateService.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RotateService.java
@@ -1,5 +1,7 @@
package com.ruoyi.admin.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.Rotate;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -13,4 +15,11 @@
*/
public interface RotateService extends IService<Rotate> {
+ /**
+ * 轮播图图片分页列表
+ *
+ * @param page 分页
+ * @return 封装分页数据
+ */
+ IPage<Rotate> queryPage(Page<Rotate> page);
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RotateServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RotateServiceImpl.java
index 5fe9ee5..9f595d1 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RotateServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/RotateServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.admin.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.Rotate;
import com.ruoyi.admin.mapper.RotateMapper;
import com.ruoyi.admin.service.RotateService;
@@ -17,4 +19,8 @@
@Service
public class RotateServiceImpl extends ServiceImpl<RotateMapper, Rotate> implements RotateService {
+ @Override
+ public IPage<Rotate> queryPage(Page<Rotate> page) {
+ return baseMapper.queryPage(page);
+ }
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/RotateResultVO.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/RotateResultVO.java
new file mode 100644
index 0000000..3fef6c4
--- /dev/null
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/RotateResultVO.java
@@ -0,0 +1,32 @@
+package com.ruoyi.admin.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.admin.entity.RecoveryServe;
+import com.ruoyi.admin.entity.Rotate;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 轮播图图片管理
+ * </p>
+ *
+ * @author hjl
+ * @since 2024-05-29
+ */
+@Getter
+@Setter
+@TableName("sys_rotate")
+@ApiModel(value = "Rotate对象", description = "轮播图图片管理")
+public class RotateResultVO {
+
+ @ApiModelProperty("轮播图信息")
+ private Rotate rotate;
+
+ @ApiModelProperty("回收服务信息")
+ private RecoveryServe recoveryServe;
+
+
+}
diff --git a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/RotateMapper.xml b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/RotateMapper.xml
index 19c3589..89a0ef8 100644
--- a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/RotateMapper.xml
+++ b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/RotateMapper.xml
@@ -4,7 +4,7 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.admin.entity.Rotate">
<id column="id" property="id"/>
- <result column="rotate_pricture" property="rotatePicture"/>
+ <result column="rotate_picture" property="rotatePicture"/>
<result column="sort" property="sort"/>
<result column="rotate_serve_id" property="rotateServeId"/>
<result column="is_rotate" property="isRotate"/>
@@ -13,5 +13,14 @@
<result column="createTime" property="createTime"/>
<result column="updateTime" property="updateTime"/>
<result column="is_delete" property="isDelete"/>
+ <result column="serve_name" property="serveName"/>
</resultMap>
+
+ <select id="queryPage" resultMap="BaseResultMap">
+ select r.*, s.serve_name
+ from sys_rotate r
+ left join sys_recovery_serve s on r.rotate_serve_id = s.id
+ where r.is_delete = 0
+ order by r.createTime desc
+ </select>
</mapper>
--
Gitblit v1.7.1