巡查记录接口，增加根据itemIds和groupId查询项id接口

guoshilong

2023-04-03 aa5609bbc2f9edfd3cce95c41590b165d6960154

巡查记录接口，增加根据itemIds和groupId查询项id接口

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java

@@ -124,5 +124,17 @@
        return R.data(patrolGroupItem);
    }

    /**
     * 通过itemIds查询
     *
     * @return
     */
    @ApiOperation(value="巡查指标项目-通过itemIds查询", notes="巡查指标项目-通过itemIds查询")
    @GetMapping(value = "/getItemByItemIds")
    public R getItemByItemIds(String itemIds,String groupId){
        List<PatrolGroupItem> list = patrolGroupItemService.getItemByItemIds(itemIds,groupId);
        return R.data(list);
    }


}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java

@@ -34,7 +34,7 @@
   /**
    * 分页列表查询
    */
   @ApiOperation(value="巡查类型-分页列表查询", notes="巡查类型-分页列表查询")
   @ApiOperation(value="巡查记录-分页列表查询", notes="巡查记录-分页列表查询")
   @GetMapping(value = "/list")
   public R queryPageList(PatrolRecord patrolRecord, Query query) {
       IPage<PatrolRecord> pageList = patrolRecordService.selectPatrolRecord(Condition.getPage(query),patrolRecord);
@@ -54,7 +54,7 @@
   /**
    * 添加
    */
   @ApiOperation(value="巡查类型-添加", notes="巡查类型-添加")
   @ApiOperation(value="巡查记录-添加", notes="巡查记录-添加")
   @PostMapping(value = "/add")
   public R add(@RequestBody PatrolRecord patrolRecord) {
       return R.data(patrolRecordService.save(patrolRecord));
@@ -63,7 +63,7 @@
   /**
    * 编辑
    */
   @ApiOperation(value="巡查类型-编辑", notes="巡查类型-编辑")
   @ApiOperation(value="巡查记录-编辑", notes="巡查记录-编辑")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public R edit(@RequestBody PatrolRecord patrolRecord) {
       return R.data(patrolRecordService.updateById(patrolRecord));
@@ -75,7 +75,7 @@
    * @param id
    * @return
    */
   @ApiOperation(value="巡查类型-通过id删除", notes="巡查类型-通过id删除")
   @ApiOperation(value="巡查记录-通过id删除", notes="巡查记录-通过id删除")
   @DeleteMapping(value = "/delete")
   public R delete(@RequestParam(name="id",required=true) String id) {
       return R.data(patrolRecordService.removeById(id));
@@ -87,7 +87,7 @@
    * @param ids
    * @return
    */
   @ApiOperation(value="巡查类型-批量删除", notes="巡查类型-批量删除")
   @ApiOperation(value="巡查记录-批量删除", notes="巡查记录-批量删除")
   @DeleteMapping(value = "/deleteBatch")
   public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       return R.data(patrolRecordService.removeByIds(Arrays.asList(ids.split(","))));
@@ -99,7 +99,7 @@
    * @param id
    * @return
    */
   @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
   @ApiOperation(value="巡查记录-通过id查询", notes="巡查记录-通过id查询")
   @GetMapping(value = "/queryById")
   public R queryById(@RequestParam(name="id",required=true) String id) {
       PatrolRecordVO patrolRecordVO = patrolRecordService.getDetail(id);
@@ -107,15 +107,26 @@
   }

    /**
     * 通过id查询
     * 通过taskId,itemsIds查询(用来判断是否完成任务)
     * @return
     */
    @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
    @ApiOperation(value="巡查记录-通过taskId,itemsIds查询", notes="巡查记录-通过taskId,itemsIds查询")
    @GetMapping(value = "/getPatrolRecordByTaskId")
    public R getPatrolRecordByTaskId(String taskId,String itemIds) {
        List<PatrolGroupItemVO> list = patrolRecordService.getPatrolRecordByTaskId(taskId,itemIds);
        return R.data(list);
    }

    /**
     * 通过taskId,itemsIds查询(用来查询巡查记录)
     * @return
     */
    @ApiOperation(value="巡查记录-通过itemId查询", notes="巡查记录-通过itemId查询")
    @GetMapping(value = "/getByTaskIdAndItemId")
    public R getByTaskIdAndItemId(String taskId,String itemIds){
        List<PatrolRecordVO> list = patrolRecordService.getByTaskIdAndItemId(taskId,itemIds);
        return R.data(list);
    }


}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.java

@@ -15,4 +15,6 @@
    List<PatrolGroupItemVO> selectPatrolGroupItemList(@Param("patrolGroupItem") PatrolGroupItemVO patrolGroupItem);

    PatrolGroupItemVO getPatrolGroupItemVOById(@Param("id") Long id);

    List<PatrolGroupItem> getItemByItemIds(@Param("itemIds") String itemIds,@Param("groupId") String groupId);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml

@@ -26,4 +26,12 @@
        WHERE item.is_deleted = 0
        AND item.id = #{id}
    </select>
    <select id="getItemByItemIds" resultType="cn.gistack.sm.patrol.entity.PatrolGroupItem">
        SELECT ID,GROUP_ID,ITEMS_NAME,DESCRIPTION FROM BLADEX.SM_PATROL_GROUP_ITEM
        WHERE ID IN
        <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")">
            #{item}
        </foreach>
        AND is_deleted = 0 AND group_id = #{groupId}
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java

@@ -13,4 +13,6 @@
    PatrolRecordVO getDetail(@Param("id") String id);

    PatrolRecord selectPatrolRecordByTaskIdAndItemId(@Param("taskId") String taskId, @Param("itemId") Long itemId);

    List<PatrolRecordVO> getByTaskIdAndItemId(@Param("taskId") String taskId, @Param("itemIds") String itemIds);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml

@@ -6,13 +6,20 @@
        <result column="id" property="id"/>
        <result column="patrol_type" property="patrolType"/>
        <result column="device_ids" property="deviceIds"/>
        <result column="images" property="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result column="images" property="images"
                typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
        <result column="content" property="content"/>
        <result column="status" property="status"/>
        <result column="item_id" property="itemId"/>
        <result column="task_id" property="taskId"/>
        <result column="patrol_route" property="patrolRoute"/>
        <result column="taskRoute" property="taskRoute"/>
        <result property="groupName" column="groupName"/>
        <result property="groupId" column="groupId"/>
        <result property="itemsName" column="itemsName"/>
        <result property="description" column="description"/>
        <result property="patrolTime" column="update_time"/>
        <result property="toUserId" column="to_user_id"/>
    </resultMap>

    <select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
@@ -45,4 +52,23 @@
    <select id="selectPatrolRecordByTaskIdAndItemId" resultType="cn.gistack.sm.patrol.entity.PatrolRecord">
        SELECT id FROM sm_patrol_record WHERE is_deleted = 0 AND task_id = #{taskId} AND item_id = #{itemId}
    </select>

    <select id="getByTaskIdAndItemId" resultMap="selectPatrolRecordList">
        SELECT r.id,r.patrol_type,r.device_ids,r.images,r.content,r.status,r.item_id,r.task_id,
                    c.name groupName,c.id groupId,c.items_name itemsName,c.description,t.update_time,t.to_user_id
        FROM BLADEX.SM_PATROL_RECORD r
        LEFT JOIN
        (SELECT g.ID,g.NAME,a.id itemId, a.items_name,description FROM
        (
        SELECT ID,GROUP_ID,items_name,description FROM BLADEX.SM_PATROL_GROUP_ITEM WHERE ID IN
        <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")">
            #{item}
        </foreach>
        ) a ,BLADEX.SM_PATROL_GROUP g
        WHERE g.is_deleted = 0 AND a.group_id = g.id) c

        ON c.itemId = r.item_id
        LEFT JOIN BLADEX.SM_PATROL_TASK t ON t.id = r.task_id
        where r.task_id = #{taskId}
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupItemService.java

@@ -17,4 +17,6 @@
    IPage<PatrolGroupItemVO> selectPatrolConfig(IPage<PatrolGroupItemVO> page, PatrolGroupItemVO patrolGroupItem);

    PatrolGroupItemVO getPatrolGroupItemVOById(Long id);

    List<PatrolGroupItem> getItemByItemIds(String itemIds,String groupId);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRecordService.java

@@ -22,4 +22,6 @@
     * @return
     */
    List<PatrolGroupItemVO> getPatrolRecordByTaskId(String taskId, String itemIds);

    List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupItemServiceImpl.java

@@ -33,4 +33,9 @@
    public PatrolGroupItemVO getPatrolGroupItemVOById(Long id) {
        return baseMapper.getPatrolGroupItemVOById(id);
    }

    @Override
    public List<PatrolGroupItem> getItemByItemIds(String itemIds,String groupId) {
        return baseMapper.getItemByItemIds(itemIds,groupId);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java

@@ -49,4 +49,9 @@

        return patrolGroupItemVOList;
    }

    @Override
    public List<PatrolRecordVO> getByTaskIdAndItemId(String taskId, String itemIds) {
        return baseMapper.getByTaskIdAndItemId(taskId,itemIds);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java

@@ -7,4 +7,16 @@
public class PatrolRecordVO extends PatrolRecord {

    private String taskRoute;

    private String groupName;

    private String groupId;

    private String itemsName;

    private String description;

    private String patrolTime;

    private String toUserId;
}