From bc3b37b1622091def1f6ee4c3eb3ff79499b3466 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期一, 19 六月 2023 10:19:14 +0800
Subject: [PATCH] 数据可视化
---
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 6 ++
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | 58 ++++++++++++++--------------
src/main/java/com/qxueyou/scc/user/service/IUserService.java | 2 +
src/main/java/com/qxueyou/scc/operation/topic/service/impl/TopicService.java | 5 +-
src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java | 11 +++++
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java | 8 ++++
src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java | 2 +
7 files changed, 59 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
index 02ed5f2..58b4d3a 100644
--- a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
+++ b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
@@ -95,6 +95,14 @@
))));
}
+ @ApiOperation(value = "鑾峰彇宸茬粨鏉熺洿鎾垪琛�")
+ @GetMapping(value = "listvideo")
+ public Result listvideo() {
+
+ List<MediaVideoLive> data = liveService.listvideo("9");
+
+ return new Result(true, "success", CollectionUtils.newObjectMap("listVideo",data));
+ }
/**
* 鏂板鐩存挱/鏇存柊鐩存挱
*
diff --git a/src/main/java/com/qxueyou/scc/operation/topic/service/impl/TopicService.java b/src/main/java/com/qxueyou/scc/operation/topic/service/impl/TopicService.java
index 6273da7..0a4c9d8 100644
--- a/src/main/java/com/qxueyou/scc/operation/topic/service/impl/TopicService.java
+++ b/src/main/java/com/qxueyou/scc/operation/topic/service/impl/TopicService.java
@@ -677,6 +677,7 @@
List<Map<String, Object>> topicLst = findListWithMapByHql(hql, hqlMap, new Pager(pageSize, pageNum));
+ int sunCount=0;
for (Map<String, Object> map : topicLst) {
String topicId = (String) map.get("topicId");
String findPeopleCountByHql = "select distinct c.commentterId as commentterId from CommentObject o,Comment c where o.deleteFlag is false and o.commentObjectUid =:topicId and"
@@ -684,10 +685,10 @@
List<Map<String, Object>> commentIdLst = findListWithMapByHql(findPeopleCountByHql,
CollectionUtils.newObjectMap("topicId", topicId));
int peopleCount = commentIdLst.size();// 鍙備笌浜烘暟
+ sunCount+=peopleCount;
map.put("peopleCount", peopleCount);
}
- return new Result(true, "success",
- CollectionUtils.newObjectMap("topicLst", topicLst, "topicCount", topicCount));
+ return new Result(true, "success",CollectionUtils.newObjectMap("topicLst", topicLst, "topicCount", topicCount,"sunCount",sunCount));
}
@Override
diff --git a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
index 9f89e5d..be0ded6 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -54,12 +54,12 @@
import io.swagger.annotations.ApiOperation;
/**
- * 娉ㄥ唽controller 鎻愪緵娉ㄥ唽锛岀櫥褰曪紝娉ㄩ攢鏈嶅姟
+ * 娉ㄥ唽controller 鎻愪緵娉ㄥ唽锛屽綍锛屾敞閿�鏈嶅姟
*
* @author 寰疯檸
* @history 2014-11-25 鏂板缓 澶忓痉铏�
*/
-@Api(tags="鐧诲叆鐩稿叧鎺ュ彛")
+@Api(tags="鍏ョ浉鍏虫帴鍙�")
@Controller
@CrossOrigin(origins="*",maxAge=3600)
@EnableConfigurationProperties(SccConfig.class)
@@ -135,14 +135,14 @@
IWechatService wechatService;
/**
- * 寰俊鐧诲綍
+ * 寰俊褰�
*
* @param uid
* @throws IOException
*/
@PostMapping("/wxAccountsLogin")
- @ApiOperation("寰俊鍏紬鍙风櫥褰�")
+ @ApiOperation("寰俊鍏紬鍙峰綍")
@ResponseBody
public Result wxAccountsLogin(String code) {
JSONObject gettoken = wechatService.gettoken(wxappId, wxsecret);
@@ -153,7 +153,7 @@
@PostMapping("/wxlogin")
- @ApiOperation("寰俊灏忕▼搴忕櫥褰�")
+ @ApiOperation("寰俊灏忕▼搴忓綍")
@ResponseBody
public Result wechatLogin(String code,String number) {
JSONObject sessionKeyOrOpenId = wechatService.getSessionKeyOrOpenId(code);
@@ -202,7 +202,7 @@
}
- @ApiOperation(value = "鐧诲叆鎺ュ彛", notes = "")
+ @ApiOperation(value = "鍏ユ帴鍙�", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "account", value = "璐﹀彿", required = true, paramType="query", dataType = "String"),
@ApiImplicitParam(name = "password", value = "瀵嗙爜", required = true, paramType="query", dataType = "String"),
@@ -257,7 +257,7 @@
return new Result(true, "楠岃瘉鎴愬姛",CollectionUtils.newObjectMap("uuNumber",uuNumber,"uuReNumber",uuReNumber));
}
- @ApiOperation(value = "鐧诲叆鎺ュ彛", notes = "")
+ @ApiOperation(value = "鍏ユ帴鍙�", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "uuNumber", value = "uuNumber", required = true, paramType="query", dataType = "String"),
@ApiImplicitParam(name = "uuReNumber", value = "uuReNumber", required = true, paramType="query", dataType = "String"),
@@ -293,7 +293,7 @@
return new Result(true, "楠岃瘉鎴愬姛");
}
- @ApiOperation(value = "鐧诲叆鎺ュ彛", notes = "")
+ @ApiOperation(value = "鍏ユ帴鍙�", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "uuNumber", value = "uuNumber", required = true, paramType="query", dataType = "String"),
@ApiImplicitParam(name = "uuReNumber", value = "uuReNumber", required = true, paramType="query", dataType = "String"),
@@ -327,7 +327,7 @@
return new Result(true, "楠岃瘉鎴愬姛");
}
- //閫�鍑虹櫥褰� 娓呴櫎session
+ //閫�鍑哄綍 娓呴櫎session
@RequestMapping(value = "khdloginout", method = RequestMethod.POST)
@ResponseBody
public void khdloginout(HttpServletRequest request, HttpServletResponse response) {
@@ -340,19 +340,19 @@
}
/**
- * 瀛﹀憳绔櫥褰�
+ * 瀛﹀憳绔綍
*
* @param account 璐︽埛
* @param password 瀵嗙爜
* @return
*/
- @ApiOperation(value = "鐧诲叆鎺ュ彛", notes = "")
+ @ApiOperation(value = "鍏ユ帴鍙�", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "account", value = "璐﹀彿", required = true, paramType="query", dataType = "String"),
@ApiImplicitParam(name = "password", value = "瀵嗙爜", required = true, paramType="query", dataType = "String"),
@ApiImplicitParam(name = "organizationId", value = "鏈烘瀯id", required = true, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "platForm", value = "鐧诲叆骞冲彴锛坅pp锛寃eb锛宷Live锛宲c锛寃eixin锛�", required = true, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "logType", value = "鐧诲叆type锛坰tudy瀛﹀憳锛宼eacher鏁欏笀,鍚﹀垯涓哄悗鍙帮級", required = true, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "platForm", value = "鍏ュ钩鍙帮紙app锛寃eb锛宷Live锛宲c锛寃eixin锛�", required = true, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "logType", value = "鍏ype锛坰tudy瀛﹀憳锛宼eacher鏁欏笀,鍚﹀垯涓哄悗鍙帮級", required = true, paramType="query", dataType = "String"),
})
@RequestMapping(value = "studentLogin", method = RequestMethod.POST)
@ResponseBody
@@ -386,19 +386,19 @@
}
/**
- * 鍚庡彴鐧诲綍
+ * 鍚庡彴褰�
*
* @param account 璐︽埛
* @param password 瀵嗙爜
* @return
*/
- @ApiOperation(value = "鐧诲叆鎺ュ彛", notes = "")
+ @ApiOperation(value = "鍏ユ帴鍙�", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "account", value = "璐﹀彿", required = true, paramType="query", dataType = "String"),
@ApiImplicitParam(name = "password", value = "瀵嗙爜", required = true, paramType="query", dataType = "String"),
@ApiImplicitParam(name = "organizationId", value = "鏈烘瀯id", required = true, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "platForm", value = "鐧诲叆骞冲彴锛坅pp锛寃eb锛宷Live锛宲c锛寃eixin锛�", required = true, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "logType", value = "鐧诲叆type锛坰tudy瀛﹀憳锛宼eacher鏁欏笀,鍚﹀垯涓哄悗鍙帮級", required = true, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "platForm", value = "鍏ュ钩鍙帮紙app锛寃eb锛宷Live锛宲c锛寃eixin锛�", required = true, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "logType", value = "鍏ype锛坰tudy瀛﹀憳锛宼eacher鏁欏笀,鍚﹀垯涓哄悗鍙帮級", required = true, paramType="query", dataType = "String"),
})
@RequestMapping(value = "platformLogin", method = RequestMethod.POST)
@ResponseBody
@@ -436,12 +436,12 @@
User user = commonDAO.findUnique(hql,params, User.class);
if(uuNumber!=null&&!"".equals(uuNumber)&&!"null".equals(uuNumber)){
- //鐧诲綍鎴愬姛瀛樺叆user閲岋紝鍒犻櫎session閲岀殑uuNumber锛屼笅涓汉鏃犳硶浣跨敤
+ //褰曟垚鍔熷瓨鍏ser閲岋紝鍒犻櫎session閲岀殑uuNumber锛屼笅涓汉鏃犳硶浣跨敤
user.setEmail(uuNumber);
// request.getSession().removeAttribute("uuNumber");
}
// if(uuReNumber!=null&&!"".equals(uuReNumber)&&!"null".equals(uuReNumber)){
-// //鐧诲綍鎴愬姛瀛樺叆user閲岋紝鍒犻櫎session閲岀殑uuReNumber锛屼笅涓汉鏃犳硶浣跨敤
+// //褰曟垚鍔熷瓨鍏ser閲岋紝鍒犻櫎session閲岀殑uuReNumber锛屼笅涓汉鏃犳硶浣跨敤
// user.setImei(uuReNumber);
// request.getSession().removeAttribute("uuReNumber");
// }
@@ -465,7 +465,7 @@
}
/**
- * 鐧诲叆楠岃瘉
+ * 鍏ラ獙璇�
* @param user
* @param type
* @param request
@@ -497,20 +497,20 @@
}*/
if (StringUtils.isEmpty(user.getOrganizationId())) {
- return new Result(false, "璇ョ敤鎴蜂笉灞炰簬浠讳綍鏈烘瀯锛屾棤娉曠櫥鍏�");
+ return new Result(false, "璇ョ敤鎴蜂笉灞炰簬浠讳綍鏈烘瀯锛屾棤娉曞叆");
}
if (StringUtils.isNoneBlank(organizationId) && !user.getOrganizationId().equals(organizationId)) {
return new Result(false, "閫夋嫨鐨勬満鏋勯敊璇紝璇风‘璁�");
}
- //鍒ゆ柇鏄惁涓哄鐢燂紝濡傛灉鏄鐢燂紝鍒ゆ柇鏄惁宸插喕缁撴垨绉婚櫎锛屽喕缁撴垨绉婚櫎鐨勫鐢熶笉璁╃櫥褰�
+ //鍒ゆ柇鏄惁涓哄鐢燂紝濡傛灉鏄鐢燂紝鍒ゆ柇鏄惁宸插喕缁撴垨绉婚櫎锛屽喕缁撴垨绉婚櫎鐨勫鐢熶笉璁╁綍
StuStudent stu = this.studentService.getStudentByUserId(user.getUserId());
if(stu!=null && (stu.getDeleteFlag() || stu.getStatus().equalsIgnoreCase(StuStudent.STATUS_DEACTIVE))){
return new Result(false, "鐢ㄦ埛璐︽埛宸茬粡琚喕缁撴垨绉婚櫎");
}
/*if(StringUtils.isEmpty(wrapper.getInfo(UserInfoWrapper.INF_CLASS_ID))) {
- return new Result(false, "璇ョ敤鎴锋湭鍔犲叆浠讳綍鐝骇锛屾棤娉曠櫥鍏�");
+ return new Result(false, "璇ョ敤鎴锋湭鍔犲叆浠讳綍鐝骇锛屾棤娉曞叆");
}*/
// 淇濆瓨鍒皊ession涓�
return new Result(true, "success",
@@ -521,16 +521,16 @@
}else if("teacher".equals(logType)) {
String teacherId = teacherService.getTeacherIdByUserId(user.getUserId());
if (StringUtils.isEmpty(teacherId)) {
- return new Result(false, "璇ヨ处鎴蜂笉鏄�佸笀瑙掕壊锛屾棤娉曠櫥鍏�");
+ return new Result(false, "璇ヨ处鎴蜂笉鏄�佸笀瑙掕壊锛屾棤娉曞叆");
}
if (StringUtils.isEmpty(user.getOrganizationId())) {
- return new Result(false, "璇ョ敤鎴蜂笉灞炰簬浠讳綍鏈烘瀯锛屾棤娉曠櫥鍏�");
+ return new Result(false, "璇ョ敤鎴蜂笉灞炰簬浠讳綍鏈烘瀯锛屾棤娉曞叆");
}
if (StringUtils.isNoneBlank(organizationId) && !user.getOrganizationId().equals(organizationId)) {
return new Result(false, "閫夋嫨鐨勬満鏋勯敊璇紝璇风‘璁�");
}
- //鑾峰彇鐢ㄦ埛瀵瑰簲鐨剆essionId鏄惁涓庝繚瀛樺湪redis涓殑涓�鑷达紝濡傛灉涓嶄竴鑷村垯璺宠浆鍒扮櫥褰曢〉闈�
+ //鑾峰彇鐢ㄦ埛瀵瑰簲鐨剆essionId鏄惁涓庝繚瀛樺湪redis涓殑涓�鑷达紝濡傛灉涓嶄竴鑷村垯璺宠浆鍒板綍椤甸潰
// stringRedisTemplate.opsForHash().put(UserInfoWrapper.REDIS_USER_ONLINE_MAP_KEY, user.getUserId(), request.getSession().getId());
return new Result(true, "success",
CollectionUtils.newObjectMap("userId", user.getUserId(), "userName", user.getName(), "imgPath",
@@ -557,7 +557,7 @@
}
/**
- * 鍚庡彴锛氶��鍑虹櫥褰�,鍚庡彴绯荤粺
+ * 鍚庡彴锛氶��鍑哄綍,鍚庡彴绯荤粺
*
* @param account 璐︽埛
* @return
@@ -570,7 +570,7 @@
}
/**
- * 鍚庡彴锛氶��鍑虹櫥褰�,鍚庡彴绯荤粺
+ * 鍚庡彴锛氶��鍑哄綍,鍚庡彴绯荤粺
*
* @return
*/
@@ -600,7 +600,7 @@
}
/**
- * 鎻掑叆鐧诲綍鏃ュ織
+ * 鎻掑叆褰曟棩蹇�
*
* @param request
* @param lstUser
diff --git a/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java b/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java
index 255aeec..4f63054 100644
--- a/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java
+++ b/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java
@@ -53,6 +53,8 @@
*/
int listCountOfMine(String keyword);
+ List<MediaVideoLive> listvideo(String status);
+
/**
* 鏌ヨ鐩存挱
* @param keyword 鏌ヨ鍏抽敭瀛�
diff --git a/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java b/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java
index 84234c9..b4365a6 100644
--- a/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java
+++ b/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java
@@ -332,7 +332,16 @@
return this.findCountByComplexHql(hql.toString(), params);
}
-
+
+ @Override
+ public List<MediaVideoLive> listvideo(String status) {
+
+ String hql = "from MediaVideoLive where deleteFlag is false and status=? order by createTime desc";
+
+
+ return find(hql, CollectionUtils.newList(status), MediaVideoLive.class);
+ }
+
@Override
public List<MediaVideoLive> listOfMine(String keyword, Integer pageNum, Integer pageSize) {
diff --git a/src/main/java/com/qxueyou/scc/user/service/IUserService.java b/src/main/java/com/qxueyou/scc/user/service/IUserService.java
index 34d792b..02327a5 100644
--- a/src/main/java/com/qxueyou/scc/user/service/IUserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/IUserService.java
@@ -119,4 +119,6 @@
boolean exists(String account);
Result countUser();
+
+ Result countUsersex();
}
diff --git a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
index f994905..ad29f25 100644
--- a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
@@ -287,5 +287,9 @@
String hql = "from count User where sex=? and deleteFlag is false";
return new Result(true,findCount(hql,CollectionUtils.newList(1)));
}
-
+ @Override
+ public Result countUsersex() {
+ String hql = "from count User where sex=? and deleteFlag is false";
+ return new Result(true,findCount(hql,CollectionUtils.newList(0)));
+ }
}
--
Gitblit v1.8.0