Signed-off-by: ljx <809268652@qq.com>b类添加查询接口

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,6 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                .antMatchers("/system/contract/getInfoByCode").anonymous()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

ruoyi-system/other.http

@@ -0,0 +1,7 @@
+###
+POST http://127.0.0.1:8080/system/contract/getInfoByCode
+Content-Type: application/json
+
+{
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/ContractTableController.java

@@ -2,6 +2,9 @@ package com.ruoyi.system.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.dto.QueryEntity;
+import com.ruoyi.system.utils.CaptchaUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -71,6 +74,21 @@ public class ContractTableController extends BaseController
     }
 
     /**
+     * 获取B类详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:contract:query')")
+    @PostMapping("/getInfoByCode")
+    public AjaxResult getInfoByCode(@RequestBody QueryEntity queryEntity)
+    {
+        CaptchaUtils utils = new CaptchaUtils();
+        if (utils.validateCaptcha(queryEntity.getCode(), queryEntity.getUuid())){
+            return success(contractTableService.selectContractTableByQuery(queryEntity));
+        }else {
+            return error("验证码输入错误");
+        }
+    }
+
+    /**
      * 新增B类
      */
     @PreAuthorize("@ss.hasPermi('system:contract:add')")

ruoyi-system/src/main/java/com/ruoyi/system/controller/WebShowController.java

@@ -1,7 +0,0 @@
-package com.ruoyi.system.controller;
-
-import com.ruoyi.common.core.controller.BaseController;
-
-public class WebShowController extends BaseController {
-
-}

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/QueryEntity.java

@@ -0,0 +1,15 @@
+package com.ruoyi.system.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryEntity {
+    private String certNumber; //证书编号
+    private String code; //验证码
+    private String userName;  //姓名
+    private String uuid;//验证吗的uuid
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ContractTableMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
 
 import java.util.List;
 import com.ruoyi.system.domain.ContractTable;
+import com.ruoyi.system.domain.dto.QueryEntity;
 
 /**
  * B类Mapper接口
@@ -60,4 +61,6 @@ public interface ContractTableMapper
     public int deleteContractTableByIds(Long[] ids);
 
     public ContractTable selectContractTableByCode(String code);
+
+    ContractTable selectInfoByQuery(QueryEntity entity);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/GradTableMapper.java

@@ -58,4 +58,6 @@ public interface GradTableMapper
      * @return 结果
      */
     public int deleteGradTableByIds(Integer[] ids);
+
+    GradTable selectInfoByCertId(String certId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IContractTableService.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.ContractTable;
+import com.ruoyi.system.domain.dto.QueryEntity;
 
 /**
  * B类Service接口
@@ -69,4 +70,7 @@ public interface IContractTableService
      */
     public String importCon(List<ContractTable> stuList, Boolean isUpdateSupport, String operName);
 
+    public ContractTable selectContractTableByQuery(QueryEntity queryEntity);
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ContractTableServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
+import com.ruoyi.system.domain.dto.QueryEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ContractTableMapper;
@@ -158,4 +159,9 @@ public class ContractTableServiceImpl implements IContractTableService
         }
         return successMsg.toString();
     }
+
+    @Override
+    public ContractTable selectContractTableByQuery(QueryEntity queryEntity) {
+        return contractTableMapper.selectInfoByQuery(queryEntity);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/utils/CaptchaUtils.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.utils;
+
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class CaptchaUtils {
+    @Autowired
+    private RedisCache redisCache;
+
+    public Boolean validateCaptcha(String code, String uuid) {
+        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
+        String captcha = redisCache.getCacheObject(verifyKey);
+        redisCache.deleteObject(verifyKey);
+        if (captcha.equals(code)){
+            return true;
+        }else {
+            return false;
+        }
+    }
+}

ruoyi-system/src/main/resources/mapper/system/ContractTableMapper.xml

@@ -46,6 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where code = #{code}
     </select>
 
+    <select id="selectInfoByQuery" parameterType="QueryEntity" resultMap="ContractTableResult">
+        <include refid="selectContractTableVo"/>
+        where code = #{certNumber} AND name = #{userName}
+    </select>
         
     <insert id="insertContractTable" parameterType="ContractTable" useGeneratedKeys="true" keyProperty="id">
         insert into contract_table

ruoyi-system/src/main/resources/mapper/system/GradTableMapper.xml

@@ -45,6 +45,11 @@
         where id = #{id}
     </select>
 
+    <select id="selectInfoByCertId" parameterType="String" resultMap="GradTableResult">
+        <include refid="selectGradTableVo"/>
+        where cert_id = #{certId}
+    </select>
+
     <insert id="insertGradTable" parameterType="GradTable" useGeneratedKeys="true" keyProperty="id">
         insert into grad_table
         <trim prefix="(" suffix=")" suffixOverrides=",">