打卡上报增加经纬度

whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -94,7 +94,7 @@ public class MsSuspectedService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long addSuspected(Long suspectedId, String userName, Integer grender, Integer age, String familyStatus,
                              String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
-                             Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score) {
+                             Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score, String longitude, String latitude) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -241,25 +241,24 @@ public class MsSuspectedService {
         }
 
         //更新今日日报
-        updateReport(reportId, medical, singleRoom, temperature);
+        updateReport(reportId, medical, singleRoom, temperature, longitude, latitude);
         return reportId;
-
     }
 
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer deleteSuspected(Long suspectedId) {
-
-        MsSuspected msSuspected = msSuspectedMapper.selectById(suspectedId);
-        if (msSuspected != null) {
-            msSuspectedMapper.deleteById(suspectedId);
-            //更新今日日报
-            updateReport(msSuspected.getReportId(), msSuspected.getMedical(), msSuspected.getSingleRoom(), msSuspected.getTemperature());
-            MsReport msReport = msReportMapper.selectById(msSuspected.getReportId());
-            if (msReport != null)
-                return msReport.getSafetyNum();
-        }
-        return 0;
-    }
+//    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+//    public Integer deleteSuspected(Long suspectedId) {
+//
+//        MsSuspected msSuspected = msSuspectedMapper.selectById(suspectedId);
+//        if (msSuspected != null) {
+//            msSuspectedMapper.deleteById(suspectedId);
+//            //更新今日日报
+//            updateReport(msSuspected.getReportId(), msSuspected.getMedical(), msSuspected.getSingleRoom(), msSuspected.getTemperature(), longitude, latitude);
+//            MsReport msReport = msReportMapper.selectById(msSuspected.getReportId());
+//            if (msReport != null)
+//                return msReport.getSafetyNum();
+//        }
+//        return 0;
+//    }
 
     //更新今日日报
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)

whepi-web/src/main/java/com/bofeng/service/MsTripService.java

@@ -301,7 +301,7 @@ public class MsTripService {
                 }
             }
             //更新今日日报,直接上报
-            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
+            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature, longitude, latitude);
             //修改上报状态
             msReportService.editReportLy(reportId, userCreate);
         }

whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -64,9 +64,12 @@ public class MsReportController {
         Integer temperatureScore = Conv.NI(request.getParameter("temperatureScore"));
         Integer scoreHistroy = Conv.NI(request.getParameter("scoreHistroy"));
         Integer score = Conv.NI(request.getParameter("score"));
+        //经纬度
+        String longitude = request.getParameter("longitude");
+        String latitude = request.getParameter("latitude");
 
         MsReport msReport = new MsReport();
-        Long reportId = msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate, scoreRezult, temperatureScore, scoreHistroy, score);
+        Long reportId = msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate, scoreRezult, temperatureScore, scoreHistroy, score, longitude, latitude);
         if (reportId == 2L)
             msReport.setMsgReport("2");
         else
@@ -100,17 +103,17 @@ public class MsReportController {
     }
 
     //删除家人病例
-    @PostMapping("/home/deleteSuspected")
-    public MsReport deleteSuspected(HttpServletRequest request) {
-        Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
-        MsSuspected msSuspected = msSuspectedService.selectSuspected(suspectedId);
-        msSuspectedService.deleteSuspected(suspectedId);
-        msTripService.deleteTrip(suspectedId);
-        if (msSuspected != null)
-            return msReportService.getByReport(msSuspected.getReportId());
-        else
-            return null;
-    }
+//    @PostMapping("/home/deleteSuspected")
+//    public MsReport deleteSuspected(HttpServletRequest request) {
+//        Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
+//        MsSuspected msSuspected = msSuspectedService.selectSuspected(suspectedId);
+//        msSuspectedService.deleteSuspected(suspectedId);
+//        msTripService.deleteTrip(suspectedId);
+//        if (msSuspected != null)
+//            return msReportService.getByReport(msSuspected.getReportId());
+//        else
+//            return null;
+//    }
 
     //根据点击获取家人
     @GetMapping("/home/home/queryRibao")