Merge branch 'feature/admin' into preview

feature/my-invitation
Diyu0904 2025-01-13 11:46:41 +08:00
commit 821dce5654
11 changed files with 261 additions and 13 deletions

View File

@ -2,11 +2,11 @@ package com.mcwl.web.controller.resource;
import com.mcwl.common.core.controller.BaseController;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.service.impl.WorkFlowServiceImpl;
import com.mcwl.web.controller.common.OssUtil;
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -25,9 +25,10 @@ import org.springframework.web.multipart.MultipartFile;
public class WorkFlowController extends BaseController {
@Autowired
private WorkFlowServiceImpl workFlowService;
/***
*
*
* @param file
* @return
@ -39,7 +40,6 @@ public class WorkFlowController extends BaseController {
return AjaxResult.success(s);
}
/***
*
* zip
@ -53,8 +53,6 @@ public class WorkFlowController extends BaseController {
}
/***
*
* zip
@ -68,6 +66,17 @@ public class WorkFlowController extends BaseController {
}
// @PostMapping("/add")
// public AjaxResult
@PostMapping("/addWorkFlow")
public AjaxResult addWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow){
return workFlowService.addWorkFlow(requestWorkFlow);
}
@PostMapping("/updateWorkFlow")
public AjaxResult updateWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow){
workFlowService.updateWorkFlow(requestWorkFlow);
return AjaxResult.success("修改成功");
}
}

View File

@ -56,4 +56,29 @@ public class WorkFlow {
*/
private String del_flag;
/**
* 0 1- 2- 3 4
*/
private Integer auditStatus = 0;
/**
*
*/
private String auditText;
/**
*
*/
private String authorName;
/**
* 使
*/
private Long useNumber = 0L;
/**
*
*/
private Long downloadNumber = 0L;
}

View File

@ -44,9 +44,74 @@ public class WorkFlowVersion {
/**
*
*/
private String hideGenInfo;
private Integer hideGenInfo;
/**
* 0 2
*/
private String delFlag;
/**
* 0 1- 2- 3 4
*/
private Integer auditStatus = 0;
/**
*
*/
private String auditText;
/**
* ID
*/
private Long workFlowId;
/**
*
*/
private Integer basicModel;
/**
*
*/
private Integer jurisdiction;
/**
*使(0 1
*/
private Integer itselfUse;
/**
* 使(0 1)
*/
private Integer subordinateUse;
/**
* (0 1)
*/
private Integer download;
/**
* (0 1)
*/
private Integer fuse;
/**
* (0 1)
*/
private Integer sell;
/**
* (0 1)
*/
private Integer fuseSell;
/**
* (0 1)
*/
private Integer exclusive;
/**
*
*/
private String fileName;
}

View File

@ -0,0 +1,29 @@
package com.mcwl.resource.domain.request;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.WorkFlowVersion;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* +
* @author DaiZibo
* @date 2025/1/9
* @apiNote
*/
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Data
public class RequestWorkFlow {
private WorkFlow workFlow;
private List<WorkFlowVersion> workFlowVersionList;
}

View File

@ -14,5 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface WorkFlowMapper extends BaseMapper<WorkFlow> {
void updateWorkFlow(WorkFlow workFlow);
}

View File

@ -1,8 +1,12 @@
package com.mcwl.resource.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mcwl.resource.domain.WorkFlow;
import com.mcwl.resource.domain.WorkFlowVersion;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
@ -13,4 +17,9 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface WorkFlowVersionMapper extends BaseMapper<WorkFlowVersion> {
void addWorkFlowVersion(@Param("workFlow") WorkFlow workFlow, @Param("list") List<WorkFlowVersion> workFlowVersionList);
void updateWorkFlowVersion(WorkFlowVersion workFlowVersion);
}

View File

@ -1,5 +1,8 @@
package com.mcwl.resource.service;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.resource.domain.request.RequestWorkFlow;
/**
*
* @author DaiZibo
@ -8,4 +11,8 @@ package com.mcwl.resource.service;
*/
public interface WorkFlowService {
AjaxResult addWorkFlow(RequestWorkFlow requestWorkFlow);
void updateWorkFlow(RequestWorkFlow requestWorkFlow);
}

