版本合并

zengh

2021-06-01 cd2cfd37366002f790a2ed1435962d4eff7d5cec

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/controller/PositionController.java

@@ -41,6 +41,7 @@
/**
 *  控制器
 *
 *
 * @author BladeX
 * @since 2020-07-13
 */
@@ -169,10 +170,7 @@
    * @return
    */
   @PostMapping("/selectry")
   public R selectry(String coordinate, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
   public R selectry(String coordinate) {
      return R.data(positionService.selectry(coordinate));
   }

@@ -212,4 +210,14 @@

   }

   /**
    * 通过警情位置查询附近安保人员
    * @return
    */
   @PostMapping("/selectfj")
   @ApiOperation(value = "通过警情位置查询附近安保人员", notes = "经纬度")
   public R selectry(String jd,String wd) {
      return R.data(positionService.selectfj(jd, wd));
   }

}