大理访客登记h5待测试
diff --git a/src/main/java/com/supwisdom/dlpay/api/controller/DoorApiAction.java b/src/main/java/com/supwisdom/dlpay/api/controller/DoorApiAction.java
index 45c6a9d..3e11bc7 100644
--- a/src/main/java/com/supwisdom/dlpay/api/controller/DoorApiAction.java
+++ b/src/main/java/com/supwisdom/dlpay/api/controller/DoorApiAction.java
@@ -19,6 +19,8 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -91,25 +93,42 @@
resp.setData(custlist);
return resp;
}
- @RequestMapping(value = "/visitorcheck", method = {RequestMethod.POST})
+
+
+// @RequestMapping(
+// value = "",
+// method = RequestMethod.POST,
+// consumes = {"application/x-www-form-urlencoded"})
+
+ @PostMapping("/visitorcheck")
@ResponseBody
- public BaseResp visitorcheck(@RequestBody VisitorCheckBean postData) {
+ public BaseResp visitorcheck(
+ @RequestParam(value = "visitorname")String visitorname,
+ @RequestParam(value = "idno")String idno,
+ @RequestParam(value = "phone")String phone,
+ @RequestParam(value = "sex")String sex,
+ @RequestParam(value = "deptcode")String deptcode,
+ @RequestParam(value = "custid")String custid,
+ @RequestParam(value = "remarks")String remarks,
+ @RequestParam(value = "company")String company,
+ @RequestParam(value = "sign")String sign
+ ) {
BaseResp resp = new BaseResp();
Map<String,String> datamap=new HashMap<>();
- datamap.put("visitorname",postData.getVisitorname());
- datamap.put("idno",postData.getIdno());
- datamap.put("phone",postData.getPhone());
- datamap.put("time",postData.getPhone());
- datamap.put("sex",postData.getSex());
- datamap.put("deptcode",postData.getDeptcode());
- datamap.put("custid",postData.getCustid());
- datamap.put("company",postData.getCompany());
- datamap.put("remarks",postData.getRemarks());
+ datamap.put("visitorname",visitorname);
+ datamap.put("idno",idno);
+ datamap.put("phone",phone);
+ datamap.put("time",DateUtil.getNow("yyyyMMddhhmmss"));
+ datamap.put("sex",sex);
+ datamap.put("deptcode",deptcode);
+ datamap.put("custid",custid);
+ datamap.put("company",company);
+ datamap.put("remarks",remarks);
Map<String, String> paraFilter = HmacUtil.paraFilter(datamap);
- String linkString= "visitorname="+postData.getVisitorname()+"&idno="+postData.getIdno()+"&custid="+postData.getCustid();
+ String linkString= "visitorname="+visitorname+"&idno="+idno+"&custid="+custid;
String hmacsha1 = HmacUtil.HMACSHA1(linkString, "adc4ac6822fd462780f878b86cb94688");
- if(postData.getSign()==null||!postData.getSign().toLowerCase().equals(hmacsha1.toLowerCase())){
+ if(sign==null||!sign.toLowerCase().equals(hmacsha1.toLowerCase())){
resp.setRetcode("99");
resp.setRetmsg("校验失败");
return resp;
@@ -120,16 +139,16 @@
try{
String time = DateUtil.getNow("yyyyMMddhhmmss");
EVisitorCheckDtl eVisitorCheckDtl=new EVisitorCheckDtl();
- eVisitorCheckDtl.setCompany(postData.getCompany());
- eVisitorCheckDtl.setCustid(postData.getCustid());
- eVisitorCheckDtl.setDeptcode(postData.getDeptcode());
- eVisitorCheckDtl.setPhone(postData.getPhone());
- eVisitorCheckDtl.setRemarks(postData.getRemarks());
- eVisitorCheckDtl.setVisitorname(postData.getVisitorname());
+ eVisitorCheckDtl.setCompany(company);
+ eVisitorCheckDtl.setCustid(custid);
+ eVisitorCheckDtl.setDeptcode(deptcode);
+ eVisitorCheckDtl.setPhone(phone);
+ eVisitorCheckDtl.setRemarks(remarks);
+ eVisitorCheckDtl.setVisitorname(visitorname);
eVisitorCheckDtl.setTransdate(time.substring(0,8));
eVisitorCheckDtl.setStatus(1);
- eVisitorCheckDtl.setIdno(postData.getIdno());
- eVisitorCheckDtl.setSex(postData.getSex());
+ eVisitorCheckDtl.setIdno(idno);
+ eVisitorCheckDtl.setSex(sex);
eVisitorCheckDtl.setTranstime(time.substring(8));
boolean b = visitormanageService.saveVisitorCheck(eVisitorCheckDtl);
diff --git a/src/main/java/com/supwisdom/dlpay/app/controller/AppController.java b/src/main/java/com/supwisdom/dlpay/app/controller/AppController.java
index fdff5d0..c35933d 100644
--- a/src/main/java/com/supwisdom/dlpay/app/controller/AppController.java
+++ b/src/main/java/com/supwisdom/dlpay/app/controller/AppController.java
@@ -6,8 +6,6 @@
import com.supwisdom.dlpay.doorlist.service.DoorlistMgrService;
import com.supwisdom.dlpay.framework.util.DateUtil;
import com.supwisdom.dlpay.framework.util.StringUtil;
-import com.supwisdom.dlpay.ncmgr.domain.TNcAllottime;
-import com.supwisdom.dlpay.ncmgr.domain.TNcAllottimeId;
import com.supwisdom.dlpay.ncmgr.domain.TNcCardlist;
import com.supwisdom.dlpay.ncmgr.domain.TNcDevice;
import com.supwisdom.dlpay.ncmgr.service.NcService;
@@ -26,9 +24,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.PublicKey;
import java.util.*;
@Controller
@@ -124,7 +119,7 @@
model.addAttribute("msg", "您还未关注公众号，请先关注");
}
- return "apph5/visitorresult";
+ return "visitorresult3";
}
diff --git a/src/main/resources/templates/apph5/visitorresult.html b/src/main/resources/templates/apph5/visitorresult.html
index e113e0d..fe4a37a 100644
--- a/src/main/resources/templates/apph5/visitorresult.html
+++ b/src/main/resources/templates/apph5/visitorresult.html
@@ -5,7 +5,7 @@
<!--<meta name="_csrf_header" th:content="${_csrf.headerName}" />
<meta name="_csrf_token" th:content="${_csrf.parameterName}" th:value="${_csrf.token}" />-->
<meta charset="utf-8"/>
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<!-- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">-->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<!-- 引入样式 -->
<!--<link rel="stylesheet" href="https://unpkg.com/mint-ui/lib/style.css">-->
@@ -20,15 +20,18 @@
<!--<script src="https://unpkg.com/vue/dist/vue.js"></script>
<script src="https://unpkg.com/mint-ui/lib/index.js"></script>-->
</head>
-<body th:background="@{/static/res/images/visitorsuccess.jpg}" th:attr="background-size='contain'" >
+<body >
<div id="app" >
<!-- <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247">登记结果</div><br>
<div class="mintui-success" id="msg"></div>
<input type="hidden" id="issuccess" th:value="${issuccess}">
-->
</div>
+<div style="background-size: contain|cover;width: 100%;height: auto">
+ <img th:src="@{/static/res/images/visitorsuccess.jpg}" style="width: 411px"/>
-<!--<img th:src="@{/static/res/images/visitorsuccess.jpg}"/>-->
+</div>
+
</body>
<script>
diff --git a/src/main/resources/templates/apph5/visitorresultfail.html b/src/main/resources/templates/apph5/visitorresultfail.html
index 81d715f..e0edff5 100644
--- a/src/main/resources/templates/apph5/visitorresultfail.html
+++ b/src/main/resources/templates/apph5/visitorresultfail.html
@@ -5,7 +5,7 @@
<!--<meta name="_csrf_header" th:content="${_csrf.headerName}" />
<meta name="_csrf_token" th:content="${_csrf.parameterName}" th:value="${_csrf.token}" />-->
<meta charset="utf-8"/>
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <!-- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">-->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<!-- 引入样式 -->
<!--<link rel="stylesheet" href="https://unpkg.com/mint-ui/lib/style.css">-->
@@ -20,14 +20,17 @@
<!--<script src="https://unpkg.com/vue/dist/vue.js"></script>
<script src="https://unpkg.com/mint-ui/lib/index.js"></script>-->
</head>
-<body th:background="@{/static/res/images/visitorfail.jpg}" th:attr="background-size='contain'" >
+<body >
<div id="app" >
<!-- <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247">登记结果</div><br>
<div class="mintui-success" id="msg"></div>
<input type="hidden" id="issuccess" th:value="${issuccess}">
-->
</div>
+<div style="background-size: contain|cover;width: 100%;height: auto">
+ <img th:src="@{/static/res/images/visitorfail.jpg}" style="width: 411px"/>
+</div>
<!--<img th:src="@{/static/res/images/visitorsuccess.jpg}"/>-->
</body>