添加展示端接口

gis_admin/src/main/java/com/gis/admin/controller/LogController.java

@@ -22,7 +22,6 @@ import springfox.documentation.annotations.ApiIgnore;
  * Created by owen on 2020/5/12 0018 12:17
  * 日志管理,只有admin权限访问
  */
-@ApiIgnore
 @Api(tags = "sys-日志管理")
 @RestController
 @RequestMapping("sys/log")

gis_admin/src/main/java/com/gis/admin/controller/SysUserController.java

@@ -93,3 +93,5 @@ public class SysUserController {
 
 }
 
+
+

gis_cms/src/main/java/com/gis/cms/controller/WebController.java

@@ -0,0 +1,52 @@
+package com.gis.cms.controller;
+
+import com.gis.cms.service.ContentService;
+import com.gis.cms.service.VillageService;
+import com.gis.common.util.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by owen on 2022/5/31 0031 15:17
+ */
+@Api(tags = "web-展示端")
+@RestController
+@RequestMapping("/web")
+public class WebController {
+
+    @Autowired
+    ContentService contentService;
+
+    @Autowired
+    VillageService villageService;
+
+    @ApiOperation(value = "内容-列表")
+    @GetMapping("/content/list/{villageId}/{menuId}")
+    public Result getList(@PathVariable Long villageId, @PathVariable Long menuId){
+        return contentService.getList(villageId, menuId);
+    }
+
+
+    @ApiOperation(value = "村庄-保存浏览")
+    @GetMapping("/village/addVisit/{villageId}")
+    public Result addVisit(@PathVariable String villageId){
+        return villageService.addVisit(villageId);
+    }
+
+    @ApiOperation(value = "村庄-保存点赞")
+    @GetMapping("/village/addStar/{villageId}")
+    public Result addStar(@PathVariable String villageId){
+        return villageService.addStar(villageId);
+    }
+
+    @ApiOperation(value = "村庄-获取点赞量|浏览量")
+    @GetMapping("/village/getDetail/{villageId}")
+    public Result getDetail(@PathVariable String villageId){
+        return Result.success(villageService.getById(villageId));
+    }
+}

gis_cms/src/main/java/com/gis/cms/entity/po/VillageEntity.java

@@ -19,4 +19,10 @@ public class VillageEntity extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "名称")
     private String name;
+
+    @ApiModelProperty(value = "浏览量")
+    private Integer visit;
+
+    @ApiModelProperty(value = "点赞量")
+    private Integer star;
 }

gis_cms/src/main/java/com/gis/cms/mapper/VillageMapper.java

@@ -3,6 +3,7 @@ package com.gis.cms.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.cms.entity.po.VillageEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,4 +12,10 @@ import org.springframework.stereotype.Component;
 @Component
 @Mapper
 public interface VillageMapper extends BaseMapper<VillageEntity> {
+
+    @Update("UPDATE tb_village set visit=visit+1, update_time=NOW() where is_delete=0 and id=#{villageId} ")
+    void addVisit(String villageId);
+
+    @Update("UPDATE tb_village set star=star+1, update_time=NOW() where is_delete=0 and id=#{villageId}")
+    void addStar(String villageId);
 }

gis_cms/src/main/java/com/gis/cms/service/VillageService.java

@@ -9,4 +9,8 @@ import com.gis.common.util.Result;
  */
 public interface VillageService extends IService<VillageEntity> {
     Result getList();
+
+    Result addVisit(String villageId);
+
+    Result addStar(String villageId);
 }

gis_cms/src/main/java/com/gis/cms/service/impl/VillageServiceImpl.java

@@ -41,8 +41,20 @@ public class VillageServiceImpl extends ServiceImpl<VillageMapper, VillageEntity
             wrapper.inSql(StrUtil.isNotBlank(projectIds), VillageEntity::getId, projectIds);
         }
 
-        list = this.list();
+        list = this.list(wrapper);
 
         return Result.success(list);
     }
+
+    @Override
+    public Result addVisit(String villageId) {
+        baseMapper.addVisit(villageId);
+        return Result.success();
+    }
+
+    @Override
+    public Result addStar(String villageId) {
+        baseMapper.addStar(villageId);
+        return Result.success();
+    }
 }

gis_common/src/main/java/com/gis/common/util/FileUtils.java

@@ -68,7 +68,6 @@ public class FileUtils {
         if (isPinYinRename){
              newName = RegexUtil.getPinyinName(fileName);
         } else {
-//            String suffix = StrUtil.substringAfterLast(fileName, ".");
             String suffix = StrUtil.subAfter(fileName, ".", true);
             newName =  DateUtils.getDateTime() + ATOMIC_INTEGER.incrementAndGet() + "." + suffix;
         }
@@ -115,4 +114,11 @@ public class FileUtils {
 
     }
 
+
+
+
+
+
+
+
 }