单兵端-新任务轮询接口-获取最新任务接口

‘liusuyi’

2023-07-28 7e864f157e98e468de60aea1658c66a2d8d5d53f

单兵端-新任务轮询接口-获取最新任务接口

 ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java

@@ -3,6 +3,7 @@
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.system.service.ISysUserService;
@@ -91,6 +92,9 @@
        //获取所有app用户
        List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
        for (SysUser sysUser : list) {
            if (StringUtils.isNull(sysUser.getAppOnlineState())) {
                continue;
            }
            if (sysUser.getAppOnlineState().equals("0")) {
                continue;
            }

 ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java

@@ -1,10 +1,13 @@
package com.ruoyi.app.task.controller;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;

import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
import com.ruoyi.app.task.domain.AppParam;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -146,4 +149,15 @@
    public AjaxResult getTaskDetailInfo(@PathVariable("id") String id) {
        return success(ardAppTaskService.selectArdAppTaskDetailById(id));
    }

    @ApiOperation("单兵端-新任务轮询")
    @PostMapping(value = "/newTaskPolling")
    public AjaxResult newTaskPolling(@RequestBody AppParam param)
    {
        Map<String,Object> map=new HashMap<>();
        String userId = param.getUserId();
        ArdAppTask ardAppTask= ardAppTaskService.selectNewArdAppTaskByUserId(userId);
        map.put("task",ardAppTask);
        return success(map);
    }
}

 ard-work/src/main/java/com/ruoyi/app/task/domain/AppParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.app.task.domain;

import lombok.Data;

/**
 * @Description:
 * @ClassName: AppParam
 * @Author: åˆ˜è‹ä¹‰
 * @Date: 2023å¹´07月28日16:38:26
 * @Version: 1.0
 **/
@Data
public class AppParam {
    String userId;
}

 ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java

@@ -75,11 +75,21 @@
    /** æŸ¥çœ‹ä½ç½® */
    @Excel(name = "查看位置")
    private String viewPosition;

    /** å¼¹çª—标记 */
    @Excel(name = "弹窗标记")
    private String viewFlag;
    /** æ‰“卡时间*/
    @Excel(name = "打卡时间")
    private Date clockInTime;

    public String getViewFlag() {
        return viewFlag;
    }

    public void setViewFlag(String viewFlag) {
        this.viewFlag = viewFlag;
    }

    public Date getClockInTime() {
        return clockInTime;
    }

 ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java

@@ -154,4 +154,12 @@
     * @return ç»“æžœ
     */
    public int deleteArdAppTaskDetailPicByTaskDetailId(String id);

    /**
     * æŸ¥è¯¢ç”¨æˆ·æœ€æ–°çš„任务
     *
     * @param userId app用户Id
     * @return ç»“æžœ
     */
    public ArdAppTask selectNewArdAppTaskByUserId(String userId);
}

 ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java

@@ -90,4 +90,11 @@
     * @return ç»“æžœ
     */
    public int updateArdAppTaskDetailView(ArdAppTaskDetail ardAppTaskDetail);
    /**
     * æŸ¥è¯¢ç”¨æˆ·æœ€æ–°çš„任务
     *
     * @param userId app用户Id
     * @return ç»“æžœ
     */
    public ArdAppTask selectNewArdAppTaskByUserId(String userId);
}

 ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java

@@ -281,4 +281,9 @@
            }
        }
    }

    @Override
    public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
        return ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
    }
}

 ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml

@@ -37,6 +37,7 @@
        <result property="viewTime" column="sub1_view_time"/>
        <result property="viewPosition" column="sub1_view_position"/>
        <result property="clockInTime" column="sub1_clock_in_time"/>
        <result property="viewFlag" column="sub1_view_flag"/>
    </resultMap>
    <resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult">
        <result property="id" column="sub2_id"/>
@@ -94,7 +95,9 @@
               c.status           as sub1_status,
               c.clock_in_pic_url as sub1_clock_in_pic_url,
               c.view_time        as sub1_view_time,
               c.view_position    as sub1_view_position
               c.view_position    as sub1_view_position,
               c.clock_in_time    as sub1_clock_in_time,
               c.view_flag        as sub1_view_flag
        from ard_app_task a
                 left join ard_app_task_pic b on b.task_id = a.id
                 left join ard_app_task_detail c on c.task_id = a.id
@@ -299,4 +302,9 @@
        from ard_app_task_detail c
        where c.id = #{id}
    </select>
    <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSubResult">
        <include refid="selectArdAppTaskDto"/>
        where c.user_id = #{userId} AND c.view_flag is null
        order by create_time desc limit 1
    </select>
</mapper>