diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusRouteMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusRouteMapper.xml new file mode 100644 index 0000000..533170a --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusRouteMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + ID AS id, INSPECTION_ID AS inspectionId, LNG AS lng, LAT AS lat, UPLOAD_TIME AS uploadTime + + diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java index 161c601..171f8dc 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,17 +19,25 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_inspection") public class BusInspection extends Model { private static final long serialVersionUID = 1L; /** - * 主键ID + * 主键ID（对应单机版巡检ID） */ @TableId("ID") private String id; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -58,6 +68,11 @@ @TableField("START_LAT") private BigDecimal startLat; /** + * 开始点位置 + */ + @TableField("START_ADDRESS") + private String startAddress; + /** * 结束位置经度 */ @TableField("END_LNG") @@ -68,124 +83,23 @@ @TableField("END_LAT") private BigDecimal endLat; /** - * 路径 + * 结束点位置 */ - @TableField("ROUTES") - private String routes; + @TableField("END_ADDRESS") + private String endAddress; + /** + * 路线点距离 + */ + @TableField("DISTANCE") + private String distance; /** * 用户姓名 */ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public BigDecimal getStartLng() { - return startLng; - } - - public void setStartLng(BigDecimal startLng) { - this.startLng = startLng; - } - - public BigDecimal getStartLat() { - return startLat; - } - - public void setStartLat(BigDecimal startLat) { - this.startLat = startLat; - } - - public BigDecimal getEndLng() { - return endLng; - } - - public void setEndLng(BigDecimal endLng) { - this.endLng = endLng; - } - - public BigDecimal getEndLat() { - return endLat; - } - - public void setEndLat(BigDecimal endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusInspection{" + - "id=" + id + - ", name=" + name + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", date=" + date + - ", startLng=" + startLng + - ", startLat=" + startLat + - ", endLng=" + endLng + - ", endLat=" + endLat + - ", routes=" + routes + - ", user=" + user + - "}"; - } } diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java index 161c601..171f8dc 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,17 +19,25 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_inspection") public class BusInspection extends Model { private static final long serialVersionUID = 1L; /** - * 主键ID + * 主键ID（对应单机版巡检ID） */ @TableId("ID") private String id; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -58,6 +68,11 @@ @TableField("START_LAT") private BigDecimal startLat; /** + * 开始点位置 + */ + @TableField("START_ADDRESS") + private String startAddress; + /** * 结束位置经度 */ @TableField("END_LNG") @@ -68,124 +83,23 @@ @TableField("END_LAT") private BigDecimal endLat; /** - * 路径 + * 结束点位置 */ - @TableField("ROUTES") - private String routes; + @TableField("END_ADDRESS") + private String endAddress; + /** + * 路线点距离 + */ + @TableField("DISTANCE") + private String distance; /** * 用户姓名 */ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public BigDecimal getStartLng() { - return startLng; - } - - public void setStartLng(BigDecimal startLng) { - this.startLng = startLng; - } - - public BigDecimal getStartLat() { - return startLat; - } - - public void setStartLat(BigDecimal startLat) { - this.startLat = startLat; - } - - public BigDecimal getEndLng() { - return endLng; - } - - public void setEndLng(BigDecimal endLng) { - this.endLng = endLng; - } - - public BigDecimal getEndLat() { - return endLat; - } - - public void setEndLat(BigDecimal endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusInspection{" + - "id=" + id + - ", name=" + name + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", date=" + date + - ", startLng=" + startLng + - ", startLat=" + startLat + - ", endLng=" + endLng + - ", endLat=" + endLat + - ", routes=" + routes + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java new file mode 100644 index 0000000..a7c4c5a --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +@ToString +@TableName("bus_route") +public class BusRoute extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + /** + * 巡检任务ID + */ + @TableField("INSPECTION_ID") + private String inspectionId; + + /** + * 经度 + */ + @TableField("LNG") + private String lng; + + /** + * 纬度 + */ + @TableField("LAT") + private String lat; + /** + * 点上传时间 + */ + @TableField("UPLOAD_TIME") + private String uploadTime; + + @Override + protected Serializable pkVal() { + return this.id; + } +} diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java index 161c601..171f8dc 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,17 +19,25 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_inspection") public class BusInspection extends Model { private static final long serialVersionUID = 1L; /** - * 主键ID + * 主键ID（对应单机版巡检ID） */ @TableId("ID") private String id; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -58,6 +68,11 @@ @TableField("START_LAT") private BigDecimal startLat; /** + * 开始点位置 + */ + @TableField("START_ADDRESS") + private String startAddress; + /** * 结束位置经度 */ @TableField("END_LNG") @@ -68,124 +83,23 @@ @TableField("END_LAT") private BigDecimal endLat; /** - * 路径 + * 结束点位置 */ - @TableField("ROUTES") - private String routes; + @TableField("END_ADDRESS") + private String endAddress; + /** + * 路线点距离 + */ + @TableField("DISTANCE") + private String distance; /** * 用户姓名 */ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public BigDecimal getStartLng() { - return startLng; - } - - public void setStartLng(BigDecimal startLng) { - this.startLng = startLng; - } - - public BigDecimal getStartLat() { - return startLat; - } - - public void setStartLat(BigDecimal startLat) { - this.startLat = startLat; - } - - public BigDecimal getEndLng() { - return endLng; - } - - public void setEndLng(BigDecimal endLng) { - this.endLng = endLng; - } - - public BigDecimal getEndLat() { - return endLat; - } - - public void setEndLat(BigDecimal endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusInspection{" + - "id=" + id + - ", name=" + name + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", date=" + date + - ", startLng=" + startLng + - ", startLat=" + startLat + - ", endLng=" + endLng + - ", endLat=" + endLat + - ", routes=" + routes + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java new file mode 100644 index 0000000..a7c4c5a --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +@ToString +@TableName("bus_route") +public class BusRoute extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + /** + * 巡检任务ID + */ + @TableField("INSPECTION_ID") + private String inspectionId; + + /** + * 经度 + */ + @TableField("LNG") + private String lng; + + /** + * 纬度 + */ + @TableField("LAT") + private String lat; + /** + * 点上传时间 + */ + @TableField("UPLOAD_TIME") + private String uploadTime; + + @Override + protected Serializable pkVal() { + return this.id; + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java index 0e75b2c..eb5c4e5 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,6 +19,9 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_task") public class BusTask extends Model { @@ -33,6 +38,11 @@ @TableField("INSPECTION_ID") private String inspectionId; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -78,114 +88,8 @@ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInspectionId() { - return inspectionId; - } - - public void setInspectionId(String inspectionId) { - this.inspectionId = inspectionId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public BigDecimal getLng() { - return lng; - } - - public void setLng(BigDecimal lng) { - this.lng = lng; - } - - public BigDecimal getLat() { - return lat; - } - - public void setLat(BigDecimal lat) { - this.lat = lat; - } - - public BigDecimal getData() { - return data; - } - - public void setData(BigDecimal data) { - this.data = data; - } - - public String getImages() { - return images; - } - - public void setImages(String images) { - this.images = images; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusTask{" + - "id=" + id + - ", inspectionId=" + inspectionId + - ", name=" + name + - ", createTime=" + createTime + - ", type=" + type + - ", lng=" + lng + - ", lat=" + lat + - ", data=" + data + - ", images=" + images + - ", description=" + description + - ", user=" + user + - "}"; - } } diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java index 161c601..171f8dc 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,17 +19,25 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_inspection") public class BusInspection extends Model { private static final long serialVersionUID = 1L; /** - * 主键ID + * 主键ID（对应单机版巡检ID） */ @TableId("ID") private String id; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -58,6 +68,11 @@ @TableField("START_LAT") private BigDecimal startLat; /** + * 开始点位置 + */ + @TableField("START_ADDRESS") + private String startAddress; + /** * 结束位置经度 */ @TableField("END_LNG") @@ -68,124 +83,23 @@ @TableField("END_LAT") private BigDecimal endLat; /** - * 路径 + * 结束点位置 */ - @TableField("ROUTES") - private String routes; + @TableField("END_ADDRESS") + private String endAddress; + /** + * 路线点距离 + */ + @TableField("DISTANCE") + private String distance; /** * 用户姓名 */ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public BigDecimal getStartLng() { - return startLng; - } - - public void setStartLng(BigDecimal startLng) { - this.startLng = startLng; - } - - public BigDecimal getStartLat() { - return startLat; - } - - public void setStartLat(BigDecimal startLat) { - this.startLat = startLat; - } - - public BigDecimal getEndLng() { - return endLng; - } - - public void setEndLng(BigDecimal endLng) { - this.endLng = endLng; - } - - public BigDecimal getEndLat() { - return endLat; - } - - public void setEndLat(BigDecimal endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusInspection{" + - "id=" + id + - ", name=" + name + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", date=" + date + - ", startLng=" + startLng + - ", startLat=" + startLat + - ", endLng=" + endLng + - ", endLat=" + endLat + - ", routes=" + routes + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java new file mode 100644 index 0000000..a7c4c5a --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +@ToString +@TableName("bus_route") +public class BusRoute extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + /** + * 巡检任务ID + */ + @TableField("INSPECTION_ID") + private String inspectionId; + + /** + * 经度 + */ + @TableField("LNG") + private String lng; + + /** + * 纬度 + */ + @TableField("LAT") + private String lat; + /** + * 点上传时间 + */ + @TableField("UPLOAD_TIME") + private String uploadTime; + + @Override + protected Serializable pkVal() { + return this.id; + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java index 0e75b2c..eb5c4e5 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,6 +19,9 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_task") public class BusTask extends Model { @@ -33,6 +38,11 @@ @TableField("INSPECTION_ID") private String inspectionId; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -78,114 +88,8 @@ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInspectionId() { - return inspectionId; - } - - public void setInspectionId(String inspectionId) { - this.inspectionId = inspectionId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public BigDecimal getLng() { - return lng; - } - - public void setLng(BigDecimal lng) { - this.lng = lng; - } - - public BigDecimal getLat() { - return lat; - } - - public void setLat(BigDecimal lat) { - this.lat = lat; - } - - public BigDecimal getData() { - return data; - } - - public void setData(BigDecimal data) { - this.data = data; - } - - public String getImages() { - return images; - } - - public void setImages(String images) { - this.images = images; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusTask{" + - "id=" + id + - ", inspectionId=" + inspectionId + - ", name=" + name + - ", createTime=" + createTime + - ", type=" + type + - ", lng=" + lng + - ", lat=" + lat + - ", data=" + data + - ", images=" + images + - ", description=" + description + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java new file mode 100644 index 0000000..3c79926 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface IBusRouteService extends IService { + +} diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java index 161c601..171f8dc 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,17 +19,25 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_inspection") public class BusInspection extends Model { private static final long serialVersionUID = 1L; /** - * 主键ID + * 主键ID（对应单机版巡检ID） */ @TableId("ID") private String id; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -58,6 +68,11 @@ @TableField("START_LAT") private BigDecimal startLat; /** + * 开始点位置 + */ + @TableField("START_ADDRESS") + private String startAddress; + /** * 结束位置经度 */ @TableField("END_LNG") @@ -68,124 +83,23 @@ @TableField("END_LAT") private BigDecimal endLat; /** - * 路径 + * 结束点位置 */ - @TableField("ROUTES") - private String routes; + @TableField("END_ADDRESS") + private String endAddress; + /** + * 路线点距离 + */ + @TableField("DISTANCE") + private String distance; /** * 用户姓名 */ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public BigDecimal getStartLng() { - return startLng; - } - - public void setStartLng(BigDecimal startLng) { - this.startLng = startLng; - } - - public BigDecimal getStartLat() { - return startLat; - } - - public void setStartLat(BigDecimal startLat) { - this.startLat = startLat; - } - - public BigDecimal getEndLng() { - return endLng; - } - - public void setEndLng(BigDecimal endLng) { - this.endLng = endLng; - } - - public BigDecimal getEndLat() { - return endLat; - } - - public void setEndLat(BigDecimal endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusInspection{" + - "id=" + id + - ", name=" + name + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", date=" + date + - ", startLng=" + startLng + - ", startLat=" + startLat + - ", endLng=" + endLng + - ", endLat=" + endLat + - ", routes=" + routes + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java new file mode 100644 index 0000000..a7c4c5a --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +@ToString +@TableName("bus_route") +public class BusRoute extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + /** + * 巡检任务ID + */ + @TableField("INSPECTION_ID") + private String inspectionId; + + /** + * 经度 + */ + @TableField("LNG") + private String lng; + + /** + * 纬度 + */ + @TableField("LAT") + private String lat; + /** + * 点上传时间 + */ + @TableField("UPLOAD_TIME") + private String uploadTime; + + @Override + protected Serializable pkVal() { + return this.id; + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java index 0e75b2c..eb5c4e5 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,6 +19,9 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_task") public class BusTask extends Model { @@ -33,6 +38,11 @@ @TableField("INSPECTION_ID") private String inspectionId; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -78,114 +88,8 @@ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInspectionId() { - return inspectionId; - } - - public void setInspectionId(String inspectionId) { - this.inspectionId = inspectionId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public BigDecimal getLng() { - return lng; - } - - public void setLng(BigDecimal lng) { - this.lng = lng; - } - - public BigDecimal getLat() { - return lat; - } - - public void setLat(BigDecimal lat) { - this.lat = lat; - } - - public BigDecimal getData() { - return data; - } - - public void setData(BigDecimal data) { - this.data = data; - } - - public String getImages() { - return images; - } - - public void setImages(String images) { - this.images = images; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusTask{" + - "id=" + id + - ", inspectionId=" + inspectionId + - ", name=" + name + - ", createTime=" + createTime + - ", type=" + type + - ", lng=" + lng + - ", lat=" + lat + - ", data=" + data + - ", images=" + images + - ", description=" + description + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java new file mode 100644 index 0000000..3c79926 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface IBusRouteService extends IService { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/impl/BusRouteServiceImpl.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/impl/BusRouteServiceImpl.java new file mode 100644 index 0000000..a1e2b82 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/impl/BusRouteServiceImpl.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.BusRouteMapper; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.stereotype.Service; + +@Service +public class BusRouteServiceImpl extends ServiceImpl implements IBusRouteService { +} diff --git a/README.md b/README.md index 4c74446..85e8eac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 虹膜门禁 V1.0.0 +# 激光甲烷遥测仪 [^_^]: # (Talk is cheap,Show me the code!) @@ -9,10 +9,5 @@ ## 其他 ->* [git地址](http://192.168.0.203:8080/gitbucket/git/root/casic-iris-parent.git) ->* [本地免登地址](http://localhost:8083/route/mockToken) - - - - - +>* [git地址](http://111.198.10.15:12003/gitbucket/git/codedev/casic-inspection.git) +>* [本地免登地址](http://localhost:8083/route/mockToken) \ No newline at end of file diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java index d87b82e..0cf526b 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusInspectionController.java @@ -1,16 +1,24 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import java.util.List; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.modular.system.model.BusInspection; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.model.BusTask; import com.casic.missiles.modular.system.service.IBusInspectionService; +import com.casic.missiles.modular.system.service.IBusRouteService; +import com.casic.missiles.modular.system.service.IBusTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; /** * 控制器 @@ -22,9 +30,12 @@ @RequestMapping("/inspection") public class BusInspectionController extends BaseController { - @Autowired private IBusInspectionService busInspectionService; + @Autowired + private IBusTaskService taskService; + @Autowired + private IBusRouteService routeService; @PostMapping("/add") @ResponseBody @@ -35,20 +46,40 @@ @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busInspectionService.search(page,keywords,startTime,endTime); + List list = busInspectionService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/info") @ResponseBody - public Object info(String id){ + public Object info(String id) { BusInspection inspection = busInspectionService.selectById(id); return ResponseData.success(inspection); } - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busInspectionService.deleteById(id)) { + //删除巡检任务下的事件和路线 + EntityWrapper taskWrapper = new EntityWrapper<>(); + taskWrapper.eq("INSPECTION_ID", id); + if (taskService.delete(taskWrapper)) { + EntityWrapper routeWrapper = new EntityWrapper<>(); + routeWrapper.eq("INSPECTION_ID", id); + if (routeService.delete(routeWrapper)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检路径删除失败"); + } + } else { + return ResponseData.error("巡检关联事件删除失败"); + } + } else { + return ResponseData.error("巡检任务删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java new file mode 100644 index 0000000..2270d52 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusRouteController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/route") +public class BusRouteController extends BaseController { + + @Autowired + private IBusRouteService routeService; + + @PostMapping("/add") + @ResponseBody + public Object add(BusRoute route) { + routeService.insert(route); + return ResponseData.success(); + } + + @GetMapping("/searchById") + @ResponseBody + public Object searchByInspection(String inspectionId) { + EntityWrapper query = new EntityWrapper<>(); + query.eq("INSPECTION_ID", inspectionId); + query.orderBy("UPLOAD_TIME", false); + List list = routeService.selectList(query); + + Map res = new HashMap<>(); + res.put("list", list); + return ResponseData.success(res); + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java index 9e843f9..a841826 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/controller/BusTaskController.java @@ -1,21 +1,23 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.BusTask; +import com.casic.missiles.modular.system.service.IBusTaskService; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.modular.system.model.BusTask; -import com.casic.missiles.modular.system.service.IBusTaskService; - /** * 控制器 * @@ -26,42 +28,44 @@ @RequestMapping("/task") public class BusTaskController extends BaseController { - @Autowired private IBusTaskService busTaskService; @PostMapping("/add") @ResponseBody - public Object add(BusTask task){ + public Object add(BusTask task) { busTaskService.insert(task); return ResponseData.success(); } @GetMapping("/search") @ResponseBody - public Object search(String keywords, String startTime, String endTime){ + public Object search(String keywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - List list = busTaskService.search(page,keywords,startTime,endTime); + List list = busTaskService.search(page, keywords, startTime, endTime); page.setRecords(list); return ResponseData.success(super.packForBT(page)); } @GetMapping("/searchByInspection") @ResponseBody - public Object searchByInspection(String inspectionId){ + public Object searchByInspection(String inspectionId) { EntityWrapper query = new EntityWrapper<>(); query.eq("INSPECTION_ID", inspectionId); List list = busTaskService.selectList(query); Map res = new HashMap<>(); - res.put("list",list); + res.put("list", list); return ResponseData.success(res); } - - - - - - + @GetMapping("/delete") + @ResponseBody + public Object delete(String id) { + if (busTaskService.deleteById(id)) { + return ResponseData.success(); + } else { + return ResponseData.error("巡检事件删除失败"); + } + } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java new file mode 100644 index 0000000..8ef7883 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/BusRouteMapper.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface BusRouteMapper extends BaseMapper { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml index 2078ead..c40b574 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusInspectionMapper.xml @@ -5,21 +5,24 @@ + + - + + - ID AS id, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, END_LNG AS endLng, END_LAT AS endLat, ROUTES AS routes, USER AS user + ID AS id, DEVICE_CODE as deviceCode, NAME AS name, START_TIME AS startTime, END_TIME AS endTime, DATE AS date, START_LNG AS startLng, START_LAT AS startLat, START_ADDRESS as startAddress, END_LNG AS endLng, END_LAT AS endLat, END_ADDRESS as endAddress, DISTANCE AS distance, USER AS user diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java index 161c601..171f8dc 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusInspection.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,17 +19,25 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_inspection") public class BusInspection extends Model { private static final long serialVersionUID = 1L; /** - * 主键ID + * 主键ID（对应单机版巡检ID） */ @TableId("ID") private String id; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -58,6 +68,11 @@ @TableField("START_LAT") private BigDecimal startLat; /** + * 开始点位置 + */ + @TableField("START_ADDRESS") + private String startAddress; + /** * 结束位置经度 */ @TableField("END_LNG") @@ -68,124 +83,23 @@ @TableField("END_LAT") private BigDecimal endLat; /** - * 路径 + * 结束点位置 */ - @TableField("ROUTES") - private String routes; + @TableField("END_ADDRESS") + private String endAddress; + /** + * 路线点距离 + */ + @TableField("DISTANCE") + private String distance; /** * 用户姓名 */ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public BigDecimal getStartLng() { - return startLng; - } - - public void setStartLng(BigDecimal startLng) { - this.startLng = startLng; - } - - public BigDecimal getStartLat() { - return startLat; - } - - public void setStartLat(BigDecimal startLat) { - this.startLat = startLat; - } - - public BigDecimal getEndLng() { - return endLng; - } - - public void setEndLng(BigDecimal endLng) { - this.endLng = endLng; - } - - public BigDecimal getEndLat() { - return endLat; - } - - public void setEndLat(BigDecimal endLat) { - this.endLat = endLat; - } - - public String getRoutes() { - return routes; - } - - public void setRoutes(String routes) { - this.routes = routes; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusInspection{" + - "id=" + id + - ", name=" + name + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", date=" + date + - ", startLng=" + startLng + - ", startLat=" + startLat + - ", endLng=" + endLng + - ", endLat=" + endLat + - ", routes=" + routes + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java new file mode 100644 index 0000000..a7c4c5a --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusRoute.java @@ -0,0 +1,55 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serializable; + +@EqualsAndHashCode(callSuper = true) +@Data +@ToString +@TableName("bus_route") +public class BusRoute extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "ID", type = IdType.AUTO) + private Long id; + + /** + * 巡检任务ID + */ + @TableField("INSPECTION_ID") + private String inspectionId; + + /** + * 经度 + */ + @TableField("LNG") + private String lng; + + /** + * 纬度 + */ + @TableField("LAT") + private String lat; + /** + * 点上传时间 + */ + @TableField("UPLOAD_TIME") + private String uploadTime; + + @Override + protected Serializable pkVal() { + return this.id; + } +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java index 0e75b2c..eb5c4e5 100644 --- a/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/model/BusTask.java @@ -1,13 +1,15 @@ package com.casic.missiles.modular.system.model; -import java.io.Serializable; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -17,6 +19,9 @@ * @author stylefeng123 * @since 2020-06-09 */ +@EqualsAndHashCode(callSuper = true) +@Data +@ToString @TableName("bus_task") public class BusTask extends Model { @@ -33,6 +38,11 @@ @TableField("INSPECTION_ID") private String inspectionId; /** + * 设备编号（蓝牙搜索出来的设备名字） + */ + @TableField("DEVICE_CODE") + private String deviceCode; + /** * 巡检名称 */ @TableField("NAME") @@ -78,114 +88,8 @@ @TableField("USER") private String user; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getInspectionId() { - return inspectionId; - } - - public void setInspectionId(String inspectionId) { - this.inspectionId = inspectionId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public BigDecimal getLng() { - return lng; - } - - public void setLng(BigDecimal lng) { - this.lng = lng; - } - - public BigDecimal getLat() { - return lat; - } - - public void setLat(BigDecimal lat) { - this.lat = lat; - } - - public BigDecimal getData() { - return data; - } - - public void setData(BigDecimal data) { - this.data = data; - } - - public String getImages() { - return images; - } - - public void setImages(String images) { - this.images = images; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getUser() { - return user; - } - - public void setUser(String user) { - this.user = user; - } - @Override protected Serializable pkVal() { return this.id; } - - @Override - public String toString() { - return "BusTask{" + - "id=" + id + - ", inspectionId=" + inspectionId + - ", name=" + name + - ", createTime=" + createTime + - ", type=" + type + - ", lng=" + lng + - ", lat=" + lat + - ", data=" + data + - ", images=" + images + - ", description=" + description + - ", user=" + user + - "}"; - } } diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java new file mode 100644 index 0000000..3c79926 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/IBusRouteService.java @@ -0,0 +1,8 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.model.BusRoute; + +public interface IBusRouteService extends IService { + +} diff --git a/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/impl/BusRouteServiceImpl.java b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/impl/BusRouteServiceImpl.java new file mode 100644 index 0000000..a1e2b82 --- /dev/null +++ b/casic-inspection/src/main/java/com/casic/missiles/modular/system/service/impl/BusRouteServiceImpl.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.BusRouteMapper; +import com.casic.missiles.modular.system.model.BusRoute; +import com.casic.missiles.modular.system.service.IBusRouteService; +import org.springframework.stereotype.Service; + +@Service +public class BusRouteServiceImpl extends ServiceImpl implements IBusRouteService { +} diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 077fc3b..1886940 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -3,17 +3,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; - import java.io.FileNotFoundException; -import java.lang.reflect.GenericArrayType; import java.text.ParseException; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; /** * SpringBoot方式启动类 @@ -36,5 +31,4 @@ // GenerateReportTask task = new GenerateReportTask(); // task.generateTask(); } - }