xins
/
highwaysaas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(hw-portal): 修改文档主键类型为字符串

Browse Source 
将 HwWebDocument 及相关类中的 documentId 类型从 Long 改为 String，
并同步更新了 Controller、Service、Mapper 和 XML 映射文件。
同时优化了密钥验证逻辑，增加去空格处理。
master
zangch@mesnac.com 3 months ago
parent 8aa59876b0
commit 57de3c5e04
7 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/controller/HwWebDocumentController.java
Unescape Escape View File

@ -67,7 +67,7 @@ public class HwWebDocumentController extends BaseController
*/ */
// @RequiresPermissions("portal:hwWebDocument:query") // @RequiresPermissions("portal:hwWebDocument:query")
@GetMapping(value = "/{documentId}") @GetMapping(value = "/{documentId}")
public AjaxResult getInfo(@PathVariable("documentId") Long documentId) public AjaxResult getInfo(@PathVariable("documentId") String documentId)
{ {
return success(hwWebDocumentService.selectHwWebDocumentByDocumentId(documentId)); return success(hwWebDocumentService.selectHwWebDocumentByDocumentId(documentId));
} }
@ -100,7 +100,7 @@ public class HwWebDocumentController extends BaseController
// @RequiresPermissions("portal:hwWebDocument:remove") // @RequiresPermissions("portal:hwWebDocument:remove")
@Log(title = "Hw资料文件", businessType = BusinessType.DELETE) @Log(title = "Hw资料文件", businessType = BusinessType.DELETE)
@DeleteMapping("/{documentIds}") @DeleteMapping("/{documentIds}")
public AjaxResult remove(@PathVariable Long[] documentIds) public AjaxResult remove(@PathVariable String[] documentIds)
{ {
return toAjax(hwWebDocumentService.deleteHwWebDocumentByDocumentIds(documentIds)); return toAjax(hwWebDocumentService.deleteHwWebDocumentByDocumentIds(documentIds));
} }

6
ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWebDocument.java
Unescape Escape View File

@ -16,7 +16,7 @@ public class HwWebDocument extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键 */ /** 主键 */
private Long documentId; private String documentId;
/** 租户id */ /** 租户id */
@Excel(name = "租户id") @Excel(name = "租户id")
@ -34,12 +34,12 @@ public class HwWebDocument extends BaseEntity
@Excel(name = "密钥") @Excel(name = "密钥")
private String secretKey; private String secretKey;
public void setDocumentId(Long documentId) public void setDocumentId(String documentId)
{ {
this.documentId = documentId; this.documentId = documentId;
} }
public Long getDocumentId() public String getDocumentId()
{ {
return documentId; return documentId;
} }

2
ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/SecureDocumentRequest.java
Unescape Escape View File

@ -4,6 +4,6 @@ import lombok.Data;
@Data @Data
public class SecureDocumentRequest { public class SecureDocumentRequest {
private Long documentId; private String documentId;
private String providedKey; private String providedKey;
} }

6
ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/mapper/HwWebDocumentMapper.java
Unescape Escape View File

@ -17,7 +17,7 @@ public interface HwWebDocumentMapper
* @param documentId Hw资料文件主键 * @param documentId Hw资料文件主键
* @return Hw资料文件 * @return Hw资料文件
*/ */
public HwWebDocument selectHwWebDocumentByDocumentId(Long documentId); public HwWebDocument selectHwWebDocumentByDocumentId(String documentId);
/** /**
* 查询Hw资料文件列表 * 查询Hw资料文件列表
@ -49,7 +49,7 @@ public interface HwWebDocumentMapper
* @param documentId Hw资料文件主键 * @param documentId Hw资料文件主键
* @return 结果 * @return 结果
*/ */
public int deleteHwWebDocumentByDocumentId(Long documentId); public int deleteHwWebDocumentByDocumentId(String documentId);
/** /**
* 批量删除Hw资料文件 * 批量删除Hw资料文件
@ -57,5 +57,5 @@ public interface HwWebDocumentMapper
* @param documentIds 需要删除的数据主键集合 * @param documentIds 需要删除的数据主键集合
* @return 结果 * @return 结果
*/ */
public int deleteHwWebDocumentByDocumentIds(Long[] documentIds); public int deleteHwWebDocumentByDocumentIds(String[] documentIds);
} }

