巡查记录增加根据任务查询的接口

guoshilong

2023-04-03 6c581a74bf82bd8e743a5f440cac94b6fd113c39

巡查记录增加根据任务查询的接口

 skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/ResourceApplication.java

@@ -16,9 +16,11 @@
 */
package cn.gistack.resource;

import org.mybatis.spring.annotation.MapperScan;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.cloud.openfeign.EnableFeignClients;

/**
 * 资源启动器
@@ -26,6 +28,8 @@
 * @author Chill
 */
@BladeCloudApplication
@EnableFeignClients({"cn.gistack"})
@MapperScan({"org.springblade.**.mapper.**","cn.gistack.**.mapper.**"})
public class ResourceApplication {

    public static void main(String[] args) {

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

@@ -1,8 +1,10 @@
package cn.gistack.sm.patrol.controller;

import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -104,5 +106,16 @@
       return R.data(patrolRecordVO);
   }

    /**
     * 通过id查询
     * @return
     */
    @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
    @GetMapping(value = "/getPatrolRecordByTaskId")
    public R getPatrolRecordByTaskId(String taskId,String itemIds) {
        List<PatrolGroupItemVO> list = patrolRecordService.getPatrolRecordByTaskId(taskId,itemIds);
        return R.data(list);
    }


}

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

@@ -13,4 +13,6 @@
public interface PatrolGroupItemMapper extends BaseMapper<PatrolGroupItem> {

    List<PatrolGroupItemVO> selectPatrolGroupItemList(@Param("patrolGroupItem") PatrolGroupItemVO patrolGroupItem);

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

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

@@ -19,4 +19,11 @@
            AND spgi.description LIKE CONCAT('%',#{patrolGroupItem.description},'%')
        </if>
    </select>
    <select id="getPatrolGroupItemVOById" resultType="cn.gistack.sm.patrol.vo.PatrolGroupItemVO">
        SELECT item.id,item.items_name,item.description,item.group_id,b.name groupName
        FROM sm_patrol_group_item item
        LEFT JOIN sm_patrol_group b ON b.id = item.group_id
        WHERE item.is_deleted = 0
        AND item.id = #{id}
    </select>
</mapper>

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

@@ -11,4 +11,6 @@
    List<PatrolRecord> selectPatrolRecord(@Param("patrolRecord") PatrolRecord patrolRecord);

    PatrolRecordVO getDetail(@Param("id") String id);

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

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

@@ -42,4 +42,7 @@
        WHERE record.is_deleted = 0
        AND record.id =#{id}
    </select>
    <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>
</mapper>

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

@@ -6,9 +6,11 @@
    <select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
        SELECT
        spt.*,
        spt2.name as patrolTypeName
        spt2.name as patrolTypeName,
        route.ROUTE_COORDINATES routeRange
        FROM sm_patrol_task spt
        left join sm_patrol_type spt2 on spt.task_type = spt2.id
        LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
        WHERE spt.is_deleted = 0
        <if test="patrolTask.title !=null and patrolTask.title!=''">
            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')

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

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

    IPage<PatrolGroupItemVO> selectPatrolConfig(IPage<PatrolGroupItemVO> page, PatrolGroupItemVO patrolGroupItem);

    PatrolGroupItemVO getPatrolGroupItemVOById(Long id);
}

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

@@ -1,13 +1,25 @@
package cn.gistack.sm.patrol.service;

import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

import java.util.List;

public interface IPatrolRecordService extends BaseService<PatrolRecord> {
    IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord);

    PatrolRecordVO getDetail(String id);

    /**
     * 根据任务id查询巡查记录表中的内容
     * @param taskId
     * @param itemIds
     * @return
     */
    List<PatrolGroupItemVO> getPatrolRecordByTaskId(String taskId, String itemIds);
}

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

@@ -28,4 +28,9 @@
    public IPage<PatrolGroupItemVO> selectPatrolConfig(IPage<PatrolGroupItemVO> page, PatrolGroupItemVO patrolGroupItem) {
        return page.setRecords(baseMapper.selectPatrolGroupItemList(patrolGroupItem));
    }

    @Override
    public PatrolGroupItemVO getPatrolGroupItemVOById(Long id) {
        return baseMapper.getPatrolGroupItemVOById(id);
    }
}

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

@@ -1,16 +1,30 @@
package cn.gistack.sm.patrol.service.impl;

import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
import cn.gistack.sm.patrol.mapper.PatrolRecordMapper;
import cn.gistack.sm.patrol.service.IPatrolGroupItemService;
import cn.gistack.sm.patrol.service.IPatrolRecordService;
import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
public class PatrolRecordServiceImpl extends BaseServiceImpl<PatrolRecordMapper, PatrolRecord> implements IPatrolRecordService {
    @Autowired
    IPatrolGroupItemService patrolGroupItemService;

    @Override
    public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord) {
        return page.setRecords(baseMapper.selectPatrolRecord(patrolRecord));
@@ -20,4 +34,19 @@
    public PatrolRecordVO getDetail(String id) {
        return baseMapper.getDetail(id);
    }

    @Override
    public List<PatrolGroupItemVO> getPatrolRecordByTaskId(String taskId, String itemIds) {
        List<Long> longList = Func.toLongList(itemIds);
        List<PatrolGroupItemVO> patrolGroupItemVOList = new ArrayList<>();
        longList.forEach(e->{
            PatrolRecord patrolRecord = baseMapper.selectPatrolRecordByTaskIdAndItemId(taskId, e);
            if (ObjectUtil.isEmpty(patrolRecord)){
                PatrolGroupItemVO patrolGroupItemVO = patrolGroupItemService.getPatrolGroupItemVOById(e);
                patrolGroupItemVOList.add(patrolGroupItemVO);
            }
        });

        return patrolGroupItemVOList;
    }
}