From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/BlacklistController.java | 97 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/BlacklistController.java b/src/main/java/com/lf/server/controller/sys/BlacklistController.java
index 78b87da..c33692b 100644
--- a/src/main/java/com/lf/server/controller/sys/BlacklistController.java
+++ b/src/main/java/com/lf/server/controller/sys/BlacklistController.java
@@ -1,10 +1,12 @@
package com.lf.server.controller.sys;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.sys.BlacklistEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.service.sys.BlacklistService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -12,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -25,66 +28,72 @@
@Autowired
BlacklistService blacklistService;
+ @Autowired
+ TokenService tokenService;
+
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ip", value = "IP鍦板潃", dataType = "String", paramType = "query", required = false, example = "")
+ @ApiImplicitParam(name = "ip", value = "IP鍦板潃", dataType = "String", paramType = "query", required = false, example = "192."),
+ @ApiImplicitParam(name = "type", value = "绫诲埆", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String ip) {
+ public ResponseMsg<Integer> selectCount(String ip, Integer type) {
try {
- int count = blacklistService.selectCount(ip);
+ int count = blacklistService.selectCount(ip, type);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ip", value = "IP鍦板潃", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "ip", value = "IP鍦板潃", dataType = "String", paramType = "query", example = "192."),
+ @ApiImplicitParam(name = "type", value = "绫诲埆", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPage")
- public ResponseMsg<List<BlacklistEntity>> selectByPage(String ip, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<BlacklistEntity>> selectByPage(String ip, Integer type, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- List<BlacklistEntity> rs = blacklistService.selectByPage(ip, pageSize, pageSize * (pageIndex - 1));
+ List<BlacklistEntity> rs = blacklistService.selectByPage(ip, type, pageSize, pageSize * (pageIndex - 1));
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ip", value = "IP鍦板潃", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "ip", value = "IP鍦板潃", dataType = "String", paramType = "query", required = false, example = "192."),
+ @ApiImplicitParam(name = "type", value = "绫诲埆", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<BlacklistEntity>> selectByPageAndCount(String ip, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<BlacklistEntity>> selectByPageAndCount(String ip, Integer type, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = blacklistService.selectCount(ip);
+ int count = blacklistService.selectCount(ip, type);
if (count == 0) {
return success(0, null);
}
- List<BlacklistEntity> rs = blacklistService.selectByPage(ip, pageSize, pageSize * (pageIndex - 1));
+ List<BlacklistEntity> rs = blacklistService.selectByPage(ip, type, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -97,7 +106,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -113,44 +122,56 @@
return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "娣诲姞鏁版嵁")
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "BlacklistEntity", paramType = "body")
})
@PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insert(@RequestBody BlacklistEntity entity) {
+ public ResponseMsg<Integer> insert(@RequestBody BlacklistEntity entity, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
int count = blacklistService.insert(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎵归噺娣诲姞")
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "BlacklistEntity", paramType = "body")
})
@PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> inserts(@RequestBody List<BlacklistEntity> list) {
+ public ResponseMsg<Integer> inserts(@RequestBody List<BlacklistEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (BlacklistEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
int count = blacklistService.inserts(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鍒櫎鏁版嵁")
+ @ApiOperation(value = "鍒犻櫎涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@@ -161,12 +182,12 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
@@ -181,41 +202,53 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "淇敼鏁版嵁")
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "BlacklistEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/update", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> update(@RequestBody BlacklistEntity entity) {
+ public ResponseMsg<Integer> update(@RequestBody BlacklistEntity entity, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
int count = blacklistService.update(entity);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
- @ApiOperation(value = "鎵归噺淇敼")
+ @ApiOperation(value = "鏇存柊澶氭潯")
@ApiImplicitParams({
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "BlacklistEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updates(@RequestBody List<BlacklistEntity> list) {
+ public ResponseMsg<Integer> updates(@RequestBody List<BlacklistEntity> list, HttpServletRequest req) {
try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (BlacklistEntity entity : list) {
+ entity.setUpdateUser(ue.getId());
+ }
+ }
+
int count = blacklistService.updates(list);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
}
--
Gitblit v1.9.3