满意度评价

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java

@@ -3,15 +3,13 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -50,4 +48,10 @@ public class ApiItemController {
     public Result<ItemDetailResultDTO> itemDetail(@LoginUser TokenDto userDetail, @PathVariable String itemId) {
         return itemService.getItemDetail(userDetail, itemId);
     }
+
+
+    @PostMapping("evaluation")
+    public Result evaluation(@LoginUser TokenDto userDetail, EvaluationFormDTO evaluationFormDTO) {
+        return itemService.evaluation(userDetail,evaluationFormDTO);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
@@ -10,6 +11,7 @@ import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -40,4 +42,8 @@ public interface ItemFeignClient {
      */
     @GetMapping(value = "events/epdc-app/item/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto);
+
+
+    @PostMapping(value = "events/epdc-app/item/evaluation", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result evaluation(EvaluationFormDTO evaluationFormDTO);
 }

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
@@ -28,4 +29,9 @@ public class ItemFeignClientFallback implements ItemFeignClient {
     public Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", formDto);
     }
+
+    @Override
+    public Result evaluation(EvaluationFormDTO evaluationFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluation", evaluationFormDTO);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
@@ -32,4 +33,7 @@ public interface ItemService {
      * @Date: 2019/9/10 20:42
      */
     Result<ItemDetailResultDTO> getItemDetail(TokenDto userDetail, String itemId);
+
+    Result evaluation(TokenDto userDetail, EvaluationFormDTO evaluationFormDTO);
+
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
@@ -37,4 +38,11 @@ public class ItemServiceImpl implements ItemService {
         formDto.setItemId(itemId);
         return itemFeignClient.getItemDetail(formDto);
     }
+
+
+    @Override
+    public Result evaluation(TokenDto userDetail, EvaluationFormDTO evaluationFormDTO) {
+        evaluationFormDTO.setUserId(userDetail.getUserId());
+        return itemFeignClient.evaluation(evaluationFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author LC
+ * @Date 2019/9/9 16:24
+ */
+@Data
+public class EvaluationFormDTO implements Serializable {
+    private static final long serialVersionUID = -3034807666143092535L;
+
+    @NotBlank(message = "项目ID不能为空")
+    private String itemId;
+
+    @NotBlank(message = "满意度评价得分不能为空")
+    private int evaluationScore;
+
+    @NotBlank(message = "满意度评价内容不能为空")
+    private String evaluationContent;
+
+    private String userId;
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java

@@ -3,16 +3,14 @@ package com.elink.esua.epdc.modules.item.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.modules.item.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -53,4 +51,12 @@ public class EpdcAppItemController {
         ValidatorUtils.validateEntity(formDto);
         return this.itemService.getItemDetail(formDto);
     }
+
+    @PostMapping("evaluation")
+    public Result evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+        ValidatorUtils.validateEntity(evaluationFormDTO);
+        return this.itemService.evaluation(evaluationFormDTO);
+    }
+
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.ItemDTO;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
@@ -124,4 +125,7 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Date: 2019/9/10 20:54
      */
     Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto);
+
+
+    Result evaluation(EvaluationFormDTO evaluationFormDTO);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.ItemDTO;
+import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
@@ -133,4 +134,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return new Result<ItemDetailResultDTO>().ok(resultDTO);
     }
 
+    @Override
+    public Result evaluation(EvaluationFormDTO evaluationFormDTO) {
+        ItemEntity itemEntityResult = baseDao.selectById(evaluationFormDTO.getItemId());
+        if (itemEntityResult.getUserId().equals(evaluationFormDTO.getUserId()) && itemEntityResult.getEvaluationScore() == null){
+            ItemEntity itemEntity = new ItemEntity();
+            itemEntity.setId(evaluationFormDTO.getItemId());
+            itemEntity.setEvaluationScore(evaluationFormDTO.getEvaluationScore());
+            itemEntity.setEvaluationContent(evaluationFormDTO.getEvaluationContent());
+            baseDao.updateById(itemEntity);
+            return new Result();
+        }else {
+            return new Result().error("您无法评价");
+        }
+    }
 }