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

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/GhDetailVo.java

@@ -9,9 +9,9 @@ public class GhDetailVo {
 
     private Long id;
 
-    private String ghId;
+    private String accountId;
 
-    private String ghName;
+    private String accountName;
 
     private Integer type;
 

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

@@ -7,7 +7,7 @@ import com.tzld.longarticle.recommend.server.util.page.Page;
 
 public interface GhDetailService {
 
-    CommonResponse<Page<GhDetailVo>> getGhDetailList(Integer pageNum, Integer pageSize, String ghId);
+    CommonResponse<Page<GhDetailVo>> getGhDetailList(Integer pageNum, Integer pageSize, String accountId);
 
     CommonResponse<Void> addGhDetail(GhDetailVo ghDetailVo);
 

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

@@ -30,7 +30,7 @@ public class GhDetailServiceImpl implements GhDetailService {
     private GhDetailMapper ghDetailMapper;
 
     @Override
-    public CommonResponse<Page<GhDetailVo>> getGhDetailList(Integer pageNum, Integer pageSize, String ghId) {
+    public CommonResponse<Page<GhDetailVo>> getGhDetailList(Integer pageNum, Integer pageSize, String accountId) {
         if (pageNum == null) {
             pageNum = 1;
         }
@@ -44,8 +44,8 @@ public class GhDetailServiceImpl implements GhDetailService {
         page.setCurrentPage(pageNum);
         page.setPageSize(pageSize);
         GhDetailExample example = new GhDetailExample();
-        if (StringUtils.isNotEmpty(ghId)) {
-            example.createCriteria().andGhIdEqualTo(ghId);
+        if (StringUtils.isNotEmpty(accountId)) {
+            example.createCriteria().andGhIdEqualTo(accountId);
         }
         example.setPage(page);
         long total = ghDetailMapper.countByExample(example);
@@ -57,6 +57,8 @@ public class GhDetailServiceImpl implements GhDetailService {
             for (GhDetail ghDetail : ghDetails) {
                 GhDetailVo ghDetailVo = new GhDetailVo();
                 BeanUtils.copyProperties(ghDetail, ghDetailVo);
+                ghDetailVo.setAccountId(ghDetail.getGhId());
+                ghDetailVo.setAccountName(ghDetail.getGhName());
                 ghDetailVo.setTypeName(GhTypeEnum.getTypeName(ghDetailVo.getType()));
                 ghDetailVos.add(ghDetailVo);
             }
@@ -68,16 +70,18 @@ public class GhDetailServiceImpl implements GhDetailService {
     @Override
     public CommonResponse<Void> addGhDetail(GhDetailVo ghDetailVo) {
         if (ghDetailVo == null
-                || StringUtils.isEmpty(ghDetailVo.getGhId())
-                || StringUtils.isEmpty(ghDetailVo.getGhName())
+                || StringUtils.isEmpty(ghDetailVo.getAccountId())
+                || StringUtils.isEmpty(ghDetailVo.getAccountName())
                 || ghDetailVo.getType() == null
                 || StringUtils.isEmpty(ghDetailVo.getCategory1())) {
-            CommonResponse.create(500, "参数错误");
+            return CommonResponse.create(500, "参数错误");
         }
 
         try {
             GhDetail ghDetail = new GhDetail();
             BeanUtils.copyProperties(ghDetailVo, ghDetail);
+            ghDetail.setGhId(ghDetailVo.getAccountId());
+            ghDetail.setGhName(ghDetailVo.getAccountName());
             ghDetailMapper.insert(ghDetail);
             return CommonResponse.success();
         } catch (Exception e) {
@@ -91,6 +95,8 @@ public class GhDetailServiceImpl implements GhDetailService {
         try {
             GhDetail ghDetail = new GhDetail();
             BeanUtils.copyProperties(ghDetailVo, ghDetail);
+            ghDetail.setGhId(ghDetailVo.getAccountId());
+            ghDetail.setGhName(ghDetailVo.getAccountName());
             ghDetailMapper.updateByPrimaryKeySelective(ghDetail);
             return CommonResponse.success();
         } catch (Exception e) {

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

@@ -25,8 +25,10 @@ public class GhDetailController {
     private GhDetailService ghDetailService;
 
     @GetMapping("/getList")
-    public CommonResponse<Page<GhDetailVo>> getGhDetailList(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam String ghId) {
-        return ghDetailService.getGhDetailList(pageNum, pageSize, ghId);
+    public CommonResponse<Page<GhDetailVo>> getGhDetailList(@RequestParam Integer pageNum,
+                                                            @RequestParam Integer pageSize,
+                                                            @RequestParam(defaultValue = "") String accountId) {
+        return ghDetailService.getGhDetailList(pageNum, pageSize, accountId);
     }
 
     @PostMapping("/add")