xielianghe

whepi-ui/templates/home/home.ftl

@@ -60,11 +60,10 @@
         family_init();
         ribao_add();
         ribao_cancel();
-        ribao_commit();
 
-        <#--var msReport = ${msReport};-->
-        <#--$('#ribao_safety_num').val(msReport.safetyNum);-->
-        <#--ribaoInitialization(msReport.reportId);-->
+        <#if msReport ??>var msReport = ${msReport}</#if>;
+        $('#ribao_safety_num').val(msReport.safetyNum);
+        ribaoInitialization(msReport.reportId);
         /*submit_back();*/
         familyClick();
 

whepi-ui/templates/home/ribao.js

@@ -33,9 +33,12 @@ function ribaoInitialization(reportId) {
 
 //刷新今日日报
 function ribao_refrash() {
+  var userId = $("#userId").val();
   $.ajax({
     url: '/home/home/queryRibao',
-    data: {},
+    data: {
+      userCreate: userId
+    },
     type: 'GET',
     success: function (data) {
       console.log(data);
@@ -74,7 +77,7 @@ function ribao_cell(v) {
   else
     conditionStatus += "   未确诊"
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\n' +
-    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId)+ ')\'>删除</a></h4>\n' +
+    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a></h4>\n' +
     '                                      <p class="weui-media-box__desc">' + v.remarks + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
@@ -104,34 +107,23 @@ function ribao_cancel() {
   });
 }
 
-function ribao_commit() {
-  $('#commit').on('click', function () {
-
-    if ($('#ribao')[0].style.display == 'none') {
-      $('#notOpenRibao').toggle();
-      $('#ribao')[0].style.display = '';
-    } else {
-      $('#notOpenRibao')[0].style.display = '';
-      $('#ribao')[0].style.display = 'none';
-    }
-  });
-}
-
-
 function ribaoCommit() {
+  var userId = $("#userId").val();
   var user_name = $("#js_input_user_name").val();
-  if(user_name==""){
+  if (user_name == "") {
     alert("请填写家人姓名");
     return;
-  }if(user_name.length>25){
+  }
+  if (user_name.length > 25) {
     alert("请填写正确格式家人姓名");
     return;
   }
   var remarks = $("#rb_remarks").val();
-  if(remarks==""){
+  if (remarks == "") {
     alert("请填写病情描述");
     return;
-  }if(remarks.length>100){
+  }
+  if (remarks.length > 100) {
     alert("病情描述内容太长");
     return;
   }
@@ -167,15 +159,23 @@ function ribaoCommit() {
     conditionStatus += ",6";
 
   $.ajax({
-    url: '/home/addRibao.json',
+    url: '/home/addRibao',
     type: "post",
     data: {
+      "userCreate": userId,
       "userName": user_name,
       "conditionStatus": conditionStatus,
       "medical": medical,
       "remarks": remarks,
     },
     success: function (data) {
+      if ($('#ribao')[0].style.display == 'none') {
+        $('#notOpenRibao').toggle();
+        $('#ribao')[0].style.display = '';
+      } else {
+        $('#notOpenRibao')[0].style.display = '';
+        $('#ribao')[0].style.display = 'none';
+      }
       ribao_refrash();
     },
   });
@@ -183,7 +183,7 @@ function ribaoCommit() {
 
 function deleteSuspected(suspectedId) {
   $.ajax({
-    url: '/home/deleteSuspected.json',
+    url: '/home/deleteSuspected',
     type: "post",
     data: {
       "suspectedId": suspectedId
@@ -196,15 +196,17 @@ function deleteSuspected(suspectedId) {
 
 
 function addReport() {
+  var userId = $("#userId").val();
   var safety_num = $("#ribao_safety_num").val();
-  if(safety_num==""){
+  if (safety_num == "") {
     alert("请填写居家人数");
     return;
   }
   $.ajax({
-    url: '/home/addReport.json',
+    url: '/home/addReport',
     type: "post",
     data: {
+      "userCreate": userId,
       "safetyNum": safety_num,
     },
   });
@@ -215,14 +217,16 @@ $("#my-input-ribao").calendar({
   inputReadOnly: false,
   onChange: function (p, values, displayValues) {
     var reportDate = values.toString();
+    var userId = $("#userId").val();
     $.ajax({
       url: '/home/home/queryRibaoReportDate',
       data: {
+        "userCreate": userId,
         "reportDate": reportDate,
       },
       type: 'GET',
       success: function (data) {
-        if(data.data==undefined){
+        if (data.data == undefined) {
           $('#ribao_famliy').empty();
         }
         else {
@@ -249,13 +253,13 @@ function helpValue1(v) {
   if (conditionStatusList[0] > 0)
     conditionStatus += "&nbsp;&nbsp;&nbsp;咳嗽"
   if (conditionStatusList[1] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
   }
   if (conditionStatusList[2] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;腹泻"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;腹泻"
   }
   if (conditionStatusList[3] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;酸痛"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;酸痛"
   }
   if (conditionStatusList[4] > 0) {
     conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"

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

@@ -92,7 +92,6 @@ public class MsSuspectedService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void deleteSuspected(Long suspectedId) {
 
-
         MsSuspected msSuspected = msSuspectedMapper.selectById(suspectedId);
         if (msSuspected != null) {
             msSuspectedMapper.deleteById(suspectedId);

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

@@ -49,8 +49,9 @@ public class HomeController {
     public ModelAndView home(ModelMap model) throws JsonProcessingException {
         model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         //初始化今日日报
-        //UserOpen userOpen = homeService.getUserOpen();
-        Long userId = 1224706869998772226L;
+        UserOpen userOpen = homeService.getUserOpen();
+        Long userId = userOpen.getUserId();
+        //Long userId = 1224706869998772226L;
         MsReport msReport = msReportService.getReportByDateNow(userId);
         model.put("msReport", new JsonWapper(msReport));
         return new ModelAndView("/home/home.ftl", model);

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

@@ -2,7 +2,6 @@ package com.bofeng.wx.controller;
 
 
 import com.bofeng.entity.*;
-import com.bofeng.service.HomeService;
 import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsSuspectedService;
 import com.yvan.Model;
@@ -11,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
@@ -26,66 +24,58 @@ import java.util.List;
 public class MsReportController {
 
     @Autowired
-    private HomeService homeService;
-
-    @Autowired
     private MsSuspectedService msSuspectedService;
     @Autowired
     private MsReportService msReportService;
 
     //添加家人
-    @PostMapping("/home/addRibao.json")
-    public ModelAndView saveUser(HttpServletRequest request) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
+    @PostMapping("/home/addRibao")
+    public Integer saveUser(HttpServletRequest request) {
+        //初始化今日日报
+        Long userCreate = Long.parseLong(request.getParameter("userCreate"));
         String userName = request.getParameter("userName");
         String conditionStatus = request.getParameter("conditionStatus");
         Integer medical = Integer.parseInt(request.getParameter("medical"));
         String remarks = request.getParameter("remarks");
-        msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks, userId);
-        return new ModelAndView("/home/home.ftl");
+        msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks, userCreate);
+        return 1;
     }
 
-    //删除家人
-    @PostMapping("/home/deleteSuspected.json")
-    public ModelAndView deleteSuspected(HttpServletRequest request) {
+    //删除家人病例
+    @PostMapping("/home/deleteSuspected")
+    public Integer deleteSuspected(HttpServletRequest request) {
         Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
         msSuspectedService.deleteSuspected(suspectedId);
-        return new ModelAndView("/home/home.ftl");
+        return 1;
     }
 
-    //获取家人
+    //根据登录人获取家人
     @GetMapping("/home/home/queryRibao")
-    public Model<List<MsSuspected>> queryRibao() {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
+    public Model<List<MsSuspected>> queryRibao(@Pd(name = "userCreate") Long userCreate) {
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
-        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userId));
+        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userCreate));
     }
 
-    //获取家人
+    //根据日报获取家人
     @GetMapping("/home/home/queryRibaoRefresh")
-    public Model<List<MsSuspected>> queryRibao(@Pd(name = "reportId") Long reportId) {
+    public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId) {
         return Model.newSuccess(msReportService.getByReportId(reportId));
     }
 
     //全家报平安
-    @PostMapping("/home/addReport.json")
-    public ModelAndView addReport(HttpServletRequest request) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
+    @PostMapping("/home/addReport")
+    public Integer addReport(HttpServletRequest request) {
+        Long userCreate = Long.parseLong(request.getParameter("userCreate"));
         String safetyNum = request.getParameter("safetyNum");
-        msReportService.addReport(safetyNum, userId);
-        return new ModelAndView("/home/home.ftl");
+        msReportService.addReport(safetyNum, userCreate);
+        return 1;
     }
 
-    //获取家人
+    //根据日期获取家人
     @GetMapping("/home/home/queryRibaoReportDate")
-    public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
-        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userId));
+    public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate, @Pd(name = "userCreate") Long userCreate) {
+        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userCreate));
     }
 }