手机端地点采集

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

@@ -2,6 +2,7 @@ package com.usky.fire.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.PatrolInspectionSite;
 import com.usky.fire.service.PatrolInspectionPlanSonService;
 import com.usky.fire.service.vo.PatrolInspectionPlanSonVo;
 import com.usky.fire.service.vo.PatrolInspectionSiteVo;
@@ -95,6 +96,7 @@ public class AppPatrolInspectionController {
 
     /**
      * 手机端-巡检自检-巡检扫码地点详情
+     *
      * @param planSonId 子计划ID
      * @return
      */
@@ -102,4 +104,17 @@ public class AppPatrolInspectionController {
     public ApiResult<List<PatrolInspectionSiteVo>> planSonSiteDetails(@RequestParam(value = "planSonId") Integer planSonId) {
         return ApiResult.success(patrolInspectionPlanSonService.planSonSiteDetails(planSonId));
     }
+
+
+    /**
+     * 手机端-巡检自检-点位采集-提交
+     *
+     * @param patrolInspectionSite
+     * @return
+     */
+    @PostMapping("addSite")
+    public ApiResult<Void> addSite(@RequestBody PatrolInspectionSite patrolInspectionSite) {
+        patrolInspectionPlanSonService.addSite(patrolInspectionSite);
+        return ApiResult.success();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.usky.fire.service;
 
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.PatrolInspectionPlanSon;
+import com.usky.fire.domain.PatrolInspectionSite;
 import com.usky.fire.service.vo.*;
 
 import java.util.List;
@@ -58,19 +59,28 @@ public interface PatrolInspectionPlanSonService extends CrudService<PatrolInspec
 
     /**
      * 手机端-巡检自检-巡检上报-提交
+     *
      * @param planRecordVo
      */
     void updatePlan(PlanRecordVo planRecordVo);
 
 
     /**
-     *  手机端-巡检自检-巡检上报-根据子计划ID查询站点
+     * 手机端-巡检自检-巡检上报-根据子计划ID查询站点
+     *
      * @param planSonId 子计划ID
      * @return
      */
     List<PatrolInspectionSiteVo> planSonSiteDetails(Integer planSonId);
 
 
+    /**
+     * 手机端-巡检自检-点位采集-提交
+     *
+     * @param patrolInspectionSite
+     */
+    void addSite(PatrolInspectionSite patrolInspectionSite);
+
     /**
      * 手机端-巡检自检-子计划巡检点位统计
      *

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

@@ -321,7 +321,18 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
             list.add(SiteVo);
         }
         return list;
+    }
+
 
+    @Override
+    public void addSite(PatrolInspectionSite patrolInspectionSite){
+        patrolInspectionSite.setCreator(SecurityUtils.getUsername());
+        patrolInspectionSite.setCollector(SecurityUtils.getUsername());
+        patrolInspectionSite.setCollectTime(LocalDateTime.now());
+        patrolInspectionSite.setCreateTime(LocalDateTime.now());
+        patrolInspectionSite.setTenantId(SecurityUtils.getTenantId());
+        patrolInspectionSite.setEnable(1);
+        patrolInspectionSiteService.save(patrolInspectionSite);
     }
 
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/util/OnlineMethod.java

@@ -30,6 +30,9 @@ public class OnlineMethod {
         double fen = baiy / baiz;
         DecimalFormat df1 = new DecimalFormat("##.00%");
         baifenbi = df1.format(fen);
+        if (baifenbi.equals(".00%")){
+            baifenbi = "0.00%";
+        }
         return baifenbi;
     }