View File

@ -1,6 +1,13 @@
package com.mcwl.resource.service.impl;
import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.resource.domain.WorkFlowVersion;
import com.mcwl.resource.domain.request.RequestWorkFlow;
import com.mcwl.resource.mapper.WorkFlowMapper;
import com.mcwl.resource.mapper.WorkFlowVersionMapper;
import com.mcwl.resource.service.WorkFlowService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@ -10,8 +17,48 @@ import org.springframework.stereotype.Service;
* @apiNote
*/
@Slf4j
@Service
public class WorkFlowServiceImpl implements WorkFlowService {
@Autowired
private WorkFlowMapper flowMapper;
@Autowired
private WorkFlowVersionMapper workFlowVersionMapper;
@Override
public AjaxResult addWorkFlow(RequestWorkFlow requestWorkFlow) {
//添加模型表数据
flowMapper.insert(requestWorkFlow.getWorkFlow());
log.info("获取到的入参:{}",requestWorkFlow.getWorkFlow());
//批量添加版本
workFlowVersionMapper.addWorkFlowVersion(requestWorkFlow.getWorkFlow(),requestWorkFlow.getWorkFlowVersionList());
return AjaxResult.success("添加成功,等待审核");
}
@Override
public void updateWorkFlow(RequestWorkFlow requestWorkFlow) {
//修改工作流的信息
if (requestWorkFlow.getWorkFlow().getId() != null){
requestWorkFlow.getWorkFlow().setAuditStatus(3);
flowMapper.updateWorkFlow(requestWorkFlow.getWorkFlow());
}
//修改工作流版本的信息
if (requestWorkFlow.getWorkFlowVersionList().size() != 0){
//批量修改
for (WorkFlowVersion workFlowVersion : requestWorkFlow.getWorkFlowVersionList()) {
workFlowVersion.setAuditStatus(3);
workFlowVersionMapper.updateWorkFlowVersion(workFlowVersion);
}
}
}
}

View File

@ -1,6 +1,6 @@
package com.mcwl.resource.service.impl;
import com.mcwl.resource.service.WorkFlowService;
import com.mcwl.resource.service.WorkFlowVersionService;
import org.springframework.stereotype.Service;
/**
@ -11,6 +11,6 @@ import org.springframework.stereotype.Service;
*/
@Service
public class WorkFlowVersionServiceImpl implements WorkFlowService {
public class WorkFlowVersionServiceImpl implements WorkFlowVersionService {
}

View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.resource.mapper.WorkFlowMapper">
<update id="updateWorkFlow">
UPDATE work_flow
<set>
<if test="workflowName != null and workflowName != ''">
workflow_name = #{workflowName},
</if>
<if test="category != null and category != ''">
category = #{category},
</if>
<if test="theme != null and theme != ''">
theme = #{theme},
</if>
<if test="style != null and style != ''">
style = #{style},
</if>
<if test="functions != null and functions != ''">
functions = #{functions},
</if>
<if test="activityParticipation != null">
activity_participation = #{activityParticipation}
</if>
<if test="auditStatus != null and auditStatus != ''">
audit_status = #{auditStatus}
</if>
</set>
WHERE id = #{id}
</update>
</mapper>

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mcwl.resource.mapper.WorkFlowVersionMapper">
<insert id="addWorkFlowVersion">
INSERT INTO work_flow_version (version_name,version_description,file_path,image_paths,hide_gen_info,del_flag,
audit_status,work_flow_id,basic_model,jurisdiction,itself_use,subordinate_use,
download,fuse,sell,fuse_sell,exclusive,file_name)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.versionName}, #{item.versionDescription}, #{item.filePath}, #{item.imagePaths},#{item.hideGenInfo},
0,#{item.auditStatus},#{workFlow.id},#{item.basicModel},#{item.jurisdiction},#{item.itselfUse},
#{item.subordinateUse},#{item.download},#{item.fuse},#{item.sell},#{item.fuseSell},#{item.exclusive},#{item.fileName})
</foreach>
</insert>
<update id="updateWorkFlowVersion">
-- update work_flow_version
</update>
</mapper>