代码调整

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java

@@ -58,7 +58,6 @@ public interface NewsFeignClient {
     Result browseNotice(@RequestBody EpdcNoticeBrowseFormDTO formDto);
 
 
-
     /***
      * @Description 移动端新闻列表
      * @Author qushutong
@@ -93,7 +92,7 @@ public interface NewsFeignClient {
      *
      */
     @PostMapping("news/epdc-app/news/statement")
-    Result upDateStatement(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO);
+    Result updateStatement(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO);
 
     /***
      * @Description

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java

@@ -43,16 +43,16 @@ public class NewsFeignClientFallback implements NewsFeignClient {
 
     @Override
     public Result<EpdcNewsDetailResultDTO> getNewsDetail(String id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "detail", id);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "getNewsDetail", id);
     }
 
     @Override
-    public Result upDateStatement(EpdcNewsStatementFromDTO newsStatementFromDTO) {
+    public Result updateStatement(EpdcNewsStatementFromDTO newsStatementFromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "statement", newsStatementFromDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "updateStatement", newsStatementFromDTO);
     }
 
     @Override
     public Result modifyNewsBrowse(EpdcNewsBrowseFromDTO newsBrowseFromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "browse", newsBrowseFromDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "modifyNewsBrowse", newsBrowseFromDTO);
     }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -1,7 +1,6 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.common.token.property.TokenPropertise;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
 import com.elink.esua.epdc.common.token.util.TokenUtil;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -58,7 +58,7 @@ public class NewsServiceImpl implements NewsService {
     @Override
     public Result upDateStatement(TokenDto userDetail, EpdcNewsStatementFromDTO newsStatementFromDTO) {
         newsStatementFromDTO.setUserId(userDetail.getUserId());
-        return newsFeignClient.upDateStatement(newsStatementFromDTO);
+        return newsFeignClient.updateStatement(newsStatementFromDTO);
     }
 
 

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcNewsStatementFromDTO.java

@@ -20,7 +20,7 @@ public class EpdcNewsStatementFromDTO implements Serializable {
      * newsId : 95429
      */
     @NotNull(message = "态度不能为空")
-    private int attitude;
+    private Integer attitude;
 
     @NotNull(message = "新闻id不能为空")
     private String newsId;

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/enums/AppNewsLikeEnum.java → esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNewsLikeEnum.java

@@ -1,4 +1,6 @@
-package com.elink.esua.epdc.dto.enums;
+package com.elink.esua.epdc.enums;
+
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 
 /**
  * 用户审核状态枚举
@@ -12,11 +14,11 @@ public enum AppNewsLikeEnum {
     /**
      * 0-点赞
      */
-    LIKE("0"),
+    LIKE(NumConstant.ZERO_STR),
     /**
      * 1-踩
      */
-    UNLIKE("1");
+    UNLIKE(NumConstant.ONE_STR);
 
     private String value;
 

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java

@@ -18,33 +18,23 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.constant.Constant;
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.NewsDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsDetailResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO;
-import com.elink.esua.epdc.excel.NewsExcel;
 import com.elink.esua.epdc.service.NewsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
-
 
 
 /**
  * 新闻相关APP接口
+ *
  * @author: qushutong
  * @Date: 2019/9/7 11:15
  * @Description:
@@ -55,6 +45,7 @@ public class EpdcAppNewsController {
 
     @Autowired
     private NewsService newsService;
+
     /***
      * @Description 新闻列表
      * @Author qushutong
@@ -70,6 +61,7 @@ public class EpdcAppNewsController {
         Result<List<EpdcNewsResultDTO>> listNews = newsService.listNews(epdcNewsFromDTO);
         return listNews;
     }
+
     /***
      * @Description 新闻详情
      * @Author qushutong
@@ -84,6 +76,7 @@ public class EpdcAppNewsController {
         Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id);
         return newsDetail;
     }
+
     /***
      * @Description 点赞或踩
      * @Author qushutong

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@@ -33,7 +33,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NewsDao;
 import com.elink.esua.epdc.dto.NewsDTO;
 import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
-import com.elink.esua.epdc.dto.enums.AppNewsLikeEnum;
+import com.elink.esua.epdc.enums.AppNewsLikeEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsFromDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
@@ -249,7 +249,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     @Override
     public void modifyDraftsPublic(String id) {
         NewsDTO newsDTO = get(id);
-        publishNews(newsDTO,"1");
+        publishNews(newsDTO, YesOrNoEnum.YES.value());
 
     }
 
@@ -276,11 +276,11 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
 
         //表态 0赞；1踩
         NewsEntity newsEntity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
-        if(YesOrNoEnum.YES.value().equals(newsStatementFromDTO.getAttitude())){
+        if (AppNewsLikeEnum.LIKE.value().equals(newsStatementFromDTO.getAttitude())) {
-            newsEntity.setUnLikeNumber(newsDTO.getUnLikeNumber()+1);
+            newsEntity.setUnLikeNumber(newsDTO.getUnLikeNumber() + NumConstant.ONE);
             newsUserAttitudeDTO.setAttitudeFlag(AppNewsLikeEnum.LIKE.value());
         } else {
-            newsEntity.setLikeNumber(newsDTO.getLikeNumber()+1);
+            newsEntity.setLikeNumber(newsDTO.getLikeNumber() + NumConstant.ONE);
             newsUserAttitudeDTO.setAttitudeFlag(AppNewsLikeEnum.UNLIKE.value());
         }
         baseDao.insert(newsEntity);

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.enums;
 
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+
 /**
  * 用户审核状态枚举
  *
@@ -12,15 +14,15 @@ public enum AppUserAuditStateEnum {
     /**
      * 0-未审核
      */
-    UNDER_AUDIT("0"),
+    UNDER_AUDIT(NumConstant.ZERO_STR),
     /**
      * 1-审核通过
      */
-    AUDIT_SUCCESS("1"),
+    AUDIT_SUCCESS(NumConstant.ONE_STR),
     /**
      * 2-审核未通过
      */
-    AUDIT_FAILURE("2");
+    AUDIT_FAILURE(NumConstant.TWO_STR);
 
     private String value;
 

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStateEnum.java

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.enums;
 
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+
 /**
  * 用户状态枚举
  *
@@ -12,19 +14,19 @@ public enum  AppUserStateEnum {
     /**
      * 0已注册
      */
-    REGISTERED("0"),
+    REGISTERED(NumConstant.ZERO_STR),
     /**
      * 1未注册需扫码
      */
-    UNREGISTERED("1"),
+    UNREGISTERED(NumConstant.ONE_STR),
     /**
      * 2注册审核中
      */
-    UNDER_AUDIT("2"),
+    UNDER_AUDIT(NumConstant.TWO_STR),
     /**
      * 3注册审核失败
      */
-    AUDIT_FAILURE("2");
+    AUDIT_FAILURE(NumConstant.THREE_STR);
 
     private String value;