diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 3573d20fc..74f358abb 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -79,10 +79,10 @@ ruoyi-system-saas - - - - + + org.dromara + ruoyi-job + @@ -96,11 +96,11 @@ - - - - - + + + org.dromara + ruoyi-workflow + de.codecentric diff --git a/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessEvent.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java similarity index 92% rename from ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessEvent.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java index 6b4ee6421..61c7efc39 100644 --- a/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessEvent.java +++ b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain; +package org.dromara.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessTaskEvent.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java similarity index 91% rename from ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessTaskEvent.java rename to ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java index 14a6dedaf..019ca823b 100644 --- a/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/ProcessTaskEvent.java +++ b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain; +package org.dromara.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-h5-saas/pom.xml b/ruoyi-modules/ruoyi-h5-saas/pom.xml deleted file mode 100644 index edcb6f951..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-h5-saas - - - ruoyi-h5-saas h5系统模块 - - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-doc - - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-translation - - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - - org.dromara - ruoyi-common-excel - - - - - org.dromara - ruoyi-common-sms - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-websocket - - - - org.dromara - ruoyi-common-sse - - - - - org.apache.dubbo - dubbo-spring-boot-starter - - - - org.apache.dubbo - dubbo-nacos-spring-boot-starter - - - - org.dromara - ruoyi-api-system - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/constant/PackageConstant.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/constant/PackageConstant.java deleted file mode 100644 index 5ffb727fa..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/constant/PackageConstant.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.system.saas.constant; - -/** - * 包名常量 - * - * @author WeiHongBin - */ -public final class PackageConstant { - - - public static final String BASE_PACKAGE = "com.luban.api"; - - public static final String CONTROLLER_PACKAGE = BASE_PACKAGE + ".controller"; - - public static final String DAO_PACKAGE = BASE_PACKAGE + ".dao"; - - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/ScriptsController.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/ScriptsController.java deleted file mode 100644 index f71a78061..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/ScriptsController.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.dromara.system.saas.controller; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.luban.api.convert.ScriptsConvert; -import com.luban.api.entity.Scripts; -import com.luban.api.service.ScriptsService; -import com.luban.api.vo.ScriptsVO; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.stream.Collectors; - -/** - *

- * 作品 前端控制器 - *

- * - * @author lizhengwei - * @since 2024-06-21 - */ -@RestController -@RequestMapping("/scripts") -public class ScriptsController { - - - private final ScriptsService scriptsService; - - public ScriptsController(ScriptsService scriptsService) { - this.scriptsService = scriptsService; - } - - - @Operation(summary = "根据scriptsId查询") - @GetMapping("/{id}") - public ScriptsVO findScriptsById(@PathVariable Long id) { - return ScriptsConvert.toVO(scriptsService.getById(id)); - } - - @Operation(summary = "查询所有scripts") - @GetMapping - public List listAllScriptss(@RequestParam Integer _limit) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.last("limit " + _limit); - return scriptsService.list(wrapper).stream().map(ScriptsConvert::toVO).collect(Collectors.toList()); - } - -} - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/UploadController.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/UploadController.java deleted file mode 100644 index a9c8f758a..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/UploadController.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.system.saas.controller; - -import cn.hutool.core.util.IdUtil; -import com.luban.api.exception.UnifiedException; -import com.luban.api.vo.FileVO; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -/** - * @author WeiHongBin - */ -@RestController -@RequestMapping("/upload") -@Tag(name = "上传文件") -@Slf4j -public class UploadController { - -// @Value("${upload-path}") todo 改成公共文件上传下载 - - public String uploadPath = "data"; - - @Operation(summary = "文件上传") - @PostMapping - public List upload(@Validated MultipartFile files) { - String originalFilename = files.getOriginalFilename(); - assert originalFilename != null; - String suffix = originalFilename.substring(originalFilename.lastIndexOf(".") + 1); - String key = IdUtil.fastSimpleUUID() + "." + suffix; - try { - files.transferTo(new File(uploadPath + key)); - } catch (IOException e) { - throw new UnifiedException("文件上传失败"); - } - return new ArrayList() {{ - add(new FileVO() {{ - setUrl(key); - }}); - }}; - } -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/WorkController.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/WorkController.java deleted file mode 100644 index 61af74d28..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/WorkController.java +++ /dev/null @@ -1,175 +0,0 @@ -package org.dromara.system.saas.controller; - - -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.luban.api.convert.WorkConvert; -import com.luban.api.dto.WorkCreateDTO; -import com.luban.api.dto.WorkQueryDTO; -import com.luban.api.dto.WorkUpdateDTO; -import com.luban.api.entity.Work; -import com.luban.api.service.WorkService; -import com.luban.api.vo.WorkVO; -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.springframework.beans.BeanUtils; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - -/** - *

- * 前端控制器 - *

- *

- * 由于业务都非常简单,并没有把业务代码下沉到 service 层 - * - * @author WeiHongBin - */ -@RestController -@RequestMapping("/works") -@Tag(name = "作品管理", description = "作品管理") -@Slf4j -public class WorkController { - - - private final WorkService workService; - - public WorkController(WorkService workService) { - this.workService = workService; - } - - - @Operation(summary = "根据workId查询") - @GetMapping("/has-forms") - public List hasForms() { - return WorkConvert.toVO(workService.list()); - } - - @Operation(summary = "根据workId查询") - @GetMapping("/{id}") - public WorkVO findWorkById(@PathVariable Long id) { - return WorkConvert.toVO(workService.getById(id)); - } - - @Operation(summary = "查询所有work") - @GetMapping - public List listAllWorks(@Valid WorkQueryDTO dto) { - WorkVO vo = new WorkVO(); - vo.setTemplate(Boolean.parseBoolean(dto.getIs_template())); - BeanUtils.copyProperties(dto, vo); - return workService.list(new QueryWrapper<>(WorkConvert.toEntity(vo))).stream().map(WorkConvert::toVO).collect(Collectors.toList()); - } - - - @Operation(summary = "分页查询works") - @GetMapping("/pageable") - public IPage listWorks(@Valid WorkQueryDTO dto) { - WorkVO vo = new WorkVO(); - vo.setTemplate(Boolean.parseBoolean(dto.getIs_template())); - BeanUtils.copyProperties(dto, vo); - IPage page = workService.page(new Page<>(dto.getCurrent(), 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); - } - - @Operation(summary = "创建work") - @PostMapping - public WorkVO createWork(@RequestBody @Valid WorkCreateDTO dto) { - WorkVO vo = new WorkVO(); - BeanUtils.copyProperties(dto, vo); - Work work = WorkConvert.toEntity(vo); - workService.save(work); - return WorkConvert.toVO(work); - } - - @Operation(summary = "更新work") - @PutMapping("/{id}") - public WorkVO updateWork(@PathVariable Long id, @RequestBody @Valid WorkUpdateDTO dto) { - Work work = workService.getById(id); - if (!StringUtils.isEmpty(dto.getTitle())) { - work.setTitle(dto.getTitle()); - } - if (!StringUtils.isEmpty(dto.getDescription())) { - work.setDescription(dto.getDescription()); - } - if (!StringUtils.isEmpty(dto.getCoverImageUrl())) { - work.setCoverImageUrl(dto.getCoverImageUrl()); - } - if (!CollectionUtils.isEmpty(dto.getPages())) { - work.setPages(JSONUtil.toJsonStr(dto.getPages())); - } - work.setIsTemplate(dto.isTemplate()); - work.setIsPublish(dto.isPublish()); - work.setWidth(dto.getWidth()); - work.setHeight(dto.getWidth()); - work.setPageMode(dto.getWidth()); - - work.setUpdateTime(LocalDateTime.now()); - workService.saveOrUpdate(work); - return WorkConvert.toVO(work); - } - - - @Operation(summary = "删除work") - @DeleteMapping("/{id}") - public void deleteWorkById(@PathVariable Long id) { - workService.removeById(id); - } - - @Operation(summary = "设为模板") - @PostMapping("/set-as-template/{id}") - public WorkVO markWorkAsTemplate(@PathVariable Long id) { - Work work = workService.getById(id); - work.setIsTemplate(true); - work.setUpdateTime(LocalDateTime.now()); - workService.updateById(work); - return WorkConvert.toVO(work); - } - - @Operation(summary = "统计作品总数") - @GetMapping("/count") - public long countWork() { - return workService.count(); - } - - @Operation(summary = "使用模板") - @PostMapping("/use-template/{id}") - public WorkVO useTemplate(@PathVariable Long id) { - Work work = workService.getById(id); - work.setId(null); - work.setIsTemplate(false); - work.setIsPublish(false); - workService.save(work); - return WorkConvert.toVO(work); - } - - @Operation(summary = "使用模板") - @GetMapping("/preview/{id}") - public ModelAndView useTemplate(@PathVariable Long id, @RequestParam(value = "view_mode", required = false) String viewMode) { - Work work = workService.getById(id); - - // 非预览模式, 查看不到内容 - boolean canRender = "preview".equals(viewMode) || work.getIsPublish(); - - if (!canRender) { - work.setPages("[]"); - } - ModelAndView mv = new ModelAndView("engine"); - //TODO 后端处理前端,这种方式不是很好,最后改成纯前端处理 - mv.addObject("workString", JSONUtil.toJsonStr(WorkConvert.toVO(work))); - mv.addObject("work", work); - return mv; - } -} - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/WorkFormsController.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/WorkFormsController.java deleted file mode 100644 index f6ae9b0d8..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/controller/WorkFormsController.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.system.saas.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@RestController -@RequestMapping("/work-forms") -public class WorkFormsController { - -} - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/convert/ScriptsConvert.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/convert/ScriptsConvert.java deleted file mode 100644 index baf04df8e..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/convert/ScriptsConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dromara.system.saas.convert; - -import com.luban.api.entity.Scripts; -import com.luban.api.vo.ScriptsVO; -import org.springframework.beans.BeanUtils; - -/** - * Scripts 转换器 - * - * @author WeiHongBin - */ -public class ScriptsConvert { - - - public static ScriptsVO toVO(Scripts entity) { - ScriptsVO vo = new ScriptsVO(); - BeanUtils.copyProperties(entity, vo); - return vo; - } - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/convert/WorkConvert.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/convert/WorkConvert.java deleted file mode 100644 index ff69bb98d..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/convert/WorkConvert.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/ScriptsDao.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/ScriptsDao.java deleted file mode 100644 index 4a2d33892..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/ScriptsDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.Scripts; - -/** - *

- * 作品 Mapper 接口 - *

- * - * @author lizhengwei - * @since 2024-06-21 - */ -public interface ScriptsDao extends BaseMapper { - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/WorkDao.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/WorkDao.java deleted file mode 100644 index 77c29325b..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/WorkDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.Work; - -/** - *

- * Mapper 接口 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -public interface WorkDao extends BaseMapper { - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/WorkFormsDao.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/WorkFormsDao.java deleted file mode 100644 index 2bb466687..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dao/WorkFormsDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.WorkForms; - -/** - *

- * Mapper 接口 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -public interface WorkFormsDao extends BaseMapper { - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/PageDtoBase.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/PageDtoBase.java deleted file mode 100644 index 0673309b1..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/PageDtoBase.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.system.saas.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * 分页基类 - * - * @author admin - */ -@Data -public class PageDtoBase { - /** - * 每页行数 - */ - @Schema(title = "每页行数") - protected Integer size = 10; - - /** - * 页码 - */ - @Schema(title = "页码") - protected Integer current = 1; - - - public void setSize(Integer size) { - if (size != null) { - this.size = size; - } - } - - public void setCurrent(Integer current) { - if (current != null) { - this.current = current; - } - } -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/ScriptsQueryDTO.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/ScriptsQueryDTO.java deleted file mode 100644 index 00f1cc387..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/ScriptsQueryDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkCreateDTO.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkCreateDTO.java deleted file mode 100644 index 54097861e..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkCreateDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkQueryDTO.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkQueryDTO.java deleted file mode 100644 index ab500a5b2..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkQueryDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.dromara.system.saas.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 WorkQueryDTO extends PageDtoBase { - - private String title; - - private String description; - - private String coverImageUrl; - - private List pages; - - private LocalDateTime createTime; - - private LocalDateTime updateTime; - - private String is_publish; - - private String is_template; -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkUpdateDTO.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkUpdateDTO.java deleted file mode 100644 index fb1e4c818..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/dto/WorkUpdateDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/Scripts.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/Scripts.java deleted file mode 100644 index 7c698f040..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/Scripts.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.dromara.system.saas.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 lizhengwei - * @since 2024-06-21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@Schema(name = "Scripts对象", description = "作品") -public class Scripts implements Serializable { - - private static final long serialVersionUID=1L; - - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - - @Schema(title = "标题") - private String title; - - @Schema(title = "内容") - private String content; - - private LocalDateTime createTime; - - private LocalDateTime updateTime; - - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/Work.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/Work.java deleted file mode 100644 index 0a6fc6942..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/Work.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/WorkForms.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/WorkForms.java deleted file mode 100644 index 36c4f6872..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/entity/WorkForms.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/ScriptsService.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/ScriptsService.java deleted file mode 100644 index bbe27f6d7..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/ScriptsService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.Scripts; - -/** - *

- * 作品 服务类 - *

- * - * @author lizhengwei - * @since 2024-06-21 - */ -public interface ScriptsService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/WorkFormsService.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/WorkFormsService.java deleted file mode 100644 index 5444744f6..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/WorkFormsService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/WorkService.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/WorkService.java deleted file mode 100644 index 1ddd36822..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/WorkService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.Work; - -/** - *

- * 服务类 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -public interface WorkService extends IService { - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/ScriptsServiceImpl.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/ScriptsServiceImpl.java deleted file mode 100644 index 000ab49b4..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/ScriptsServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.ScriptsDao; -import com.luban.api.entity.Scripts; -import com.luban.api.service.ScriptsService; -import org.springframework.stereotype.Service; - -/** - *

- * 作品 服务实现类 - *

- * - * @author lizhengwei - * @since 2024-06-21 - */ -@Service -public class ScriptsServiceImpl extends ServiceImpl implements ScriptsService { - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/WorkFormsServiceImpl.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/WorkFormsServiceImpl.java deleted file mode 100644 index 62d3f102b..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/WorkFormsServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.system.saas.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-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/WorkServiceImpl.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/WorkServiceImpl.java deleted file mode 100644 index 7184c44f4..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/service/impl/WorkServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.WorkDao; -import com.luban.api.entity.Work; -import com.luban.api.service.WorkService; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author WeiHongBin - * @since 2019-11-26 - */ -@Service -public class WorkServiceImpl extends ServiceImpl implements WorkService { - - -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/util/JSON.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/util/JSON.java deleted file mode 100644 index bdb171dc3..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/util/JSON.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.dromara.system.saas.util; - - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -/** - * JSON 转换工具 - * - * @author WeiHongBin - */ -@Slf4j -@Component -public class JSON { - - @Autowired - private ObjectMapper objectMapper; - - public String toJSON(Object jsonObj) { - try { - return objectMapper.writeValueAsString(jsonObj); - } catch (JsonProcessingException e) { - log.error("JSON 转换异常 转换异常的数据类型: " + jsonObj.getClass().getName(), e); - } - return jsonObj.toString(); - } - - - public Map toMap(String json) { - try { - return objectMapper.readValue(json, Map.class); - } catch (IOException e) { - log.error("JSON 转换异常", e); - } - return null; - } - - public List> toListMapStr(String json) { - try { - return objectMapper.readValue(json, new TypeReference>>() { - }); - } catch (IOException e) { - log.error("JSON 转换异常", e); - } - return null; - } - - - public List toListString(String json) { - try { - return objectMapper.readValue(json, new TypeReference>() { - }); - } catch (IOException e) { - log.error("JSON 转换异常", e); - } - return null; - } -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/FileVO.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/FileVO.java deleted file mode 100644 index 05c724274..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/FileVO.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.system.saas.vo; - -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 = "文件视图对象") -public class FileVO { - private String url; -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/Result.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/Result.java deleted file mode 100644 index ac9a8b83e..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/Result.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.dromara.system.saas.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Component; - -/** - * 统一返回 - * - * @author WeiHongBin - */ -@Schema(description = "返回响应数据") -@Component -@Data -public class Result { - @Schema(title = "返回状态码") - private Integer code; - @Schema(title = "返回消息") - private String msg; - @Schema(title = "返回当前状态") - private HttpStatus status; - @Schema(title = "返回对象") - private T data; - - public Result() { - this.msg = "成功"; - setStatus(HttpStatus.OK); - } - - public void setStatus(HttpStatus status) { - this.status = status; - setCode(status.value()); - } - - private void setCode(Integer code) { - this.code = code; - } - - public Result(T data) { - setStatus(HttpStatus.OK); - this.msg = "成功"; - this.data = data; - } - - public Result(String msg, HttpStatus status, T data) { - this.msg = msg; - setStatus(status); - this.data = data; - } - - public Result(String msg, HttpStatus status) { - this.msg = msg; - setStatus(status); - } - - public Result ok(T data) { - setStatus(HttpStatus.OK); - this.msg = "成功"; - this.data = data; - return this; - } - - public Result error(HttpStatus status, String msg) { - setStatus(status); - this.msg = msg; - this.data = null; - return this; - } - - public boolean isOK() { - return this.getStatus() == HttpStatus.OK; - } - - @Override - public String toString() { - return "Result{" + - "code=" + code + - ", msg='" + msg + '\'' + - ", status=" + status + - ", data=" + data + - '}'; - } -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/ScriptsVO.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/ScriptsVO.java deleted file mode 100644 index 9ea6d054d..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/ScriptsVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.system.saas.vo; - -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; - -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "Script视图对象") -public class ScriptsVO implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer id; - - private String title; - - private String content; - - private LocalDateTime createTime; - - private LocalDateTime updateTime; -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/WorkVO.java b/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/WorkVO.java deleted file mode 100644 index e65bce967..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/java/org/dromara/system/saas/vo/WorkVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.system.saas.vo; - -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 = "Work视图对象") -public class WorkVO { - - private Long id; - - private String title; - - private String description; - - private String coverImageUrl; - - private List pages; - - private LocalDateTime createTime; - - private LocalDateTime updateTime; - - private boolean isPublish; - - private boolean isTemplate; -} diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/package-info.md deleted file mode 100644 index c938b1e50..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/package-info.md +++ /dev/null @@ -1,3 +0,0 @@ -java包使用 `.` 分割 resource 目录使用 `/` 分割 -
-此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml deleted file mode 100644 index 81401e4d8..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasClientMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasClientMapper.xml deleted file mode 100644 index d1d33b7fd..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasClientMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml deleted file mode 100644 index 4241f006f..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDeptMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDeptMapper.xml deleted file mode 100644 index 2e0d99f66..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDeptMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDictDataMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDictDataMapper.xml deleted file mode 100644 index 6803c94b6..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDictDataMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDictTypeMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDictTypeMapper.xml deleted file mode 100644 index 924ad6dbe..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasDictTypeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasLogininforMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasLogininforMapper.xml deleted file mode 100644 index 877aca682..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasLogininforMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasMenuMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasMenuMapper.xml deleted file mode 100644 index 373a7f263..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasMenuMapper.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasNoticeMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasNoticeMapper.xml deleted file mode 100644 index d3803c5ae..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasNoticeMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOperLogMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOperLogMapper.xml deleted file mode 100644 index 7a4b4a67f..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOperLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml deleted file mode 100644 index c932b44fa..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOssMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOssMapper.xml deleted file mode 100644 index d8638a423..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasOssMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasPostMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasPostMapper.xml deleted file mode 100644 index 55aec8c99..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasPostMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleDeptMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleDeptMapper.xml deleted file mode 100644 index 6e19ef8f0..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleDeptMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMapper.xml deleted file mode 100644 index e0ba2cbf5..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMapper.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - select distinct r.role_id, - r.role_name, - r.role_key, - r.role_sort, - r.data_scope, - r.menu_check_strictly, - r.dept_check_strictly, - r.status, - r.del_flag, - r.create_time, - r.remark - from sys_saas_role r - left join sys_saas_user_role sur on sur.role_id = r.role_id - left join sys_saas_user u on u.user_id = sur.user_id - left join sys_saas_dept d on u.dept_id = d.dept_id - - - - - - - - - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMenuMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMenuMapper.xml deleted file mode 100644 index 3edfc6514..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMenuMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasSocialMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasSocialMapper.xml deleted file mode 100644 index 2638690af..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasSocialMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml deleted file mode 100644 index cb5b8d8e4..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml deleted file mode 100644 index 0f79bf363..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml deleted file mode 100644 index 64e9d2b1c..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserMapper.xml deleted file mode 100644 index fb2e2d656..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserMapper.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserPostMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserPostMapper.xml deleted file mode 100644 index 78d521a89..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserPostMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserRoleMapper.xml b/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserRoleMapper.xml deleted file mode 100644 index 6edd8a81c..000000000 --- a/ruoyi-modules/ruoyi-h5-saas/src/main/resources/mapper/systemTenant/SysSaasUserRoleMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - -