ソースを参照

修改测试bug

wuweihao 3 年 前
コミット
6b1e980a17

+ 1 - 2
gis_cms/src/main/java/com/gis/cms/controller/WebController.java

@@ -42,8 +42,6 @@ public class WebController {
     @Autowired
     BarrageService barrageService;
 
-//    @Autowired
-//    SceneService sceneService;
 
     @Autowired
     GoodsService goodsService;
@@ -119,6 +117,7 @@ public class WebController {
     @ApiOperation("精品典藏-列表")
     @GetMapping("goods/detail/{id}")
     public Result<GoodsEntity> goodsDetail(@PathVariable Long id){
+        goodsService.addVisit(id);
         return goodsService.detail(id);
     }
 

+ 13 - 0
gis_cms/src/main/java/com/gis/cms/entity/po/BarrageEntity.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -26,6 +27,18 @@ public class BarrageEntity extends BaseEntity implements Serializable {
     private Integer display;
 
 
+    @Transient
+    @ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+    @Transient
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @Transient
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
 
 
 

+ 11 - 10
gis_cms/src/main/java/com/gis/cms/entity/po/CommentEntity.java

@@ -33,16 +33,17 @@ public class CommentEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否显示真实姓名: 1:是, 0:否")
     private Integer isRealName;
 
-//    @Transient
-//    @ApiModelProperty(value = "真实姓名")
-//    private String realName;
-//
-//    @Transient
-//    @ApiModelProperty(value = "单位")
-//    private String unit;
-
-//    @ApiModelProperty(value = "昵称")
-//    private String nickName;
+    @Transient
+    @ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+    @Transient
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @Transient
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
 
 
 

+ 5 - 0
gis_cms/src/main/java/com/gis/cms/mapper/BarrageMapper.java

@@ -7,6 +7,7 @@ import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.vo.BarrageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
@@ -18,4 +19,8 @@ public interface BarrageMapper extends IBaseMapper<BarrageEntity, Long> {
 
     @SelectProvider(type = BarrageProvider.class, method = "search")
     List<BarrageVo> search(PageDateDto param, Integer display);
+
+    @Select("select a.id, a.create_time, a.content, a.display, b.unit, b.real_name, b.nick_name from tb_barrage a left join sys_user b on b.id=a.user_id " +
+            "where a.is_delete = '0' and a.id=#{id}")
+    BarrageEntity detailMapper(Long id);
 }

+ 3 - 3
gis_cms/src/main/java/com/gis/cms/mapper/GoodsMapper.java

@@ -7,6 +7,7 @@ import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.dto.TypePageDateDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -20,7 +21,6 @@ public interface GoodsMapper extends IBaseMapper<GoodsEntity, Long> {
     @SelectProvider(type = GoodsProvider.class, method = "search")
     List<GoodsEntity> search(TypePageDateDto param, Integer display);
 
-
-
-
+    @Update("update tb_goods set visit = visit + 1 , update_time = NOW() where is_delete = 0  and id = #{id}")
+    void addVisit(Long id);
 }

+ 4 - 2
gis_cms/src/main/java/com/gis/cms/mapper/QuestionUserMapper.java

@@ -14,8 +14,10 @@ import java.util.List;
 @Mapper
 public interface QuestionUserMapper extends IBaseMapper<QuestionUserEntity, Long> {
 
-//    @Select("select distinct a.user_id, a.score, a.id, b.real_name as realName from tb_question_user a left join sys_user b on b.id=a.user_id where a.is_delete=0 AND a.question_group_id=#{questionGroupId} order by a.score desc limit 10")
-    @Select("SELECT DISTINCT a.user_id,  max(a.score) as score ,a.id, b.real_name as realName, a.create_time, a.question_group_id " +
+//    @Select("SELECT DISTINCT a.user_id,  max(a.score) as score ,a.id, b.real_name as realName, a.create_time, a.question_group_id " +
+//            "FROM tb_question_user a left join sys_user b on b.id=a.user_id  WHERE question_group_id=#{questionGroupId} " +
+//            "GROUP BY user_id ORDER BY a.score desc, a.create_time limit 10")
+    @Select("SELECT DISTINCT a.user_id, a.score, a.id, b.real_name as realName, a.create_time, a.question_group_id " +
             "FROM tb_question_user a left join sys_user b on b.id=a.user_id  WHERE question_group_id=#{questionGroupId} " +
             "GROUP BY user_id ORDER BY a.score desc, a.create_time limit 10")
     List<QuestionUserEntity> ranking(Long questionGroupId);

+ 2 - 0
gis_cms/src/main/java/com/gis/cms/service/GoodsService.java

@@ -39,4 +39,6 @@ public interface GoodsService extends IBaseService<GoodsEntity, Long> {
     Result auditDetail(Long id);
 
     Result display(Long id, Integer display);
+
+    void addVisit(Long id);
 }

+ 2 - 1
gis_cms/src/main/java/com/gis/cms/service/impl/BarrageServiceImpl.java

@@ -82,7 +82,8 @@ public class BarrageServiceImpl extends IBaseServiceImpl<BarrageEntity, Long> im
 
     @Override
     public Result<BarrageEntity> detail(Long id) {
-        BarrageEntity entity = this.findById(id);
+//        BarrageEntity entity = this.findById(id);
+        BarrageEntity entity = entityMapper.detailMapper(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }

+ 6 - 0
gis_cms/src/main/java/com/gis/cms/service/impl/GoodsServiceImpl.java

@@ -269,6 +269,12 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
         return Result.success(entity);
     }
 
+    @Override
+    public void addVisit(Long id) {
+        entityMapper.addVisit(id);
+
+    }
+
     private void updateStatus(Long id, Integer status){
         GoodsEntity entity = this.findById(id);
         if (entity == null) {