From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update

---
 src/main/java/com/fgkj/controller/User_permitgroupController.java |  113 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/User_permitgroupController.java b/src/main/java/com/fgkj/controller/User_permitgroupController.java
index c8dadc5..d0a0b8e 100644
--- a/src/main/java/com/fgkj/controller/User_permitgroupController.java
+++ b/src/main/java/com/fgkj/controller/User_permitgroupController.java
@@ -1,65 +1,70 @@
 package com.fgkj.controller;
 
-import java.util.List;
+import com.fgkj.util.*;
 
-import com.fgkj.mapper.UinfDaoFactory;
 import com.fgkj.dto.ServiceModel;
 import com.fgkj.dto.User_inf;
 import com.fgkj.dto.User_log;
 import com.fgkj.dto.User_permitgroup;
+import com.fgkj.mapper.UinfDaoFactory;
 import com.fgkj.services.User_logService;
 import com.fgkj.services.User_permitgroupService;
-import com.google.gson.reflect.TypeToken;
-import com.opensymphony.xwork2.ActionSupport;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 @RequestMapping("userPermitGroup")
 @RestController
-@Api
+@Api(tags = "userPermitGroup鎺ュ彛")
 public class User_permitgroupController{
 
-	@Autowired
+	@Resource
 	private User_permitgroupService service;
-	@Autowired
+	@Resource
 	private User_logService uservice;
 
 
-	// private User_permitgroup up;
-	// private User_inf uinf;
-	// private String addjson;		//鏉冮檺娣诲姞鐨勬潈闄恓son鏁扮粍
-	// private String updjson;		//鏉冮檺鏇存柊鐨勬潈闄恓son鏁扮粍
-	// private String result;
-	
-	
 	//5.1鏍规嵁uid鏌ュ搴旂殑鎵�鏈夋潈闄愮粍
-	@GetMapping("permitNameByUid")
-    public ServiceModel serchPermitName(@RequestBody User_inf uinf){
-    	ServiceModel model=service.serchPermitName(uinf);
-    	
-    	return model;
-    }
+	@PostMapping("permitNameByUid")
+	@ApiOperation(notes = "", value = "uid鏌ュ搴旂殑鎵�鏈夋潈闄愮粍")
+	public ServiceModel serchPermitName(@RequestParam Integer uId) {
+		User_inf uinf = new User_inf();
+		uinf.setuId(uId);
+		ServiceModel model = service.serchPermitName(uinf);
+
+		return model;
+	}
 	
 	//5.2鏌ユ墍鏈夌殑鏉冮檺缁�
 	@GetMapping("all")
+	@ApiOperation(notes = "",value="鏌ユ墍鏈夌殑鏉冮檺缁�")
 	public ServiceModel searchAll(){
 		ServiceModel model=service.searchAll();
 		
 		return model;
 	}
-	
+
 	//5.2鏍规嵁鏉冮檺id鏌ョ敤鎴�
-	@GetMapping("UserByPermitId")
-	public ServiceModel serchByPermit(@RequestBody User_permitgroup up){
-		ServiceModel model=service.serchByPermit(up);
-		
+	@PostMapping("UserByPermitId")
+	@ApiOperation(notes = "", value = "鏉冮檺id鏌ョ敤鎴�")
+	public ServiceModel serchByPermit(@RequestParam Integer permit_group_id) {
+		User_permitgroup up = new User_permitgroup();
+		up.setPermit_group_id(permit_group_id);
+		ServiceModel model = service.serchByPermit(up);
+
 		return model;
 	}
 	
 	//5.2鏍规嵁鏉冮檺缁刬d鏌ュ搴旂殑鎵�鏈夋潈闄�
-	@GetMapping("byPermitGroupId")
-	public ServiceModel serchByInfo(@RequestBody User_permitgroup up){
+	@PostMapping("byPermitGroupId")
+	@ApiOperation(notes = "",value="鏉冮檺缁刬d鏌ュ搴旂殑鎵�鏈夋潈闄�")
+	public ServiceModel serchByInfo(@RequestParam Integer permit_group_id) {
+		User_permitgroup up = new User_permitgroup();
+		up.setPermit_group_id(permit_group_id);
 		ServiceModel model=service.serchByInfo(up);
 		
 		return model;
@@ -67,9 +72,13 @@
 	
 	//5.2鍒犻櫎鎸囧畾id鐨勬潈闄愮粍
 	@DeleteMapping("/")
-	public ServiceModel delete(@RequestBody User_permitgroup up){
+	@ApiOperation(notes = "",value="鍒犻櫎鎸囧畾id鐨勬潈闄愮粍")
+	public ServiceModel delete(@RequestParam Integer permit_group_id,@RequestParam String permit_group_name) {
+		User_permitgroup up = new User_permitgroup();
+		up.setPermit_group_id(permit_group_id);
+		up.setPermit_group_name(permit_group_name);
 		ServiceModel model=service.delete(up);
-		{
+		if (model.getCode().equals(1)){
 			String msg="鍒犻櫎鐨勬潈闄愮粍涓�:"+up.getPermit_group_name();
 			User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
 			uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
@@ -77,39 +86,50 @@
 		
 		return model;
 	}
-	
+
 	//5.2娣诲姞鏉冮檺缁�
 	@PostMapping("/")
-	public ServiceModel add(@RequestBody User_permitgroup up){
-		ServiceModel model=service.add(up);
+	@ApiOperation(notes = "[{ \"permit_group_id\": 0, \"permit_group_name\": \"\", \"permit_item_name\": \"\", \"permit_item_value\": 0 }]",value="娣诲姞鏉冮檺缁�")
+	public ServiceModel add(@RequestBody List<User_permitgroup> list){
+		ServiceModel model=service.add(list);
 		
 		return model;
 	}
-	
+
 	//鏇存柊鏉冮檺缁�
 	@PutMapping("/")
-	public ServiceModel update(@RequestBody User_permitgroup up){
-		ServiceModel model=service.update(up);
-		
+	@ApiOperation(notes = "", value = "鏇存柊鏉冮檺缁�")
+	public ServiceModel update(@RequestParam Integer permit_item_value, @RequestParam Integer num) {
+		User_permitgroup up = new User_permitgroup();
+		up.setPermit_item_value(permit_item_value);
+		up.setNum(num);
+		ServiceModel model = service.update(up);
+
 		return model;
 	}
-	
+
 	//5.2閲嶅懡鍚�(淇敼鏉冮檺鍚�)
 	@PutMapping("name")
-    public ServiceModel updateName(@RequestBody User_permitgroup up){
-    	ServiceModel model=service.updateName(up);
-    	{
-			String msg="閲嶅懡鍚�"+up.getPermit_item_name()+"鏉冮檺缁勫悕绉颁负:"+up.getPermit_group_name();
-			User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+	@ApiOperation(notes = "", value = "閲嶅懡鍚�(淇敼鏉冮檺鍚�)")
+	public ServiceModel updateName(@RequestParam Integer permit_group_id, @RequestParam String permit_group_name, @RequestParam Integer permit_item_name) {
+		User_permitgroup up = new User_permitgroup();
+		up.setPermit_group_id(permit_group_id);
+		up.setPermit_group_name(permit_group_name);
+		up.setPermit_item_value(permit_item_name);
+		ServiceModel model = service.updateName(up);
+		if (model.getCode().equals(1)){
+			String msg = "閲嶅懡鍚�" + up.getPermit_item_name() + "鏉冮檺缁勫悕绉颁负:" + up.getPermit_group_name();
+			User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
 			uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
 		}
-    	
-    	return model;
-    }
+
+		return model;
+	}
 	
 	
 	//鏇存柊骞朵笖娣诲姞鏉冮檺
 	@PutMapping("permit")
+	@ApiOperation(notes = "",value="鏇存柊骞朵笖娣诲姞鏉冮檺 TODO")
 	public ServiceModel updatePermit(){
 		String msg="";
 		ServiceModel model=new ServiceModel();
@@ -140,7 +160,8 @@
 	}
 	
 	//5.2鏌ヨ鎵�鏈夌殑鏉冮檺
-	@GetMapping("role")
+	@PostMapping("role")
+	@ApiOperation(notes = "杩斿洖data涓篖ist闆嗗悎permit_item_name",value="鏌ヨ鎵�鏈夌殑鏉冮檺")
 	public ServiceModel serchRole(){
 		ServiceModel model=service.serchRole();
 		

--
Gitblit v1.9.1