8
ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/IHwWebDocumentService.java
Unescape Escape View File

@ -17,7 +17,7 @@ public interface IHwWebDocumentService
* @param documentId Hw资料文件主键 * @param documentId Hw资料文件主键
* @return Hw资料文件 * @return Hw资料文件
*/ */
public HwWebDocument selectHwWebDocumentByDocumentId(Long documentId); public HwWebDocument selectHwWebDocumentByDocumentId(String documentId);
/** /**
* 查询Hw资料文件列表 * 查询Hw资料文件列表
@ -49,7 +49,7 @@ public interface IHwWebDocumentService
* @param documentIds 需要删除的Hw资料文件主键集合 * @param documentIds 需要删除的Hw资料文件主键集合
* @return 结果 * @return 结果
*/ */
public int deleteHwWebDocumentByDocumentIds(Long[] documentIds); public int deleteHwWebDocumentByDocumentIds(String[] documentIds);
/** /**
* 删除Hw资料文件信息 * 删除Hw资料文件信息
@ -57,7 +57,7 @@ public interface IHwWebDocumentService
* @param documentId Hw资料文件主键 * @param documentId Hw资料文件主键
* @return 结果 * @return 结果
*/ */
public int deleteHwWebDocumentByDocumentId(Long documentId); public int deleteHwWebDocumentByDocumentId(String documentId);
/** /**
* 验证密钥并获取文件地址 * 验证密钥并获取文件地址
@ -66,6 +66,6 @@ public interface IHwWebDocumentService
* @return 文件地址 * @return 文件地址
* @throws Exception 如果密钥不匹配 * @throws Exception 如果密钥不匹配
*/ */
String verifyAndGetDocumentAddress(Long documentId, String providedKey) throws Exception; String verifyAndGetDocumentAddress(String documentId, String providedKey) throws Exception;
} }

13
ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/service/impl/HwWebDocumentServiceImpl.java
Unescape Escape View File

