From 0e12f18edf807799367894657b08b764bfea5f52 Mon Sep 17 00:00:00 2001 From: lizhengwei Date: Fri, 6 Mar 2026 16:20:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=B8=8D=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../luban/api/controller/WorkController.java | 6 +- .../com/luban/api/convert/WorkConvert.java | 49 --------------- .../main/java/com/luban/api/dao/WorkDao.java | 18 ------ .../java/com/luban/api/dao/WorkFormsDao.java | 18 ------ .../com/luban/api/dto/ScriptsQueryDTO.java | 15 ----- .../java/com/luban/api/dto/WorkCreateDTO.java | 35 ----------- .../java/com/luban/api/dto/WorkQueryDTO.java | 22 ------- .../java/com/luban/api/dto/WorkUpdateDTO.java | 42 ------------- .../main/java/com/luban/api/entity/Work.java | 62 ------------------- .../java/com/luban/api/entity/WorkForms.java | 36 ----------- .../java/com/luban/api/log/P6SpyLogger.java | 42 ++++++------- .../java/com/luban/api/log/StdoutLogger.java | 40 ++++++------ .../luban/api/service/WorkFormsService.java | 16 ----- .../com/luban/api/service/WorkService.java | 27 -------- .../service/impl/WorkFormsServiceImpl.java | 20 ------ .../api/service/impl/WorkServiceImpl.java | 45 -------------- .../resources/mapper/ruoyi-h5/WorkDao.xml | 18 ------ .../mapper/ruoyi-h5/WorkFormsDao.xml | 12 ---- 18 files changed, 42 insertions(+), 481 deletions(-) delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/WorkConvert.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/ScriptsQueryDTO.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkCreateDTO.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkQueryDTO.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkUpdateDTO.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Work.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/WorkForms.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkFormsService.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkService.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkFormsServiceImpl.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkServiceImpl.java delete mode 100644 ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkDao.xml delete mode 100644 ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkFormsDao.xml diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java index 8e864d582..f5a456ec8 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java @@ -9,12 +9,11 @@ import com.luban.api.dto.H5ProjectContentDTO; import com.luban.api.dto.query.H5ProjectQueryDTO; import com.luban.api.entity.H5Project; import com.luban.api.service.H5ProjectService; -import com.luban.api.service.WorkService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.LoginHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,9 +37,6 @@ public class WorkController { @Autowired private H5ProjectService h5ProjectService; - @Autowired - private WorkService workService; - @Operation(summary = "分页查询works") @GetMapping("/page") public IPage listWorks(@Valid H5ProjectQueryDTO dto) { diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/WorkConvert.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/WorkConvert.java deleted file mode 100644 index 0e39b8e6a..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/WorkConvert.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.luban.api.convert; - -import cn.hutool.json.JSONUtil; -import com.luban.api.entity.Work; -import com.luban.api.vo.WorkVO; -import org.springframework.beans.BeanUtils; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - -import java.util.ArrayList; -import java.util.List; - -/** - * Work 转换器 - * - * @author WeiHongBin - */ -public class WorkConvert { - - - public static WorkVO toVO(Work entity) { - WorkVO vo = new WorkVO(); - BeanUtils.copyProperties(entity, vo); - if (!StringUtils.isEmpty(entity.getPages())) { - vo.setPages(JSONUtil.parseArray(entity.getPages())); - } - return vo; - } - - - public static List toVO(List entitys) { - List workVOS = new ArrayList<>(); - for (Work entity : entitys) { - workVOS.add(toVO(entity)); - } - return workVOS; - } - - public static Work toEntity(WorkVO vo) { - Work work = new Work(); - BeanUtils.copyProperties(vo, work); - if (!CollectionUtils.isEmpty(vo.getPages())) { - work.setPages(JSONUtil.toJsonStr(vo.getPages())); - } - return work; - } - - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java deleted file mode 100644 index 3b9cffb92..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.luban.api.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.Work; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@Mapper -public interface WorkDao extends BaseMapper { - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java deleted file mode 100644 index 440f69bdf..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.luban.api.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.WorkForms; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * Mapper 接口 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@Mapper -public interface WorkFormsDao extends BaseMapper { - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/ScriptsQueryDTO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/ScriptsQueryDTO.java deleted file mode 100644 index 80ae28ace..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/ScriptsQueryDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.luban.api.dto; - - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "WorkQueryDTO") -public class ScriptsQueryDTO { - private Integer _limit; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkCreateDTO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkCreateDTO.java deleted file mode 100644 index c755dec02..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkCreateDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.luban.api.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * @author WeiHongBin - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "WorkCreateDTO") -public class WorkCreateDTO { - - private String title; - - private String description; - - private String coverImageUrl; - - private List pages; - - private LocalDateTime createTime = LocalDateTime.now(); - - private LocalDateTime updateTime = LocalDateTime.now(); - - private boolean isPublish = false; - - private boolean isTemplate = false; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkQueryDTO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkQueryDTO.java deleted file mode 100644 index 7661fa014..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkQueryDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.luban.api.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @author WeiHongBin - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "WorkQueryDTO") -public class WorkQueryDTO extends PageDtoBase { - - private String title; - - private Boolean isPublish; - - private Boolean isTemplate; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkUpdateDTO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkUpdateDTO.java deleted file mode 100644 index 9c743e223..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/WorkUpdateDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.luban.api.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * @author WeiHongBin - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "WorkQueryDTO") -public class WorkUpdateDTO { - - private String title; - - private String description; - - private String coverImageUrl; - - private String width; - - private String height; - - /** - * 页面模式：h5_swipper、h5_long_page、h5_form - */ - private String pageMode; - - private List pages; - - private LocalDateTime updateTime = LocalDateTime.now(); - - private boolean isPublish; - - private boolean isTemplate; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Work.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Work.java deleted file mode 100644 index 9b8ce1f5a..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Work.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.luban.api.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "Work对象") -public class Work implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - @Schema(title = "标题") - private String title; - - @Schema(title = "描述") - private String description; - - private String coverImageUrl; - - private String pages; - - private String width; - - private String height; - - /** - * 页面模式：h5_swipper、h5_long_page、h5_form - */ - private String pageMode; - - private Boolean isPublish; - - private Boolean isTemplate; - - @Schema(title = "创建时间") - private LocalDateTime createTime; - - @Schema(title = "更新时间") - private LocalDateTime updateTime; - - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/WorkForms.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/WorkForms.java deleted file mode 100644 index c14c6379e..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/WorkForms.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.luban.api.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *

- * - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "WorkForms对象") -public class WorkForms implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - private String form; - - private Long workId; - - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java index 620d3a0e7..5ee9c0246 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/P6SpyLogger.java @@ -1,21 +1,21 @@ -package com.luban.api.log; - -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.p6spy.engine.spy.appender.MessageFormattingStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * P6Spy 日志自定义处理 - * - * @author WeiHongBin - */ -@Slf4j -@Component -public class P6SpyLogger implements MessageFormattingStrategy { - @Override - public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) { - return StringUtils.isNotEmpty(sql) ? " Consume Time：" + elapsed + " ms " + now + - "\n Execute SQL：" + sql.replaceAll("[\\s]+", " ") + "\n" : null; - } -} +//package com.luban.api.log; +// +//import com.baomidou.mybatisplus.core.toolkit.StringUtils; +//import com.p6spy.engine.spy.appender.MessageFormattingStrategy; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Component; +// +///** +// * P6Spy 日志自定义处理 +// * +// * @author WeiHongBin +// */ +//@Slf4j +//@Component +//public class P6SpyLogger implements MessageFormattingStrategy { +// @Override +// public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) { +// return StringUtils.isNotEmpty(sql) ? " Consume Time：" + elapsed + " ms " + now + +// "\n Execute SQL：" + sql.replaceAll("[\\s]+", " ") + "\n" : null; +// } +//} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java index 437c007ec..8121515ea 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/log/StdoutLogger.java @@ -1,20 +1,20 @@ -package com.luban.api.log; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 修改SQL执行输出到 日志，便于分析 - * - * @author WeiHongBin - */ -@Slf4j -@Component -public class StdoutLogger extends com.p6spy.engine.spy.appender.StdoutLogger { - @Override - public void logText(String text) { - if (log.isDebugEnabled()) { - log.debug(text); - } - } -} +//package com.luban.api.log; +// +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Component; +// +///** +// * 修改SQL执行输出到 日志，便于分析 +// * +// * @author WeiHongBin +// */ +//@Slf4j +//@Component +//public class StdoutLogger extends com.p6spy.engine.spy.appender.StdoutLogger { +// @Override +// public void logText(String text) { +// if (log.isDebugEnabled()) { +// log.debug(text); +// } +// } +//} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkFormsService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkFormsService.java deleted file mode 100644 index 0317bcb29..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkFormsService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.luban.api.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.WorkForms; - -/** - *

- * 服务类 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -public interface WorkFormsService extends IService { - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkService.java deleted file mode 100644 index 511394918..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/WorkService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.luban.api.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.dto.WorkQueryDTO; -import com.luban.api.entity.Work; -import com.luban.api.vo.WorkVO; - -/** - *

- * 服务类 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -public interface WorkService extends IService { - - /** - * 分页查询作品列表 - * - * @param dto 查询条件 - * @return 分页结果 - */ - IPage pageWorks(WorkQueryDTO dto); - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkFormsServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkFormsServiceImpl.java deleted file mode 100644 index a64c228b1..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkFormsServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.luban.api.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.WorkFormsDao; -import com.luban.api.entity.WorkForms; -import com.luban.api.service.WorkFormsService; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@Service -public class WorkFormsServiceImpl extends ServiceImpl implements WorkFormsService { - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkServiceImpl.java deleted file mode 100644 index ec88f62fd..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/WorkServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.luban.api.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.convert.WorkConvert; -import com.luban.api.dao.WorkDao; -import com.luban.api.dto.WorkQueryDTO; -import com.luban.api.entity.Work; -import com.luban.api.service.WorkService; -import com.luban.api.vo.WorkVO; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -/** - *

- * 服务实现类 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@Service -public class WorkServiceImpl extends ServiceImpl implements WorkService { - - @Override - public IPage pageWorks(WorkQueryDTO dto) { - WorkVO vo = new WorkVO(); - vo.setTemplate(dto.getIsTemplate()); - BeanUtils.copyProperties(dto, vo); - IPage page = this.page(new Page<>(dto.getPage(), dto.getSize()), - new LambdaQueryWrapper<>(WorkConvert.toEntity(vo)).orderByDesc(Work::getCreateTime)); - List voList = page.getRecords().stream() - .map(WorkConvert::toVO) - .collect(Collectors.toList()); - return new Page(page.getCurrent(), page.getSize(), page.getTotal()) - .setPages(page.getPages()) - .setRecords(voList); - } - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkDao.xml b/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkDao.xml deleted file mode 100644 index 896aeb858..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkDao.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkFormsDao.xml b/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkFormsDao.xml deleted file mode 100644 index c524a62e5..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkFormsDao.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - -