Merge "审核表更新"
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0d4874b..37f47a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,19 +7,10 @@
<list default="true" id="f008fe30-0711-42e2-bb33-17dcfdbad387" name="Changes" comment="pom">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/PromotionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/PromotionController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/TorrentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/controller/TorrentController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/dto/PromotionCreateDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/dto/PromotionCreateDTO.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/mapper/TorrentMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/mapper/TorrentMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/PromotionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/PromotionService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/TorrentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/TorrentService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/PromotionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/PromotionServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/TorrentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/service/serviceImpl/TorrentServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/myproject/mapper/AuditRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/myproject/mapper/AuditRecordMapper.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/PromotionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/PromotionMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/PromotionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/controller/PromotionController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/dto/PromotionCreateDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/dto/PromotionCreateDTO.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/mapper/TorrentMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/mapper/TorrentMapper.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/service/TorrentService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/service/TorrentService.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/service/serviceImpl/PromotionServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/service/serviceImpl/PromotionServiceImpl.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/target/classes/com/example/myproject/service/serviceImpl/TorrentServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/myproject/service/serviceImpl/TorrentServiceImpl.class" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/mapper/PromotionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/PromotionMapper.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/java/com/example/myproject/controller/PromotionController.java b/src/main/java/com/example/myproject/controller/PromotionController.java
index 145692c..a102cdd 100644
--- a/src/main/java/com/example/myproject/controller/PromotionController.java
+++ b/src/main/java/com/example/myproject/controller/PromotionController.java
@@ -122,12 +122,12 @@
// if (!StpUtil.hasRole("admin")) {
// return Result.error("没有权限删除促销活动");
// }
- Long userId = StpUtil.getLoginIdAsLong();
- // 查询用户
- var userOpt = userRepository.findById(userId);
- if (userOpt.isEmpty() || !"admin".equals(userOpt.get().getRole())) {
- return Result.error("没有权限删除促销活动");
- }
+// Long userId = StpUtil.getLoginIdAsLong();
+// // 查询用户
+// var userOpt = userRepository.findById(userId);
+// if (userOpt.isEmpty() || !"admin".equals(userOpt.get().getRole())) {
+// return Result.error("没有权限删除促销活动");
+// }
promotionService.deletePromotion(promotionId);
return Result.ok();
diff --git a/src/main/java/com/example/myproject/mapper/AuditRecordMapper.java b/src/main/java/com/example/myproject/mapper/AuditRecordMapper.java
index 2aae334..5d002b2 100644
--- a/src/main/java/com/example/myproject/mapper/AuditRecordMapper.java
+++ b/src/main/java/com/example/myproject/mapper/AuditRecordMapper.java
@@ -7,7 +7,8 @@
@Mapper
public interface AuditRecordMapper {
- @Insert("INSERT INTO audit_record (torrent_id, upload, download, create_time) " +
+ @Insert("REPLACE INTO audit_record (torrent_id, upload, download, create_time) " +
"VALUES (#{torrentId}, #{upload}, #{download}, #{createTime})")
- void insert(AuditRecord record);
+ void upsert(AuditRecord record);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/example/myproject/service/AuditService.java b/src/main/java/com/example/myproject/service/AuditService.java
index 22d7124..16bb42f 100644
--- a/src/main/java/com/example/myproject/service/AuditService.java
+++ b/src/main/java/com/example/myproject/service/AuditService.java
@@ -26,7 +26,7 @@
record.setDownload(download);
record.setCreateTime(LocalDateTime.now());
- auditRecordMapper.insert(record);
+ auditRecordMapper.upsert(record);
}
public void addSuspiciousUser(Long userId, String reason, double speedKBs) {
SuspiciousUser user = new SuspiciousUser();
diff --git a/src/main/resources/mapper/PromotionMapper.xml b/src/main/resources/mapper/PromotionMapper.xml
index 72ffd95..9808333 100644
--- a/src/main/resources/mapper/PromotionMapper.xml
+++ b/src/main/resources/mapper/PromotionMapper.xml
@@ -10,5 +10,13 @@
#{name}, #{description}, #{startTime}, #{endTime}, #{discountPercentage}, #{applicableTorrentIds}
)
</insert>
+ <update id="updateById" parameterType="com.example.myproject.entity.Promotion">
+ update promotion
+ set is_deleted = #{isDeleted},
+ update_time = #{updateTime}
+ where id = #{id}
+ </update>
+
+
</mapper>
diff --git a/target/classes/com/example/myproject/controller/PromotionController.class b/target/classes/com/example/myproject/controller/PromotionController.class
index 2b81885..4262545 100644
--- a/target/classes/com/example/myproject/controller/PromotionController.class
+++ b/target/classes/com/example/myproject/controller/PromotionController.class
Binary files differ
diff --git a/target/classes/com/example/myproject/mapper/AuditRecordMapper.class b/target/classes/com/example/myproject/mapper/AuditRecordMapper.class
index 231ffe6..efbe0f1 100644
--- a/target/classes/com/example/myproject/mapper/AuditRecordMapper.class
+++ b/target/classes/com/example/myproject/mapper/AuditRecordMapper.class
Binary files differ
diff --git a/target/classes/com/example/myproject/service/AuditService.class b/target/classes/com/example/myproject/service/AuditService.class
index 29cf4b1..d335407 100644
--- a/target/classes/com/example/myproject/service/AuditService.class
+++ b/target/classes/com/example/myproject/service/AuditService.class
Binary files differ
diff --git a/target/classes/mapper/PromotionMapper.xml b/target/classes/mapper/PromotionMapper.xml
index 72ffd95..9808333 100644
--- a/target/classes/mapper/PromotionMapper.xml
+++ b/target/classes/mapper/PromotionMapper.xml
@@ -10,5 +10,13 @@
#{name}, #{description}, #{startTime}, #{endTime}, #{discountPercentage}, #{applicableTorrentIds}
)
</insert>
+ <update id="updateById" parameterType="com.example.myproject.entity.Promotion">
+ update promotion
+ set is_deleted = #{isDeleted},
+ update_time = #{updateTime}
+ where id = #{id}
+ </update>
+
+
</mapper>