修改打卡距离

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/DynamicAuditSumDTO.java

+package com.mmc.csf.infomation.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author 张培
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class DynamicAuditSumDTO implements Serializable {
+    @ApiModelProperty(value = "动态审核通过")
+    private Integer passDynamicAuditSum;
+    @ApiModelProperty(value = "动态审核未通过")
+    private Integer failDynamicAuditSum;
+    @ApiModelProperty(value = "未审核动态")
+    private Integer unDynamicAuditSum;
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/dto/DynamicInfoDTO.java

@@ -48,5 +48,6 @@ public class DynamicInfoDTO {
     @ApiModelProperty(value = "话题名称",example = "#深圳暴雨,#深圳大雨")
     private List<String> gambitName;
 
-
+    @ApiModelProperty(value = "点赞数")
+    private Integer likesCount;
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/qo/DynamicQO.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 import com.mmc.csf.release.model.group.Page;
+import io.swagger.annotations.Api;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,6 +35,11 @@ public class DynamicQO implements Serializable {
   @Min(value = 1, groups = Page.class)
   private Integer pageSize;
 
+  @ApiModelProperty(value = "审核状态")
+  private Integer status;
+
+  @ApiModelProperty(value = "话题Id")
+  private Integer gambitId;
   public void buildCurrentPage() {
     this.pageNo = (pageNo - 1) * pageSize;
   }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: da27c9d2ba624fd8400d37a7ae0b4d7a735ce3aa
+  newTag: b8edbbc8eb3d4cb7c0295a5225ce8b5485928167

release-service/src/main/java/com/mmc/csf/release/controller/BackstageForumController.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.infomation.dto.DynamicAuditSumDTO;
 import com.mmc.csf.release.forum.dto.DynamicInfoDTO;
 import com.mmc.csf.release.forum.qo.DynamicQO;
 import com.mmc.csf.release.forum.vo.UserBaseInfoVO;
@@ -36,6 +37,14 @@ public class BackstageForumController extends BaseController{
         return ResultBody.success(backstageForumService.listDynamic(dynamic, request));
     }
 
+    @ApiOperation(value = "后台-统计各个审核状态总数")
+    @GetMapping("/getDynamicAuditSum")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicAuditSumDTO.class)})
+    public ResultBody<DynamicAuditSumDTO> getDynamicAuditSum() {
+        return backstageForumService.getDynamicAuditSum();
+    }
+
+
     @ApiOperation(value = "动态删除")
     @GetMapping("/deleteDynamic")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})

release-service/src/main/java/com/mmc/csf/release/controller/GambitController.java

@@ -59,6 +59,11 @@ public class GambitController extends BaseController{
         return ResultBody.success(gambitService.listGambit(forumGambitQO));
     }
 
+    @ApiOperation(value = "后台统计话题总数")
+    @GetMapping("/getGambitSum")
+    public ResultBody getGambitSum(){
+        return gambitService.getGambitSum();
+    }
 
     @ApiOperation(value = "关注")
     @GetMapping("/attention")

release-service/src/main/java/com/mmc/csf/release/dao/BackstageForumDao.java

@@ -18,5 +18,15 @@ public interface BackstageForumDao {
   List<ForumDynamicDO> listDynamicInfo(
       @Param("ids") List<Integer> ids,
       @Param("pageNo") int pageNo,
-      @Param("pageSize") Integer pageSize);
+      @Param("pageSize") Integer pageSize,
+      @Param("status") Integer status,
+      @Param("gambitId") Integer gambitId
+  );
+
+  /**
+   * 输入状态获取该状态下总人数
+   * @param status
+   * @return int
+   */
+  int getDynamicAuditSum(Integer status);
 }

release-service/src/main/java/com/mmc/csf/release/dao/gambit/GambitDao.java

@@ -30,6 +30,7 @@ public interface GambitDao {
 
     List<ForumGambitDO> listGambit(ForumGambitQO forumGambitQO);
 
+    int getGambitSum();
     int listGambitCount(ForumGambitQO forumGambitQO);
 
     List<ForumGambitDO> recommendCount(ForumGambitDO forumGambitDO);

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumDynamicDO.java

@@ -121,12 +121,14 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
 
     public DynamicInfoDTO buildDynamicInfoDTO() {
         return DynamicInfoDTO.builder()
+
                 .id(this.getId())
                 .userAccountId(userAccountId)
                 .description(description)
                 .dynamicPublishTime(this.getCreateTime())
                 .show(this.getDeleted())
                 .checkStatus(checkStatus)
+                .likesCount(likesCount)
                 .gambitName(this.gambitName)
                 .build();
     }

release-service/src/main/java/com/mmc/csf/release/service/BackstageForumService.java

@@ -13,6 +13,7 @@ import com.mmc.csf.release.forum.qo.DynamicQO;
 public interface BackstageForumService {
     PageResult listDynamic(DynamicQO dynamic, HttpServletRequest request);
 
+    ResultBody getDynamicAuditSum();
     ResultBody deleteDynamic(Integer dynamicId);
 
     ResultBody hiddenDynamic(Integer dynamicId);

release-service/src/main/java/com/mmc/csf/release/service/gambit/GambitService.java

@@ -21,6 +21,7 @@ public interface GambitService {
 
     PageResult listGambit(ForumGambitQO forumGambitQO);
 
+    ResultBody getGambitSum();
     ResultBody attention(Boolean status, Integer userAccountId,Integer attentionUserAccountId);
 
     ResultBody transPond(Integer dynamicId, Integer userAccountId);

release-service/src/main/java/com/mmc/csf/release/service/gambit/impl/GambitServiceImpl.java

@@ -134,6 +134,12 @@ public class GambitServiceImpl implements GambitService {
     }
 
     @Override
+    public ResultBody getGambitSum() {
+        int gambitSum = gambitDao.getGambitSum();
+        return ResultBody.success(gambitSum);
+    }
+
+    @Override
     public ResultBody attention( Boolean status, Integer userAccountId,Integer attentionUserAccountId) {
         if (status.equals(true)){
             //插入用户

release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.infomation.dto.DynamicAuditSumDTO;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.constant.TokenConstant;
@@ -78,7 +79,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
         int itemIndex = (dynamic.getPageNo() - 1) * dynamic.getPageSize();
         // 获取动态信息
         List<ForumDynamicDO> dynamicList =
-                backstageForumDao.listDynamicInfo(userIds, itemIndex, dynamic.getPageSize());
+                backstageForumDao.listDynamicInfo(userIds, itemIndex, dynamic.getPageSize(),dynamic.getStatus(),dynamic.getGambitId());
         for (ForumDynamicDO forumDynamicDO : dynamicList) {
             Integer id = forumDynamicDO.getDynamicId();
             ArrayList<String> list = new ArrayList<>();
@@ -137,6 +138,15 @@ public class BackstageForumServiceImpl implements BackstageForumService {
     }
 
     @Override
+    public ResultBody getDynamicAuditSum() {
+        DynamicAuditSumDTO dynamicAuditSumDTO = new DynamicAuditSumDTO();
+        dynamicAuditSumDTO.setUnDynamicAuditSum(backstageForumDao.getDynamicAuditSum(0));
+        dynamicAuditSumDTO.setFailDynamicAuditSum(backstageForumDao.getDynamicAuditSum(2));
+        dynamicAuditSumDTO.setPassDynamicAuditSum(backstageForumDao.getDynamicAuditSum(1));
+        return ResultBody.success(dynamicAuditSumDTO);
+    }
+
+    @Override
     public ResultBody deleteDynamic(Integer dynamicId) {
         List<DynamicGambitDO> dynamicGambitDOS = gambitDao.selectDynamicGambit(dynamicId);
         if (dynamicGambitDOS!=null){

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -2936,7 +2936,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         GlobalCoordinates target = new GlobalCoordinates(Double.parseDouble(String.valueOf(serviceArriveSceneDO.getLatitude())), Double.parseDouble(String.valueOf(serviceArriveSceneDO.getLongitude())));
         double geoCurve = getDistanceMeter(source, target, Ellipsoid.Sphere);
         //100米
-        if (geoCurve > 100) {
+        if (geoCurve > 500) {
             return ResultBody.error(ResultEnum.FALL_OUTSIDE_OF);
         } else {
             requirementsDao.arriveAtTheScene(serviceArriveSceneDO);

release-service/src/main/resources/application-local.yml

@@ -52,8 +52,9 @@ spring:
   #Redis
   redis:
     database: 1
-    host: 127.0.0.1
+    host: r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
     port: 6379
+    password: MMC@2022&REDIS
     #连接池
     lettuce:
       shutdown-timeout: 1000 # 关闭超时时间-ms

release-service/src/main/resources/mapper/forum/BackstageForumDao.xml

@@ -17,7 +17,8 @@
         </where>
     </select>
     <select id="listDynamicInfo" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
-        select id,user_account_id,description,is_deleted as deleted,create_time,check_status,id AS dynamicId from forum_dynamic
+        select fd.id,fd.user_account_id,description,is_deleted as deleted,fd.create_time,fd.likes_count,fd.check_status,fd.id AS dynamicId from forum_dynamic fd
+            left outer join forum_dynamic_gambit fdg on fd.id = fdg.dynamic_id
         <where>
             root_path is null
             <if test="ids != null">
@@ -26,8 +27,22 @@
                     #{ids}
                 </foreach>
             </if>
+             <if test="status != null">
+                 and fd.check_status = #{status}
+             </if>
+            <if test="gambitId != null">
+                and fdg.gambit_id = #{gambitId}
+
+            </if>
         </where>
-        order by create_time desc
+        order by fd.likes_count desc
         limit #{pageNo},#{pageSize}
     </select>
+    <select id="getDynamicAuditSum" resultType="java.lang.Integer">
+        select count(id) from forum_dynamic
+        <where>
+            root_path is null
+                and check_status = #{status}
+        </where>
+    </select>
 </mapper>

release-service/src/main/resources/mapper/gambit/GambitDao.xml

@@ -353,6 +353,10 @@
         limit #{pageNo}, #{pageSize}
     </select>
 
+    <select id="getGambitSum" resultType="java.lang.Integer">
+        select count(id) from forum_gambit where 1=1
+    </select>
+
     <select id="listGambitCount" parameterType="com.mmc.csf.release.gambit.qo.ForumGambitQO" resultType="java.lang.Integer">
         select count(*) from forum_gambit where 1=1 and check_status=1
         <if test="gambitName!='' and gambitName!=null ">
@@ -722,4 +726,5 @@
         select id,user_account_id,like_count,fans_count,attention_count,create_time,update_time
         from forum_count where user_account_id=#{userAccountId}
     </select>
+
 </mapper>