站点IP黑名单

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebPublicBlackIpController.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 /**
  * @Description: IP黑名单
  * @Author: jeecg-boot
- * @Date:   2023-02-20
+ * @Date: 2023-02-20
  * @Version: V1.0
  */
 @Tag(name = "IP黑名单")
@@ -36,278 +36,278 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AdwebPublicBlackIpController extends JeecgController<AdwebPublicBlackIp, IAdwebPublicBlackIpService> {
 
-	@Resource
-	private IAdwebPublicBlackIpService adwebBlackIpService;
-
-	 @Resource
-	 private RedisUtil redisUtil;
-
-	 private static final String IpTenMinKey = "JUDGE_WASTE_ENQUIRY_IP_BY_10_MIN::";
-	 private static final String IpOneDayKey = "JUDGE_WASTE_ENQUIRY_IP_BY_ONE_DAY::";
-	 private static final String BlackIpKey = "BLACK_IP_LIST";
-	 private static final String NotBlackIpWasteEnquiryKey = "NOT_BLACK_IP_WASTE_ENQUIRY_MAP::";
-	 private static final String WhiteIpListKey = "WHITE_IP_LIST";
-
-	/**
-	 * 分页列表查询
-	 *
-	 * @param adwebBlackIp
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "IP黑名单-分页列表查询")
-	@Operation(summary = "IP黑名单-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<?> queryPageList(AdwebPublicBlackIp adwebBlackIp,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		Page<AdwebPublicBlackIp> page = new Page<AdwebPublicBlackIp>(pageNo, pageSize);
-		String column = req.getParameter("column");
-		String order = req.getParameter("order");
-		IPage<AdwebPublicBlackIp> pageList = adwebBlackIpService.pageList(page, adwebBlackIp.getIp(), adwebBlackIp.getBlackOrWhite(),column,order);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 *   添加
-	 *
-	 * @param adwebBlackIp
-	 * @return
-	 */
-	@AutoLog(value = "IP黑名单-添加")
-	@Operation(summary = "IP黑名单-添加")
-	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody AdwebPublicBlackIp adwebBlackIp) {
-
-		if (adwebBlackIp.getIp() == null || "".equals(adwebBlackIp.getIp())) {
-			return Result.error("IP不能为空");
-		}
-		if (adwebBlackIp.getIp().length() > 15) {
-			return Result.error("IP长度不能超过15");
-		}
-
-		int count = (int) adwebBlackIpService.count(new QueryWrapper<AdwebPublicBlackIp>().eq("ip", adwebBlackIp.getIp()).eq("status", 1));
-
-		if (count > 0) {
-			return Result.error("该IP已存在");
-		}
-
-		adwebBlackIp.setStatus(1);
-		adwebBlackIpService.save(adwebBlackIp);
-		List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
-
-		if (CollectionUtils.isNotEmpty(blackIpList)) {
-			List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(BlackIpKey);
-		}
-
-		List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
-
-		if (CollectionUtils.isNotEmpty(whiteIpList)) {
-			List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(WhiteIpListKey);
-		}
-		return Result.OK("添加成功！");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param adwebBlackIp
-	 * @return
-	 */
-	@AutoLog(value = "IP黑名单-编辑")
-	@Operation(summary = "IP黑名单-编辑")
-	@PutMapping(value = "/edit")
-	public Result<?> edit(@RequestBody AdwebPublicBlackIp adwebBlackIp) {
-
-		if (adwebBlackIp.getIp() == null || "".equals(adwebBlackIp.getIp())) {
-			return Result.error("IP不能为空");
-		}
-		if (adwebBlackIp.getIp().length() > 15) {
-			return Result.error("IP长度不能超过15");
-		}
-
-		int count = (int) adwebBlackIpService.count(new QueryWrapper<AdwebPublicBlackIp>().eq("ip", adwebBlackIp.getIp()).eq("status", 1).ne("id", adwebBlackIp.getId()));
-
-		if (count > 0) {
-			return Result.error("该IP已存在");
-		}
-
-		adwebBlackIpService.updateById(adwebBlackIp);
-
-		List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
-
-		if (CollectionUtils.isNotEmpty(blackIpList)) {
-			List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(BlackIpKey);
-		}
-
-		List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
-
-		if (CollectionUtils.isNotEmpty(whiteIpList)) {
-			List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(WhiteIpListKey);
-		}
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "IP黑名单-通过id删除")
-	@Operation(summary = "IP黑名单-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-
-		if (id == null || "".equals(id)) {
-			return Result.error("ID不能为空");
-		}
-
-		List<AdwebPublicBlackIp> list = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("id", id).eq("status", 1));
-
-		if (list.size() == 0) {
-			return Result.error("该IP不存在");
-		}
-
-		AdwebPublicBlackIp adwebBlackIp = list.get(0);
-		adwebBlackIp.setStatus(0);
-
-		adwebBlackIpService.updateById(adwebBlackIp);
-
-		redisUtil.del(IpTenMinKey+adwebBlackIp.getIp());
-		redisUtil.del(IpOneDayKey+adwebBlackIp.getIp());
-		redisUtil.del(NotBlackIpWasteEnquiryKey+adwebBlackIp.getIp());
-
-		List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
-
-		if (CollectionUtils.isNotEmpty(blackIpList)) {
-			List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(BlackIpKey);
-		}
-
-		List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
-
-		if (CollectionUtils.isNotEmpty(whiteIpList)) {
-			List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(WhiteIpListKey);
-		}
-
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "IP黑名单-批量删除")
-	@Operation(summary = "IP黑名单-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-
-		if (ids == null || "".equals(ids.trim())) {
-			return Result.error("ID不能为空");
-		}
-		List<String> idList = Arrays.asList(ids.split(","));
-
-		List<AdwebPublicBlackIp> list = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).in("id", idList));
-
-		if (list.size() == 0) {
-			return Result.error("该IP不存在");
-		}
-
-		adwebBlackIpService.update(new UpdateWrapper<AdwebPublicBlackIp>().in("id", idList).set("status", 0));
-
-		for (AdwebPublicBlackIp adwebBlackIp : list) {
-			redisUtil.del(IpTenMinKey+adwebBlackIp.getIp());
-			redisUtil.del(IpOneDayKey+adwebBlackIp.getIp());
-			redisUtil.del(NotBlackIpWasteEnquiryKey+adwebBlackIp.getIp());
-		}
-
-		List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
-
-		if (CollectionUtils.isNotEmpty(blackIpList)) {
-			List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(BlackIpKey);
-		}
-
-		List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
-
-		if (CollectionUtils.isNotEmpty(whiteIpList)) {
-			List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
-			redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
-		}else{
-			redisUtil.del(WhiteIpListKey);
-		}
-
-
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "IP黑名单-通过id查询")
-	@Operation(summary = "IP黑名单-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+    @Resource
+    private IAdwebPublicBlackIpService adwebBlackIpService;
 
-		if (id == null || "".equals(id)) {
-			return Result.error("ID不能为空");
-		}
-
-		List<AdwebPublicBlackIp> list = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("id", id).eq("status", 1));
-
-		if (list.size() == 0) {
-			return Result.error("该IP不存在");
-		}
-
-		return Result.OK(list.get(0));
-	}
+    @Resource
+    private RedisUtil redisUtil;
+
+    private static final String IpTenMinKey = "JUDGE_WASTE_ENQUIRY_IP_BY_10_MIN::";
+    private static final String IpOneDayKey = "JUDGE_WASTE_ENQUIRY_IP_BY_ONE_DAY::";
+    private static final String BlackIpKey = "BLACK_IP_LIST";
+    private static final String NotBlackIpWasteEnquiryKey = "NOT_BLACK_IP_WASTE_ENQUIRY_MAP::";
+    private static final String WhiteIpListKey = "WHITE_IP_LIST";
+
+    /**
+     * 分页列表查询
+     *
+     * @param adwebBlackIp
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "IP黑名单-分页列表查询")
+    @Operation(summary = "IP黑名单-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(AdwebPublicBlackIp adwebBlackIp,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+        Page<AdwebPublicBlackIp> page = new Page<AdwebPublicBlackIp>(pageNo, pageSize);
+        String column = req.getParameter("column");
+        String order = req.getParameter("order");
+        IPage<AdwebPublicBlackIp> pageList = adwebBlackIpService.pageList(page, adwebBlackIp.getIp(), adwebBlackIp.getBlackOrWhite(), column, order);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param adwebBlackIp
+     * @return
+     */
+    @AutoLog(value = "IP黑名单-添加")
+    @Operation(summary = "IP黑名单-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody AdwebPublicBlackIp adwebBlackIp) {
+
+        if (adwebBlackIp.getIp() == null || "".equals(adwebBlackIp.getIp())) {
+            return Result.error("IP不能为空");
+        }
+        if (adwebBlackIp.getIp().length() > 15) {
+            return Result.error("IP长度不能超过15");
+        }
+
+        int count = (int) adwebBlackIpService.count(new QueryWrapper<AdwebPublicBlackIp>().eq("ip", adwebBlackIp.getIp()).eq("status", 1));
+
+        if (count > 0) {
+            return Result.error("该IP已存在");
+        }
+
+        adwebBlackIp.setStatus(1);
+        adwebBlackIpService.save(adwebBlackIp);
+        List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
+
+        if (CollectionUtils.isNotEmpty(blackIpList)) {
+            List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(BlackIpKey);
+        }
+
+        List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
+
+        if (CollectionUtils.isNotEmpty(whiteIpList)) {
+            List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(WhiteIpListKey);
+        }
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param adwebBlackIp
+     * @return
+     */
+    @AutoLog(value = "IP黑名单-编辑")
+    @Operation(summary = "IP黑名单-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody AdwebPublicBlackIp adwebBlackIp) {
+
+        if (adwebBlackIp.getIp() == null || "".equals(adwebBlackIp.getIp())) {
+            return Result.error("IP不能为空");
+        }
+        if (adwebBlackIp.getIp().length() > 15) {
+            return Result.error("IP长度不能超过15");
+        }
+
+        int count = (int) adwebBlackIpService.count(new QueryWrapper<AdwebPublicBlackIp>().eq("ip", adwebBlackIp.getIp()).eq("status", 1).ne("id", adwebBlackIp.getId()));
+
+        if (count > 0) {
+            return Result.error("该IP已存在");
+        }
+
+        adwebBlackIpService.updateById(adwebBlackIp);
+
+        List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
+
+        if (CollectionUtils.isNotEmpty(blackIpList)) {
+            List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(BlackIpKey);
+        }
+
+        List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
+
+        if (CollectionUtils.isNotEmpty(whiteIpList)) {
+            List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(WhiteIpListKey);
+        }
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "IP黑名单-通过id删除")
+    @Operation(summary = "IP黑名单-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+
+        if (id == null || "".equals(id)) {
+            return Result.error("ID不能为空");
+        }
+
+        List<AdwebPublicBlackIp> list = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("id", id).eq("status", 1));
+
+        if (list.size() == 0) {
+            return Result.error("该IP不存在");
+        }
+
+        AdwebPublicBlackIp adwebBlackIp = list.get(0);
+        adwebBlackIp.setStatus(0);
+
+        adwebBlackIpService.updateById(adwebBlackIp);
+
+        redisUtil.del(IpTenMinKey + adwebBlackIp.getIp());
+        redisUtil.del(IpOneDayKey + adwebBlackIp.getIp());
+        redisUtil.del(NotBlackIpWasteEnquiryKey + adwebBlackIp.getIp());
+
+        List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
+
+        if (CollectionUtils.isNotEmpty(blackIpList)) {
+            List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(BlackIpKey);
+        }
+
+        List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
+
+        if (CollectionUtils.isNotEmpty(whiteIpList)) {
+            List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(WhiteIpListKey);
+        }
+
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "IP黑名单-批量删除")
+    @Operation(summary = "IP黑名单-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+        if (ids == null || "".equals(ids.trim())) {
+            return Result.error("ID不能为空");
+        }
+        List<String> idList = Arrays.asList(ids.split(","));
+
+        List<AdwebPublicBlackIp> list = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).in("id", idList));
+
+        if (list.size() == 0) {
+            return Result.error("该IP不存在");
+        }
+
+        adwebBlackIpService.update(new UpdateWrapper<AdwebPublicBlackIp>().in("id", idList).set("status", 0));
+
+        for (AdwebPublicBlackIp adwebBlackIp : list) {
+            redisUtil.del(IpTenMinKey + adwebBlackIp.getIp());
+            redisUtil.del(IpOneDayKey + adwebBlackIp.getIp());
+            redisUtil.del(NotBlackIpWasteEnquiryKey + adwebBlackIp.getIp());
+        }
+
+        List<AdwebPublicBlackIp> blackIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 0));
+
+        if (CollectionUtils.isNotEmpty(blackIpList)) {
+            List<String> collect = blackIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(BlackIpKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(BlackIpKey);
+        }
+
+        List<AdwebPublicBlackIp> whiteIpList = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("status", 1).eq("black_or_white", 1));
+
+        if (CollectionUtils.isNotEmpty(whiteIpList)) {
+            List<String> collect = whiteIpList.stream().map(AdwebPublicBlackIp::getIp).collect(Collectors.toList());
+            redisUtil.set(WhiteIpListKey, collect, 60 * 60 * 24);
+        } else {
+            redisUtil.del(WhiteIpListKey);
+        }
+
+
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "IP黑名单-通过id查询")
+    @Operation(summary = "IP黑名单-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+
+        if (id == null || "".equals(id)) {
+            return Result.error("ID不能为空");
+        }
+
+        List<AdwebPublicBlackIp> list = adwebBlackIpService.list(new QueryWrapper<AdwebPublicBlackIp>().eq("id", id).eq("status", 1));
+
+        if (list.size() == 0) {
+            return Result.error("该IP不存在");
+        }
+
+        return Result.OK(list.get(0));
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param adwebBlackIp
-    */
+     * 导出excel
+     *
+     * @param request
+     * @param adwebBlackIp
+     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AdwebPublicBlackIp adwebBlackIp) {
         return super.exportXls(request, adwebBlackIp, AdwebPublicBlackIp.class, "IP黑名单");
     }
 
     /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AdwebPublicBlackIp.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebSiteBlackIpController.java

