app位置结构增加params 修改单兵端的任务详情和列表

‘liusuyi’

2023-07-31 b627f6ca5a5ba2a46099e1a3aea6aa5a516c683f

app位置结构增加params
修改单兵端的任务详情和列表

 ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java

@@ -159,7 +159,7 @@
            if(ardAppPosition!=null) {
                Map<String, Object> params =new HashMap<>();
                params.put("longitude", ardAppPosition.getLongitude());
                params.put("lagitude", ardAppPosition.getLatitude());
                params.put("latitude", ardAppPosition.getLatitude());
                params.put("altitude", ardAppPosition.getAltitude());
                params.put("bearing", ardAppPosition.getBearing());
                sysUser.setParams(params);

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

@@ -87,6 +87,12 @@
            IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
            ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
            if (StringUtils.isNotNull(ardAppPosition)) {
                Map<String, Object> params=new HashMap<>();
                params.put("longitude",ardAppPosition.getLongitude());
                params.put("latitude",ardAppPosition.getLatitude());
                params.put("speed",ardAppPosition.getSpeed());
                params.put("bearing",ardAppPosition.getBearing());
                ardAppPosition.setParams(params);
                ArdAppPositions.add(ardAppPosition);
            }
        }

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

@@ -43,8 +43,6 @@
public class ArdAppTaskController extends BaseController {
    @Autowired
    private IArdAppTaskService ardAppTaskService;
    @Autowired
    private ISysUserService sysUserService;

    /**
     * 查询app任务管理列表
@@ -61,14 +59,10 @@
    @ApiOperation("单兵端 - 下发给我的任务列表")
    @PreAuthorize("@ss.hasPermi('app:task:list')")
    @GetMapping("/listWithDetail")
    public AjaxResult userlist(ArdAppTask ardAppTask) {
        Integer pageNum = ardAppTask.getPageNum();
        Integer pageSize = ardAppTask.getPageSize();
        List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
        /*分页方式1*/
        JpaPageHelper.startPage(pageNum,pageSize);
        JpaPageInfo pageInfo = new JpaPageInfo(ardAppTasks);
        return AjaxResult.success(pageInfo);
    public TableDataInfo userlist(ArdAppTask ardAppTask) {
        startPage();
        List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
        return getDataTable(list);
    }

    @ApiOperation("单兵端 - 下发给我的任务详情")

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

@@ -83,22 +83,13 @@
     */
    @Override
    public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
        ardAppTask.setUserId(SecurityUtils.getUserId());
        ardAppTask.setPageNum(null);
        ardAppTask.setPageSize(null);
        List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
        List<ArdAppTask> list = new ArrayList<>();
        list.addAll(list1);
        List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
        return list;

    }

    @Override
    public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask) {
        ardAppTask.setUserId(SecurityUtils.getUserId());
        List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetailById(ardAppTask);
        List<ArdAppTask> list = new ArrayList<>();
        list.addAll(list1);
        List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
        return list;
    }


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

@@ -16,12 +16,18 @@
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
    </resultMap>

    <resultMap id="ArdAppTaskSubResult" type="ArdAppTask" extends="ArdAppTaskResult">
        <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"
                    resultMap="ArdAppTaskPicResult"/>
        <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"
                    resultMap="ArdAppTaskDetailResult"/>
        <collection property="ardAppTaskDetailList" column="{id=id,detailUserId=detail_user_id}"
                    select="selectArdAppTaskDetailListByIdAndUserId"/>
        <collection property="ardAppTaskPicList" column="id"
                    select="selectArdAppTaskPicListById"/>
        <!--        <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"-->
        <!--                    resultMap="ArdAppTaskPicResult"/>-->
        <!--        <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"-->
        <!--                    resultMap="ArdAppTaskDetailResult"/>-->
    </resultMap>

    <resultMap type="ArdAppTaskDetail" id="ArdAppTaskDetailResult">
        <result property="id" column="sub1_id"/>
        <result property="name" column="sub1_name"/>
@@ -43,14 +49,6 @@
        <result property="id" column="sub2_id"/>
        <result property="taskId" column="sub2_task_id"/>
        <result property="picUrl" column="sub2_pic_url"/>
    </resultMap>
    <resultMap id="ArdAppTaskArdAppTaskPicResult" type="ArdAppTask" extends="ArdAppTaskResult">
        <collection property="ardAppTaskPicList" notNullColumn="sub_id" javaType="java.util.List"
                    resultMap="ArdAppTaskPicResult"/>
    </resultMap>
    <resultMap id="ArdAppTaskArdAppTaskDetailResult" type="ArdAppTask" extends="ArdAppTaskResult">
        <collection property="ardAppTaskDetailList" notNullColumn="sub_id" javaType="java.util.List"
                    resultMap="ArdAppTaskDetailResult"/>
    </resultMap>

    <sql id="selectArdAppTaskVo">
@@ -102,6 +100,7 @@
                 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
    </sql>

    <select id="selectArdAppTaskList" parameterType="ArdAppTask" resultMap="ArdAppTaskResult">
        <include refid="selectArdAppTaskVo"/>
        <where>
@@ -119,9 +118,14 @@
            ${params.dataScope}
        </where>
    </select>

    <select id="selectArdAppTaskListWithDetail" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
        <include refid="selectArdAppTaskDto"/>
        select DISTINCT(a.id)as idd,c.user_id as detail_user_id,a.* from ard_app_task a
        LEFT JOIN ard_app_task_detail c on c.task_id=a.id
        <where>
            <if test="id != null and id != ''">
                and a.id = #{id}
            </if>
            <if test="userId != null and userId != ''">
                and c.user_id = #{userId}
            </if>
@@ -134,6 +138,7 @@
        </where>
        order by a.create_time desc
    </select>

    <select id="selectArdAppTaskListWithDetailById" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
        <include refid="selectArdAppTaskDto"/>
        <where>
@@ -155,6 +160,14 @@
    <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
        <include refid="selectArdAppTaskDto"/>
        where a.id = #{id}
    </select>

    <select id="selectArdAppTaskDetailListByIdAndUserId" resultType="ArdAppTaskDetail">
        select * from ard_app_task_detail d
        where d.task_id = #{id} and d.user_id = #{detailUserId}
    </select>
    <select id="selectArdAppTaskPicListById" resultType="ArdAppTaskPic">
        select * from ard_app_task_pic d where d.task_id = #{id}
    </select>

    <insert id="insertArdAppTask" parameterType="ArdAppTask">
@@ -318,12 +331,11 @@
        order by create_time desc limit 1
    </select>
    <select id="selectUnreadArdAppTaskCount" resultType="Integer">
        SELECT COUNT( A.ID )
        FROM ard_app_task
        A LEFT JOIN ard_app_task_detail C ON C.task_id = A.ID
        WHERE
            C.view_time IS NULL
          AND  C.view_flag = '1'
        SELECT COUNT(A.ID)
        FROM ard_app_task A
                 LEFT JOIN ard_app_task_detail C ON C.task_id = A.ID
        WHERE C.view_time IS NULL
          AND C.view_flag = '1'
          AND C.user_id = #{userId}
    </select>
</mapper>