bob
/
RuoYi-flowable-bak
mirror of https://gitee.com/libobio/RuoYi-flowable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

联调
continuous-integration/drone/push Build is passing Details

Browse Source
飞书小程序
YXY 1 year ago
parent 5daed4d743
commit 8bf5f6f38e
9 changed files with 163 additions and 95 deletions
Show Stats Download Patch File Download Diff File

16
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/controller/LarkActiveController.java
Unescape View File

@ -21,8 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.util.Date;
import java.util.Enumeration;
import java.util.List;
@Slf4j
@ -64,8 +66,8 @@ public class LarkActiveController extends BaseController {
/**
* 通过活动id查询 活动明细
*/
@PostMapping("/getAcitveById")
public ResponseVo<LarkActiveVo> getAcitveById(@RequestBody LarkActiveRequest request) {
@PostMapping("/getAcitveByName")
public ResponseVo<LarkActiveVo> getAcitveByName(@RequestBody LarkActiveRequest request) {
LarkActive larkActive = larkActiveService.getActiveInfo(request);
return new ResponseVo(larkActive);
}
@ -74,11 +76,11 @@ public class LarkActiveController extends BaseController {
* 上传活动图片
*/
@PostMapping("/uploadActiveFile")
public ResponseVo<LarkUserActiveRelatoin> uploadActiveFile(@RequestParam("file") MultipartFile file,@RequestParam("userName")String userName,@RequestParam("larkActiveId") Long larkActiveId) {
public ResponseVo<LarkUserActiveRelatoin> uploadActiveFile(@RequestParam("file") MultipartFile file,@RequestParam("userName")String userName,@RequestParam("larkActiveName") String larkActiveName) {
LarkActiveUserRelationRequest request = new LarkActiveUserRelationRequest();
request.setFile(file);
request.setUserName(userName);
request.setLarkActiveId(larkActiveId);
request.setLarkActiveName(larkActiveName);
return larkUserActiveRelatoinService.commitFile(request);
}
@ -87,8 +89,8 @@ public class LarkActiveController extends BaseController {
*/
@PostMapping("/queryCompleteActiveList")
public ResponseVo<String> queryCompleteActiveList(@RequestBody LarkActiveRequest request) {
List<String> list = larkActiveService.queryCompleteActiveUserName(request.getCompanyName());
return new ResponseVo(list);
String nameList = larkActiveService.queryCompleteActiveUserName(request.getCompanyName());
return new ResponseVo(nameList);
}
/**
@ -105,7 +107,7 @@ public class LarkActiveController extends BaseController {
* 查询邀请的top 10的人的信息
*/
@PostMapping("/queryInviteTopTen")
public ResponseVo<LarkUserActiveInviteRelatoin> queryInviteTopTen(LarkUserActiveInviteRelatoin request) {
public ResponseVo<LarkUserActiveInviteRelatoin> queryInviteTopTen(@RequestBody LarkUserActiveInviteRelatoin request) {
List<LarkUserActiveInviteRelatoin> larkUserActiveInviteRelatoins = larkUserActiveInviteRelatoinService.queryTopTen(request);
return new ResponseVo(larkUserActiveInviteRelatoins);
}

4
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveRequest.java
Unescape View File

@ -2,6 +2,7 @@ package com.ruoyi.flyingbook.domain.larkactive;
import com.ruoyi.common.core.domain.LarkActiveBaseRequestVo;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@ -13,8 +14,9 @@ import java.util.List;
public class LarkActiveRequest extends LarkActiveBaseRequestVo {
private String companyName;
private MultipartFile file;
private Long larkActiveId;
private String larkActiveName;
private List<Long> larkActiveIdList;
private String userName;

2
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkActiveUserRelationRequest.java
Unescape View File

@ -15,7 +15,7 @@ public class LarkActiveUserRelationRequest extends LarkActiveBaseRequestVo {
private String companyName;
private Long larkActiveId;
private String larkActiveName;
private String userName;

3
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkActiveMapper.java
Unescape View File

@ -2,6 +2,7 @@ package com.ruoyi.flyingbook.mapper;
import com.ruoyi.flyingbook.domain.LarkActive;
import com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@ -19,6 +20,7 @@ public interface LarkActiveMapper {
* @return 【请填写功能名称】
*/
public LarkActive selectLarkActiveById(Long id);
public List<LarkActive> selectLarkActiveByName(@RequestParam("activeName") String activeName,@RequestParam("flag") Long flag);
/**
* 查询【请填写功能名称】列表
@ -29,6 +31,7 @@ public interface LarkActiveMapper {
public List<LarkActive> selectLarkActiveList(LarkActive larkActive);
public Integer count(LarkActive larkActive);
public List<LarkActive> queryPage(LarkActiveRequest request);
public List<LarkActive> queryActive(LarkActiveRequest larkActive);
public List<LarkActive> queryCompleteActive(LarkActiveRequest larkActive);
/**
* 新增【请填写功能名称】

2
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/ILarkActiveService.java
Unescape View File

@ -33,7 +33,7 @@ public interface ILarkActiveService {
public List<LarkActive> selectLarkActiveList(LarkActive larkActive);
ResponseVo<LarkActive> queryPage(LarkActiveRequest request);
public List<String> queryCompleteActiveUserName(String companyName);
public String queryCompleteActiveUserName(String companyName);
public List<LarkActive> queryCompleteActiveByUserName(LarkActiveRequest larkActive);
/**

19
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkActiveServiceImpl.java
Unescape View File

@ -47,18 +47,21 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
@Override
public LarkActiveVo getActiveInfo(LarkActiveRequest request) {
LarkActiveVo result = new LarkActiveVo();
if (request == null || request.getLarkActiveId() == null){
if (request == null || StringUtils.isBlank(request.getLarkActiveName()) || StringUtils.isBlank(request.getUserName())){
return result;
}
LarkActive larkActive = larkActiveMapper.selectLarkActiveById(request.getLarkActiveId());
if (larkActive != null){
BeanUtils.copyProperties(larkActive,result);
List<LarkActive> larkActiveList = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(),FlagStatus.OK.getCode());
if (CollectionUtils.isEmpty(larkActiveList)){
return result;
}
LarkActive active = larkActiveList.get(0);
BeanUtils.copyProperties(active,result);
if (StringUtils.isNotBlank(request.getUserName())){
LarkUserActiveRelatoin relatoin = new LarkUserActiveRelatoin();
relatoin.setFlag(FlagStatus.OK.getCode());
relatoin.setActiveId(request.getLarkActiveId());
relatoin.setActiveId(active.getId());
relatoin.setUserName(request.getUserName());
List<LarkUserActiveRelatoin> larkUserActiveRelatoins = larkUserActiveRelatoinMapper.selectLarkUserActiveRelatoinList(relatoin);
result.setComplete(CollectionUtils.isNotEmpty(larkUserActiveRelatoins));
@ -94,15 +97,17 @@ public class LarkActiveServiceImpl implements ILarkActiveService {
}
@Override
public List<String> queryCompleteActiveUserName(String companyName) {
public String queryCompleteActiveUserName(String companyName) {
LarkActive larkActive = new LarkActive();
larkActive.setFlag(FlagStatus.OK.getCode());
Integer count = larkActiveMapper.count(larkActive);
return larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count,companyName);
List<String> nameList = larkUserActiveRelatoinMapper.queryCompleteActiveUserName(count, companyName);
return String.join(",",nameList);
}
@Override
public List<LarkActive> queryCompleteActiveByUserName(LarkActiveRequest larkActive) {
larkActive.setFlag(FlagStatus.OK.getCode());
return larkActiveMapper.queryCompleteActive(larkActive);
}

9
ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveRelatoinServiceImpl.java
Unescape View File

@ -79,7 +79,7 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi
LarkActiveRequest query = new LarkActiveRequest();
query.setFlag(FlagStatus.OK.getCode());
query.setLarkActiveIdList(activeIdList);
Map<Long, LarkActive> activeMap = larkActiveMapper.queryCompleteActive(query).stream().collect(Collectors.toMap(LarkActive::getId, Function.identity(), (k1, k2) -> k1));
Map<Long, LarkActive> activeMap = larkActiveMapper.queryActive(query).stream().collect(Collectors.toMap(LarkActive::getId, Function.identity(), (k1, k2) -> k1));
for (LarkActiveVo activeCountVo : larkActiveCountVos) {
LarkActive larkActive = activeMap.get(activeCountVo.getId());
if (larkActive != null) {
@ -128,7 +128,12 @@ public class LarkUserActiveRelatoinServiceImpl implements ILarkUserActiveRelatoi
String key = String.format("%s_%s", split[0], System.currentTimeMillis());
split[0] = key;
key = String.join(".", split);
LarkUserActiveRelatoin relatoin = queryUserActiveRelation(request.getUserName(), request.getLarkActiveId());
List<LarkActive> larkActives = larkActiveMapper.selectLarkActiveByName(request.getLarkActiveName(), FlagStatus.OK.getCode());
if (CollectionUtils.isEmpty(larkActives)){
return new ResponseVo();
}
LarkActive active = larkActives.get(0);
LarkUserActiveRelatoin relatoin = queryUserActiveRelation(request.getUserName(), active.getId());
if (relatoin == null) {
return new ResponseVo();
}

191
ruoyi-flyingbook/src/main/resources/mapper/LarkActiveMapper.xml
Unescape View File

@ -1,108 +1,157 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.flyingbook.mapper.LarkActiveMapper">
<resultMap type="com.ruoyi.flyingbook.domain.LarkActive" id="LarkActiveResult">
<result property="id" column="id" />
<result property="companyId" column="company_id" />
<result property="companyName" column="company_name" />
<result property="activeName" column="active_name" />
<result property="activeDesc" column="active_desc" />
<result property="activeContent" column="active_content" />
<result property="activeImageUrl" column="active_image_url" />
<result property="activeType" column="active_type" />
<result property="activeScore" column="active_score" />
<result property="activeImageCount" column="active_image_count" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="flag" column="flag" />
<result property="remark" column="remark" />
<result property="id" column="id"/>
<result property="companyId" column="company_id"/>
<result property="companyName" column="company_name"/>
<result property="activeName" column="active_name"/>
<result property="activeDesc" column="active_desc"/>
<result property="activeContent" column="active_content"/>
<result property="activeImageUrl" column="active_image_url"/>
<result property="activeType" column="active_type"/>
<result property="activeScore" column="active_score"/>
<result property="activeImageCount" column="active_image_count"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="flag" column="flag"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectLarkActiveVo">
select id, company_id, company_name, active_name, active_desc, active_content, active_image_url, active_type, active_score,active_image_count, create_by, create_time, update_by, update_time, flag, remark from lark_active
select id,
company_id,
company_name,
active_name,
active_desc,
active_content,
active_image_url,
active_type,
active_score,
active_image_count,
create_by,
create_time,
update_by,
update_time,
flag,
remark
from lark_active
</sql>
<select id="selectLarkActiveList" parameterType="com.ruoyi.flyingbook.domain.LarkActive" resultMap="LarkActiveResult">
<select id="selectLarkActiveList" parameterType="com.ruoyi.flyingbook.domain.LarkActive"
resultMap="LarkActiveResult">
<include refid="selectLarkActiveVo"/>
<where>
<if test="companyId != null "> and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
<if test="activeName != null and activeName != ''"> and active_name like concat('%', #{activeName}, '%')</if>
<if test="activeDesc != null and activeDesc != ''"> and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''"> and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''"> and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''"> and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''"> and active_score = #{activeScore}</if>
<if test="activeImageCount != null "> and active_image_count = #{activeImageCount}</if>
<if test="flag != null "> and flag = #{flag}</if>
<if test="companyId != null ">and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''">and company_name like concat('%', #{companyName},
'%')
</if>
<if test="activeName != null and activeName != ''">and active_name like concat('%', #{activeName}, '%')
</if>
<if test="activeDesc != null and activeDesc != ''">and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''">and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''">and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''">and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''">and active_score = #{activeScore}</if>
<if test="activeImageCount != null ">and active_image_count = #{activeImageCount}</if>
<if test="flag != null ">and flag = #{flag}</if>
</where>
</select>
<select id="count" parameterType="com.ruoyi.flyingbook.domain.LarkActive" resultType="java.lang.Integer">
select count(id) from lark_active
<where>
<if test="companyId != null "> and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
<if test="activeName != null and activeName != ''"> and active_name like concat('%', #{activeName}, '%')</if>
<if test="activeDesc != null and activeDesc != ''"> and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''"> and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''"> and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''"> and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''"> and active_score = #{activeScore}</if>
<if test="activeImageCount != null "> and active_image_count = #{activeImageCount}</if>
<if test="flag != null "> and flag = #{flag}</if>
<if test="companyId != null ">and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''">and company_name like concat('%', #{companyName},
'%')
</if>
<if test="activeName != null and activeName != ''">and active_name like concat('%', #{activeName}, '%')
</if>
<if test="activeDesc != null and activeDesc != ''">and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''">and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''">and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''">and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''">and active_score = #{activeScore}</if>
<if test="activeImageCount != null ">and active_image_count = #{activeImageCount}</if>
<if test="flag != null ">and flag = #{flag}</if>
</where>
</select>
<select id="queryPage" parameterType="com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest" resultMap="LarkActiveResult">
<select id="queryPage" parameterType="com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest"
resultMap="LarkActiveResult">
<include refid="selectLarkActiveVo"/>
<where>
<if test="companyId != null "> and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
<if test="activeName != null and activeName != ''"> and active_name like concat('%', #{activeName}, '%')</if>
<if test="activeDesc != null and activeDesc != ''"> and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''"> and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''"> and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''"> and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''"> and active_score = #{activeScore}</if>
<if test="activeImageCount != null "> and active_image_count = #{activeImageCount}</if>
<if test="flag != null "> and flag = #{flag}</if>
<if test="companyId != null ">and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''">and company_name like concat('%', #{companyName},
'%')
</if>
<if test="activeName != null and activeName != ''">and active_name like concat('%', #{activeName}, '%')
</if>
<if test="activeDesc != null and activeDesc != ''">and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''">and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''">and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''">and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''">and active_score = #{activeScore}</if>
<if test="activeImageCount != null ">and active_image_count = #{activeImageCount}</if>
<if test="flag != null ">and flag = #{flag}</if>
</where>
limit #{offset},{pageSize}
</select>
<select id="queryCompleteActive" parameterType="com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest" resultMap="LarkActiveResult">
<select id="queryActive" parameterType="com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest"
resultMap="LarkActiveResult">
<include refid="selectLarkActiveVo"/>
<where>
<if test="companyId != null "> and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
<if test="activeName != null and activeName != ''"> and active_name like concat('%', #{activeName}, '%')</if>
<if test="activeDesc != null and activeDesc != ''"> and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''"> and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''"> and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''"> and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''"> and active_score = #{activeScore}</if>
<if test="activeImageCount != null "> and active_image_count = #{activeImageCount}</if>
<if test="flag != null "> and flag = #{flag}</if>
<if test="companyId != null ">and company_id = #{companyId}</if>
<if test="companyName != null and companyName != ''">and company_name like concat('%', #{companyName},
'%')
</if>
<if test="activeName != null and activeName != ''">and active_name like concat('%', #{activeName}, '%')
</if>
<if test="activeDesc != null and activeDesc != ''">and active_desc = #{activeDesc}</if>
<if test="activeContent != null and activeContent != ''">and active_content = #{activeContent}</if>
<if test="activeImageUrl != null and activeImageUrl != ''">and active_image_url = #{activeImageUrl}</if>
<if test="activeType != null and activeType != ''">and active_type = #{activeType}</if>
<if test="activeScore != null and activeScore != ''">and active_score = #{activeScore}</if>
<if test="activeImageCount != null ">and active_image_count = #{activeImageCount}</if>
<if test="flag != null ">and flag = #{flag}</if>
<if test="larkActiveIdList != null ">
and id in <foreach collection="larkActiveIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
and id in
<foreach collection="larkActiveIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</select>
<select id="queryCompleteActive" parameterType="com.ruoyi.flyingbook.domain.larkactive.LarkActiveRequest"
resultMap="LarkActiveResult">
SELECT la.*
from lark_user_active_relatoin r
LEFT JOIN lark_active la on r.active_id = la.id
where r.user_name = #{userName}
and la.company_name = #{companyName}
and r.flag = #{flag}
and la.flag = #{flag}
</select>
<select id="selectLarkActiveById" parameterType="Long" resultMap="LarkActiveResult">
<include refid="selectLarkActiveVo"/>
where id = #{id}
</select>
<insert id="insertLarkActive" parameterType="com.ruoyi.flyingbook.domain.LarkActive" useGeneratedKeys="true" keyProperty="id">
<select id="selectLarkActiveByName" resultMap="LarkActiveResult">
<include refid="selectLarkActiveVo"/>
where activeName = #{activeName} and flag = #{flag}
</select>
<insert id="insertLarkActive" parameterType="com.ruoyi.flyingbook.domain.LarkActive" useGeneratedKeys="true"
keyProperty="id">
insert into lark_active
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="companyId != null">company_id,</if>
@ -120,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="flag != null">flag,</if>
<if test="remark != null">remark,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="companyId != null">#{companyId},</if>
<if test="companyName != null">#{companyName},</if>
@ -137,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="flag != null">#{flag},</if>
<if test="remark != null">#{remark},</if>
</trim>
</trim>
</insert>
<update id="updateLarkActive" parameterType="com.ruoyi.flyingbook.domain.LarkActive">
@ -163,7 +212,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteLarkActiveById" parameterType="Long">
delete from lark_active where id = #{id}
delete
from lark_active
where id = #{id}
</delete>
<delete id="deleteLarkActiveByIds" parameterType="String">

2
ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveRelatoinMapper.xml
Unescape View File

@ -123,7 +123,7 @@
from lark_user_active_relatoin
where company_name = #{companyName}
GROUP BY user_name
HAVING total > #{count}
HAVING total >= #{count}
</select>
<select id="selectLarkUserActiveRelatoinById" parameterType="Long" resultMap="LarkUserActiveRelatoinResult">

Write Preview
Loading…
Cancel
Save