@ -29,7 +29,7 @@ public class HwWebDocumentServiceImpl implements IHwWebDocumentService
* @return Hw资料文件 * @return Hw资料文件
*/ */
@Override @Override
public HwWebDocument selectHwWebDocumentByDocumentId(Long documentId) public HwWebDocument selectHwWebDocumentByDocumentId(String documentId)
{ {
return hwWebDocumentMapper.selectHwWebDocumentByDocumentId(documentId); return hwWebDocumentMapper.selectHwWebDocumentByDocumentId(documentId);
} }
@ -78,7 +78,7 @@ public class HwWebDocumentServiceImpl implements IHwWebDocumentService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteHwWebDocumentByDocumentIds(Long[] documentIds) public int deleteHwWebDocumentByDocumentIds(String[] documentIds)
{ {
return hwWebDocumentMapper.deleteHwWebDocumentByDocumentIds(documentIds); return hwWebDocumentMapper.deleteHwWebDocumentByDocumentIds(documentIds);
} }
@ -90,19 +90,22 @@ public class HwWebDocumentServiceImpl implements IHwWebDocumentService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteHwWebDocumentByDocumentId(Long documentId) public int deleteHwWebDocumentByDocumentId(String documentId)
{ {
return hwWebDocumentMapper.deleteHwWebDocumentByDocumentId(documentId); return hwWebDocumentMapper.deleteHwWebDocumentByDocumentId(documentId);
} }
@Override @Override
public String verifyAndGetDocumentAddress(Long documentId, String providedKey) throws Exception { public String verifyAndGetDocumentAddress(String documentId, String providedKey) throws Exception {
HwWebDocument document = selectHwWebDocumentByDocumentId(documentId); HwWebDocument document = selectHwWebDocumentByDocumentId(documentId);
if (document == null) { if (document == null) {
throw new ServiceException("文件不存在"); throw new ServiceException("文件不存在");
} }
String secretKey = document.getSecretKey(); String secretKey = document.getSecretKey();
if (secretKey == null || secretKey.equals(providedKey)) { if (providedKey != null) {
providedKey = providedKey.trim();
}
if (secretKey.isEmpty()|| secretKey.equals(providedKey)) {
return document.getDocumentAddress(); return document.getDocumentAddress();
} else { } else {
throw new ServiceException("密钥错误"); throw new ServiceException("密钥错误");

8
ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebDocumentMapper.xml
Unescape Escape View File

@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectHwWebDocumentList" parameterType="HwWebDocument" resultMap="HwWebDocumentResult"> <select id="selectHwWebDocumentList" parameterType="HwWebDocument" resultMap="HwWebDocumentResult">
<include refid="selectHwWebDocumentVo"/> <include refid="selectHwWebDocumentVo"/>
<where> <where>
<if test="documentId != null "> and document_id = #{documentId}</if>
<if test="tenantId != null "> and tenant_id = #{tenantId}</if> <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
<if test="documentAddress != null and documentAddress != ''"> and document_address = #{documentAddress}</if> <if test="documentAddress != null and documentAddress != ''"> and document_address = #{documentAddress}</if>
<if test="webCode != null and webCode != ''"> and web_code = #{webCode}</if> <if test="webCode != null and webCode != ''"> and web_code = #{webCode}</if>
@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectHwWebDocumentByDocumentId" parameterType="Long" resultMap="HwWebDocumentResult"> <select id="selectHwWebDocumentByDocumentId" parameterType="String" resultMap="HwWebDocumentResult">
<include refid="selectHwWebDocumentVo"/> <include refid="selectHwWebDocumentVo"/>
where document_id = #{documentId} where document_id = #{documentId}
</select> </select>
@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertHwWebDocument" parameterType="HwWebDocument" useGeneratedKeys="true" keyProperty="documentId"> <insert id="insertHwWebDocument" parameterType="HwWebDocument" useGeneratedKeys="true" keyProperty="documentId">
insert into hw_web_document insert into hw_web_document
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="documentId != null">document_id,</if>
<if test="tenantId != null">tenant_id,</if> <if test="tenantId != null">tenant_id,</if>
<if test="documentAddress != null">document_address,</if> <if test="documentAddress != null">document_address,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -42,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="secretKey != null">secretKey,</if> <if test="secretKey != null">secretKey,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="documentId != null">#{documentId},</if>
<if test="tenantId != null">#{tenantId},</if> <if test="tenantId != null">#{tenantId},</if>
<if test="documentAddress != null">#{documentAddress},</if> <if test="documentAddress != null">#{documentAddress},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -53,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateHwWebDocument" parameterType="HwWebDocument"> <update id="updateHwWebDocument" parameterType="HwWebDocument">
update hw_web_document update hw_web_document
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="documentId != null">document_id = #{documentId},</if>
<if test="tenantId != null">tenant_id = #{tenantId},</if> <if test="tenantId != null">tenant_id = #{tenantId},</if>
<if test="documentAddress != null">document_address = #{documentAddress},</if> <if test="documentAddress != null">document_address = #{documentAddress},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
@ -62,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where document_id = #{documentId} where document_id = #{documentId}
</update> </update>
<delete id="deleteHwWebDocumentByDocumentId" parameterType="Long"> <delete id="deleteHwWebDocumentByDocumentId" parameterType="String">
delete from hw_web_document where document_id = #{documentId} delete from hw_web_document where document_id = #{documentId}
</delete> </delete>

Write Preview
Loading…
Cancel
Save