@@ -1,15 +1,17 @@
 package org.jeecg.modules.adweb.enquiry.controller;
 
-import com.advich.template.common.utils.ListUtil;
-import com.advich.template.model.AdwebSite;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -17,39 +19,35 @@ import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.StringUtil;
-import org.jeecg.modules.adweb.entity.AdwebSiteBlackIp;
-import org.jeecg.modules.adweb.service.IAdwebSiteBlackIpService;
-import org.jeecg.modules.adweb.service.IAdwebSiteService;
-import org.jeecg.modules.serp.service.ISiteUserPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jeecg.modules.adweb.enquiry.entity.AdwebSiteBlackIp;
+import org.jeecg.modules.adweb.enquiry.service.IAdwebSiteBlackIpService;
+import org.jeecg.modules.adweb.site.entity.AdwebSite;
+import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
+import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
 /**
-* @Description: adweb_site_black_ip
-* @Author: jeecg-boot
-* @Date:   2023-08-31
-* @Version: V1.0
-*/
-@Api(tags="adweb_site_black_ip")
+ * @Description: adweb_site_black_ip
+ * @Author: jeecg-boot
+ * @Date: 2023-08-31
+ * @Version: V1.0
+ */
+@Tag(name = "adweb_site_black_ip")
 @RestController
 @RequestMapping("/adweb/adwebSiteBlackIp")
 @Slf4j
 public class AdwebSiteBlackIpController extends JeecgController<AdwebSiteBlackIp, IAdwebSiteBlackIpService> {
-   @Autowired
-   private IAdwebSiteBlackIpService adwebSiteBlackIpService;
-    @Autowired
+    @Resource
+    private IAdwebSiteBlackIpService adwebSiteBlackIpService;
+    @Resource
     private IAdwebSiteService adwebSiteService;
-    @Autowired
+    @Resource
     private ISiteUserPermissionService siteUserPermissionService;
-    @Autowired
+    @Resource
     private ISysBaseAPI sysBaseAPI;
 
     @Resource
@@ -61,342 +59,313 @@ public class AdwebSiteBlackIpController extends JeecgController<AdwebSiteBlackIp
     private static final String SiteBlackIpKey = "SITE_BLACK_IP_LIST";
     private static final String SiteWhiteIpListKey = "SITE_WHITE_IP_LIST";
 
-   /**
-    * 分页列表查询
-    *
-    * @param adwebSiteBlackIp
-    * @param pageNo
-    * @param pageSize
-    * @param req
-    * @return
-    */
-   @AutoLog(value = "adweb_site_black_ip-分页列表查询")
-   @ApiOperation(value="adweb_site_black_ip-分页列表查询", notes="adweb_site_black_ip-分页列表查询")
-   @GetMapping(value = "/list")
-   public Result<?> queryPageList(AdwebSiteBlackIp adwebSiteBlackIp,
-                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                  HttpServletRequest req) {
-
-       Page<AdwebSiteBlackIp> page = new Page<AdwebSiteBlackIp>(pageNo, pageSize);
-
-       LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-       List<String> codeList = null;
-       if (sysUser.isPerform()) {
-           codeList = adwebSiteService.list(new LambdaQueryWrapper<AdwebSite>()
-                   .eq(AdwebSite::getPerformFlag, 1)
-                   .eq(adwebSiteBlackIp.getSiteId() != null, AdwebSite::getId, adwebSiteBlackIp.getSiteId())
-                   .ne(AdwebSite::getStatus, 0)).stream().map(AdwebSite::getCode).collect(Collectors.toList());
-       } else {
-           List<String> uidList = null;
-           if (sysBaseAPI.isAdmin()) {
-
-           } else if (sysBaseAPI.isOem()) {
-               uidList = sysBaseAPI.getOemGroupUids();
-           } else {
-               uidList = new ArrayList<>();
-               uidList.add(sysUser.getId());
-           }
-           List<String> siteCodeList = null;
-           if(ListUtil.notEmpty(uidList)){
-               siteCodeList = siteUserPermissionService.getSiteCodeListByUids(uidList);
-           }
-
-           if (adwebSiteBlackIp.getSiteId() != null) {
-               String siteCode = adwebSiteService.getSiteCodeById(adwebSiteBlackIp.getSiteId());
-               if (com.advich.template.common.utils.StringUtil.notEmpty(siteCode)) {
-                   QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
-                   queryWrapper.eq("id", adwebSiteBlackIp.getSiteId()).or().eq("parent_group_code", siteCode);
-                   queryWrapper.ne("status", 0);
-                   queryWrapper.in(!sysBaseAPI.isAdmin(),"code", siteCodeList);
-                   codeList = adwebSiteService.list(queryWrapper).stream().map(AdwebSite::getCode).collect(Collectors.toList());
-               }
-           } else {
-               codeList = siteCodeList;
-           }
-       }
-
-       String column = req.getParameter("column");
-       String order = req.getParameter("order");
-       IPage<AdwebSiteBlackIp> pageList = adwebSiteBlackIpService.pageList(page, adwebSiteBlackIp,codeList,column,order);
-       List<AdwebSiteBlackIp> record = pageList.getRecords();
-       if(sysUser.isPerform()){
-           if(ListUtil.notEmpty(record)){
-               for(AdwebSiteBlackIp adwebSiteBlackIp1 : record){
-                   String siteName = adwebSiteBlackIp1.getSiteName();
-                   if(StringUtil.isEmpty(siteName) || siteName.length() <= 4){
-                       adwebSiteBlackIp1.setSiteName("**************");
-                   }else{
-                       adwebSiteBlackIp1.setSiteName(siteName.substring(0,2)+"**********"+siteName.substring(siteName.length()-2));
-                   }
-                   //对fromIp ip进行脱敏
-                   adwebSiteBlackIp1.setIp("xxx.xxx.xxx.xxx");
-                   adwebSiteBlackIp1.setWasteEnquiryNum(0);
-               }
-           }
-       }
-       return Result.OK(pageList);
-   }
-
-   /**
-    *   添加
-    *
-    * @param adwebSiteBlackIp
-    * @return
-    */
-   @AutoLog(value = "adweb_site_black_ip-添加")
-   @ApiOperation(value="adweb_site_black_ip-添加", notes="adweb_site_black_ip-添加")
-   @PostMapping(value = "/add")
-   public Result<?> add(@RequestBody AdwebSiteBlackIp adwebSiteBlackIp) {
-       LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-       if(sysUser.isPerform()){
-           return Result.FORBIDDEN("\"演示版\"没有操作权限，如果需要操作，请切换到\"正式版\"再操作！");
-       }
-       int count = adwebSiteBlackIpService.count(new QueryWrapper<AdwebSiteBlackIp>().ne("status", 0).eq("ip", adwebSiteBlackIp.getIp())
-               .eq("site_id",adwebSiteBlackIp.getSiteId()));
-
-       if (count > 0) {
-           return Result.error("当前站点已存在此ip");
-       }
-       adwebSiteBlackIp.setStatus(1);
-       adwebSiteBlackIp.setCreateTime(new Date());
-       adwebSiteBlackIpService.save(adwebSiteBlackIp);
-
-       List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", adwebSiteBlackIp.getSiteId()));
-
-       if (ListUtil.isEmpty(siteBlackIpList)) {
-           redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
-           redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
-           return Result.OK("编辑成功!");
-       }
-
-       List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-       if(ListUtil.notEmpty(blackIpList)){
-           redisUtil.set(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId(), blackIpList, 60 * 60 * 24);
-       } else{
-           redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
-       }
-
-       List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-       if(ListUtil.notEmpty(whiteIpList)){
-           redisUtil.set(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId(), whiteIpList, 60 * 60 * 24);
-       } else{
-           redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
-       }
-       return Result.OK("添加成功！");
-   }
-
-   /**
-    *  编辑
-    *
-    * @param adwebSiteBlackIp
-    * @return
-    */
-   @AutoLog(value = "adweb_site_black_ip-编辑")
-   @ApiOperation(value="adweb_site_black_ip-编辑", notes="adweb_site_black_ip-编辑")
-   @PutMapping(value = "/edit")
-   public Result<?> edit(@RequestBody AdwebSiteBlackIp adwebSiteBlackIp) {
-       LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-       if(sysUser.isPerform()){
-           return Result.FORBIDDEN("\"演示版\"没有操作权限，如果需要操作，请切换到\"正式版\"再操作！");
-       }
-       int count = adwebSiteBlackIpService.count(new QueryWrapper<AdwebSiteBlackIp>().ne("status", 0).eq("ip", adwebSiteBlackIp.getIp())
-               .eq("site_id",adwebSiteBlackIp.getSiteId()).ne("id", adwebSiteBlackIp.getId()));
-
-       if (count > 0) {
-           return Result.error("当前站点已存在此ip");
-       }
-       AdwebSiteBlackIp oldSiteBlackIp = adwebSiteBlackIpService.getById(adwebSiteBlackIp.getId());
-       if(!oldSiteBlackIp.getSiteId().equals(adwebSiteBlackIp.getSiteId())){
-           redisUtil.del(SiteBlackIpKey + "::" + oldSiteBlackIp.getSiteId());
-           redisUtil.del(SiteWhiteIpListKey + "::" + oldSiteBlackIp.getSiteId());
-       }
-       adwebSiteBlackIpService.updateById(adwebSiteBlackIp);
-
-       List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", adwebSiteBlackIp.getSiteId()));
-
-       if (ListUtil.isEmpty(siteBlackIpList)) {
-           redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
-           redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
-           return Result.OK("编辑成功!");
-       }
-
-       List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-       if(ListUtil.notEmpty(blackIpList)){
-           redisUtil.set(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId(), blackIpList, 60 * 60 * 24);
-       } else{
-           redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
-       }
-
-       List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-       if(ListUtil.notEmpty(whiteIpList)){
-           redisUtil.set(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId(), whiteIpList, 60 * 60 * 24);
-       } else{
-           redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
-       }
-       return Result.OK("编辑成功!");
-   }
-
-   /**
-    *   通过id删除
-    *
-    * @param id
-    * @return
-    */
-   @AutoLog(value = "adweb_site_black_ip-通过id删除")
-   @ApiOperation(value="adweb_site_black_ip-通过id删除", notes="adweb_site_black_ip-通过id删除")
-   @DeleteMapping(value = "/delete")
-   public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-       LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-       if(sysUser.isPerform()){
-           return Result.FORBIDDEN("\"演示版\"没有操作权限，如果需要操作，请切换到\"正式版\"再操作！");
-       }
-       if (id == null || "".equals(id)) {
-           return Result.error("id不能为空");
-       }
-
-       List<AdwebSiteBlackIp> list = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("id", id).eq("status", 1));
-
-       if (list.size() == 0) {
-           return Result.error("该IP不存在");
-       }
-
-       AdwebSiteBlackIp adwebSiteBlackIp = list.get(0);
-       adwebSiteBlackIp.setStatus(0);
-       adwebSiteBlackIpService.updateById(adwebSiteBlackIp);
-
-       redisUtil.del(SiteIpTenMinKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
-       redisUtil.del(SiteIpOneDayKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
-       redisUtil.del(NotSiteBlackIpWasteEnquiryKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
-
-       List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", adwebSiteBlackIp.getSiteId()));
-
-       if (ListUtil.isEmpty(siteBlackIpList)) {
-           redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
-           redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
-           return Result.OK("编辑成功!");
-       }
-
-       List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-       if(ListUtil.notEmpty(blackIpList)){
-           redisUtil.set(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId(), blackIpList, 60 * 60 * 24);
-       } else{
-           redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
-       }
-
-       List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-       if(ListUtil.notEmpty(whiteIpList)){
-           redisUtil.set(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId(), whiteIpList, 60 * 60 * 24);
-       } else{
-           redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
-       }
-
-       return Result.OK("删除成功!");
-   }
-
-   /**
-    *  批量删除
-    *
-    * @param ids
-    * @return
-    */
-   @AutoLog(value = "adweb_site_black_ip-批量删除")
-   @ApiOperation(value="adweb_site_black_ip-批量删除", notes="adweb_site_black_ip-批量删除")
-   @DeleteMapping(value = "/deleteBatch")
-   public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-       LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-       if(sysUser.isPerform()){
-           return Result.FORBIDDEN("\"演示版\"没有操作权限，如果需要操作，请切换到\"正式版\"再操作！");
-       }
-       if (ids == null || "".equals(ids.trim())) {
-           return Result.error("ID不能为空");
-       }
-       List<String> idList = Arrays.asList(ids.split(","));
-
-       List<AdwebSiteBlackIp> list = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).in("id", idList));
-
-       if (list.size() == 0) {
-           return Result.error("该IP不存在");
-       }
-
-       UpdateWrapper<AdwebSiteBlackIp> adwebSiteBlackIpUpdateWrapper = new UpdateWrapper<>();
-       adwebSiteBlackIpUpdateWrapper.in("id",idList);
-       adwebSiteBlackIpUpdateWrapper.set("status", 0);
-       adwebSiteBlackIpService.update(adwebSiteBlackIpUpdateWrapper);
-
-       HashSet<Integer> siteIdHashSet = new HashSet<Integer>();
-       for(AdwebSiteBlackIp adwebSiteBlackIp : list){
-           redisUtil.del(SiteIpTenMinKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
-           redisUtil.del(SiteIpOneDayKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
-           redisUtil.del(NotSiteBlackIpWasteEnquiryKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
-           siteIdHashSet.add(adwebSiteBlackIp.getSiteId());
-       }
-
-       for(Integer siteId : siteIdHashSet){
-           List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", siteId));
-
-           if (ListUtil.isEmpty(siteBlackIpList)) {
-               redisUtil.del(SiteBlackIpKey + "::" + siteId);
-               redisUtil.del(SiteWhiteIpListKey + "::" + siteId);
-               return Result.OK("编辑成功!");
-           }
-
-           List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-           if(ListUtil.notEmpty(blackIpList)){
-               redisUtil.set(SiteBlackIpKey + "::" + siteId, blackIpList, 60 * 60 * 24);
-           } else{
-               redisUtil.del(SiteBlackIpKey + "::" + siteId);
-           }
-
-           List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
-           if(ListUtil.notEmpty(whiteIpList)){
-               redisUtil.set(SiteWhiteIpListKey + "::" + siteId, whiteIpList, 60 * 60 * 24);
-           } else{
-               redisUtil.del(SiteWhiteIpListKey + "::" + siteId);
-           }
-       }
-
-       return Result.OK("批量删除成功!");
-   }
-
-   /**
-    * 通过id查询
-    *
-    * @param id
-    * @return
-    */
-   @AutoLog(value = "adweb_site_black_ip-通过id查询")
-   @ApiOperation(value="adweb_site_black_ip-通过id查询", notes="adweb_site_black_ip-通过id查询")
-   @GetMapping(value = "/queryById")
-   public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-       AdwebSiteBlackIp adwebSiteBlackIp = adwebSiteBlackIpService.getById(id);
-       if(adwebSiteBlackIp==null) {
-           return Result.error("未找到对应数据");
-       }
-       return Result.OK(adwebSiteBlackIp);
-   }
-
-   /**
-   * 导出excel
-   *
-   * @param request
-   * @param adwebSiteBlackIp
-   */
-   @RequestMapping(value = "/exportXls")
-   public ModelAndView exportXls(HttpServletRequest request, AdwebSiteBlackIp adwebSiteBlackIp) {
-       return super.exportXls(request, adwebSiteBlackIp, AdwebSiteBlackIp.class, "adweb_site_black_ip");
-   }
-
-   /**
+    /**
+     * 分页列表查询
+     *
+     * @param adwebSiteBlackIp
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "adweb_site_black_ip-分页列表查询")
+    @Operation(summary = "adweb_site_black_ip-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<?> queryPageList(AdwebSiteBlackIp adwebSiteBlackIp,
+                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                   HttpServletRequest req) {
+
+        Page<AdwebSiteBlackIp> page = new Page<AdwebSiteBlackIp>(pageNo, pageSize);
+
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        List<String> codeList = null;
+        List<String> uidList = null;
+        if (sysBaseAPI.isAdmin()) {
+
+        } else if (sysBaseAPI.isOem()) {
+            uidList = sysBaseAPI.getOemGroupUids();
+        } else {
+            uidList = new ArrayList<>();
+            uidList.add(sysUser.getId());
+        }
+        List<String> siteCodeList = null;
+        if (CollectionUtils.isNotEmpty(uidList)) {
+            siteCodeList = siteUserPermissionService.getSiteCodeListByUids(uidList);
+        }
+
+        if (adwebSiteBlackIp.getSiteId() != null) {
+            String siteCode = adwebSiteService.getSiteCodeById(adwebSiteBlackIp.getSiteId());
+            if (StringUtils.isNotBlank(siteCode)) {
+                QueryWrapper<AdwebSite> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("id", adwebSiteBlackIp.getSiteId()).or().eq("parent_group_code", siteCode);
+                queryWrapper.ne("status", 0);
+                queryWrapper.in(!sysBaseAPI.isAdmin(), "code", siteCodeList);
+                codeList = adwebSiteService.list(queryWrapper).stream().map(AdwebSite::getCode).collect(Collectors.toList());
+            }
+        } else {
+            codeList = siteCodeList;
+        }
+
+        String column = req.getParameter("column");
+        String order = req.getParameter("order");
+        IPage<AdwebSiteBlackIp> pageList = adwebSiteBlackIpService.pageList(page, adwebSiteBlackIp, codeList, column, order);
+        List<AdwebSiteBlackIp> record = pageList.getRecords();
+
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param adwebSiteBlackIp
+     * @return
+     */
+    @AutoLog(value = "adweb_site_black_ip-添加")
+    @Operation(summary = "adweb_site_black_ip-添加")
+    @PostMapping(value = "/add")
+    public Result<?> add(@RequestBody AdwebSiteBlackIp adwebSiteBlackIp) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        int count = (int) adwebSiteBlackIpService.count(new QueryWrapper<AdwebSiteBlackIp>().ne("status", 0).eq("ip", adwebSiteBlackIp.getIp())
+                .eq("site_id", adwebSiteBlackIp.getSiteId()));
+
+        if (count > 0) {
+            return Result.error("当前站点已存在此ip");
+        }
+        adwebSiteBlackIp.setStatus(1);
+        adwebSiteBlackIp.setCreateTime(new Date());
+        adwebSiteBlackIpService.save(adwebSiteBlackIp);
+
+        List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", adwebSiteBlackIp.getSiteId()));
+
+        if (CollectionUtils.isEmpty(siteBlackIpList)) {
+            redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
+            redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
+            return Result.OK("编辑成功!");
+        }
+
+        List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(blackIpList)) {
+            redisUtil.set(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId(), blackIpList, 60 * 60 * 24);
+        } else {
+            redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
+        }
+
+        List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(whiteIpList)) {
+            redisUtil.set(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId(), whiteIpList, 60 * 60 * 24);
+        } else {
+            redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
+        }
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param adwebSiteBlackIp
+     * @return
+     */
+    @AutoLog(value = "adweb_site_black_ip-编辑")
+    @Operation(summary = "adweb_site_black_ip-编辑")
+    @PutMapping(value = "/edit")
+    public Result<?> edit(@RequestBody AdwebSiteBlackIp adwebSiteBlackIp) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        int count = (int) adwebSiteBlackIpService.count(new QueryWrapper<AdwebSiteBlackIp>().ne("status", 0).eq("ip", adwebSiteBlackIp.getIp())
+                .eq("site_id", adwebSiteBlackIp.getSiteId()).ne("id", adwebSiteBlackIp.getId()));
+
+        if (count > 0) {
+            return Result.error("当前站点已存在此ip");
+        }
+        AdwebSiteBlackIp oldSiteBlackIp = adwebSiteBlackIpService.getById(adwebSiteBlackIp.getId());
+        if (!oldSiteBlackIp.getSiteId().equals(adwebSiteBlackIp.getSiteId())) {
+            redisUtil.del(SiteBlackIpKey + "::" + oldSiteBlackIp.getSiteId());
+            redisUtil.del(SiteWhiteIpListKey + "::" + oldSiteBlackIp.getSiteId());
+        }
+        adwebSiteBlackIpService.updateById(adwebSiteBlackIp);
+
+        List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", adwebSiteBlackIp.getSiteId()));
+
+        if (CollectionUtils.isEmpty(siteBlackIpList)) {
+            redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
+            redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
+            return Result.OK("编辑成功!");
+        }
+
+        List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(blackIpList)) {
+            redisUtil.set(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId(), blackIpList, 60 * 60 * 24);
+        } else {
+            redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
+        }
+
+        List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(whiteIpList)) {
+            redisUtil.set(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId(), whiteIpList, 60 * 60 * 24);
+        } else {
+            redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
+        }
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "adweb_site_black_ip-通过id删除")
+    @Operation(summary = "adweb_site_black_ip-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        if (id == null || "".equals(id)) {
+            return Result.error("id不能为空");
+        }
+
+        List<AdwebSiteBlackIp> list = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("id", id).eq("status", 1));
+
+        if (list.size() == 0) {
+            return Result.error("该IP不存在");
+        }
+
+        AdwebSiteBlackIp adwebSiteBlackIp = list.get(0);
+        adwebSiteBlackIp.setStatus(0);
+        adwebSiteBlackIpService.updateById(adwebSiteBlackIp);
+
+        redisUtil.del(SiteIpTenMinKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
+        redisUtil.del(SiteIpOneDayKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
+        redisUtil.del(NotSiteBlackIpWasteEnquiryKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
+
+        List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", adwebSiteBlackIp.getSiteId()));
+
+        if (CollectionUtils.isEmpty(siteBlackIpList)) {
+            redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
+            redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
+            return Result.OK("编辑成功!");
+        }
+
+        List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(blackIpList)) {
+            redisUtil.set(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId(), blackIpList, 60 * 60 * 24);
+        } else {
+            redisUtil.del(SiteBlackIpKey + "::" + adwebSiteBlackIp.getSiteId());
+        }
+
+        List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(whiteIpList)) {
+            redisUtil.set(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId(), whiteIpList, 60 * 60 * 24);
+        } else {
+            redisUtil.del(SiteWhiteIpListKey + "::" + adwebSiteBlackIp.getSiteId());
+        }
+
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "adweb_site_black_ip-批量删除")
+    @Operation(summary = "adweb_site_black_ip-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        if (ids == null || "".equals(ids.trim())) {
+            return Result.error("ID不能为空");
+        }
+        List<String> idList = Arrays.asList(ids.split(","));
+
+        List<AdwebSiteBlackIp> list = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).in("id", idList));
+
+        if (list.size() == 0) {
+            return Result.error("该IP不存在");
+        }
+
+        UpdateWrapper<AdwebSiteBlackIp> adwebSiteBlackIpUpdateWrapper = new UpdateWrapper<>();
+        adwebSiteBlackIpUpdateWrapper.in("id", idList);
+        adwebSiteBlackIpUpdateWrapper.set("status", 0);
+        adwebSiteBlackIpService.update(adwebSiteBlackIpUpdateWrapper);
+
+        HashSet<Integer> siteIdHashSet = new HashSet<Integer>();
+        for (AdwebSiteBlackIp adwebSiteBlackIp : list) {
+            redisUtil.del(SiteIpTenMinKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
+            redisUtil.del(SiteIpOneDayKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
+            redisUtil.del(NotSiteBlackIpWasteEnquiryKey + adwebSiteBlackIp.getSiteId() + "::" + adwebSiteBlackIp.getIp());
+            siteIdHashSet.add(adwebSiteBlackIp.getSiteId());
+        }
+
+        for (Integer siteId : siteIdHashSet) {
+            List<AdwebSiteBlackIp> siteBlackIpList = adwebSiteBlackIpService.list(new QueryWrapper<AdwebSiteBlackIp>().eq("status", 1).eq("site_id", siteId));
+
+            if (CollectionUtils.isEmpty(siteBlackIpList)) {
+                redisUtil.del(SiteBlackIpKey + "::" + siteId);
+                redisUtil.del(SiteWhiteIpListKey + "::" + siteId);
+                return Result.OK("编辑成功!");
+            }
+
+            List<String> blackIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(0)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(blackIpList)) {
+                redisUtil.set(SiteBlackIpKey + "::" + siteId, blackIpList, 60 * 60 * 24);
+            } else {
+                redisUtil.del(SiteBlackIpKey + "::" + siteId);
+            }
+
+            List<String> whiteIpList = siteBlackIpList.stream().filter(siteBlackIp -> siteBlackIp.getBlackOrWhite().equals(1)).map(AdwebSiteBlackIp::getIp).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(whiteIpList)) {
+                redisUtil.set(SiteWhiteIpListKey + "::" + siteId, whiteIpList, 60 * 60 * 24);
+            } else {
+                redisUtil.del(SiteWhiteIpListKey + "::" + siteId);
+            }
+        }
+
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "adweb_site_black_ip-通过id查询")
+    @Operation(summary = "adweb_site_black_ip-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+        AdwebSiteBlackIp adwebSiteBlackIp = adwebSiteBlackIpService.getById(id);
+        if (adwebSiteBlackIp == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(adwebSiteBlackIp);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param adwebSiteBlackIp
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AdwebSiteBlackIp adwebSiteBlackIp) {
+        return super.exportXls(request, adwebSiteBlackIp, AdwebSiteBlackIp.class, "adweb_site_black_ip");
+    }
+
+    /**
      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-   @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-   public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-       return super.importExcel(request, response, AdwebSiteBlackIp.class);
-   }
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AdwebSiteBlackIp.class);
+    }
 
 }