洪城义警-正式版后台
zengh
2022-02-19 a97a5dfe73256905b30bfb08c3283212bc8bf10c
问题修复
7 files modified
41 ■■■■■ changed files
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/webscoket/WebSocketHandler.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java 23 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -267,6 +267,7 @@
        int msg = pushMsgService.startTask(serid, rid,type);
        map.put("res", msg);
        map.put("type", type);
        taskqdService.updateRtype("0",rid);
        return R.data(map);
    }
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -36,6 +36,7 @@
public interface TaskqdMapper extends BaseMapper<Taskqd> {
    //抢单任务
    void updatet(Integer id, Integer num, String serid,String captain,String team);
    void updateRtype(String type,String rid);
    List<Taskqd> selectList(Integer id);
    List<Map<String, Object>> queryReceiver(String serid);
    List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -38,6 +38,11 @@
        </if>
        where id = #{id}
    </update>
    <update id="updateRtype">
        update sys_taskqd
        SET rtype=#{type}
        where id = #{rid}
    </update>
    <!--日常任务列表-->
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -35,6 +35,7 @@
 */
public interface ITaskqdService extends IService<Taskqd> {
    void updatet(Integer id, Integer num, String serid,String captain,String team);
    void updateRtype(String type,String rid);
    List<Taskqd> selectList(Integer id);
    List<Map<String, Object>> queryReceiver(String serid);
    List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
@@ -42,6 +42,11 @@
    }
    @Override
    public void updateRtype(String type,String rid) {
        baseMapper.updateRtype(type,rid);
    }
    @Override
    public List<Taskqd> selectList(Integer id) {
        return baseMapper.selectList(id);
    }
src/main/java/org/springblade/modules/webscoket/WebSocketHandler.java
@@ -115,11 +115,6 @@
                ChannelSupervise.addChannel(ctx.channel(),id);
            }
        }
//        TextWebSocketFrame tws = new TextWebSocketFrame(new Date().toString()
src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java
@@ -1,16 +1,12 @@
package org.springblade.modules.webscoket.service.impl;
import com.alibaba.fastjson.JSONObject;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import io.netty.channel.group.ChannelGroup;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import org.springblade.modules.nettyServer.NettyConfig;
import org.springblade.modules.webscoket.service.IPushMsgService;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
/**
 * @author lq
@@ -56,13 +52,18 @@
    public int startTask(String serid, String rid,String type) {
        //返回值
        int res = 0;
        Channel channel = NettyConfig.getUserChannelMap().get(serid);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("type", type);
        jsonObject.put("rid", rid);
        if (channel != null) {
            channel.writeAndFlush(new TextWebSocketFrame(String.valueOf(jsonObject)));
            res = 1;
        String[] list = serid.split(",");
        for (int i = 0; i <list.length ; i++) {
            if (!list[i].equals("")){
                Channel channel = NettyConfig.getUserChannelMap().get(list[i]);
                JSONObject jsonObject = new JSONObject();
                jsonObject.put("type", type);
                jsonObject.put("rid", rid);
                if (channel != null) {
                    channel.writeAndFlush(new TextWebSocketFrame(String.valueOf(jsonObject)));
                    res = 1;
                }
            }
        }
        return res;
    }