查看 所选区域 信息

xufenglei

2018-12-12 c3a445185ee6e016718402ab3e807450b498c901

查看 所选区域 信息

 src/main/java/com/moral/controller/ScreenController.java

@@ -468,11 +468,13 @@
    }

    @RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)

    @ResponseBody

    public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){

    public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){

        ResultBean<List<MonitorPoint>> resultBean = new ResultBean();

        Map<String,Object> paramMap = new HashMap<String, Object>();

        paramMap.put("orgId", orgId);

        paramMap.put("mapBounds",mapBounds);

        paramMap.put("regionCode",regionCode);

        ParameterUtils.getRegionType4RegionCode(paramMap);

        List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);

        resultBean.setData(list);

        resultBean.setCode(ResultBean.SUCCESS);

@@ -480,11 +482,13 @@
    }

    @RequestMapping(value="/get-devices",method = RequestMethod.GET)

    @ResponseBody

    public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds){

    public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){

        ResultBean<List<Device>> resultBean = new ResultBean();

        Map<String,Object> paramMap = new HashMap<String, Object>();

        paramMap.put("orgId", orgId);

        paramMap.put("mapBounds",mapBounds);

        paramMap.put("regionCode",regionCode);

        ParameterUtils.getRegionType4RegionCode(paramMap);

        List<Device> list = deviceService.query(paramMap);

        resultBean.setData(list);

        resultBean.setCode(ResultBean.SUCCESS);


 src/main/resources/mapper/DeviceMapper.xml

@@ -238,6 +238,9 @@
            AND dev.latitude  < #{mapBounds.Fe,jdbcType=NUMERIC}
            AND dev.latitude  > #{mapBounds.Ke,jdbcType=NUMERIC}
              ]]>
             <if test="regionCode != null">
             AND mpt.${regionType}_code = #{regionCode}
             </if>
            AND dev.is_delete =0
        </where>
    </select>

 src/main/resources/mapper/MonitorPointMapper.xml

@@ -125,6 +125,10 @@
            AND mpt.latitude  < #{mapBounds.Fe,jdbcType=NUMERIC}
            AND mpt.latitude  > #{mapBounds.Ke,jdbcType=NUMERIC}
              ]]>
             <if test="regionCode != null">
             AND mpt.${regionType}_code = #{regionCode}
             </if>
     		 
            <if test="isDelete != null">
            AND    mpt.is_delete = #{isDelete,jdbcType=VARCHAR}
            </if>

 src/main/webapp/view/map.jsp

@@ -357,6 +357,7 @@
            var maxBounds = moralMap.getMaxBounds();
            var paramMap = {};
            paramMap["orgId"]=  params['orgId'];
            paramMap["regionCode"]=  params['regionCode'];
            // 为了适配旧接口
            paramMap["Fe"]=  maxBounds.northeastLat;//东北角纬度，大一点
            paramMap["Ge"]=  maxBounds.northeastLng;//东北角经度，大一点