zqy
2024-08-08 f95968f0465e2332eea578785822c51719e9e10f
修改直播,分享bug
7个文件已修改
105 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountSharServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailSharServiceImpl.java 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -41,8 +43,7 @@
     */
    @Log(title = "直播", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody LiveStreaming liveStreaming)
    {
    public AjaxResult add(@RequestBody LiveStreaming liveStreaming) throws ParseException {
        return liveStreamingService.addData(liveStreaming);
    }
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -569,7 +569,7 @@
                    roleId.setRoleId(2L);
                    roleList.add(roleId);
                    successNum++;
                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                }
                else if (isUpdateSupport)
zhang-content/src/main/java/com/ruoyi/domain/LiveStreaming.java
@@ -94,5 +94,9 @@
     */
    private Integer maxPerson;
    /**
     * 持续时间
     */
    private Integer duration;
}
zhang-content/src/main/java/com/ruoyi/service/LiveStreamingService.java
@@ -5,6 +5,7 @@
import com.ruoyi.domain.LiveStreaming;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.util.List;
public interface LiveStreamingService extends IService<LiveStreaming> {
@@ -12,5 +13,5 @@
    List<LiveStreaming> selectByIds(Long[] ids);
    AjaxResult addData(LiveStreaming liveStreaming);
    AjaxResult addData(LiveStreaming liveStreaming) throws ParseException;
}
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
@@ -17,6 +17,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@Slf4j
@@ -77,6 +79,9 @@
//        List<LiveStreaming> dtoResult = markOwnData(familyId, beanRecords);
        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
        return AjaxResult.success(data);
    }
@@ -92,8 +97,19 @@
        return list;
    }
    private Date getEndTime1(LiveStreaming liveStreaming) throws ParseException{
        System.out.println(liveStreaming.getStartTime());
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Calendar nowTime = Calendar.getInstance();
        nowTime.setTime(liveStreaming.getStartTime());
        nowTime.add(Calendar.MINUTE, liveStreaming.getDuration());
        String currentTime = df.format(nowTime.getTime());
        System.out.println("30分钟后的时间" + currentTime);
        return df.parse(currentTime);
    }
    @Override
    public AjaxResult addData(LiveStreaming liveStreaming) {
    public AjaxResult addData(LiveStreaming liveStreaming) throws ParseException {
        LambdaQueryWrapper<LiveStreaming> lqw = uniqueCondition(liveStreaming);
        List<LiveStreaming> list = list(lqw);
@@ -103,6 +119,8 @@
        if (liveStreaming.getMaxPerson() > 120){
            throw new RuntimeException("可容纳人数暂时最多为120人");
        }
        liveStreaming.setEndTime(getEndTime1(liveStreaming));
        if (save(liveStreaming)) {
            EsModel esModel = new EsModel();
@@ -114,7 +132,12 @@
            esModel.setBy1(liveStreaming.getTitle());
            esModel.setBy2(liveStreaming.getApplyPerson());
            esModel.setBy3(liveStreaming.getRoomId());
            //取当前的时分-30
            System.out.println(liveStreaming.getEndTime());
//            esModel.setBy4(liveStreaming.getEndTime());
            //这里存储查询详情的路径
            esModel.setBy5("/zLiveStreaming");
//            esModel.setFid(familyId);
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountSharServiceImpl.java
@@ -97,6 +97,20 @@
                za.setShareId(shareId);
                za.setSysMenuId(2056L);
                addData(za);
                TravelDetail travelDetail = new TravelDetail();
                travelDetail.setCid(za.getShareContent());
                List<TravelDetail> travelDetails = travelDetailService.getDataByCid(za.getShareContent(),travelDetail);
                for (TravelDetail travelDetail1:travelDetails) {
                    za.setId(za.getId()+1);
                    za.setSysMenuId(2055L);
                    za.setShareContent(travelDetail1.getId());
                    System.out.println(za);
                    save(za);
                }
            }
        }
        //  Long []
zhang-content/src/main/java/com/ruoyi/service/impl/TravelDetailSharServiceImpl.java
@@ -59,19 +59,19 @@
    }
    public void addData(ZfShare za)
    {
        LambdaQueryWrapper<ZfShare> lqw = uniqueCondition(za);
        List<ZfShare> list = list(lqw);
        if(list.size()>0){
            throw new RuntimeException("请勿分享重复数据");
        }
        else {
            save(za);
        }
    }
//    public void addData(ZfShare za)
//    {
//        LambdaQueryWrapper<ZfShare> lqw = uniqueCondition(za);
//        List<ZfShare> list = list(lqw);
//
//        if(list.size()>0){
//            throw new RuntimeException("请勿分享重复数据");
//        }
//        else {
//
//        }
//
//    }
    @Override
    public AjaxResult saveZa(ShareMore shareMore) {
@@ -84,19 +84,19 @@
                za.setShareContent(shareContent);
                za.setShareId(shareId);
                za.setSysMenuId(2055L);
                addData(za);
                TravelDetail travelDetail =travelDetailService.getById(za.getShareContent());
                Long id = travelDetail.getCid();
                if (id != null){
                za.setId(za.getId()+1);
                za.setSysMenuId(2056L);
                za.setShareContent(id);
                List<ZfShare> travelCount = list(uniqueCondition(za));
                System.out.println("nmfiwwugn419526/"+za);
                System.out.println(travelCount);
                if (travelCount.size() == 0){
                    addData(za);
                }}
                save(za);
//                TravelDetail travelDetail =travelDetailService.getById(za.getShareContent());
//                Long id = travelDetail.getCid();
//                if (id != null){
//                za.setId(za.getId()+1);
//                za.setSysMenuId(2056L);
//                za.setShareContent(id);
//                List<ZfShare> travelCount = list(uniqueCondition(za));
//                System.out.println("nmfiwwugn419526/"+za);
//                System.out.println(travelCount);
//                if (travelCount.size() == 0){
//                    addData(za);
//                }}
            }
        }
        //  Long []