为留言和企业自主上报添加滑块验证

zksy-admin/src/main/java/com/zksy/web/controller/basicData/CrmComplainController.java

@@ -8,6 +8,7 @@ import com.zksy.common.core.domain.AjaxResult;
 import com.zksy.common.enums.BusinessType;
 import com.zksy.system.basicData.domain.CrmComplain;
 import com.zksy.system.basicData.domain.CrmFile;
+import com.zksy.system.basicData.domain.dto.CrmComplainDTO;
 import com.zksy.system.basicData.service.CrmComplainService;
 import com.zksy.system.basicData.service.CrmFileService;
 import com.zksy.utils.SearchUtil;
@@ -73,9 +74,9 @@ public class CrmComplainController extends BaseController {
      */
     @PostMapping("/save")
     @ApiOperation(value = "投诉新增")
-    @Log(title = "新增投诉", businessType = BusinessType.INSERT)
-    public AjaxResult saveCrmComplain(@RequestBody CrmComplain crmComplain) {
-        return service.saveCrmComplain(crmComplain);
+//    @Log(title = "新增投诉", businessType = BusinessType.INSERT)
+    public AjaxResult saveCrmComplain(@RequestBody CrmComplainDTO dto) {
+        return service.saveCrmComplain(dto);
     }
 
     /**

zksy-admin/src/main/java/com/zksy/web/controller/basicData/OwSelfReportingController.java

@@ -7,6 +7,7 @@ import com.zksy.common.core.domain.AjaxResult;
 import com.zksy.common.enums.BusinessType;
 import com.zksy.system.basicData.domain.OwSelfReporting;
 import com.zksy.system.basicData.domain.CrmFile;
+import com.zksy.system.basicData.domain.dto.OwSelfReportingDTO;
 import com.zksy.system.basicData.service.OwSelfReportingService;
 import com.zksy.system.basicData.service.CrmFileService;
 import com.zksy.utils.DowntemplateUtil;
@@ -74,9 +75,9 @@ public class OwSelfReportingController extends BaseController {
          */
         @PostMapping("/save")
         @ApiOperation(value = "新增官网自主上报")
-        @Log(title = "新增官网自主上报", businessType = BusinessType.INSERT)
-        public AjaxResult saveOwSelfReporting(@RequestBody OwSelfReporting owSelfReporting) {
-            return service.saveOwSelfReporting(owSelfReporting);
+//        @Log(title = "新增官网自主上报", businessType = BusinessType.INSERT)
+        public AjaxResult saveOwSelfReporting(@RequestBody OwSelfReportingDTO dto) {
+            return service.saveOwSelfReporting(dto);
         }
 
         /**

zksy-admin/src/main/resources/application-druid.yml

@@ -32,9 +32,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3306/credit_rating_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.110.30:3307/credit_rating_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: 123
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

zksy-system/src/main/java/com/zksy/system/basicData/domain/dto/CrmComplainDTO.java

@@ -0,0 +1,14 @@
+package com.zksy.system.basicData.domain.dto;
+
+import com.zksy.system.basicData.domain.CrmComplain;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CrmComplainDTO extends CrmComplain {
+    private String imageKey;
+    private String imageCode;
+}

zksy-system/src/main/java/com/zksy/system/basicData/domain/dto/OwSelfReportingDTO.java

@@ -0,0 +1,15 @@
+package com.zksy.system.basicData.domain.dto;
+
+import com.zksy.system.basicData.domain.OwSelfReporting;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OwSelfReportingDTO extends OwSelfReporting {
+    private String imageKey;
+
+    private String imageCode;
+}

zksy-system/src/main/java/com/zksy/system/basicData/service/CaptchaService.java

@@ -17,7 +17,7 @@ public class CaptchaService {
     /**
      * 拼图验证码允许偏差
      **/
-    private static Integer ALLOW_DEVIATION = 3;
+    private static Integer ALLOW_DEVIATION = 5;
 
     @Autowired
     private StringRedisTemplate stringRedisTemplate;

zksy-system/src/main/java/com/zksy/system/basicData/service/CrmComplainService.java

@@ -3,6 +3,7 @@ package com.zksy.system.basicData.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zksy.common.core.domain.AjaxResult;
 import com.zksy.system.basicData.domain.CrmComplain;
+import com.zksy.system.basicData.domain.dto.CrmComplainDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -16,12 +17,12 @@ import java.util.List;
 public interface CrmComplainService extends IService<CrmComplain> {
     /**
      * TODO 新增投诉
-      * @param crmComplain
+      * @param dto
      * @return com.zksy.common.core.domain.AjaxResult
      * @author Administrator
      * @date 2024/5/20 09:17:26
      */
-    AjaxResult saveCrmComplain(CrmComplain crmComplain);
+    AjaxResult saveCrmComplain(CrmComplainDTO dto);
 
     /**
      * TODO 修改投诉

zksy-system/src/main/java/com/zksy/system/basicData/service/OwSelfReportingService.java

@@ -3,6 +3,7 @@ package com.zksy.system.basicData.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zksy.common.core.domain.AjaxResult;
 import com.zksy.system.basicData.domain.OwSelfReporting;
+import com.zksy.system.basicData.domain.dto.OwSelfReportingDTO;
 
 import java.util.List;
 
@@ -16,12 +17,12 @@ import java.util.List;
 public interface OwSelfReportingService extends IService<OwSelfReporting> {
     /**
      * TODO 新增上报
-     * @param owSelfReporting
+     * @param dto
      * @return com.zksy.common.core.domain.AjaxResult
      * @author Administrator
      * @date 2024/5/20 09:17:26
      */
-    AjaxResult saveOwSelfReporting(OwSelfReporting owSelfReporting);
+    AjaxResult saveOwSelfReporting(OwSelfReportingDTO dto);
 
     /**
      * TODO 修改上报

zksy-system/src/main/java/com/zksy/system/basicData/service/impl/CrmComplainServiceImpl.java

@@ -5,7 +5,9 @@ import com.zksy.common.core.domain.AjaxResult;
 import com.zksy.common.utils.DateUtils;
 import com.zksy.system.basicData.domain.CrmComplain;
 import com.zksy.system.basicData.domain.CrmFile;
+import com.zksy.system.basicData.domain.dto.CrmComplainDTO;
 import com.zksy.system.basicData.mapper.CrmComplainMapper;
+import com.zksy.system.basicData.service.CaptchaService;
 import com.zksy.system.basicData.service.CrmComplainService;
 import com.zksy.system.basicData.service.CrmFileService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,16 +44,23 @@ public class CrmComplainServiceImpl extends ServiceImpl<CrmComplainMapper, CrmCo
     @Autowired
     private CrmFileService crmFileService;
 
+    @Autowired
+    private CaptchaService captchaService;
+
     @Override
-    public AjaxResult saveCrmComplain(CrmComplain crmComplain) {
+    public AjaxResult saveCrmComplain(CrmComplainDTO dto) {
+        String msg = captchaService.checkImageCode(dto.getImageKey(), dto.getImageCode());
+        if (com.zksy.common.utils.StringUtils.isNotBlank(msg)) {
+            return AjaxResult.error(999,msg);
+        }
         CrmComplain entity = new CrmComplain();
-        BeanUtils.copyProperties(crmComplain,entity);
-        entity.setCreateBy(crmComplain.getName());
+        BeanUtils.copyProperties(dto,entity);
+        entity.setCreateBy(dto.getName());
         entity.setCreateTime(new Date());
         int number = mapper.insert(entity);
         if(number > 0 ){
-            if(crmComplain.getFiles() != null) {
-                for (CrmFile file : crmComplain.getFiles()) {
+            if(dto.getFiles() != null) {
+                for (CrmFile file : dto.getFiles()) {
                     //添加文件
                     file.setFid(entity.getId());
                     file.setUpdateBy(entity.getName());

zksy-system/src/main/java/com/zksy/system/basicData/service/impl/OwSelfReportingServiceImpl.java

@@ -6,7 +6,9 @@ import com.zksy.common.core.domain.AjaxResult;
 import com.zksy.common.utils.StringUtil;
 import com.zksy.system.basicData.domain.CrmFile;
 import com.zksy.system.basicData.domain.OwSelfReporting;
+import com.zksy.system.basicData.domain.dto.OwSelfReportingDTO;
 import com.zksy.system.basicData.mapper.OwSelfReportingMapper;
+import com.zksy.system.basicData.service.CaptchaService;
 import com.zksy.system.basicData.service.CrmFileService;
 import com.zksy.system.basicData.service.OwSelfReportingService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,15 +36,22 @@ public class OwSelfReportingServiceImpl extends ServiceImpl<OwSelfReportingMappe
     @Autowired
     private CrmFileService crmFileService;
 
+    @Autowired
+    private CaptchaService captchaService;
+
     @Override
-    public AjaxResult saveOwSelfReporting(OwSelfReporting owSelfReporting) {
+    public AjaxResult saveOwSelfReporting(OwSelfReportingDTO dto) {
+        String msg = captchaService.checkImageCode(dto.getImageKey(), dto.getImageCode());
+        if (com.zksy.common.utils.StringUtils.isNotBlank(msg)) {
+            return AjaxResult.error(999,msg);
+        }
         OwSelfReporting entity = new OwSelfReporting();
-        BeanUtils.copyProperties(owSelfReporting,entity);
+        BeanUtils.copyProperties(dto,entity);
         entity.setCreateTime(new Date());
         int number = mapper.insert(entity);
         if(number > 0){
-            if(owSelfReporting.getFiles() != null) {
-                for (CrmFile file : owSelfReporting.getFiles()) {
+            if(dto.getFiles() != null) {
+                for (CrmFile file : dto.getFiles()) {
                     //添加文件
                     file.setFid(entity.getId());
                     file.setUpdateBy(entity.getEnterpriseName());