Merge branch 'cpq-dev' of wangfan/adweb3-server into master

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

@@ -0,0 +1,316 @@
+package org.jeecg.modules.adweb.enquiry.controller;
+
+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.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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.adweb.enquiry.entity.AdwebPublicBlackIp;
+import org.jeecg.modules.adweb.enquiry.service.IAdwebPublicBlackIpService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: IP黑名单
+ * @Author: jeecg-boot
+ * @Date: 2023-02-20
+ * @Version: V1.0
+ */
+@Tag(name = "IP黑名单")
+@RestController
+@RequestMapping("/blackip/adwebBlackIp")
+@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) {
+
+        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
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AdwebPublicBlackIp adwebBlackIp) {
+        return super.exportXls(request, adwebBlackIp, AdwebPublicBlackIp.class, "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, AdwebPublicBlackIp.class);
+    }
+
+}

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

@@ -0,0 +1,371 @@
+package org.jeecg.modules.adweb.enquiry.controller;
+
+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.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;
+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.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 java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @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> {
+    @Resource
+    private IAdwebSiteBlackIpService adwebSiteBlackIpService;
+    @Resource
+    private IAdwebSiteService adwebSiteService;
+    @Resource
+    private ISiteUserPermissionService siteUserPermissionService;
+    @Resource
+    private ISysBaseAPI sysBaseAPI;
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    private static final String SiteIpTenMinKey = "JUDGE_WASTE_ENQUIRY_SITE_IP_BY_10_MIN::";
+    private static final String SiteIpOneDayKey = "JUDGE_WASTE_ENQUIRY_SITE_IP_BY_ONE_DAY::";
+    private static final String NotSiteBlackIpWasteEnquiryKey = "NOT_SITE_BLACK_IP_WASTE_ENQUIRY_MAP::";
+    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-分页列表查询")
+    @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);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/mapper/xml/AdwebPublicBlackIpMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.adweb.enquiry.mapper.AdwebPublicBlackIpMapper">
     <select id="pageList" resultType="org.jeecg.modules.adweb.enquiry.entity.AdwebPublicBlackIp">
         SELECT t1.*, t2.num wasteEnquiryNum
-        FROM `adweb_black_ip` t1
+        FROM `adweb_public_black_ip` t1
                  LEFT JOIN (SELECT from_ip, COUNT(*) num
                             FROM `adweb_enquiry`
                             WHERE `status` = 1

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebEnquiryServiceImpl.java

@@ -38,6 +38,7 @@ import org.jeecg.modules.adweb.system.entity.SysException;
 import org.jeecg.modules.adweb.system.service.IMasterSubAccountRelationService;
 import org.jeecg.modules.adweb.system.service.ISysExceptionService;
 import org.jeecg.modules.adweb.system.service.impl.SysAdwebApiImpl;
+import org.jeecg.modules.message.websocket.WebSocket;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDictService;
@@ -127,6 +128,12 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     @Resource
     private IAdwebEnquiryFormService adwebEnquiryFormService;
 
+    @Resource
+    private SysAdwebApiImpl sysAdwebApiImpl;
+
+    @Resource
+    private WebSocket webSocket;
+
     private static final byte[] redisKey = EnquiryConstants.ENQUIRY_EMAIL.getBytes();
 
     private static final byte[] siteRedisKey = EnquiryConstants.ENQUIRY_SITE.getBytes();
@@ -175,8 +182,6 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     private Integer emailNotBlackListDate;
     @Value("${judge_waste_enquiry.ip.notBlackListDate}")
     private Integer ipNotBlackListDate;
-    @Autowired
-    private SysAdwebApiImpl sysAdwebApiImpl;
 
     // 获取有效公共询盘规则
     private List<String> getPublicEnquiryRules(int blackOrWhite, int useStatus) {
@@ -258,6 +263,14 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
                 AdwebEnquiry target = adwebEnquiryList.get(0);
                 this.save(target);
                 adwebEnquiryFormService.save(form);
+
+                //创建业务消息信息
+                JSONObject obj = new JSONObject();
+                obj.put("cmd", "user");//业务类型
+                obj.put("msgId", target.getId());//消息id
+                obj.put("msgTxt",  target.getEmail());//消息内容
+                //单个用户发送 (userId为用户id)
+                webSocket.sendMessage("e9ca23d68d884d4ebb19d07889727dae", obj.toJSONString());
             } catch (Exception e) {
                 log.error("站点为：{}，  recordId为：{} 保存询盘到数据库失败，原因是:{}", adwebSite.getName(), enquiryDto.getRecordId(), e.getMessage());
             }

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -397,7 +397,7 @@ dataforseo:
 
 ### 询盘列表配置
 enquiry:
-  disable-admin-read: true
+  disable-admin-read: false
   demoFlag: false
   token: zQ3jJqtIexedIw6tZGk6p
   pullCount: 5