From 8a8d4a3779b13393688f44f6ac5d8fe6d253d369 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 12 Aug 2021 20:40:25 +0800
Subject: [PATCH] 1.保安人员导入

---
 src/main/java/org/springblade/modules/permit/controller/PermitController.java |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 92e82d6..7b717bf 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -22,6 +22,18 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.json.JSONObject;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -31,9 +43,17 @@
 import org.springblade.modules.permit.service.IPermitService;
 import org.springblade.modules.permit.vo.PermitVO;
 import org.springframework.web.bind.annotation.*;
+import sun.net.www.http.HttpClient;
 
 import javax.validation.Valid;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  *  控制器
@@ -43,7 +63,7 @@
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("blade-permit/permit")
+@RequestMapping("/permit")
 @Api(value = "", tags = "接口")
 public class PermitController extends BladeController {
 
@@ -90,8 +110,28 @@
 	@ApiOperation(value = "新增", notes = "传入permit")
 	public R save(@Valid @RequestBody Permit permit) {
 		permit.setType("2");
+		permit.setStorage("1");
+		permit.setPermitime(new Date());
+		Map<String, String> param = null;
+		return R.status(permitService.save(permit));
+	}
+
+	/**
+	 *暂存
+	 */
+	@PostMapping("/storage")
+	@ApiOperation(value = "新增", notes = "传入permit")
+	public R storage(@Valid @RequestBody Permit permit) {
+		permit.setStorage("0");
 		permit.setPermitime(new Date());
 		return R.status(permitService.save(permit));
+	}
+
+
+	@PostMapping("/selectIn")
+	public R selectIn(String cardid) {
+		Map map = permitService.selectIn(cardid);
+		return R.data(map);
 	}
 
 	/**
@@ -124,6 +164,4 @@
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(permitService.removeByIds(Func.toLongList(ids)));
 	}
-
-
 }

--
Gitblit v1.9.3