xielianghe

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

@@ -0,0 +1,18 @@
+package com.bofeng.dao;
+
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.MsTripDet;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/22 14:56
+ */
+@Mapper
+@Repository
+public interface MsTripDetMapper extends BaseMapper<MsTripDet> {
+    int deleteByTripId(@Param("tripId") Long tripId);
+}

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

@@ -4,10 +4,12 @@ package com.bofeng.service;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
+import com.bofeng.dao.MsTripDetMapper;
 import com.bofeng.dao.MsTripMapper;
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
 import com.bofeng.entity.MsTrip;
+import com.bofeng.entity.MsTripDet;
 import com.yvan.platform.Conv;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,8 @@ public class MsTripService {
     @Autowired
     private MsTripMapper msTripMapper;
     @Autowired
+    private MsTripDetMapper msTripDetMapper;
+    @Autowired
     private MsSuspectedService msSuspectedService;
 
 
@@ -43,7 +47,7 @@ public class MsTripService {
     public Long addSuspectedTrip(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 workLocal, String workLocalOther, Integer todayLocal, String todayLocalOther, Integer isTrip, String tripDet) {
+            , Integer workLocal, String workLocalOther, Integer todayLocal, String todayLocalOther, Integer isTrip, List<MsTripDet> listTripDet) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -146,13 +150,33 @@ public class MsTripService {
 
             //添加出行
             MsTrip msTrip = new MsTrip();
-            msTrip.setTripId(msSuspected.getReportId());
+            msTrip.setTripId(msSuspected.getSuspectedId());
             msTrip.setIsTrip(isTrip);
             msTrip.setTodayLocal(todayLocal);
             msTrip.setTodayLocalOther(todayLocalOther);
             msTrip.setWorkLocal(workLocal);
             msTrip.setWorkLocalOther(workLocalOther);
             msTripMapper.insert(msTrip);
+            //添加出行详细
+            if (listTripDet != null && listTripDet.size() > 0) {
+                for (MsTripDet msTripDet : listTripDet) {
+                    MsTripDet msTripDet1 = new MsTripDet();
+                    msTripDet1.setTripDetId(IdWorker.getId());
+                    msTripDet1.setTripId(msSuspected.getSuspectedId());
+                    msTripDet1.setSort(msTripDet.getSort());
+                    msTripDet1.setStartLocal(msTripDet.getStartLocal());
+                    msTripDet1.setStartLocalOther(msTripDet.getStartLocalOther());
+                    msTripDet1.setEndLocal(msTripDet.getEndLocal());
+                    msTripDet1.setEndLocalOther(msTripDet.getEndLocalOther());
+                    msTripDet1.setTripType(msTripDet.getTripType());
+                    msTripDet1.setTripTypeDesp(msTripDet.getTripTypeDesp());
+                    msTripDet1.setTimeCreate(DateTime.now());
+                    msTripDet1.setUserCreate(userCreate);
+                    msTripDet1.setTimeUpdate(DateTime.now());
+                    msTripDet1.setUserUpdate(userCreate);
+                    msTripDetMapper.insert(msTripDet1);
+                }
+            }
 
         } else {
             //判断家人是否同名
@@ -196,6 +220,7 @@ public class MsTripService {
                 msSuspected1.setSuspectedStatus(suspectedStatus);
                 msSuspectedMapper.updateById(msSuspected1);
             }
+            //编辑行程
             MsTrip msTrip = msTripMapper.selectById(suspectedId);
             if (msTrip != null) {
                 msTrip.setWorkLocalOther(workLocalOther);
@@ -205,16 +230,32 @@ public class MsTripService {
                 msTrip.setIsTrip(isTrip);
                 msTripMapper.updateById(msTrip);
             }
+            //删除行程详细
+            msTripDetMapper.deleteByTripId(suspectedId);
+            //添加行程详细
+            //添加出行详细
+            if (listTripDet != null && listTripDet.size() > 0) {
+                for (MsTripDet msTripDet : listTripDet) {
+                    MsTripDet msTripDet1 = new MsTripDet();
+                    msTripDet1.setTripDetId(IdWorker.getId());
+                    msTripDet1.setTripId(suspectedId);
+                    msTripDet1.setSort(msTripDet.getSort());
+                    msTripDet1.setStartLocal(msTripDet.getStartLocal());
+                    msTripDet1.setStartLocalOther(msTripDet.getStartLocalOther());
+                    msTripDet1.setEndLocal(msTripDet.getEndLocal());
+                    msTripDet1.setEndLocalOther(msTripDet.getEndLocalOther());
+                    msTripDet1.setTripType(msTripDet.getTripType());
+                    msTripDet1.setTripTypeDesp(msTripDet.getTripTypeDesp());
+                    msTripDet1.setTimeCreate(DateTime.now());
+                    msTripDet1.setUserCreate(userCreate);
+                    msTripDet1.setTimeUpdate(DateTime.now());
+                    msTripDet1.setUserUpdate(userCreate);
+                    msTripDetMapper.insert(msTripDet1);
+                }
+            }
         }
-
         //更新今日日报
         msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
         return reportId;
     }
-
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer deleteTripdet(Long tripDetId) {
-        return msSuspectedMapper.deleteById(tripDetId);
-    }
-
 }

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

@@ -3,9 +3,12 @@ package com.bofeng.wx.controller;
 
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
+import com.bofeng.entity.MsTripDet;
+import com.bofeng.entity.Owner;
 import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsTripService;
 import com.yvan.platform.Conv;
+import com.yvan.platform.JsonWapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,6 +16,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: xielianghe
@@ -27,53 +33,57 @@ public class MsTripController {
 
     //添加家人出行
     @PostMapping("/home/addRibaoTrip")
-    public MsReport saveUser(HttpServletRequest request) throws UnsupportedEncodingException {
+    public MsReport saveUser(JsonWapper jsonWapper) throws UnsupportedEncodingException {
 
         //初始化今日日报
-        Long suspectedId = Conv.NL(request.getParameter("suspectedId"));
-        Long userCreate = Conv.NL(request.getParameter("userCreate"));
-        String userName = request.getParameter("userName").trim();
+        Long suspectedId = jsonWapper.asObject(Long.class, "suspectedId");
+        Long userCreate = jsonWapper.asObject(Long.class, "userCreate");
+        String userName = jsonWapper.asObject(String.class, "userName");
         byte[] utf8Bytes = userName.getBytes("UTF-8");
         userName = new String(utf8Bytes, "UTF-8");
-        Integer grender = Conv.NI(request.getParameter("grender"));
-        Integer age = Conv.NI(request.getParameter("age"));
-        String familyStatus = request.getParameter("familyStatus");
-        String statusDesp = request.getParameter("statusDesp");
-        Integer medical = Conv.NI(request.getParameter("medical"));
-        BigDecimal temperature = new BigDecimal(request.getParameter("temperature"));
-        Integer cough = Conv.NI(request.getParameter("cough"));
-        Integer muscle = Conv.NI(request.getParameter("muscle"));
-        Integer dyspnea = Conv.NI(request.getParameter("dyspnea"));
-        Integer fatigue = Conv.NI(request.getParameter("fatigue"));
-        Integer diarrhea = Conv.NI(request.getParameter("diarrhea"));
-        Integer singleRoom = Conv.NI(request.getParameter("singleRoom"));
-        String others = request.getParameter("others");
-        Integer scoreRezult = Conv.NI(request.getParameter("scoreRezult"));
-        Integer temperatureScore = Conv.NI(request.getParameter("temperatureScore"));
-        Integer scoreHistroy = Conv.NI(request.getParameter("scoreHistroy"));
-        Integer score = Conv.NI(request.getParameter("score"));
-
+        Integer grender = jsonWapper.asObject(Integer.class, "grender");
+        Integer age = jsonWapper.asObject(Integer.class, "age");
+        String familyStatus = jsonWapper.asObject(String.class, "familyStatus");
+        String statusDesp = jsonWapper.asObject(String.class, "statusDesp");
+        Integer medical = jsonWapper.asObject(Integer.class, "medical");
+        BigDecimal temperature = jsonWapper.asObject(BigDecimal.class, "temperature");
+        Integer cough = jsonWapper.asObject(Integer.class, "cough");
+        Integer muscle = jsonWapper.asObject(Integer.class, "muscle");
+        Integer dyspnea = jsonWapper.asObject(Integer.class, "dyspnea");
+        Integer fatigue = jsonWapper.asObject(Integer.class, "fatigue");
+        Integer diarrhea = jsonWapper.asObject(Integer.class, "diarrhea");
+        Integer singleRoom = jsonWapper.asObject(Integer.class, "singleRoom");
+        String others = jsonWapper.asObject(String.class, "others");
+        Integer scoreRezult = jsonWapper.asObject(Integer.class, "scoreRezult");
+        Integer temperatureScore = jsonWapper.asObject(Integer.class, "temperatureScore");
+        Integer scoreHistroy = jsonWapper.asObject(Integer.class, "scoreHistroy");
+        Integer score = jsonWapper.asObject(Integer.class, "score");
         //添加出行
-        Integer workLocal = Conv.NI(request.getParameter("workLocal"));
-        String workLocalOther = request.getParameter("workLocalOther");
-        Integer todayLocal = Conv.NI(request.getParameter("todayLocal"));
-        String todayLocalOther = request.getParameter("todayLocalOther");
-        Integer isTrip = Conv.NI(request.getParameter("isTrip"));
-        String tripDet = request.getParameter("tripDet");
-
+        Integer workLocal = jsonWapper.asObject(Integer.class, "workLocal");
+        String workLocalOther = jsonWapper.asObject(String.class, "workLocalOther");
+        Integer todayLocal = jsonWapper.asObject(Integer.class, "todayLocal");
+        String todayLocalOther = jsonWapper.asObject(String.class, "todayLocalOther");
+        Integer isTrip = jsonWapper.asObject(Integer.class, "isTrip");
+        List<MsTripDet> listTripDet = new ArrayList<>();
+        MsTripDet msTripDet;
+        for (int i = 0; i < jsonWapper.asList("tripDet").size(); i++) {
+            Map<String, Object> mm = (Map) jsonWapper.asList("listTripDet").get(i);
+            msTripDet = new MsTripDet();
+            msTripDet.setSort(Integer.parseInt(mm.get("sort").toString()));
+            msTripDet.setStartLocal(Integer.parseInt(mm.get("startLocal").toString()));
+            msTripDet.setStartLocalOther(mm.get("startLocalOther").toString());
+            msTripDet.setEndLocal(Integer.parseInt(mm.get("endLocal").toString()));
+            msTripDet.setEndLocalOther(mm.get("endLocalOther").toString());
+            msTripDet.setTripType(Integer.parseInt(mm.get("tripType").toString()));
+            msTripDet.setTripTypeDesp(mm.get("tripTypeOther").toString());
+            listTripDet.add(msTripDet);
+        }
         MsReport msReport = new MsReport();
-        Long reportId = msTripService.addSuspectedTrip(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate, scoreRezult, temperatureScore, scoreHistroy, score,workLocal,workLocalOther,todayLocal,todayLocalOther,isTrip,tripDet);
+        Long reportId = msTripService.addSuspectedTrip(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate, scoreRezult, temperatureScore, scoreHistroy, score, workLocal, workLocalOther, todayLocal, todayLocalOther, isTrip, listTripDet);
         if (reportId == 2L)
             msReport.setMsgReport("2");
         else
             msReport = msReportService.getByReport(reportId);
         return msReport;
     }
-
-    //删除出行详细
-    @PostMapping("/home/deleteTripdet")
-    public Integer deleteTripdet(HttpServletRequest request) {
-        Long tripDetId = Long.parseLong(request.getParameter("tripDetId"));
-       return msTripService.deleteTripdet(tripDetId);
-    }
 }

whepi-web/src/main/resources/mapper/MsTripDet.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.MsTripDetMapper">
+    <delete id="deleteByTripId">
+        delete from ms_trip_det where trip_id = #{tripId}
+    </delete>
+</mapper>