Merge remote-tracking branch 'origin/master'

zhaolianjie
Commit 0755e32e authored Oct 16, 2022 by zhaolianjie
Showing 6 changed files with 52 additions and 26 deletions
src/main/java/com/pipihelper/project/feishu/controller/FeiShuEventController.java
src/main/java/com/pipihelper/project/feishu/dao/PainDao.java
src/main/java/com/pipihelper/project/feishu/entity/Pain.java
src/main/java/com/pipihelper/project/feishu/service/PainService.java
src/main/java/com/pipihelper/project/feishu/service/massage/MassageService.java
src/main/resources/mybatis/PainMapper.xml
--- a/src/main/java/com/pipihelper/project/feishu/controller/FeiShuEventController.java
+++ b/src/main/java/com/pipihelper/project/feishu/controller/FeiShuEventController.java
 package com.pipihelper.project.feishu.controller;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -23,7 +22,6 @@ import com.pipihelper.project.feishu.service.massage.MassageMsgCardSerivce;
 import com.pipihelper.project.feishu.service.massage.MassageService;
 import com.pipihelper.project.feishu.utils.FeiShuEventDataDecrypter;
 import com.pipihelper.project.utils.CacheUtil;
-import jdk.nashorn.internal.ir.CatchNode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -108,7 +106,7 @@ public class FeiShuEventController {
                // 都需要返回 不能点击的卡片json
                if ("revice".equals(actionTypeSecond)) {
                    // 接受按摩
-                    String fileName = String.format("/templates/massage-singel-msg-card-end.json.json");
+                    String fileName = String.format("/templates/massage-singel-msg-card-end.json");
                    return getInteractiveCardStr(fileName, "感谢支持");
                } else if ("giveUp".equals(actionTypeSecond)) {
@@ -116,11 +114,11 @@ public class FeiShuEventController {
                    FeiShuMsgDTO feiShuMsgDTO = new FeiShuMsgDTO();
                    feiShuMsgDTO.setMsgType("interactive");
                    feiShuMsgDTO.setReceiveId(feiShuConfig.getChatId());
-                    String fileName = String.format("/templates/massage-msg-card-rob.json.json");
+                    String fileName = String.format("/templates/massage-msg-card-rob.json");
                    String msgCardContent = String.format(massageMsgCardSerivce.getInteractiveCardStr(fileName), feiShuMsgCardEventDTO.getOpen_id());
                    feiShuMsgDTO.setContent(msgCardContent);
                    feiShuApiService.sendMsg(feiShuMsgDTO, "chat_id");
-                    String fileName1 = String.format("/templates/massage-singel-msg-card-end.json.json");
+                    String fileName1 = String.format("/templates/massage-singel-msg-card-end.json");
                    return getInteractiveCardStr(fileName1, "遗憾放弃");
                } else if ("wait".equals(actionTypeSecond)) {
@@ -131,7 +129,7 @@ public class FeiShuEventController {
                    massageService.updateMassageMsgCardToPiPiChat(feiShuConfig.getChatId());
                    //没有按摩群的id
 //                    massageService.updateMassageMsgCardToPiPiChat();
-                    String fileName1 = String.format("/templates/massage-singel-msg-card-end.json.json");
+                    String fileName1 = String.format("/templates/massage-singel-msg-card-end.json");
                    return getInteractiveCardStr(fileName1, "已为你推迟到最后");
                } else if ("rob".equals(actionTypeSecond)) {
                    // 抢名额 -   掉延迟更新卡片接口 更新大群、按摩群的按摩时间安排卡片
@@ -144,14 +142,14 @@ public class FeiShuEventController {
                    Pain oldPain = painService.findByOpenId(endUserId);
                    oldPain.setStatus(2);
                    painService.update(oldPain);
-                    List<Pain> painList = painService.findBackIndex(oldPain.getIndex(), 1);
+                    List<Pain> painList = painService.findBackIndex(oldPain.getPindex(), 1);
                    if (CollectionUtil.isNotEmpty(painList)) {
                        Pain noticePain = CollectionUtil.getFirst(painList);
                        noticePain.setStatus(1);
                        painService.update(noticePain);
                        massageService.updateSingleMassageMsgCardWhenBegin(noticePain.getMessageId());
                    }
-                    String fileName1 = String.format("/templates/massage-singel-msg-card-end.json.json");
+                    String fileName1 = String.format("/templates/massage-singel-msg-card-end.json");
                    return getInteractiveCardStr(fileName1, "欢迎下次光临~");
                }
            default:
@@ -170,7 +168,7 @@ public class FeiShuEventController {
        feiShuChatDTO.setIdList(new String[]{feiShuMsgCardEventDTO.getOpen_id()});
        feiShuApiService.joinChatList(feiShuChatDTO);
        //ToDo 更新大群和按摩群的大卡片，异步
-        String fileName1 = String.format("/templates/massage-msg-card-rob-end.json.json.json");
+        String fileName1 = String.format("/templates/massage-msg-card-rob-end.json");
        return getInteractiveCardStr(fileName1, "已经被抢啦啦啦~");
    }
@@ -237,7 +235,7 @@ public class FeiShuEventController {
            pain.setStatus(0);
            pain.setFloor(Optional.ofNullable(it.getFloor()).orElse(14));
            int increment = i.getAndIncrement();
-            pain.setIndex(increment);
+            pain.setPindex(increment);
            pain.setName(it.getName());
            String departMentName = departmentMap.getOrDefault(it.getDepartmentId(), new FeiShuDepartmentDTO()).getName();
            pain.setDepartMentName(departMentName);

--- a/src/main/java/com/pipihelper/project/feishu/dao/PainDao.java
+++ b/src/main/java/com/pipihelper/project/feishu/dao/PainDao.java
@@ -28,4 +28,6 @@ public interface PainDao {
    List<Pain> findBackIndex(@Param(value = "index") Integer index, @Param(value = "limit") int limit);
    void deleteAllByFloor(int floor);
+    List<Pain> findAllByFloor(int floor);
 }
--- a/src/main/java/com/pipihelper/project/feishu/entity/Pain.java
+++ b/src/main/java/com/pipihelper/project/feishu/entity/Pain.java
@@ -8,7 +8,7 @@ import java.util.Date;
 public class Pain {
    private Integer id;
    private String openId;
-    private Integer index;
+    private Integer pindex;
    private String name;
    private Integer status;
    private Date startTime;

--- a/src/main/java/com/pipihelper/project/feishu/service/PainService.java
+++ b/src/main/java/com/pipihelper/project/feishu/service/PainService.java
 package com.pipihelper.project.feishu.service;
+import cn.hutool.core.collection.CollectionUtil;
 import com.pipihelper.project.feishu.dao.PainDao;
 import com.pipihelper.project.feishu.entity.Pain;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 @Service
@@ -37,6 +40,15 @@ public class PainService {
        return painDao.findAll();
    }
+    public List<Pain> findAllReorderByFloor(int floor) {
+        List<Pain> painList = painDao.findAllByFloor(floor);
+        if (CollectionUtil.isEmpty(painList)) {
+            return new ArrayList<>();
+        }
+        painList.stream().sorted(Comparator.comparing(Pain::getIndex));
+        return new ArrayList<>();
+    }
    public void waitPain(String openId) {
        Pain pain = new Pain();
        pain.setOpenId(openId);
@@ -49,8 +61,8 @@ public class PainService {
        return painDao.findListAsc(limit);
    }
-    public List<Pain> findBackIndex(Integer index,int limit) {
+    public List<Pain> findBackIndex(Integer index, int limit) {
-        return painDao.findBackIndex(index,limit);
+        return painDao.findBackIndex(index, limit);
    }
    public void deleteAllByFloor(int floor) {

--- a/src/main/java/com/pipihelper/project/feishu/service/massage/MassageService.java
+++ b/src/main/java/com/pipihelper/project/feishu/service/massage/MassageService.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.pipihelper.project.feishu.bo.PushPainBO;
 import com.pipihelper.project.feishu.dto.FeiShuConfig;
 import com.pipihelper.project.feishu.dto.msg.FeiShuMsgDTO;
+import com.pipihelper.project.feishu.entity.ChatMessage;
 import com.pipihelper.project.feishu.entity.Pain;
 import com.pipihelper.project.feishu.service.ChatMessageService;
 import com.pipihelper.project.feishu.service.FeiShuApiService;
@@ -76,7 +77,14 @@ public class MassageService {
        feiShuMsgDTO.setContent(content);
        feiShuMsgDTO.setReceiveId(chatId);
        log.info(feiShuMsgDTO.toString());
-        feiShuApiService.sendMsg(feiShuMsgDTO, "chat_id");
+        JSONObject rep = feiShuApiService.sendMsg(feiShuMsgDTO, "chat_id");
+        String messageId = rep.getJSONObject("data").getString("message_id");
+        ChatMessage chatMessage = new ChatMessage();
+        chatMessage.setChatId(chatId);
+        chatMessage.setMessageId(messageId);
+        chatMessage.setType(1);
+        chatMessageService.create(chatMessage);
    }
@@ -96,10 +104,10 @@ public class MassageService {
        for(Pain pain:pains){
            List<String> user = new ArrayList<>();
            //构建给大群发送的名单
-            user.add(pain.getIndex().toString());
+            user.add(pain.getPindex().toString());
            user.add(pain.getName());
            user.add(pain.getDepartMentName());
-            user.add(pain.getTimeRange());
+            user.add("15:00-18:00");
            user.add("");
            pushUser.add(user);
        }

--- a/src/main/resources/mybatis/PainMapper.xml
+++ b/src/main/resources/mybatis/PainMapper.xml
@@ -12,7 +12,7 @@
        <result column="message_id" property="messageId"/>
        <result column="name" property="name"/>
        <result column="depart_ment_name" property="departMentName"/>
-        <result column="index" property="index"/>
+        <result column="pindex" property="pindex"/>
    </resultMap>
    <!-- <resultMap id="BuffConfigResultBOMap" type="com.pipihelper.project.feishu.entity.Deployee"
@@ -20,7 +20,8 @@
     </resultMap>-->
    <sql id="Base_Column_List">
-        id,open_id,start_time,end_time,status,floor,message_id,name,depart_ment_name
+        id
+        ,open_id,start_time,end_time,status,floor,message_id,name,depart_ment_name,`pindex`
    </sql>
    <select id="findById" parameterType="java.lang.Integer" resultMap="PainResultMap">
@@ -37,9 +38,9 @@
        <include refid="Base_Column_List"/>
        from t_pain
        <where>
-            index >= #{index}
+            pindex >= #{pindex}
            and status = 0
-            order by index asc
+            order by pindex asc
            limit #{limit}
        </where>
    </select>
@@ -50,7 +51,7 @@
        from t_pain
        <where>
            status = 0
-            order by index asc
+            order by pindex asc
            limit #{limit}
        </where>
    </select>
@@ -65,7 +66,9 @@
    </select>
    <delete id="deleteAllByFloor">
-      delete from t_pain where floor = #{floor}
+        delete
+        from t_pain
+        where floor = #{floor}
    </delete>
    <select id="findByIndex" parameterType="java.lang.String" resultMap="PainResultMap">
@@ -73,7 +76,7 @@
        <include refid="Base_Column_List"/>
        from t_pain
        <where>
-            index = #{index}
+            pindex = #{pindex}
        </where>
    </select>
@@ -92,12 +95,12 @@
    <insert id="create" useGeneratedKeys="true" keyProperty="id"
            parameterType="com.pipihelper.project.feishu.entity.Pain">
-        insert into t_pain (open_id, start_time, end_time, status, floor,message_id,name,depart_ment_name)
+        insert into t_pain (open_id, start_time, end_time, status, floor, message_id, name, depart_ment_name, pindex)
-        values (#{openId}, #{startTime}, #{endTime}, #{status},#{floor},#{messageId},#{name},#{departMentName})
+        values (#{openId}, #{startTime}, #{endTime}, #{status}, #{floor}, #{messageId}, #{name}, #{departMentName},#{pindex})
    </insert>
    <update id="waitPain" parameterType="com.pipihelper.project.feishu.entity.Pain">
-        UPDATE t_pain set `index` = ((SELECT selected_value FROM (SELECT MAX(`index`) AS selected_value FROM t_pain) AS
+        UPDATE t_pain set pindex = ((SELECT selected_value FROM (SELECT MAX(pindex) AS selected_value FROM t_pain) AS
        sub_selected_value) + 1)
        <where>
            open_id = #{openId}
@@ -133,6 +136,9 @@
            <if test="departMentName != null">
                depart_ment_name = #{departMentName},
            </if>
+            <if test="pindex != null">
+                pindex = #{pindex},
+            </if>
        </set>
        <where>
            id = #{id}