+ 个人行程功能页面

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsMeetingUsrController.java

@@ -46,7 +46,6 @@ public class CpsMeetingUsrController extends BaseController {
     @Autowired
     private ICpsMeetingUsrService cpsMeetingUsrService;
 
-
     @Autowired
     private WeChatCfg weChatCfg;
 
@@ -146,10 +145,15 @@ public class CpsMeetingUsrController extends BaseController {
 
     @Log(title = "用户赞收藏信息", businessType = BusinessType.DELETE)
     @GetMapping("/content/rel/{openId}")
-    @Anonymous
     public TableDataInfo usrContentRel(CpsContentInfo cpsContentInfo, @PathVariable String openId) {
         startPage();
         List<CpsContentInfo> list = cpsMeetingUsrService.qryUsrCollectContent(openId, cpsContentInfo.getTitle());
         return getDataTable(list);
     }
+
+    @Log(title = "用户行程信息", businessType = BusinessType.DELETE)
+    @GetMapping("/trip/{openId}")
+    public AjaxResult usrContentRel(@PathVariable String openId) {
+        return AjaxResult.success(cpsMeetingUsrService.qryUsrTripContent(openId));
+    }
 }

ruoyi-admin/src/main/resources/application.yml

@@ -85,7 +85,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 76000
 
 # MyBatis配置
 mybatis:

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CpsMeetingUsrMapper.java

@@ -21,6 +21,7 @@ public interface CpsMeetingUsrMapper {
      */
     public CpsMeetingUsr selectCpsMeetingUsrById(Long id);
 
+    CpsMeetingUsr selectCpsMeetingUsrByOpenId(String openId);
     /**
      * 查询cps_meeting_usr与会人员信息列表
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ICpsMeetingUsrService.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import com.ruoyi.common.core.domain.model.WeChatUser;
 import com.ruoyi.system.domain.CpsContentInfo;
+import com.ruoyi.system.domain.CpsMeetingEnterpriseTripInfo;
 import com.ruoyi.system.domain.CpsMeetingUsr;
 
 import java.util.List;
@@ -67,5 +68,7 @@ public interface ICpsMeetingUsrService {
 
     void usrRegister(CpsMeetingUsr user);
 
-    List<CpsContentInfo> qryUsrCollectContent(String openId,String keyword);
+    List<CpsContentInfo> qryUsrCollectContent(String openId, String keyword);
+
+    CpsMeetingEnterpriseTripInfo qryUsrTripContent(String openId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CpsMeetingUsrServiceImpl.java

@@ -3,7 +3,9 @@ package com.ruoyi.system.service.impl;
 import com.ruoyi.common.core.domain.model.WeChatUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.CpsContentInfo;
+import com.ruoyi.system.domain.CpsMeetingEnterpriseTripInfo;
 import com.ruoyi.system.domain.CpsMeetingUsr;
+import com.ruoyi.system.mapper.CpsMeetingEnterpriseTripInfoMapper;
 import com.ruoyi.system.mapper.CpsMeetingUsrMapper;
 import com.ruoyi.system.service.ICpsMeetingUsrService;
 import org.apache.commons.lang3.ObjectUtils;
@@ -23,6 +25,9 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     @Autowired
     private CpsMeetingUsrMapper cpsMeetingUsrMapper;
 
+    @Autowired
+    private CpsMeetingEnterpriseTripInfoMapper cpsMeetingTripService;
+
     /**
      * 查询cps_meeting_usr与会人员信息
      *
@@ -127,4 +132,13 @@ public class CpsMeetingUsrServiceImpl implements ICpsMeetingUsrService {
     public List<CpsContentInfo> qryUsrCollectContent(String openId, String keyword) {
         return cpsMeetingUsrMapper.qryUsrCollectContent(openId, keyword);
     }
+
+    @Override
+    public CpsMeetingEnterpriseTripInfo qryUsrTripContent(String openId) {
+        CpsMeetingUsr cpsMeetingUsr = cpsMeetingUsrMapper.selectCpsMeetingUsrByOpenId(openId);
+        if (ObjectUtils.isEmpty(cpsMeetingUsr)) {
+            return null;
+        }
+        return cpsMeetingTripService.selectCpsMeetingEnterpriseTripInfoById(cpsMeetingUsr.getTripId());
+    }
 }

ruoyi-system/src/main/resources/mapper/cp/CpsMeetingUsrMapper.xml

@@ -56,6 +56,12 @@
         where usr.id = #{id}
     </select>
 
+    <select id="selectCpsMeetingUsrByOpenId" parameterType="String" resultMap="CpsMeetingUsrResult">
+        <include refid="selectCpsMeetingUsrVo"/>
+        where usr.open_id = #{openId}
+        limit 1
+    </select>
+
     <insert id="insertCpsMeetingUsr" parameterType="com.ruoyi.system.domain.CpsMeetingUsr" useGeneratedKeys="true"
             keyProperty="id">
         insert into cps_meeting_usr