From 4bd8f5572e62c39225da1d53e6cd101796dc90d8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 19 Jul 2022 09:02:53 +0800
Subject: [PATCH] 积分排行榜前十展示/根据派出所，日周月展示前15任务
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java | 4 ++
src/main/java/org/springblade/modules/integral/controller/IntegralController.java | 11 +++++
src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java | 7 +++
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java | 6 +++
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml | 6 +++
src/main/java/org/springblade/modules/integral/service/IIntegralService.java | 6 +++
src/main/resources/application-dev.yml | 20 +++++-----
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java | 7 +--
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 19 +++++++++
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 16 ++++++++
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java | 6 +++
11 files changed, 94 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
index b60be97..a85d0f2 100644
--- a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
+++ b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
@@ -34,6 +34,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -150,4 +151,14 @@
return R.data(map);
}
+ /**
+ * 查询积分榜前十
+ * @return
+ */
+ @PostMapping("/order")
+ @ApiOperation(value = "排序")
+ public R order(){
+ List<Integral> list = integralService.order();
+ return R.data(list);
+ }
}
diff --git a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
index 74d91ef..aecc6b5 100644
--- a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
+++ b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
@@ -42,4 +42,10 @@
List<IntegralVO> selectIntegralPage(IPage page, IntegralVO integral);
List<Map<Object, Object>> selectCount(String uid);
List<Map<Object, Object>> selectList(String uid,String type);
+
+ /**
+ * 查询积分榜前十
+ * @return
+ */
+ List<Integral> order();
}
diff --git a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
index 6a5354a..964da1d 100644
--- a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
+++ b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
@@ -38,5 +38,11 @@
and type =2
</if>
</select>
+ <select id="order" resultType="org.springblade.modules.integral.entity.Integral">
+ SELECT *
+ FROM sys_integral
+ ORDER BY integral DESC
+ LIMIT 0,10
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/integral/service/IIntegralService.java b/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
index 812a944..f7f348e 100644
--- a/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
+++ b/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
@@ -42,4 +42,10 @@
IPage<IntegralVO> selectIntegralPage(IPage<IntegralVO> page, IntegralVO integral);
List<Map<Object, Object>> selectCount(String uid);
List<Map<Object, Object>> selectList(String uid,String type);
+
+ /**
+ * 查询积分榜前十 逆序
+ * @return
+ */
+ List<Integral> order();
}
diff --git a/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java b/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
index 750bd46..36e92fe 100644
--- a/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
+++ b/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
@@ -16,12 +16,14 @@
*/
package org.springblade.modules.integral.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.integral.entity.Integral;
import org.springblade.modules.integral.mapper.IntegralMapper;
import org.springblade.modules.integral.service.IIntegralService;
import org.springblade.modules.integral.vo.IntegralVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -51,4 +53,9 @@
return baseMapper.selectList(uid,type);
}
+ @Override
+ public List<Integral> order() {
+ return baseMapper.order();
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index 16d8063..4f5be78 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -22,6 +22,8 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import me.zhyd.oauth.log.Log;
+import org.joda.time.DateTime;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -453,4 +455,18 @@
return false;
}
}
+
+ /**
+ * 根据派出所展示发布数量前十五，根据日周月切换
+ * @param jurisdiction 派出所编号
+ * @param startTime 发布时间
+ * @param period 日(day) 月(week) 年(year)
+ * @return
+ */
+ @GetMapping("/countTaskByJur")
+ @ApiOperation(value = "统计")
+ public R countTaskByJur(String jurisdiction, String startTime,String period ){
+ List<Taskqd> list = taskqdService.countTaskByJur(jurisdiction,startTime,period);
+ return R.data(list);
+ }
}
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
index c8028ee..898a41d 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -18,12 +18,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.bytedeco.javacpp.presets.opencv_core;
import org.springblade.modules.task.entity.Task;
import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.taskqd.entity.Taskqd;
import org.springblade.modules.taskqd.vo.TaskqdVO;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -46,4 +48,6 @@
List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
String querySerid(String rid);
+
+ List<Taskqd> countTaskByJur(@Param("jurisdiction") String jurisdiction, @Param("startTime") String startTime,@Param("period") String period);
}
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index 3986031..5d55aff 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -167,4 +167,23 @@
from sys_taskqd
where id = #{rid}
</select>
+
+ <select id="countTaskByJur" resultType="org.springblade.modules.taskqd.entity.Taskqd">
+ SELECT *
+ FROM sys_taskqd qd
+ WHERE qd.jurisdiction = #{jurisdiction}
+ <choose>
+ <when test='period=="day" '>
+ AND TO_DAYS(qd.time) = TO_DAYS(#{startTime})
+ </when>
+ <when test='period == "week" '>
+ AND YEARWEEK(DATE_FORMAT(qd.time,"%Y-%m-%d"),1) = YEARWEEK(#{startTime},1)
+ </when>
+ <when test='period == "month" '>
+ AND DATE_FORMAT(qd.time,"%Y-%m") = DATE_FORMAT(#{startTime},"%Y-%m")
+ </when>
+ <when test='period == "all" '></when>
+ </choose>
+ LIMIT 0,15
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
index f0575f9..287132f 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -16,14 +16,11 @@
*/
package org.springblade.modules.taskqd.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import io.swagger.models.auth.In;
-import org.springblade.modules.task.entity.Task;
-import org.springblade.modules.task.vo.TaskVO;
import org.springblade.modules.taskqd.entity.Taskqd;
import org.springblade.modules.taskqd.vo.TaskqdVO;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -45,4 +42,6 @@
List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
String querySerid(String rid);
+
+ List<Taskqd> countTaskByJur(String jurisdiction, String startTime, String period);
}
diff --git a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
index 641c1e6..c7dbec0 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
@@ -23,6 +23,7 @@
import org.springblade.modules.taskqd.vo.TaskqdVO;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -88,4 +89,9 @@
public String querySerid(String rid) {
return baseMapper.querySerid(rid);
}
+
+ @Override
+ public List<Taskqd> countTaskByJur(String jurisdiction, String startTime, String period) {
+ return baseMapper.countTaskByJur(jurisdiction,startTime,period);
+ }
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 092af5d..7a8cde9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -2,11 +2,11 @@
spring:
redis:
##redis 单机环境配置
-# host: 127.0.0.1
-# port: 6379
+ host: 127.0.0.1
+ port: 6379
- host: 192.168.90.24
- port: 6382
+# host: 192.168.90.24
+# port: 6382
password:
database: 0
ssl: false
@@ -17,9 +17,9 @@
datasource:
# MySql
#
- url: jdbc:mysql://192.168.90.24:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
- username: root
- password: NCzhba@2022
+# url: jdbc:mysql://192.168.90.24:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
+# username: root
+# password: NCzhba@2022
# url: jdbc:mysql://61.131.136.25:2083/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
# username: root
@@ -29,9 +29,9 @@
# username: root
# password: ZHba@0112
-# url: jdbc:mysql://36.134.81.48:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
-# username: root
-# password: jfpt123
+ url: jdbc:mysql://36.134.81.48:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
+ username: root
+ password: jfpt123
# PostgreSQL
--
Gitblit v1.9.3