From 25efe0d49adf512cb897fe6a1cb67221cdac94b0 Mon Sep 17 00:00:00 2001 From: Diyu0904 <1819728964@qq.com> Date: Fri, 7 Feb 2025 15:27:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcwl/web/controller/resource/WorkFlowController.java | 4 ++-- .../com/mcwl/resource/domain/dto/AddRequestWorkFlow.java | 4 ++++ .../mcwl/resource/service/impl/ToActivityServiceImpl.java | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java index 9c15d6b..d2d04b4 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java @@ -12,10 +12,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.validation.Valid; import java.util.List; @@ -115,7 +115,7 @@ public class WorkFlowController extends BaseController { */ @ApiOperation(value = "添加工作流") @PostMapping("/addWorkFlow") - public AjaxResult addWorkFlow(@Valid @RequestBody AddRequestWorkFlow addRequestWorkFlow){ + public AjaxResult addWorkFlow(@Validated @RequestBody AddRequestWorkFlow addRequestWorkFlow){ return workFlowService.addWorkFlow(addRequestWorkFlow); } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java index 739f3de..ecd68b3 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java @@ -8,6 +8,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -26,8 +28,10 @@ import java.util.List; public class AddRequestWorkFlow { @ApiModelProperty(value = "工作流信息") @Valid + @NotNull(message = "工作流信息不能为空") private AddWorkFlow addWorkFlow; @Valid + @NotEmpty(message = "工作流版本信息不能为空") @ApiModelProperty(value = "工作流版本信息") private List addWorkFlowVersions; diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java index fe21434..755009a 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java @@ -1,8 +1,8 @@ package com.mcwl.resource.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.mcwl.resource.domain.ModelProduct; import com.mcwl.resource.domain.ToActivity; import com.mcwl.resource.mapper.ToActivityMapper; import com.mcwl.resource.service.ToActivityService; @@ -31,7 +31,9 @@ public class ToActivityServiceImpl extends ServiceImpl selectToActivityList(ToActivity toActivity) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ToActivity::getActivityName, toActivity.getActivityName()); + if (StrUtil.isNotBlank(toActivity.getActivityName())){ + queryWrapper.eq(ToActivity::getActivityName, toActivity.getActivityName()); + } return toActivityMapper.selectList(queryWrapper); } From bd234023899caf2fd2974881557572bb9f218b8c Mon Sep 17 00:00:00 2001 From: Diyu0904 <1819728964@qq.com> Date: Wed, 12 Feb 2025 13:16:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=94=E8=B0=83=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/resource/FileController.java | 105 ++++++++++ .../resource/MallProductController.java | 55 ----- .../resource/ModelVersionController.java | 50 ----- .../resource/SysUserAttentionController.java | 36 +++- .../resource/WorkFlowController.java | 76 +++---- mcwl-admin/src/main/resources/application.yml | 4 +- .../mcwl/common/constant/CacheConstants.java | 14 ++ .../mcwl/common/utils/baidu/BaiduCensor.java | 9 - .../mcwl/framework/config/SecurityConfig.java | 2 +- .../com/mcwl/resource/domain/WorkFlow.java | 8 +- .../mcwl/resource/domain/WorkFlowVersion.java | 4 +- .../domain/dto/AddRequestWorkFlow.java | 4 +- .../service/SysUserAttentionService.java | 7 + .../resource/service/WorkFlowService.java | 5 +- .../service/impl/ModelServiceImpl.java | 101 ++++++--- .../impl/SysUserAttentionServiceImpl.java | 40 +++- .../service/impl/WorkFlowServiceImpl.java | 191 +++++++++++++----- .../com/mcwl/system/mapper/SysUserMapper.java | 4 + .../resources/mapper/system/SysUserMapper.xml | 14 ++ 19 files changed, 474 insertions(+), 255 deletions(-) create mode 100644 mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java new file mode 100644 index 0000000..9bb5795 --- /dev/null +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java @@ -0,0 +1,105 @@ +package com.mcwl.web.controller.resource; + +import com.mcwl.common.core.domain.AjaxResult; +import com.mcwl.resource.service.impl.ModelVersionServiceImpl; +import com.mcwl.resource.service.impl.WorkFlowVersionServiceImpl; +import com.mcwl.web.controller.common.OssUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.util.HashMap; +import java.util.Map; + +/** + * 文件/图片 + * + * @author DaiZibo + * @date 2025/2/10 + * @apiNote + */ + +@Api(tags = "上传文件") +@RestController +@RequestMapping("/file") +public class FileController { + + @Autowired + private ModelVersionServiceImpl modelVersionService; + + @Autowired + private WorkFlowVersionServiceImpl workFlowVersionService; + + /*** + * + * 图片 + * @param file + * @return + */ + @ApiOperation("上传图片") + @PostMapping("/imgUpload") + public AjaxResult imgUpload(@RequestParam MultipartFile file) { + + String s = OssUtil.uploadMultipartFile(file); + String fileName = file.getOriginalFilename(); + Map map = new HashMap<>(); + map.put("fileName", fileName); + map.put("url", s); + return AjaxResult.success(map); + } + + + /*** + * + * 上传文件 + * @param file + * @return + */ + @ApiOperation("上传文件") + @PostMapping("/fileUpload") + public AjaxResult fileUpload(@RequestParam MultipartFile file) { + + String s = OssUtil.uploadMultipartFile(file); + String fileName = file.getOriginalFilename(); + Map map = new HashMap<>(); + map.put("fileName", fileName); + map.put("url", s); + + return AjaxResult.success(map); + } + + + /*** + * + * zip + * @param file + * @return + */ + @ApiOperation(value = "zip") + @PostMapping("/zipUrlFile") + public AjaxResult zipUrlFile(@RequestParam MultipartFile file) { + String s = OssUtil.uploadMultipartFile(file); + return AjaxResult.success(s); + } + + + /*** + * + * 下载zip + * @param file + * @return + */ + @ApiOperation(value = "zip") + @PostMapping("/zipUrl") + public AjaxResult zipUrl(@RequestParam MultipartFile file) { + String s = OssUtil.uploadMultipartFile(file); + return AjaxResult.success(s); + } + + +} diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java index 7336e4d..09ad9bf 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java @@ -1,30 +1,23 @@ package com.mcwl.web.controller.resource; -import com.mcwl.common.annotation.Anonymous; import com.mcwl.common.core.controller.BaseController; import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.page.PageDomain; import com.mcwl.common.core.page.TableDataInfo; -import com.mcwl.common.domain.IdsParam; import com.mcwl.common.utils.SecurityUtils; import com.mcwl.resource.domain.ModelProduct; import com.mcwl.resource.domain.dto.ModelImagePageRes; import com.mcwl.resource.domain.request.RequestModel; import com.mcwl.resource.service.*; -import com.mcwl.web.controller.common.OssUtil; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** @@ -62,54 +55,6 @@ public class MallProductController extends BaseController { private ModelImageLikeService modelImageLikeService; - /*** - * - * 图片 - * @param file - * @return - */ - @ApiModelProperty("图片") - @Anonymous - @PostMapping("/file") - public AjaxResult Malifile(@RequestParam MultipartFile file) { - - String s = OssUtil.uploadMultipartFile(file); - String fileName = file.getOriginalFilename(); - Map map = new HashMap<>(); - map.put("fileName", fileName); - map.put("url", s); - return AjaxResult.success(map); - } - - - /*** - * - * zip - * @param file - * @return - */ - @ApiOperation(value = "zip") - @PostMapping("/zipUrlFile") - public AjaxResult zipUrlFile(@RequestParam MultipartFile file) { - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - - /*** - * - * 下载zip - * @param file - * @return - */ - @ApiOperation(value = "zip") - @PostMapping("/zipUrl") - public AjaxResult zipUrl(@RequestParam MultipartFile file) { - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - /** * 模型列表 */ diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java index dacef45..6c8064a 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java @@ -5,12 +5,10 @@ import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.page.TableDataInfo; import com.mcwl.resource.domain.ModelVersion; import com.mcwl.resource.service.ModelVersionService; -import com.mcwl.web.controller.common.OssUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -31,54 +29,6 @@ public class ModelVersionController extends BaseController { private ModelVersionService modelVersionService; - - /*** - * - * 图片 - * @param file - * @return - */ - @ApiOperation(value = "图片") - @PostMapping("/file") - public AjaxResult Malifile(@RequestParam MultipartFile file){ - - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - - - - /*** - * - * zip - * @param file - * @return - */ - @ApiOperation(value = "zip") - @PostMapping("/zipUrlFile") - public AjaxResult zipUrlFile(@RequestParam MultipartFile file){ - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - - - - /*** - * - * 下载zip - * @param file - * @return - */ - @ApiOperation(value = "下载zip") - @PostMapping("/zipUrl") - public AjaxResult zipUrl(@RequestParam MultipartFile file){ - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - /** * 详情页 版本列表 * @param modelId diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java index 4b343fc..e136435 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java @@ -1,16 +1,16 @@ package com.mcwl.web.controller.resource; +import com.github.pagehelper.PageInfo; import com.mcwl.common.annotation.RepeatSubmit; import com.mcwl.common.core.domain.AjaxResult; +import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.resource.domain.SysUserInfo; +import com.mcwl.resource.domain.vo.PageVo; import com.mcwl.resource.service.impl.SysUserAttentionServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 关注 @@ -66,4 +66,32 @@ public class SysUserAttentionController { return AjaxResult.success(sysUserInfo); } + + + /** + * 查看关注列表 + * @return + */ + @ApiOperation(value = "查询关注列表") + @PostMapping("/selectAttention") + public AjaxResult selectAttention(PageVo pageVo){ + + PageInfo sysUserList = sysUserAttentionService.selectAttentionPage(pageVo); + + return AjaxResult.success(sysUserList); + } + + + /** + * 查看关注列表 + * @return + */ + @ApiOperation(value = "查询粉丝列表") + @PostMapping("/selectToAttention") + public AjaxResult selectToAttention(PageVo pageVo){ + + PageInfo sysUserList = sysUserAttentionService.selectToAttentionPage(pageVo); + + return AjaxResult.success(sysUserList); + } } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java index d2d04b4..49462aa 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java @@ -7,15 +7,15 @@ import com.mcwl.resource.domain.dto.AddRequestWorkFlow; import com.mcwl.resource.domain.request.RequestWorkFlow; import com.mcwl.resource.domain.vo.PageVo; import com.mcwl.resource.service.impl.WorkFlowServiceImpl; -import com.mcwl.web.controller.common.OssUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; @@ -67,47 +67,6 @@ public class WorkFlowController extends BaseController { - /*** - * 图片 - * @param file - * @return - */ - @ApiOperation(value = "图片") - @PostMapping("/file") - public AjaxResult Malifile(@RequestParam MultipartFile file){ - - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - /*** - * - * zip - * @param file - * @return - */ - @ApiOperation(value = "zip") - @PostMapping("/zipUrlFile") - public AjaxResult zipUrlFile(@RequestParam MultipartFile file){ - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - - /*** - * - * 下载zip - * @param file - * @return - */ - @ApiOperation(value = "下载zip") - @PostMapping("/zipUrl") - public AjaxResult zipUrl(@RequestParam MultipartFile file){ - String s = OssUtil.uploadMultipartFile(file); - return AjaxResult.success(s); - } - - /** * 添加工作流 * @param addRequestWorkFlow @@ -141,7 +100,7 @@ public class WorkFlowController extends BaseController { */ @ApiOperation(value = "删除工作流") @GetMapping("/deleteWorkFlow") - public AjaxResult deleteWorkFlow(@RequestParam Long id){ + public AjaxResult deleteWorkFlow(@RequestParam @Valid @NotNull(message = "工作流id不能为空") Long id){ workFlowService.deleteWorkFlow(id); return AjaxResult.success("删除成功"); @@ -167,9 +126,34 @@ public class WorkFlowController extends BaseController { */ @ApiOperation(value = "查询工作流详情") @GetMapping("/selectWorkFlowById") - public AjaxResult selectWorkFlowById(@RequestParam Long id,Integer type){ + public AjaxResult selectWorkFlowById(@RequestParam @Valid @NotNull(message = "工作流id不能为空") Long id){ - return workFlowService.selectWorkFlowById(id,type); + return workFlowService.selectWorkFlowById(id); + } + + /** + * 校验名字是否重复 + * @param name + * @return + */ + @ApiOperation(value = "校验名字是否重复") + @GetMapping("/selectWorkFlowByName") + public AjaxResult selectWorkFlowByName(@RequestParam String name){ + + Long sign = workFlowService.selectWorkFlowByName(name); + return AjaxResult.success(sign); + } + + + /** + * 回显接口 + * @return + */ + @ApiOperation(value = "工作流回显接口") + @GetMapping("/selectWorkFlowVersionById") + public AjaxResult selectWorkFlowVersionById(@RequestParam @Valid @NotNull(message = "图片id不能为空") Long id){ + + return workFlowService.selectWorkFlowVersionById(id); } } diff --git a/mcwl-admin/src/main/resources/application.yml b/mcwl-admin/src/main/resources/application.yml index 28ceed3..f1bd2d8 100644 --- a/mcwl-admin/src/main/resources/application.yml +++ b/mcwl-admin/src/main/resources/application.yml @@ -57,9 +57,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 1024MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 1024MB # 服务模块 devtools: restart: diff --git a/mcwl-common/src/main/java/com/mcwl/common/constant/CacheConstants.java b/mcwl-common/src/main/java/com/mcwl/common/constant/CacheConstants.java index 8182e6b..6ee6017 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/constant/CacheConstants.java +++ b/mcwl-common/src/main/java/com/mcwl/common/constant/CacheConstants.java @@ -52,5 +52,19 @@ public class CacheConstants */ public static final String WE_CHAT = "we_chat"; + /** + * 校验身份证次数 + */ public static final String ID_CARD_COUNT = "id_card_count:"; + + /** + * 模型 + */ + public static final String MODEL = "model"; + + /** + * 工作流 + */ + public static final String WORK_FLOW = "work_flow"; + } diff --git a/mcwl-common/src/main/java/com/mcwl/common/utils/baidu/BaiduCensor.java b/mcwl-common/src/main/java/com/mcwl/common/utils/baidu/BaiduCensor.java index 960aee7..6a0507b 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/utils/baidu/BaiduCensor.java +++ b/mcwl-common/src/main/java/com/mcwl/common/utils/baidu/BaiduCensor.java @@ -114,13 +114,4 @@ public class BaiduCensor { } - public static void main(String[] args) { - String s = BaiduCensor.TextCensor("我草你妈的"); - - String s1 = BaiduCensor.ImageCnesor("https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/JANUARY/2/19/4/877e449c-3c0d-4630-a304-91ec110499f2.png"); - - - } - - } diff --git a/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java b/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java index 936e217..b7b2b7a 100644 --- a/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java +++ b/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java @@ -130,7 +130,7 @@ public class SecurityConfig permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 requests.antMatchers("/login", "/register", "/captchaImage","/ali/pay/doPay","/ali/pay/notify", - "/ali/pay/callback").permitAll() + "/ali/pay/callback","/file/**").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java index 33faa68..47a2aca 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java @@ -143,16 +143,16 @@ public class WorkFlow { * 创建时间 */ @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 更新时间 */ @ApiModelProperty(value = "更新时间") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; /** diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java index 4d8e753..e2b4b98 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java @@ -73,9 +73,9 @@ public class WorkFlowVersion { private String auditText; /** - * 模型ID + * 工作流ID */ - @ApiModelProperty("模型ID") + @ApiModelProperty("工作流ID") private Long workFlowId; /** diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java index ecd68b3..29aebc3 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddRequestWorkFlow.java @@ -29,10 +29,10 @@ public class AddRequestWorkFlow { @ApiModelProperty(value = "工作流信息") @Valid @NotNull(message = "工作流信息不能为空") - private AddWorkFlow addWorkFlow; + private AddWorkFlow workFlow; @Valid @NotEmpty(message = "工作流版本信息不能为空") @ApiModelProperty(value = "工作流版本信息") - private List addWorkFlowVersions; + private List workFlowVersionList; } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java index c0249d8..502e5da 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java @@ -1,7 +1,10 @@ package com.mcwl.resource.service; +import com.github.pagehelper.PageInfo; import com.mcwl.common.core.domain.AjaxResult; +import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.resource.domain.SysUserInfo; +import com.mcwl.resource.domain.vo.PageVo; /** * 关注表 业务层 @@ -16,4 +19,8 @@ public interface SysUserAttentionService { Boolean selectAttention(Long userId); SysUserInfo selectUserInfo(); + + PageInfo selectAttentionPage(PageVo pageVo); + + PageInfo selectToAttentionPage(PageVo pageVo); } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/WorkFlowService.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/WorkFlowService.java index ff315e9..461eb3b 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/WorkFlowService.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/WorkFlowService.java @@ -27,7 +27,7 @@ public interface WorkFlowService extends IService { AjaxResult selectWorkFlow(PageVo pageVo); - AjaxResult selectWorkFlowById(Long id,Integer type); + AjaxResult selectWorkFlowById(Long id); TableDataInfo listByPage(ModelImagePageRes imagePageRes); @@ -37,4 +37,7 @@ public interface WorkFlowService extends IService { List fetchWorkFlowSortedByTopStatus(); + Long selectWorkFlowByName(String name); + + AjaxResult selectWorkFlowVersionById(Long id); } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java index 1fed1ef..a67f498 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java @@ -31,7 +31,6 @@ import com.mcwl.system.init.DictInit; import com.mcwl.system.service.ISysUserService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Sort; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; @@ -249,12 +248,31 @@ public class ModelServiceImpl extends ServiceImpl impl if (modelProduct != null){ + //判断模型是否删除 + if (modelProduct.getDelFlag().equals("2")){ + //不做审核 + log.info("删除工作流信息,不做审核校验"); + return; + } + if (modelProduct.getModelName() != null){ //审核名称 String s = BaiduCensor.TextCensor(modelProduct.getModelName()+","+modelProduct.getTags()); // 解析 JSON 字符串 JSONObject jsonObject = JSONObject.parseObject(s); + + //获取状态码 + String code = jsonObject.getString("code"); + if (!code.equals("200")){ + //审核失败，数据有问题 + modelProduct.setAuditStatus(4); + modelProduct.setAuditText("审核失败"); + baseMapper.updateById(modelProduct); + log.info("模型审核未通过"); + return; + } + // 获取 'conclusion' 字段的值 String conclusion = jsonObject.getString("conclusion"); @@ -297,6 +315,14 @@ public class ModelServiceImpl extends ServiceImpl impl if (modelVersionList != null){ //审核版本 for (ModelVersion modelVersion : modelVersionList) { + + //判断版本是否删除 + if (modelVersion.getDelFlag().equals("2")){ + //不做审核 + log.info("删除模型版本信息,不做审核校验"); + continue; + } + modelVersion.setModelId(modelProduct.getId()); //版本名称 String s1 = BaiduCensor.TextCensor(modelVersion.getVersionName() + "," + @@ -318,18 +344,26 @@ public class ModelServiceImpl extends ServiceImpl impl String msg = item.getString("msg"); failureReasons.add(msg); } +// // 使用逗号拼接所有的失败原因 +// String concatenatedReasons = String.join(", ", failureReasons); +// modelVersion.setAuditText(concatenatedReasons); +// modelVersion.setAuditStatus(4); +// //校验id是否存在 区别修改审核或者新增审核 +// if (modelVersion.getId() != null){ +// modelVersionMapper.updateById(modelVersion); +// }else { +// modelVersionMapper.updateByName(modelVersion); +// } +// log.info("版本审核未通过"); // 使用逗号拼接所有的失败原因 String concatenatedReasons = String.join(", ", failureReasons); - modelVersion.setAuditText(concatenatedReasons); - modelVersion.setAuditStatus(4); - //校验id是否存在 区别修改审核或者新增审核 - if (modelVersion.getId() != null){ - modelVersionMapper.updateById(modelVersion); - }else { - modelVersionMapper.updateByName(modelVersion); - } - log.info("版本审核未通过"); - continue; + modelProduct.setAuditText(concatenatedReasons); + + //修改状态以及失败原因 + modelProduct.setAuditStatus(4); + baseMapper.updateById(modelProduct); + log.info("模型版本审核未通过"); + return; } //审核版本图片 @@ -350,27 +384,40 @@ public class ModelServiceImpl extends ServiceImpl impl String msg = item.getString("msg"); failureReasons.add(msg); } - // 使用逗号拼接所有的失败原因 +// // 使用逗号拼接所有的失败原因 +// String concatenatedReasons = String.join(", ", failureReasons); +// modelVersion.setAuditText(concatenatedReasons); +// modelVersion.setAuditStatus(4); +// //校验id是否存在 区别修改审核或者新增审核 +// if (modelVersion.getId() != null){ +// modelVersionMapper.updateById(modelVersion); +// }else { +// modelVersionMapper.updateByName(modelVersion); +// } +// modelVersionMapper.updateByName(modelVersion); +// log.info("图片审核未通过"); +// break; String concatenatedReasons = String.join(", ", failureReasons); - modelVersion.setAuditText(concatenatedReasons); - modelVersion.setAuditStatus(4); - //校验id是否存在 区别修改审核或者新增审核 - if (modelVersion.getId() != null){ - modelVersionMapper.updateById(modelVersion); - }else { - modelVersionMapper.updateByName(modelVersion); - } - modelVersionMapper.updateByName(modelVersion); - log.info("图片审核未通过"); - break; + modelProduct.setAuditText(concatenatedReasons); + + //修改状态以及失败原因 + modelProduct.setAuditStatus(4); + baseMapper.updateById(modelProduct); + log.info("模型版本审核未通过"); + return; } } - //修改版本成功审核状态 +// //修改版本成功审核状态 +// modelProduct.setAuditText(""); +// modelVersion.setAuditStatus(1); +// modelVersionMapper.updateByName(modelVersion); +// log.info("全部通过审核"); + //修改为合格 modelProduct.setAuditText(""); - modelVersion.setAuditStatus(1); - modelVersionMapper.updateByName(modelVersion); - log.info("全部通过审核"); + modelProduct.setAuditStatus(modelProduct.getJurisdiction()); + baseMapper.updateById(modelProduct); + log.info("模型全部通过审核"); } } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java index ff7e245..5e2b386 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java @@ -1,23 +1,24 @@ package com.mcwl.resource.service.impl; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.mcwl.common.core.domain.AjaxResult; +import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.common.utils.SecurityUtils; -import com.mcwl.resource.domain.ModelProduct; import com.mcwl.resource.domain.SysUserAttention; import com.mcwl.resource.domain.SysUserInfo; +import com.mcwl.resource.domain.vo.PageVo; import com.mcwl.resource.mapper.MallProductLikeMapper; import com.mcwl.resource.mapper.ModelImageMapper; import com.mcwl.resource.mapper.ModelMapper; import com.mcwl.resource.mapper.SysUserAttentionMapper; -import com.mcwl.resource.service.ModelImageService; -import com.mcwl.resource.service.ModelService; import com.mcwl.resource.service.SysUserAttentionService; +import com.mcwl.system.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** * 关注表 业务实现层 @@ -43,6 +44,9 @@ public class SysUserAttentionServiceImpl implements SysUserAttentionService { @Autowired private ModelImageMapper modelImageMapper; + @Autowired + private SysUserMapper sysUserMapper; + @Override public AjaxResult addAttention(Long userId) { @@ -106,4 +110,30 @@ public class SysUserAttentionServiceImpl implements SysUserAttentionService { .imageLikeNum(imageLikeNum) .build(); } + + @Override + public PageInfo selectAttentionPage(PageVo pageVo) { + + PageHelper pageHelper = new PageHelper(); + pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize()); + + //条件构造器 + List sysUserList = sysUserMapper.selectUserPage(SecurityUtils.getUserId()); + + + return new PageInfo(sysUserList); + } + + @Override + public PageInfo selectToAttentionPage(PageVo pageVo) { + + PageHelper pageHelper = new PageHelper(); + pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize()); + + //条件构造器 + List sysUserList = sysUserMapper.selectToUserPage(SecurityUtils.getUserId()); + + + return new PageInfo(sysUserList); + } } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java index 55208c9..2f82419 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java @@ -73,9 +73,9 @@ public class WorkFlowServiceImpl extends ServiceImpl i RequestWorkFlow requestWorkFlow = new RequestWorkFlow(); BeanUtil.copyProperties(addRequestWorkFlo, requestWorkFlow); - +// RequestWorkFlow requestWorkFlow = JSON.parseObject(JSON.toJSONString(addRequestWorkFlo), RequestWorkFlow.class); //获取封面图 - String filePath = requestWorkFlow.getWorkFlowVersionList().get(0).getFilePath(); + String filePath = requestWorkFlow.getWorkFlowVersionList().get(0).getImagePaths(); String[] split = filePath.split(","); @@ -94,7 +94,6 @@ public class WorkFlowServiceImpl extends ServiceImpl i audit(requestWorkFlow); - return AjaxResult.success("添加成功，等待审核"); } @@ -103,14 +102,31 @@ public class WorkFlowServiceImpl extends ServiceImpl i threadPoolTaskExecutor.submit(() -> { WorkFlow workFlow = requestWorkFlow.getWorkFlow(); - if (workFlow != null){ + if (workFlow != null) { - if (workFlow.getWorkflowName() != null){ + //判断是否删除 + if (workFlow.getDelFlag().equals("2")) { + //不做审核 + log.info("删除工作流信息,不做审核校验"); + return; + } + + if (workFlow.getWorkflowName() != null) { //审核名称 String s = BaiduCensor.TextCensor(workFlow.getWorkflowName()); // 解析 JSON 字符串 JSONObject jsonObject = JSONObject.parseObject(s); + //获取状态码 + String code = jsonObject.getString("code"); + if (!code.equals("200")) { + //审核失败，数据有问题 + workFlow.setAuditStatus(4); + workFlow.setAuditText("审核失败"); + flowMapper.updateById(workFlow); + log.info("工作流审核未通过"); + return; + } // 获取 'conclusion' 字段的值 String conclusion = jsonObject.getString("conclusion"); @@ -150,14 +166,31 @@ public class WorkFlowServiceImpl extends ServiceImpl i List workFlowVersionList = requestWorkFlow.getWorkFlowVersionList(); - if (workFlowVersionList != null){ + if (workFlowVersionList != null) { //审核版本 for (WorkFlowVersion workFlowVersion : workFlowVersionList) { + + //判断是否删除 + if (workFlowVersion.getDelFlag().equals("2")) { + //不做审核 + log.info("删除工作流版本信息,不做审核校验"); + continue; + } + workFlowVersion.setWorkFlowId(workFlow.getId()); //版本名称 String s1 = BaiduCensor.TextCensor(workFlowVersion.getVersionName() + "," + workFlowVersion.getVersionDescription()); // 解析 JSON 字符串 JSONObject jsonObject1 = JSONObject.parseObject(s1); + String code = jsonObject1.getString("code"); + if (!code.equals("200")) { + //审核失败，数据有问题 + workFlow.setAuditStatus(4); + workFlow.setAuditText("审核失败"); + flowMapper.updateById(workFlow); + log.info("工作流审核未通过"); + return; + } // 获取 'conclusion' 字段的值 String conclusion1 = jsonObject1.getString("conclusion"); if (conclusion1.equals("不合规")) { @@ -175,16 +208,21 @@ public class WorkFlowServiceImpl extends ServiceImpl i } // 使用逗号拼接所有的失败原因 String concatenatedReasons = String.join(", ", failureReasons); - workFlowVersion.setAuditText(concatenatedReasons); - workFlowVersion.setAuditStatus(4); - //校验id是否存在 区别修改审核或者新增审核 - if (workFlowVersion.getId() != null){ - workFlowVersionMapper.updateById(workFlowVersion); - }else { - workFlowVersionMapper.updateByName(workFlowVersion); - } - log.info("版本审核未通过"); - continue; + workFlow.setAuditText(concatenatedReasons); + + //修改状态以及失败原因 + workFlow.setAuditStatus(4); + flowMapper.updateById(workFlow); +// workFlowVersion.setAuditText(concatenatedReasons); +// workFlowVersion.setAuditStatus(4); +// //校验id是否存在 区别修改审核或者新增审核 +// if (workFlowVersion.getId() != null){ +// workFlowVersionMapper.updateById(workFlowVersion); +// }else { +// workFlowVersionMapper.updateByName(workFlowVersion); +// } + log.info("版本审核文字未通过"); + return; } //审核版本图片 @@ -192,6 +230,15 @@ public class WorkFlowServiceImpl extends ServiceImpl i for (String path : split) { String s2 = BaiduCensor.ImageCnesor(path); JSONObject jsonObject2 = JSONObject.parseObject(s2); + String code1 = jsonObject2.getString("code"); + if (!code1.equals("200")) { + //审核失败，数据有问题 + workFlow.setAuditStatus(4); + workFlow.setAuditText("审核失败"); + flowMapper.updateById(workFlow); + log.info("工作流审核未通过"); + return; + } if (jsonObject2.getString("conclusion").equals("不合规")) { //修改状态->跳出循环 判断下一个版本 @@ -207,24 +254,34 @@ public class WorkFlowServiceImpl extends ServiceImpl i } // 使用逗号拼接所有的失败原因 String concatenatedReasons = String.join(", ", failureReasons); - workFlowVersion.setAuditText(concatenatedReasons); - workFlowVersion.setAuditStatus(4); - //校验id是否存在 区别修改审核或者新增审核 - if (workFlowVersion.getId() != null){ - workFlowVersionMapper.updateById(workFlowVersion); - }else { - workFlowVersionMapper.updateByName(workFlowVersion); - } - log.info("图片审核未通过"); - break; + workFlow.setAuditText(concatenatedReasons); + + //修改状态以及失败原因 + workFlow.setAuditStatus(4); + flowMapper.updateById(workFlow); +// workFlowVersion.setAuditText(concatenatedReasons); +// workFlowVersion.setAuditStatus(4); +// //校验id是否存在 区别修改审核或者新增审核 +// if (workFlowVersion.getId() != null){ +// workFlowVersionMapper.updateById(workFlowVersion); +// }else { +// workFlowVersionMapper.updateByName(workFlowVersion); +// } + log.info("工作流图片审核未通过"); + return; } } //修改版本成功审核状态 +// workFlow.setAuditText(""); +// workFlowVersion.setAuditStatus(1); +// workFlowVersionMapper.updateByName(workFlowVersion); +// log.info("全部通过审核"); + + //修改为合格 workFlow.setAuditText(""); - workFlowVersion.setAuditStatus(1); - workFlowVersionMapper.updateByName(workFlowVersion); - log.info("全部通过审核"); + workFlow.setAuditStatus(workFlow.getJurisdiction()); + flowMapper.updateById(workFlow); } } @@ -245,6 +302,10 @@ public class WorkFlowServiceImpl extends ServiceImpl i // flowMapper.updateWorkFlow(requestWorkFlow.getWorkFlow()); flowMapper.updateById(requestWorkFlow.getWorkFlow()); } + if (workFlows.getDelFlag().equals("2")){ + + return; + } //修改工作流版本的信息 if (requestWorkFlow.getWorkFlowVersionList().size() != 0) { @@ -253,7 +314,13 @@ public class WorkFlowServiceImpl extends ServiceImpl i for (WorkFlowVersion workFlowVersion : requestWorkFlow.getWorkFlowVersionList()) { workFlowVersion.setAuditStatus(3); // workFlowVersionMapper.updateWorkFlowVersion(workFlowVersion); - workFlowVersionMapper.updateById(workFlowVersion); + if (workFlowVersion.getId() != null){ + workFlowVersionMapper.updateById(workFlowVersion); + }else { + workFlowVersion.setWorkFlowId(workFlows.getId()); + workFlowVersionMapper.insert(workFlowVersion); + } + } WorkFlow workFlow = WorkFlow.builder().id(requestWorkFlow.getWorkFlowVersionList().get(0).getWorkFlowId()) @@ -297,28 +364,24 @@ public class WorkFlowServiceImpl extends ServiceImpl i } @Override - public AjaxResult selectWorkFlowById(Long id,Integer type) { + public AjaxResult selectWorkFlowById(Long id) { //查询详情 WorkFlow workFlow = flowMapper.selectById(id); - if (workFlow == null){ + if (workFlow == null) { return AjaxResult.error("工作流不存在"); } - if (type == 1){ - - //类别 - if (StringUtils.isNotEmpty(workFlow.getType())) { - ArrayList strings = new ArrayList<>(); - String[] split = workFlow.getType().split(","); - for (String s : split) { - if (s != "") { - strings.add(DictInit.getDictValue(DictConstants.WORK_FLOW_TYPE_CHILD, s)); - } + //类别 + if (StringUtils.isNotEmpty(workFlow.getType())) { + ArrayList strings = new ArrayList<>(); + String[] split = workFlow.getType().split(","); + for (String s : split) { + if (s != "") { + strings.add(DictInit.getDictValue(DictConstants.WORK_FLOW_TYPE_CHILD, s)); } - workFlow.setTypeList(strings); } - + workFlow.setTypeList(strings); } return AjaxResult.success(workFlow); @@ -340,11 +403,11 @@ public class WorkFlowServiceImpl extends ServiceImpl i page.addOrder(orderItemList); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(imagePageRes.getStatus() != null && imagePageRes.getStatus() != 0 , WorkFlow::getAuditStatus, imagePageRes.getStatus()) + lqw.eq(imagePageRes.getStatus() != null && imagePageRes.getStatus() != 0, WorkFlow::getAuditStatus, imagePageRes.getStatus()) .eq(WorkFlow::getUserId, SecurityUtils.getUserId()) .ge(imagePageRes.getStartTime() != null, WorkFlow::getCreateTime, imagePageRes.getStartTime()) .le(imagePageRes.getEndTime() != null, WorkFlow::getCreateTime, imagePageRes.getEndTime()) - .eq(WorkFlow::getDelFlag,0); + .eq(WorkFlow::getDelFlag, 0); baseMapper.selectPage(page, lqw); // 获取分页数据 @@ -380,7 +443,7 @@ public class WorkFlowServiceImpl extends ServiceImpl i @Override public void setworkFlowTop(Long id, boolean isTop) { - flowMapper.setworkFlowTop(id,isTop?1:0); + flowMapper.setworkFlowTop(id, isTop ? 1 : 0); } @Override @@ -388,5 +451,39 @@ public class WorkFlowServiceImpl extends ServiceImpl i return flowMapper.fetchWorkFlowSortedByTopStatus(); } + @Override + public Long selectWorkFlowByName(String name) { + + LambdaQueryWrapper workFlowLambdaQueryWrapper = new LambdaQueryWrapper<>(); + + workFlowLambdaQueryWrapper.eq(WorkFlow::getWorkflowName, name); + workFlowLambdaQueryWrapper.eq(WorkFlow::getDelFlag, 0); + return baseMapper.selectCount(workFlowLambdaQueryWrapper); + } + + @Override + public AjaxResult selectWorkFlowVersionById(Long id) { + + RequestWorkFlow requestWorkFlow = new RequestWorkFlow(); + WorkFlow workFlow = baseMapper.selectById(id); + if (workFlow == null){ + + return AjaxResult.error("数据不存在"); + } + + if (workFlow.getDelFlag() == 2){ + + return AjaxResult.error("数据不存在"); + } + + LambdaQueryWrapper workFlowVersionLambdaQueryWrapper = new LambdaQueryWrapper<>(); + workFlowVersionLambdaQueryWrapper.eq(WorkFlowVersion::getWorkFlowId,id); + workFlowVersionLambdaQueryWrapper.eq(WorkFlowVersion::getDelFlag,0); + List workFlowVersions = workFlowVersionMapper.selectList(workFlowVersionLambdaQueryWrapper); + requestWorkFlow.setWorkFlow(workFlow); + requestWorkFlow.setWorkFlowVersionList(workFlowVersions); + return AjaxResult.success(requestWorkFlow); + } + } diff --git a/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java b/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java index 893f970..5155700 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java +++ b/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java @@ -138,4 +138,8 @@ public interface SysUserMapper List listByIds(List userIdList); + List selectUserPage(@Param("userId") Long userId); + + List selectToUserPage(@Param("userId") Long userId); + } diff --git a/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml b/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml index 83fb171..7b41522 100644 --- a/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -167,6 +167,20 @@ + + + + insert into sys_user( user_id,