xielianghe

whepi-doc/mrsb.sql

@@ -8,6 +8,7 @@ CREATE TABLE ms_report  (
   safety_num        int(11) NOT NULL DEFAULT 0                              COMMENT '平安人数',
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '疑似人数',
   remarks           varchar(100)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
+  report_date       date (0)                                                COMMENT '上报日期',
   ms_status         int(11) NOT NULL DEFAULT 1                              COMMENT '健康状态:1正常,2异常',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',
@@ -24,11 +25,11 @@ DROP TABLE IF EXISTS ms_suspected;
 CREATE TABLE ms_suspected  (
   suspected_id      bigint(20) NOT NULL DEFAULT 0                           COMMENT '疑似ID',
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
+  user_name         varchar(50)  NOT NULL DEFAULT ''                        COMMENT '家人姓名',
   family_relative   int(11)    NOT NULL DEFAULT 1                           COMMENT '是否家庭成员:1是,2暂住亲友',
   medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否就医:1否,1是',
-  condition_status  int(11)    NOT NULL DEFAULT 0                           COMMENT '疑似情况:1咳嗽,2发烧,3腹泻,4胸痛,5咽痛,6其他 ',
+  condition_status  varchar(50)  NOT NULL DEFAULT ''                        COMMENT '疑似情况:1咳嗽,2发烧,3腹泻,4胸痛,5咽痛,6其他 ',
   remarks           varchar(100)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
-
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',

whepi-ui/templates/home/ribao.ftl

@@ -66,7 +66,7 @@
                                 <div class="weui-cell weui-cell_active" id="js_cell">
                                     <div class="weui-cell__hd"><label class="weui-label">家人</label></div>
                                     <div class="weui-cell__bd weui-flex">
-                                        <input id="js_input_xingming" class="weui-input" autofocus="" type="text"
+                                        <input id="js_input_user_name" class="weui-input" autofocus="" type="text"
                                                placeholder="请输入姓名" maxlength="20">
                                     </div>
                                 </div>
@@ -110,7 +110,7 @@
                                 </div>
                                 <div class="weui-cell ">
                                     <div class="weui-cell__bd">
-                                        <textarea class="weui-textarea" placeholder="请输入病情描述" rows="3"></textarea>
+                                        <textarea id="rb_remarks" class="weui-textarea" placeholder="请输入病情描述" rows="3"></textarea>
                                         <div class="weui-textarea-counter"><span>0</span>/200</div>
                                     </div>
                                 </div>

whepi-ui/templates/home/ribao.js

@@ -45,21 +45,21 @@ function ribao_commit() {
 
 
 function ribaoCommit() {
-  var userType = $('input:radio:checked').val();
-  var linkman = $("#linkman").val();
-  var phone = $("#phone").val();
-  console.log(userType)
-  console.log(linkman)
-  console.log(phone)
+  var user_name = $("#js_input_user_name").val();
+  var remarks = $("#rb_remarks").val();
+  var medical = $('input:radio:checked').val();
+  console.log(user_name)
+  console.log(remarks)
+  console.log(medical)
 
   $.ajax({
     url: '/home/addRibao.json',
     type: "post",
     data: {
-      "userId": 123,
-      "userType": userType,
-      "linkman": '',
-      "phone": '',
+      "userName": user_name,
+      "conditionStatus": "",
+      "medical": medical,
+      "remarks": remarks,
     },
   });
 }

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -2,10 +2,20 @@ package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.MsReport;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * @Author: xielianghe
  * @Date: 2020/2/4 15:45
  */
+@Mapper
+@Repository
 public interface MsReportMapper extends BaseMapper<MsReport> {
+
+    List<MsReport> selectByReportDate(@Param("reportDate") String reportDate);
+
 }

whepi-web/src/main/java/com/bofeng/dao/MsSuspectedMapper.java

@@ -2,10 +2,14 @@ package com.bofeng.dao;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Author: xielianghe
  * @Date: 2020/2/4 15:39
@@ -13,4 +17,6 @@ import org.springframework.stereotype.Repository;
 @Mapper
 @Repository
 public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
+
+    List<MsSuspected> selectByReportId(@Param("reportId") Long reportId);
 }

whepi-web/src/main/java/com/bofeng/entity/MsReport.java

@@ -9,6 +9,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
 
+import java.util.Date;
+
 /**
  * @Author: xielianghe
  * @Date: 2020/2/4 14:54
@@ -33,6 +35,9 @@ public class MsReport {
     @TableField("remarks")
     private String remarks;
 
+    @TableField("report_date")
+    private Date reportDate;
+
     @TableField("ms_status")
     private Integer msStatus;
 

whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -24,6 +24,9 @@ public class MsSuspected {
     @TableField("report_id")
     private Long reportId;
 
+    @TableField("user_name")
+    private String userName;
+
     @TableField("family_relative")
     private Integer familyRelative;
 
@@ -31,7 +34,7 @@ public class MsSuspected {
     private Integer medical;
 
     @TableField("condition_status")
-    private Integer conditionStatus;
+    private String conditionStatus;
 
     @TableField("remarks")
     private String remarks;

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

@@ -1,9 +1,41 @@
 package com.bofeng.service;
 
 
+import com.bofeng.dao.MsReportMapper;
+import com.bofeng.dao.MsSuspectedMapper;
+import com.bofeng.entity.MsReport;
+import com.bofeng.entity.MsSuspected;
+import com.bofeng.entity.NotifyOpen;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Author: xielianghe
  * @Date: 2020/2/4 15:44
  */
+@Service
+@Transactional(readOnly = true)
 public class MsReportService {
+
+    @Autowired
+    private MsSuspectedMapper msSuspectedMapper;
+    @Autowired
+    private MsReportMapper msReportMapper;
+
+    public List<MsSuspected> getByDateNow() {
+        Date t = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String reportDate = df.format(t);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
+        List<MsSuspected> listSuspected = null;
+        if (listReport != null && listReport.size() > 0) {
+            listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
+        }
+        return listSuspected;
+    }
 }

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

@@ -2,18 +2,21 @@ package com.bofeng.service;
 
 
 import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
-import com.bofeng.dao.UserOpenMapper;
+import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
-import com.bofeng.entity.Owner;
-import com.bofeng.entity.UptownHome;
-import com.bofeng.entity.UserRole;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Author: xielianghe
  * @Date: 2020/2/4 15:44
@@ -25,22 +28,50 @@ public class MsSuspectedService {
 
     @Autowired
     private MsSuspectedMapper msSuspectedMapper;
+    @Autowired
+    private MsReportMapper msReportMapper;
 
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addRibao(Long userId, Integer userType, String linkman, String phone) {
+    public void addSuspected(String userName, String conditionStatus, Integer medical, String remarks) {
+        Long reportId=0L;
+        //如果是当前日期 已经添加
+        Date t = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String reportDate=df.format(t);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
+        if (listReport == null|| listReport.size()==0) {
+            MsReport msReport = new MsReport();
+            msReport.setReportId(IdWorker.getId());
+            msReport.setHouseId(0L);
+            msReport.setSafetyNum(0);
+            msReport.setSuspectedNum(0);
+            msReport.setRemarks("");
+            msReport.setReportDate(DateTime.now().toDate());
+            msReport.setMsStatus(0);
+            msReport.setUserCreate(0L);
+            msReport.setTimeCreate(DateTime.now());
+            msReport.setUserUpdate(0L);
+            msReport.setTimeUpdate(DateTime.now());
+            msReportMapper.insert(msReport);
+            reportId=msReport.getReportId();
+        }
+        else
+            reportId=listReport.get(0).getReportId();
+
+        //添加家人
         MsSuspected msSuspected = new MsSuspected();
         msSuspected.setSuspectedId(IdWorker.getId());
-        msSuspected.setReportId(userId);
-        msSuspected.setFamilyRelative(userType);
-        msSuspected.setConditionStatus(0);
-        msSuspected.setMedical(0);
-        msSuspected.setRemarks("测试");
-        msSuspected.setUserCreate(userId);
+        msSuspected.setReportId(reportId);
+        msSuspected.setUserName(userName);
+        msSuspected.setFamilyRelative(1);//默认为家人
+        msSuspected.setConditionStatus(conditionStatus);
+        msSuspected.setMedical(medical);
+        msSuspected.setRemarks(remarks);
+        msSuspected.setUserCreate(0L);
         msSuspected.setTimeCreate(DateTime.now());
-        msSuspected.setUserUpdate(userId);
+        msSuspected.setUserUpdate(0L);
         msSuspected.setTimeUpdate(DateTime.now());
         msSuspectedMapper.insert(msSuspected);
     }
-
 }

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

@@ -23,11 +23,11 @@ public class MsReportController {
 
     @PostMapping("/home/addRibao.json")
     public ModelAndView saveUser(HttpServletRequest request) {
-        Long userId = Long.parseLong(request.getParameter("userId"));
-        Integer userType = Integer.parseInt(request.getParameter("userType"));
-        String linkman = request.getParameter("linkman");
-        String phone = request.getParameter("phone");
-        msSuspectedService.addRibao(userId, userType, linkman, phone);
+        String userName = request.getParameter("userName");
+        String conditionStatus = request.getParameter("conditionStatus");
+        Integer medical = request.getParameter("medical").equals("on") ? 1 : 0;
+        String remarks = request.getParameter("remarks");
+        msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks);
         return new ModelAndView("/home/home.ftl");
     }
 }

whepi-web/src/main/resources/mapper/MsReport.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bofeng.dao.MsReportMapper">
+    <select id="selectByReportDate" resultType="com.bofeng.entity.MsReport">
+        select * from ms_report where report_date = #{reportDate}
+    </select>
+</mapper>

whepi-web/src/main/resources/mapper/MsSuspected.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bofeng.dao.MsSuspectedMapper">
+    <select id="selectByReportId" resultType="com.bofeng.entity.MsSuspected">
+        select * from ms_report where report_id = #{reportId}
+    </select>
+</mapper>