1. 海康api 集成，实现海康摄像头列表查询 2. 巡查路线新增树查询

zhongrj

2023-03-30 0a6b45e096ef6487927368f83ed75057e6105657

1. 海康api 集成，实现海康摄像头列表查询
2. 巡查路线新增树查询

 skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java

@@ -40,7 +40,7 @@
    /**
     * nacos dev 地址
     */
    String NACOS_DEV_ADDR = "172.16.13.144:8848";
    String NACOS_DEV_ADDR = "192.168.0.100:8848";

    /**
     * nacos prod 地址

 skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java

@@ -40,8 +40,8 @@
        PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));

        //自定义注册
        PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
        PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
        PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "zhongrijian");
        PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "zhongrijian");

        PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
        PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java

@@ -1,6 +1,7 @@
package cn.gistack.sm.hk.controller;

import cn.gistack.sm.hk.constant.HkConstant;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -30,8 +31,10 @@
    @ApiOperation(value = "海康设备-分页列表查询", notes = "海康设备-分页列表查询")
    @GetMapping(value = "/queryHkList")
    public R queryHkList(Query query) {
        String result = GetCameraResourcePage(query.getCurrent(), query.getSize(), HkConstant.cameras);
        JSONObject jsonObject1 = JSONObject.parseObject(result);
        // 查询海康设备列表并返回
        return R.data(GetCameraResourcePage(query.getCurrent(), query.getSize(), HkConstant.cameras));
        return R.data(jsonObject1);
    }

}

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

@@ -2,6 +2,7 @@

import cn.gistack.sm.patrol.entity.PatrolRoute;
import cn.gistack.sm.patrol.service.IPatrolRouteService;
import cn.gistack.sm.patrol.vo.PatrolRouteVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -109,4 +110,15 @@
       return R.data(patrolRoute);
   }

    /**
     * 查询巡查路线树数据
     * @param patrolRoute
     * @return
     */
    @ApiOperation(value="查询巡查路线树数据", notes="查询巡查路线树数据")
    @GetMapping(value = "/getPatrolRouteTree")
    public R getPatrolRouteTree(PatrolRouteVO patrolRoute) {
        return R.data(patrolRouteService.getPatrolRouteTree(patrolRoute));
    }

}

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

@@ -1,6 +1,7 @@
package cn.gistack.sm.patrol.mapper;

import cn.gistack.sm.patrol.entity.PatrolRoute;
import cn.gistack.sm.patrol.vo.PatrolRouteVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,11 @@
     * @return
     */
    List<PatrolRoute> selectPatrolRoute(IPage<PatrolRoute> page,@Param("patrolRoute") PatrolRoute patrolRoute);

    /**
     * 查询巡查路线树数据
     * @param patrolRoute
     * @return
     */
    List<PatrolRouteVO> getPatrolRouteTree(@Param("patrolRoute") PatrolRouteVO patrolRoute);
}

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

@@ -12,4 +12,15 @@
            and reservoir_id like concat(concat('%',#{patrolRoute.reservoirId}),'%')
        </if>
    </select>

    <!--自定义分页查询-->
    <select id="getPatrolRouteTree" resultType="cn.gistack.sm.patrol.vo.PatrolRouteVO">
        select id,route_name from sm_patrol_route where is_deleted = 0
        <if test="patrolRoute.routeName!=null and patrolRoute.routeName!=''">
            and route_name like concat(concat('%',#{patrolRoute.routeName}),'%')
        </if>
        <if test="patrolRoute.reservoirId!=null and patrolRoute.reservoirId!=''">
            and reservoir_id like concat(concat('%',#{patrolRoute.reservoirId}),'%')
        </if>
    </select>
</mapper>

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

@@ -1,6 +1,7 @@
package cn.gistack.sm.patrol.service;

import cn.gistack.sm.patrol.entity.PatrolRoute;
import cn.gistack.sm.patrol.vo.PatrolRouteVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

@@ -16,4 +17,11 @@
     * @return
     */
    IPage<PatrolRoute> selectPatrolRoute(IPage<PatrolRoute> page, PatrolRoute patrolRoute);

    /**
     * 查询巡查路线树数据
     * @param patrolRoute
     * @return
     */
    Object getPatrolRouteTree(PatrolRouteVO patrolRoute);
}

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

@@ -3,6 +3,7 @@
import cn.gistack.sm.patrol.entity.PatrolRoute;
import cn.gistack.sm.patrol.mapper.PatrolRouteMapper;
import cn.gistack.sm.patrol.service.IPatrolRouteService;
import cn.gistack.sm.patrol.vo.PatrolRouteVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
@@ -23,4 +24,14 @@
    public IPage<PatrolRoute> selectPatrolRoute(IPage<PatrolRoute> page, PatrolRoute patrolRoute) {
        return page.setRecords(baseMapper.selectPatrolRoute(page,patrolRoute));
    }

    /**
     * 查询巡查路线树数据
     * @param patrolRoute
     * @return
     */
    @Override
    public Object getPatrolRouteTree(PatrolRouteVO patrolRoute) {
        return baseMapper.getPatrolRouteTree(patrolRoute);
    }
}

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

New file
@@ -0,0 +1,8 @@
package cn.gistack.sm.patrol.vo;

import cn.gistack.sm.patrol.entity.PatrolRoute;
import lombok.Data;

@Data
public class PatrolRouteVO extends PatrolRoute {
}