手机端地点采集

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AppPatrolInspectionController.java

@@ -117,4 +117,18 @@ public class AppPatrolInspectionController {
         patrolInspectionPlanSonService.addSite(patrolInspectionSite);
         return ApiResult.success();
     }
+
+
+    /**
+     * 手机端-巡检自检-点位采集-采集记录
+     *
+     * @param startTime 开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endTime   结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    @GetMapping("siteList")
+    public ApiResult<List<PatrolInspectionSite>> siteList(@RequestParam(value = "startTime", required = false) String startTime,
+                                                          @RequestParam(value = "endTime", required = false) String endTime) {
+        return ApiResult.success(patrolInspectionPlanSonService.siteList(startTime, endTime));
+    }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionPlanSonService.java

@@ -81,6 +81,14 @@ public interface PatrolInspectionPlanSonService extends CrudService<PatrolInspec
      */
     void addSite(PatrolInspectionSite patrolInspectionSite);
 
+    /**
+     * 手机端-巡检自检-点位采集-采集记录
+     * @param startTime 开始时间 格式：yyyy-MM-dd HH:mm:ss
+     * @param endTime 结束时间 格式：yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    List<PatrolInspectionSite> siteList(String startTime, String endTime);
+
     /**
      * 手机端-巡检自检-子计划巡检点位统计
      *

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -325,7 +325,7 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
 
 
     @Override
-    public void addSite(PatrolInspectionSite patrolInspectionSite){
+    public void addSite(PatrolInspectionSite patrolInspectionSite) {
         patrolInspectionSite.setCreator(SecurityUtils.getUsername());
         patrolInspectionSite.setCollector(SecurityUtils.getUsername());
         patrolInspectionSite.setCollectTime(LocalDateTime.now());
@@ -335,6 +335,19 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
         patrolInspectionSiteService.save(patrolInspectionSite);
     }
 
+    @Override
+    public List<PatrolInspectionSite> siteList(String startTime, String endTime) {
+        LambdaQueryWrapper<PatrolInspectionSite> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionSite::getTenantId, SecurityUtils.getTenantId());
+        queryWrapper.eq(PatrolInspectionSite::getCollector, SecurityUtils.getUsername());
+        queryWrapper.eq(PatrolInspectionSite::getEnable, 1);
+        if (startTime != null && !"".equals(startTime) && endTime != null && !"".equals(endTime)) {
+            queryWrapper.between(PatrolInspectionSite::getCollectTime, startTime, endTime);
+        }
+        List<PatrolInspectionSite> list = patrolInspectionSiteService.list(queryWrapper);
+        return list;
+    }
+
 
     @Override
     public Integer planSiteSonCount(Integer planSonId, Integer inspectionStatus) {