Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java

@@ -37,9 +37,10 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

/**
 *  控制器
 * 控制器
 *
 * @author BladeX
 * @since 2020-07-15
@@ -72,6 +73,17 @@
   public R<IPage<RouteinVO>> list(Routein routein, Query query) {
      IPage<Routein> pages = routeinService.page(Condition.getPage(query), Condition.getQueryWrapper(routein));
      return R.data(RouteinWrapper.build().pageVO(pages));
   }

   /**
    * 分页
    */
   @GetMapping("/tree")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入routein")
   public R<List<RouteinVO>> tree(Routein routein, Query query) {
      List<RouteinVO> tree = routeinService.tree();
      return R.data(tree);
   }


@@ -127,8 +139,23 @@
      return R.status(routeinService.removeByIds(Func.toLongList(ids)));
   }


   /**
    * 根据区域id删除巡逻路线信息
    * @param regionId 区域id
    * @return
    */
   @PostMapping("/removeByRegionId")
   public R removeByRegionId(@ApiParam(value = "主键集合", required = true) @RequestParam String regionId,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");
      return R.status(routeinService.removeByRegionId(regionId));
   }

   /**
    * 巡逻路线新增
    *
    * @param routeName
    * @param regionId
    * @param routeInfo
@@ -141,9 +168,9 @@
   public R insertlx(String routeName, String regionId, String routeInfo, String creatName, String remarks, 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");
      response.setHeader("Access-Control-Allow-Credentials", "true");
      Routein routein = new Routein();
      String a="'LINESTRING("+routeInfo+")'";
      String a = "'LINESTRING(" + routeInfo + ")'";
      SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
      String time = df.format(new Date());
      routein.setRouteName(routeName);
@@ -160,6 +187,7 @@

   /**
    * 修改巡逻路线
    *
    * @param id
    * @param routeName
    * @param regionId
@@ -173,26 +201,27 @@
   public R updatelx(Integer id, String routeName, String regionId, String routeInfo, String creatName, String remarks, 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");
      String a="'LINESTRING("+routeInfo+")'";
      response.setHeader("Access-Control-Allow-Credentials", "true");
      String a = "'LINESTRING(" + routeInfo + ")'";
      SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
      String time = df.format(new Date());
      routeinService.updatelx(id,routeName,regionId,a,time,creatName,remarks);
      routeinService.updatelx(id, routeName, regionId, a, time, creatName, remarks);
      return R.success("修改成功");
   }


   /**
    * 巡逻路线查询
    * @param routeName  路线名称
    *
    * @param routeName 路线名称
    * @param response
    * @return
    */
   @PostMapping("/selectList")
   public R selectList(String routeName, HttpServletResponse response) {
   public R selectList(String routeName,String id, 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");
      return R.data(routeinService.selectList(routeName));
      response.setHeader("Access-Control-Allow-Credentials", "true");
      return R.data(routeinService.selectList(routeName,id));
   }
}