Merge remote-tracking branch 'origin/master'

src/main/java/com/pipihelper/project/feishu/controller/FeiShuEventController.java

@@ -9,10 +9,14 @@ import com.pipihelper.project.feishu.dto.FeiShuMsgCardEventDTO;
 import com.pipihelper.project.feishu.dto.chat.FeiShuChatDTO;
 import com.pipihelper.project.feishu.dto.employee.FeiShuEmployeeDTO;
 import com.pipihelper.project.feishu.dto.msg.FeiShuMsgDTO;
+import com.pipihelper.project.feishu.entity.Employee;
+import com.pipihelper.project.feishu.entity.Pain;
 import com.pipihelper.project.feishu.service.EmployeeService;
 import com.pipihelper.project.feishu.service.FeiShuApiService;
 import com.pipihelper.project.feishu.service.FeiShuEventService;
+import com.pipihelper.project.feishu.service.PainService;
 import com.pipihelper.project.feishu.service.massage.MassageMsgCardSerivce;
+import com.pipihelper.project.feishu.service.massage.MassageService;
 import com.pipihelper.project.feishu.utils.FeiShuEventDataDecrypter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +30,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -50,6 +55,10 @@ public class FeiShuEventController {
     private MassageMsgCardSerivce massageMsgCardSerivce;
     @Autowired
     private EmployeeService employeeService;
+    @Autowired
+    private PainService painService;
+    @Autowired
+    private MassageService massageService;
 
 
     @PostMapping("/event")
@@ -152,7 +161,18 @@ public class FeiShuEventController {
     public Object event() {
 
         employeeService.uprsetAllEmployee();
-        employeeService.findStartList(1, 14, 30);
+        List<Employee> startList = employeeService.findStartList(1, 14, 30);
+        AtomicInteger i = new AtomicInteger();
+        startList.forEach(it -> {
+            Pain pain = new Pain();
+            pain.setOpenId(it.getOpenId());
+            pain.setStatus(0);
+            pain.setFloor(it.getFloor());
+            pain.setIndex(i.getAndIncrement());
+            painService.create(pain);
+        });
+
+       /* massageService.sendMassageMsgCardToPiPiChat(userList);*/
         List<FeiShuEmployeeDTO> dtos = feiShuApiService.getEmployeeList();
         return dtos;
     }

src/main/java/com/pipihelper/project/feishu/entity/Employee.java

@@ -11,4 +11,5 @@ public class Employee {
     private Integer gender;
     private Integer status;
     private String departmentId;
+    private Integer floor;
 }

src/main/java/com/pipihelper/project/feishu/entity/Pain.java

@@ -2,12 +2,16 @@ package com.pipihelper.project.feishu.entity;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class Pain {
     private Integer id;
     private String openId;
     private Integer index;
     private Integer status;
+    private Date startTime;
+    private Date endTime;
     private String timeRange;
     private Integer floor;
     private String messageId;

src/main/java/com/pipihelper/project/feishu/service/FeiShuApiService.java

@@ -482,7 +482,7 @@ public class FeiShuApiService {
      *
      * @param feiShuMsgDTO
      */
-    public void sendMsg(FeiShuMsgDTO feiShuMsgDTO, String receiveIdType) {
+    public JSONObject sendMsg(FeiShuMsgDTO feiShuMsgDTO, String receiveIdType) {
         String api = "/im/v1/messages?receive_id_type={receiveIdType}";
         RestTemplate restTemplate = new RestTemplate();
         try {
@@ -493,10 +493,14 @@ public class FeiShuApiService {
             String url = feiShuConfig.getFeiShuOpenApiHost() + api;
             log.info(requestEntity.toString());
             ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity(url, requestEntity, JSONObject.class, receiveIdType);
-//            ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class, receiveIdType);
-            log.info("单发消息成功, req：{}, resp: {}", feiShuMsgDTO, responseEntity);
+            if (responseEntity.getBody().getJSONObject("data") == null) {
+                return null;
+            }
+            log.info("消息发送成功，接收人： {}", feiShuMsgDTO.getReceiveId());
+            return responseEntity.getBody();
         } catch (Exception e) {
             log.error("单发消息失败", e);
+            throw new ServiceException("飞书：" + api + "接口调用失败" + "\n" + e);
         }
     }
 

src/main/java/com/pipihelper/project/feishu/service/PainService.java

+package com.pipihelper.project.feishu.service;
+
+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.List;
+
+@Service
+public class PainService {
+
+    @Autowired
+    private PainDao painDao;
+
+    public void create(Pain pain) {
+        painDao.create(pain);
+    }
+
+    public Pain findById(Integer id) {
+        return painDao.findById(id);
+    }
+
+    public Pain findByOpenId(String openId) {
+        return painDao.findByOpenId(openId);
+    }
+
+    public void deleteById(Integer id) {
+        painDao.deleteById(id);
+    }
+
+    public void update(Pain Pain) {
+        painDao.update(Pain);
+    }
+
+    public List<Pain> findAll() {
+        return painDao.findAll();
+    }
+}

src/main/java/com/pipihelper/project/feishu/service/massage/MassageMsgCardSerivce.java

@@ -31,6 +31,12 @@ public class MassageMsgCardSerivce {
     @Autowired
     private FeiShuApiService feiShuApiService;
 
+    public String genMassageMsgCardForSingle(){
+        String fileName  = String.format("/templates/massage-singel-msg-card.json");
+        String msgCardContent = String.format(getInteractiveCardStr(fileName));
+        return msgCardContent;
+    }
+
 
     public String genMassageMsgCardForCompany(List<List<String>> pushUser){
         try {

src/main/java/com/pipihelper/project/feishu/service/massage/MassageService.java

 package com.pipihelper.project.feishu.service.massage;
 
+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.Pain;
 import com.pipihelper.project.feishu.service.FeiShuApiService;
+import com.pipihelper.project.feishu.service.PainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,12 +33,27 @@ public class MassageService {
     @Autowired
     private FeiShuConfig feiShuConfig;
 
+    @Autowired
+    private PainService painService;
+
     public void sendMassageMsgCardToPiPiChat(List<PushPainBO> pushPainBOList){
         List<List<String>> pushUser = new ArrayList<>();
         for(PushPainBO pushPainBO:pushPainBOList){
             List<String> user = new ArrayList<>();
             //给单个用户发送
-
+            String singleContent = massageMsgCardSerivce.genMassageMsgCardForSingle();
+            log.info("给单个用户发送按摩消息：{}",singleContent);
+            FeiShuMsgDTO feiShuMsgDTO = new FeiShuMsgDTO();
+            feiShuMsgDTO.setMsgType("interactive");
+            feiShuMsgDTO.setContent(singleContent);
+            feiShuMsgDTO.setReceiveId(pushPainBO.getOpenId());
+            log.info(feiShuMsgDTO.toString());
+            JSONObject sendMsgResponse = feiShuApiService.sendMsg(feiShuMsgDTO, "open_id");
+            String messageId = sendMsgResponse.getJSONObject("data").getString("message_id");
+            //更新按摩记录表中的messageId
+            Pain pain = painService.findByOpenId(pushPainBO.getOpenId());
+            pain.setMessageId(messageId);
+            painService.update(pain);
             //构建给大群发送的名单
             user.add(pushPainBO.getIndex().toString());
             user.add(pushPainBO.getName());

src/main/resources/mybatis/EmployeeMapper.xml

@@ -36,7 +36,7 @@
         <include refid="Base_Column_List"/>
         from t_employee
         <where>
-            id >= #{id}
+            id >= #{startId}
             and floor = #{floor}
             limit #{limit};
         </where>

src/main/resources/mybatis/PainMapper.xml

@@ -5,8 +5,8 @@
     <resultMap id="PainResultMap" type="com.pipihelper.project.feishu.entity.Pain">
         <id column="id" property="id"/>
         <result column="open_id" property="openId"/>
-        <result column="start_time" property="start_time"/>
-        <result column="end_time" property="end_time"/>
+        <result column="start_time" property="startTime"/>
+        <result column="end_time" property="endTime"/>
         <result column="status" property="status"/>
         <result column="floor" property="floor"/>
         <result column="messageId" property="messageId"/>
@@ -30,18 +30,6 @@
         </where>
     </select>
 
-
-    <select id="findStartList" resultMap="PainResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from t_pain
-        <where>
-            id >= #{id}
-            and floor = #{floor}
-            limit #{limit};
-        </where>
-    </select>
-
     <select id="findByOpenId" parameterType="java.lang.String" resultMap="PainResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -65,12 +53,12 @@
     </delete>
 
     <insert id="create" useGeneratedKeys="true" keyProperty="id"
-            parameterType="com.pipihelper.project.feishu.entity.Employee">
+            parameterType="com.pipihelper.project.feishu.entity.Pain">
         insert into t_pain (open_id, start_time, end_time, status, floor,message_id)
         values (#{openId}, #{startTime}, #{endTime}, #{status},#{floor},#{messageId})
     </insert>
 
-    <update id="update" parameterType="com.pipihelper.project.feishu.entity.Employee">
+    <update id="update" parameterType="com.pipihelper.project.feishu.entity.Pain">
         update t_pain
         <set>
             <if test="openId != null">