Merge branch 'dev-xym-update1' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/GhDetailService.java

@@ -14,4 +14,6 @@ public interface GhDetailService {
     CommonResponse<Void> updateDetail(GhDetailVo ghDetailVo);
 
     CommonResponse<Void> refreshGhDetail();
+
+    CommonResponse<Void> deleteDetail(Long id);
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/exterior/impl/GhDetailServiceImpl.java

@@ -44,8 +44,9 @@ public class GhDetailServiceImpl implements GhDetailService {
         page.setCurrentPage(pageNum);
         page.setPageSize(pageSize);
         GhDetailExample example = new GhDetailExample();
+        GhDetailExample.Criteria criteria = example.createCriteria().andIsDeleteEqualTo(0);
         if (StringUtils.isNotEmpty(accountId)) {
-            example.createCriteria().andGhIdEqualTo(accountId);
+            criteria.andGhIdEqualTo(accountId);
         }
         example.setPage(page);
         long total = ghDetailMapper.countByExample(example);
@@ -121,6 +122,15 @@ public class GhDetailServiceImpl implements GhDetailService {
         return CommonResponse.success();
     }
 
+    @Override
+    public CommonResponse<Void> deleteDetail(Long id) {
+        GhDetail ghDetail = new GhDetail();
+        ghDetail.setId(id);
+        ghDetail.setIsDelete(1);
+        ghDetailMapper.updateByPrimaryKeySelective(ghDetail);
+        return CommonResponse.success();
+    }
+
     public void getGhDetail(GhDetail ghDetail) {
         String baseUrl = "http://aigc-api.cybertogether.net";
         WebClient webClient = WebClient.builder()

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/AccountDetailController.java

@@ -27,8 +27,8 @@ public class AccountDetailController {
 
     @GetMapping("/getList")
     public CommonResponse<Page<GhDetailVo>> getAccountDetailList(@RequestParam Integer pageNum,
-                                                            @RequestParam Integer pageSize,
-                                                            @RequestParam(defaultValue = "") String accountId) {
+                                                                 @RequestParam Integer pageSize,
+                                                                 @RequestParam(defaultValue = "") String accountId) {
         return ghDetailService.getGhDetailList(pageNum, pageSize, accountId);
     }
 
@@ -42,6 +42,11 @@ public class AccountDetailController {
         return ghDetailService.updateDetail(detailVo);
     }
 
+    @PostMapping("/delete")
+    public CommonResponse<Void> deleteAccountDetail(@RequestBody Long id) {
+        return ghDetailService.deleteDetail(id);
+    }
+
     @GetMapping("/refresh")
     public CommonResponse<Void> refreshAccountDetail() {
         return ghDetailService.refreshGhDetail();