|
@@ -2,14 +2,12 @@ package com.bofeng.wx.controller;
|
|
|
|
|
|
|
|
|
|
import com.bofeng.entity.*;
|
|
import com.bofeng.entity.*;
|
|
|
|
+import com.bofeng.service.HomeService;
|
|
import com.bofeng.service.MsReportService;
|
|
import com.bofeng.service.MsReportService;
|
|
import com.bofeng.service.MsSuspectedService;
|
|
import com.bofeng.service.MsSuspectedService;
|
|
-import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
|
import com.yvan.Model;
|
|
import com.yvan.Model;
|
|
import com.yvan.mvc.Pd;
|
|
import com.yvan.mvc.Pd;
|
|
-import com.yvan.platform.JsonWapper;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.ui.ModelMap;
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
@@ -17,7 +15,6 @@ import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
-import java.util.Map;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Author: xielianghe
|
|
* @Author: xielianghe
|
|
@@ -26,6 +23,8 @@ import java.util.Map;
|
|
@RestController
|
|
@RestController
|
|
public class MsReportController {
|
|
public class MsReportController {
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private HomeService homeService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private MsSuspectedService msSuspectedService;
|
|
private MsSuspectedService msSuspectedService;
|
|
@@ -35,18 +34,20 @@ public class MsReportController {
|
|
//添加家人
|
|
//添加家人
|
|
@PostMapping("/home/addRibao.json")
|
|
@PostMapping("/home/addRibao.json")
|
|
public ModelAndView saveUser(HttpServletRequest request) {
|
|
public ModelAndView saveUser(HttpServletRequest request) {
|
|
|
|
+ //UserOpen userOpen = homeService.getUserOpen();
|
|
|
|
+ long userId = 1224706869998772226L;
|
|
String userName = request.getParameter("userName");
|
|
String userName = request.getParameter("userName");
|
|
String conditionStatus = request.getParameter("conditionStatus");
|
|
String conditionStatus = request.getParameter("conditionStatus");
|
|
- Integer medical =Integer.parseInt( request.getParameter("medical"));
|
|
|
|
|
|
+ Integer medical = Integer.parseInt(request.getParameter("medical"));
|
|
String remarks = request.getParameter("remarks");
|
|
String remarks = request.getParameter("remarks");
|
|
- msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks);
|
|
|
|
|
|
+ msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks, userId);
|
|
return new ModelAndView("/home/home.ftl");
|
|
return new ModelAndView("/home/home.ftl");
|
|
}
|
|
}
|
|
|
|
|
|
//删除家人
|
|
//删除家人
|
|
@PostMapping("/home/deleteSuspected.json")
|
|
@PostMapping("/home/deleteSuspected.json")
|
|
public ModelAndView deleteSuspected(HttpServletRequest request) {
|
|
public ModelAndView deleteSuspected(HttpServletRequest request) {
|
|
- Long suspectedId =Long.parseLong( request.getParameter("suspectedId"));
|
|
|
|
|
|
+ Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
|
|
msSuspectedService.deleteSuspected(suspectedId);
|
|
msSuspectedService.deleteSuspected(suspectedId);
|
|
return new ModelAndView("/home/home.ftl");
|
|
return new ModelAndView("/home/home.ftl");
|
|
}
|
|
}
|
|
@@ -60,15 +61,18 @@ public class MsReportController {
|
|
//全家报平安
|
|
//全家报平安
|
|
@PostMapping("/home/addReport.json")
|
|
@PostMapping("/home/addReport.json")
|
|
public ModelAndView addReport(HttpServletRequest request) {
|
|
public ModelAndView addReport(HttpServletRequest request) {
|
|
|
|
+ //UserOpen userOpen = homeService.getUserOpen();
|
|
|
|
+ long userId = 1224706869998772226L;
|
|
String safetyNum = request.getParameter("safetyNum");
|
|
String safetyNum = request.getParameter("safetyNum");
|
|
- msReportService.addReport(safetyNum);
|
|
|
|
|
|
+ msReportService.addReport(safetyNum, userId);
|
|
return new ModelAndView("/home/home.ftl");
|
|
return new ModelAndView("/home/home.ftl");
|
|
}
|
|
}
|
|
|
|
|
|
//获取家人
|
|
//获取家人
|
|
@GetMapping("/home/home/queryRibaoReportDate")
|
|
@GetMapping("/home/home/queryRibaoReportDate")
|
|
public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate) {
|
|
public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate) {
|
|
- String report_date=reportDate;
|
|
|
|
- return Model.newSuccess(msReportService.getByReportReportDate(reportDate));
|
|
|
|
|
|
+ //UserOpen userOpen = homeService.getUserOpen();
|
|
|
|
+ long userId = 1224706869998772226L;
|
|
|
|
+ return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userId));
|
|
}
|
|
}
|
|
}
|
|
}
|