代码调整

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

@@ -21,7 +21,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/5 19:20
  */
-@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class,url = "http://localhost:9064")
+@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class, url = "http://localhost:9064")
 public interface NewsFeignClient {
 
     /**
@@ -58,13 +58,12 @@ public interface NewsFeignClient {
     Result browseNotice(@RequestBody EpdcNoticeBrowseFormDTO formDto);
 
 
-
     /***
      * @Description 移动端新闻列表
      * @Author qushutong
      * @Date 2019/9/9 9:17
      * @Param [formDto]
-    * @Return      com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO>>
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcNewsResultDTO>>
      * @Exception
      *
      */
@@ -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,21 +45,23 @@ public class EpdcAppNewsController {
 
     @Autowired
     private NewsService newsService;
+
     /***
      * @Description 新闻列表
      * @Author qushutong
      * @Date 2019/9/7 11:19
      * @Param [params]
-     * @Return      com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.NewsDTO>>
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.NewsDTO>>
      * @Exception
      *
      */
     @GetMapping("listNews")
-    public Result<List<EpdcNewsResultDTO>> listNews(@RequestBody EpdcNewsFromDTO epdcNewsFromDTO){
+    public Result<List<EpdcNewsResultDTO>> listNews(@RequestBody EpdcNewsFromDTO epdcNewsFromDTO) {
         ValidatorUtils.validateEntity(epdcNewsFromDTO);
         Result<List<EpdcNewsResultDTO>> listNews = newsService.listNews(epdcNewsFromDTO);
         return listNews;
     }
+
     /***
      * @Description 新闻详情
      * @Author qushutong
@@ -80,10 +72,11 @@ public class EpdcAppNewsController {
      *
      */
     @GetMapping("detail/{newsId}")
-    public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id){
+    public Result<EpdcNewsDetailResultDTO> getNewsDetail(@PathVariable("newsId") String id) {
         Result<EpdcNewsDetailResultDTO> newsDetail = newsService.getNewsDetail(id);
         return newsDetail;
     }
+
     /***
      * @Description 点赞或踩
      * @Author qushutong
@@ -94,7 +87,7 @@ public class EpdcAppNewsController {
      *
      */
     @PostMapping("statement")
-    public  Result upDateStatement(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO){
+    public Result upDateStatement(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO) {
         ValidatorUtils.validateEntity(newsStatementFromDTO);
         return newsService.modifyStatement(newsStatementFromDTO);
     }
@@ -109,7 +102,7 @@ public class EpdcAppNewsController {
      *
      */
     @PostMapping("browse")
-    public Result modifyNewsBrowse(@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO){
+    public Result modifyNewsBrowse(@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) {
         ValidatorUtils.validateEntity(newsBrowseFromDTO);
         return newsService.modifyNewsBrowse(newsBrowseFromDTO);
     }

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;
@@ -94,28 +94,28 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         return ConvertUtils.sourceToTarget(entityList, NewsDTO.class);
     }
 
-    private QueryWrapper<NewsEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<NewsEntity> getWrapper(Map<String, Object> params) {
-        String draft= (String) params.get("draft");
+        String draft = (String) params.get("draft");
-        String streetId=(String) params.get("streetId");
+        String streetId = (String) params.get("streetId");
-        String communityId=(String) params.get("communityId");
+        String communityId = (String) params.get("communityId");
-        String gridId=(String) params.get("gridId");
+        String gridId = (String) params.get("gridId");
-        String startTime=(String) params.get("startTime");
+        String startTime = (String) params.get("startTime");
-        String endTime=(String) params.get("endTime");
+        String endTime = (String) params.get("endTime");
-        String category=(String) params.get("category");
+        String category = (String) params.get("category");
-        String keyword=(String) params.get("keyword");
+        String keyword = (String) params.get("keyword");
         QueryWrapper<NewsEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(streetId),"STREET_ID",streetId);
+        wrapper.eq(StringUtils.isNotBlank(streetId), "STREET_ID", streetId);
-        wrapper.eq(StringUtils.isNotBlank(communityId),"COMMUNITY_ID",communityId);
+        wrapper.eq(StringUtils.isNotBlank(communityId), "COMMUNITY_ID", communityId);
-        wrapper.eq(StringUtils.isNotBlank(gridId),"GRID_ID",gridId);
+        wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId);
-        wrapper.ge(StringUtils.isNotBlank(startTime),"CREATED_TIME",startTime);
+        wrapper.ge(StringUtils.isNotBlank(startTime), "CREATED_TIME", startTime);
-        wrapper.lt(StringUtils.isNotBlank(endTime),"CREATED_TIME",endTime);
+        wrapper.lt(StringUtils.isNotBlank(endTime), "CREATED_TIME", endTime);
-        wrapper.eq(StringUtils.isNotBlank(category),"NEWS_CATERORY_ID",category);
+        wrapper.eq(StringUtils.isNotBlank(category), "NEWS_CATERORY_ID", category);
-        wrapper.eq(StringUtils.isNotBlank(keyword),"NEWS_TITLE",keyword);
+        wrapper.eq(StringUtils.isNotBlank(keyword), "NEWS_TITLE", keyword);
         //draft 前端传上来的一个标志 有则代表是存草稿箱的 1
-        if(StringUtils.isNotEmpty(draft)){
+        if (StringUtils.isNotEmpty(draft)) {
-            wrapper.eq(StringUtils.isNotBlank(draft),"NEWS_RELEASE_STATE","1");
+            wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", "1");
-        }else {
+        } else {
-            wrapper.eq(StringUtils.isNotBlank(draft),"NEWS_RELEASE_STATE","0");
+            wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", "0");
         }
         wrapper.orderByDesc("CREATED_TIME");
         return wrapper;
@@ -162,18 +162,18 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     }
 
     @Override
-    public int checkCountByCategoryId(String categoryId){
+    public int checkCountByCategoryId(String categoryId) {
 
         return baseDao.selectCountByCategoryId(categoryId);
     }
 
     @Override
-    public boolean modifyOnLine(Map<String,String> parmas) {
+    public boolean modifyOnLine(Map<String, String> parmas) {
-        String id=parmas.get("id");
+        String id = parmas.get("id");
-        String onLineState=parmas.get("onLineState");
+        String onLineState = parmas.get("onLineState");
         NewsDTO newsDTO = get(id);
         //判断下是不是上线 是的话才执行
-        if("1".equals(newsDTO.getNewsUpDownState())){
+        if ("1".equals(newsDTO.getNewsUpDownState())) {
             newsDTO.setNewsUpDownState(onLineState);
             NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
             updateById(entity);
@@ -187,10 +187,10 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     public void savePublishNews(NewsDTO newsDTO) {
 
 
-        publishNews(newsDTO,"0");
+        publishNews(newsDTO, "0");
     }
 
-    private void publishNews(NewsDTO newsDTO,String newsReleaseState ) {
+    private void publishNews(NewsDTO newsDTO, String newsReleaseState) {
         NewsEntity entity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
         //发布的时候 默认是0  手动下线 为1
         entity.setNewsUpDownState("0");
@@ -215,7 +215,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
             newsDepartmentService.deleteByNewsId(entity.getId());
         }
         //判断是否是草稿箱  是的话 不执行下面操作
-        if(YesOrNoEnum.YES.value().equals(newsReleaseState)){
+        if (YesOrNoEnum.YES.value().equals(newsReleaseState)) {
             return;
         }
         // 通知所属部门id
@@ -241,7 +241,7 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
                 throw new RenException("获取部门信息失败");
             }
             newsGridList = adminResult.getData();
-        }else {
+        } else {
         }
         this.newsDepartmentService.save(entity.getId(), newsGridList);
     }
@@ -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());
 
     }
 
@@ -272,15 +272,15 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     @Override
     public Result modifyStatement(EpdcNewsStatementFromDTO newsStatementFromDTO) {
         NewsDTO newsDTO = get(newsStatementFromDTO.getNewsId());
-        NewsUserAttitudeDTO newsUserAttitudeDTO=new NewsUserAttitudeDTO();
+        NewsUserAttitudeDTO newsUserAttitudeDTO = new NewsUserAttitudeDTO();
 
         //表态 0赞；1踩
-        NewsEntity newsEntity= ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
+        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 {
+        } else {
-            newsEntity.setLikeNumber(newsDTO.getLikeNumber()+1);
+            newsEntity.setLikeNumber(newsDTO.getLikeNumber() + NumConstant.ONE);
             newsUserAttitudeDTO.setAttitudeFlag(AppNewsLikeEnum.UNLIKE.value());
         }
         baseDao.insert(newsEntity);
@@ -294,8 +294,8 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     @Override
     public Result modifyNewsBrowse(EpdcNewsBrowseFromDTO newsBrowseFromDTO) {
         NewsDTO newsDTO = get(newsBrowseFromDTO.getNewsId());
-        NewsEntity newsEntity= ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
+        NewsEntity newsEntity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
-        newsEntity.setReadingAmount(newsDTO.getReadingAmount()+1);
+        newsEntity.setReadingAmount(newsDTO.getReadingAmount() + 1);
         baseDao.updateById(newsEntity);
         return new Result();
     }

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;