Merge remote-tracking branch 'origin/dev_0814' into dev_0814

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 Integer attitude;
+    private String attitude;
 
     @NotNull(message = "新闻id不能为空")
     private String newsId;

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

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
 
 import java.util.List;
@@ -92,4 +93,17 @@ public interface NewsUserAttitudeService extends BaseService<NewsUserAttitudeEnt
      * @date
      */
     void delete(String[] ids);
+
+
+    /***
+     * @Description 查询用户点赞踩行为 根据userid newsid
+     * @Author qushutong
+     * @Date 2019/9/9 15:35
+     * @Param [id]
+     * @Return com.elink.esua.epdc.dto.NewsUserAttitudeDTO
+     * @Exception
+     *
+     */
+    NewsUserAttitudeEntity getUserBehavior(EpdcNewsStatementFromDTO newsStatementFromDTO);
+
 }

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

@@ -33,6 +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.entity.NewsUserAttitudeEntity;
 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;
@@ -273,7 +274,20 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
     public Result modifyStatement(EpdcNewsStatementFromDTO newsStatementFromDTO) {
         NewsDTO newsDTO = get(newsStatementFromDTO.getNewsId());
         NewsUserAttitudeDTO newsUserAttitudeDTO = new NewsUserAttitudeDTO();
-
+        NewsUserAttitudeEntity userBehavior = newsUserAttitudeService.getUserBehavior(newsStatementFromDTO);
+        if (userBehavior != null && AppNewsLikeEnum.LIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.LIKE.value().equals(newsStatementFromDTO.getAttitude())) {
+            //您已经点过赞不能赞
+            return new Result().error("您已经点过赞不能赞");
+        } else if (userBehavior != null && AppNewsLikeEnum.LIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.UNLIKE.value().equals(newsStatementFromDTO.getAttitude())) {
+            //已经踩不能赞
+            return new Result().error("您已经踩过不能赞");
+        } else if (userBehavior != null && AppNewsLikeEnum.UNLIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.LIKE.value().equals(newsStatementFromDTO.getAttitude())) {
+            //已经踩 不能踩
+            return new Result().error("您已经踩过不能踩");
+        } else if (userBehavior != null && AppNewsLikeEnum.LIKE.value().equals(userBehavior.getAttitudeFlag()) && AppNewsLikeEnum.UNLIKE.value().equals(newsStatementFromDTO.getAttitude())) {
+            //已经赞  不能踩
+            return new Result().error("您已经赞过不能踩");
+        }
         //表态 0赞；1踩
         NewsEntity newsEntity = ConvertUtils.sourceToTarget(newsDTO, NewsEntity.class);
         if (AppNewsLikeEnum.LIKE.value().equals(newsStatementFromDTO.getAttitude())) {

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

@@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.dao.NewsUserAttitudeDao;
 import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcNewsStatementFromDTO;
 import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
 import com.elink.esua.epdc.redis.NewsUserAttitudeRedis;
 import com.elink.esua.epdc.service.NewsUserAttitudeService;
@@ -101,4 +102,14 @@ public class NewsUserAttitudeServiceImpl extends BaseServiceImpl<NewsUserAttitud
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public NewsUserAttitudeEntity getUserBehavior(EpdcNewsStatementFromDTO newsStatementFromDTO) {
+        String userId=newsStatementFromDTO.getUserId();
+        String newsId=newsStatementFromDTO.getNewsId();
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq(StringUtils.isNotBlank(userId), "USER_ID", userId);
+        queryWrapper.eq(StringUtils.isNotBlank(newsId), "EPDC_NEWS_ID", newsId);
+        return baseDao.selectOne(queryWrapper);
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -46,4 +46,10 @@ public class EpdcAppUserController {
     public Result userRegist(@RequestBody UserDTO userDto) {
         return userService.userRegist(userDto);
     }
+
+
+//    @GetMapping("getInfoById")
+//    public Result<> getInfoById(String id){
+//        return
+//    }
 }