From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/permit/controller/PermitController.java |   62 +++++++++++++++++++++++++++++-
 1 files changed, 59 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..0909f0b 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -17,23 +17,46 @@
 package org.springblade.modules.permit.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 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;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.permit.entity.Permit;
 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 +66,7 @@
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("blade-permit/permit")
+@RequestMapping("/permit")
 @Api(value = "", tags = "接口")
 public class PermitController extends BladeController {
 
@@ -67,6 +90,7 @@
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入permit")
 	public R<IPage<Permit>> list(Permit permit, Query query) {
+		permit.setStorage("1");
 		IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
 		return R.data(pages);
 	}
@@ -89,9 +113,43 @@
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入permit")
 	public R save(@Valid @RequestBody Permit permit) {
+		String cardid = permit.getCardid();
+		Map map = permitService.selectIn(cardid);
+		if (map!=null){
+			String id = map.get("id").toString();
+			permitService.removeByIds(Func.toLongList(id));
+		}
 		permit.setType("2");
+		permit.setStorage("1");
 		permit.setPermitime(new Date());
 		return R.status(permitService.save(permit));
+	}
+
+	/**
+	 *暂存
+	 */
+	@PostMapping("/storage")
+	@ApiOperation(value = "新增", notes = "传入permit")
+	public R storage(@Valid @RequestBody Permit permit) {
+		String cardid = permit.getCardid();
+		Map map = permitService.selectIn(cardid);
+		if (map!=null){
+			permit.setStorage("0");
+			permitService.updateById(permit);
+		}
+		else {
+			permit.setStorage("0");
+			permit.setPermitime(new Date());
+			permitService.save(permit);
+		}
+		return R.success("暂存成功");
+	}
+
+
+	@PostMapping("/selectIn")
+	public R selectIn(String cardid) {
+		Map map = permitService.selectIn(cardid);
+		return R.data(map);
 	}
 
 	/**
@@ -124,6 +182,4 @@
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(permitService.removeByIds(Func.toLongList(ids)));
 	}
-
-
 }

--
Gitblit v1.9.3