From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 135 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 118 insertions(+), 17 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index 5dd4f92..9f1d241 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -14,7 +14,7 @@
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
-import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
+import com.ruoyi.app.patrolplan.domain.param.*;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
@@ -79,11 +79,11 @@
IArdAppPatrolpointRecordService recordService;
/**
- * 查询app巡检计划列表
+ * 管理端--查询app巡检计划列表
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')")
@GetMapping("/list")
- @ApiOperation("查询全部巡检列表及搜索筛选")
+ @ApiOperation("管理端--查询全部巡检列表及搜索筛选")
public Results list(ArdAppPatrolplan ardAppPatrolplan)
{
String userId = SecurityUtils.getUserId();
@@ -100,12 +100,12 @@
}
/**
- * 导出app巡检计划列表
+ * 管理端--导出app巡检计划列表
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:export')")
@Log(title = "app巡检计划", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("导出全部巡检列表")
+ @ApiOperation("管理端--导出全部巡检列表")
public void export(HttpServletResponse response, ArdAppPatrolplan ardAppPatrolplan)
{
List<ArdAppPatrolplan> list = ardAppPatrolplanService.selectArdAppPatrolplanList(ardAppPatrolplan);
@@ -136,12 +136,12 @@
}
/**
- * 删除app巡检计划
+ * 管理端--删除app巡检计划
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:remove')")
@Log(title = "app巡检计划", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
- @ApiOperation("删除app巡检计划")
+ @ApiOperation("管理端--删除app巡检计划")
//public Results remove(@PathVariable String id)
public AjaxResult remove(@PathVariable String id)
{
@@ -170,34 +170,34 @@
}
/**
- * 新增app巡检计划及人员点位
+ * 管理端--新增app巡检计划及人员点位
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:insertArdAppPatrolplan')")
@Log(title = "app巡检计划", businessType = BusinessType.INSERT)
@PostMapping("/insertArdAppPatrolplan")
- @ApiOperation("新增app巡检计划及人员点位")
+ @ApiOperation("管理端--新增app巡检计划及人员点位")
public AjaxResult addArdAppPatrolplan(@RequestBody Map<String,Object> para)
{
return toAjax(ardAppPatrolplanService.insertArdAppPatrolplan(para));
}
/**
- * 查询单条数据
+ * 管理端--查询单条数据
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:oneById')")
@PostMapping("/oneById/{id}")
- @ApiOperation("查询单条数据")
+ @ApiOperation("管理端--查询单条数据")
public Results oneById(@PathVariable String id)
{
return ardAppPatrolplanService.oneById(id);
}
/**
- * 修改app巡检计划
+ * 管理端--修改app巡检计划
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:edit')")
@Log(title = "app巡检计划", businessType = BusinessType.UPDATE)
- @ApiOperation("修改单条数据")
+ @ApiOperation("管理端--修改单条数据")
@PutMapping("upd")
public Results edit(@RequestBody Map<String,Object> para)
{
@@ -215,13 +215,114 @@
}
/**
- * 巡检日历
+ * 管理端--巡检日历
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
- @ApiOperation("巡检日历")
+ @ApiOperation("管理端--巡检日历")
@PostMapping("recordMonth")
- public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
- return recordService.recordMonth(ardAppPatrolpointRecordParam);
+ public Results recordMonth(@RequestBody RecordMonthParam recordMonthParam) throws ParseException {
+ return recordService.recordMonth(recordMonthParam);
}
+ /**
+ * 管理端--点击日历获取该记录下人员打卡记录
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordDetails')")
+ @ApiOperation("管理端--点击日历获取该记录下人员打卡记录")
+ @PostMapping("recordDetails")
+ public Results recordDetails(@RequestBody RecordDetailsParam recordDetailsParam) throws ParseException {
+ return recordService.recordDetails(recordDetailsParam);
+ }
+
+ /**
+ * 单人详情
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
+ @ApiOperation("单人详情")
+ @PostMapping("recordSolo")
+ public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
+ return recordService.recordSolo(recordSoloParam);
+ }
+
+ /**
+ * 单兵端--查询app巡检计划列表
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeList')")
+ @GetMapping("/executeList")
+ @ApiOperation("单兵端--查询该用户下所有执行计划及搜索筛选")
+ public Results executeList(ArdAppPatrolplan ardAppPatrolplan)
+ {
+ String userId = SecurityUtils.getUserId();
+ ardAppPatrolplan.setUserId(userId);
+ if(ardAppPatrolplan.getPageNum()==null || ardAppPatrolplan.getPageNum() == 0){
+ ardAppPatrolplan.setPageNum(1);
+ }
+ if(ardAppPatrolplan.getPageSize()==null || ardAppPatrolplan.getPageSize() == 0){
+ ardAppPatrolplan.setPageSize(10);
+ }
+ PageHelper.startPage(ardAppPatrolplan.getPageNum(),ardAppPatrolplan.getPageSize());
+ List<ArdAppPatrolplan> list = ardAppPatrolplanService.executeList(ardAppPatrolplan);
+ return Results.succeed(new PageInfo<>(list));
+ }
+
+ /**
+ * 单兵端--查询单条数据
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeOneById')")
+ @PostMapping("/executeOneById/{id}")
+ @ApiOperation("单兵端--查询单条数据")
+ public Results executeOneById(@PathVariable String id)
+ {
+ return ardAppPatrolplanService.executeOneById(id);
+ }
+
+ /**
+ * 单兵端--巡检日历
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeMonth')")
+ @ApiOperation("单兵端--巡检日历")
+ @PostMapping("executeMonth")
+ public Results executeMonth(@RequestBody RecordMonthExParam recordMonthExParam) throws ParseException {
+ return recordService.executeMonth(recordMonthExParam);
+ }
+
+ /**
+ * 单兵端--点击日历获取该记录下人员打卡记录
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeDetails')")
+ @ApiOperation("单兵端--点击日历获取该人员下所有地点打卡记录")
+ @PostMapping("executeDetails")
+ public Results executeDetails(@RequestBody RecordDetailsExParam recordDetailsExParam) throws ParseException {
+ return recordService.executeDetails(recordDetailsExParam);
+ }
+
+ /**
+ * 单兵端--单人详情
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeSolo')")
+// @ApiOperation("单兵端--单人详情")
+ @PostMapping("executeSolo")
+ public Results executeSolo(@RequestBody RecordSoloExParam recordSoloExParam) throws ParseException {
+ return recordService.executeSolo(recordSoloExParam);
+ }
+
+ /**
+ * 单兵端--打卡前
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordBefore')")
+ @ApiOperation("单兵端--打卡前")
+ @PostMapping("recordBefore")
+ public Results recordBefore(@RequestBody RecordBeforeParam recordBeforeParam) throws ParseException {
+ return recordService.recordBefore(recordBeforeParam);
+ }
+
+ /**
+ * 单兵端--循环
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:son')")
+ @ApiOperation("单兵端--循环")
+ @GetMapping("son")
+ public Results son(){
+ return recordService.son();
+ }
}
--
Gitblit v1.9.3