Merge branch 'zhaoyue-dev4' into 'master'

Zhaoyue dev4



See merge request !46

@@ -2,7 +2,7 @@ git pull
 git add --all src/main/java/*
 git add --all src/main/java/*
 git add push.sh
 git add push.sh
 git add pom.xml
 git add pom.xml
-git commit -m "ADD report location log"
+git commit -m "ADD member pulse and breathrate"
 #git push origin master
 #git push origin master
 git push origin zhaoyue-dev4
 git push origin zhaoyue-dev4
 git status
 git status

+package com.xkl.controller;
+
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.xkl.authorization.annotation.Authorization;
+import com.xkl.authorization.annotation.CurrentAdmin;
+import com.xkl.authorization.annotation.LogAnnotation;
+import com.xkl.authorization.annotation.Sign;
+import com.xkl.config.Constants;
+import com.xkl.config.ResultStatus;
+import com.xkl.domain.User;
+import com.xkl.domain.XklAdminEntity;
+import com.xkl.domain.XklMemberEntity;
+import com.xkl.model.ResultModel;
+import com.xkl.repository.UserRepository;
+import com.xkl.repository.XklMemberRespository;
+import com.xkl.security.AntiXSS;
+import com.xkl.service.IAdminOpsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by zhaoyue on 2017/04/15
+ */
+@RestController
+@RequestMapping("/setPulseBreath")
+public class PulseBreathSetController {
+    @Autowired
+    private IAdminOpsService adminOpsService;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private XklMemberRespository memberRespository;
+
+    @LogAnnotation
+    @AntiXSS
+    @Authorization
+    @Sign
+    @RequestMapping(method = RequestMethod.POST)
+    @ApiOperation(value = "admin设置用户当前的呼吸频率和脉搏")
+    public ResponseEntity<ResultModel> setPulseBreath(HttpServletRequest request, @CurrentAdmin XklAdminEntity admin, @RequestParam String username,
+                                                @RequestParam int pulse, @RequestParam int breathrate, @RequestParam String sign, @RequestParam long t) {
+
+        if (!(boolean) request.getAttribute("signAspect"))
+            return new ResponseEntity<>(ResultModel.error(ResultStatus.SIGN_ERROR), HttpStatus.OK);
+        User user = userRepository.findByLoginAccountAndStatus(username, Constants.STATUS_OK2);
+        if (user == null) {  //用户不存在
+            return new ResponseEntity<>(ResultModel.error(ResultStatus.USER_NOT_FOUND), HttpStatus.OK);
+        }
+        XklMemberEntity memberEntity = memberRespository.findOne(user.getMemberId());
+        memberEntity.setCurPulse(pulse);
+        memberEntity.setCurBreathrate(breathrate);
+        memberRespository.save(memberEntity);
+        return new ResponseEntity<>(ResultModel.ok(), HttpStatus.OK);
+    }
+}

@@ -54,6 +54,12 @@ public class XklMemberEntity {
     @Basic
     @Basic
     @Column(name = "status")
     @Column(name = "status")
     private int status;
     private int status;
+    @Basic
+    @Column(name = "cur_pulse")
+    private int curPulse;
+    @Basic
+    @Column(name = "cur_breathrate")
+    private int curBreathrate;
 
 
     public long getId() {
     public long getId() {
         return id;
         return id;
@@ -158,4 +164,20 @@ public class XklMemberEntity {
     public void setStatus(int status) {
     public void setStatus(int status) {
         this.status = status;
         this.status = status;
     }
     }
+
+    public int getCurPulse() {
+        return curPulse;
+    }
+
+    public void setCurPulse(int curPulse) {
+        this.curPulse = curPulse;
+    }
+
+    public int getCurBreathrate() {
+        return curBreathrate;
+    }
+
+    public void setCurBreathrate(int curBreathrate) {
+        this.curBreathrate = curBreathrate;
+    }
 }
 }