wangpeng
/
integrated_traffic_admin
forked from integrated_whb/integrated_whb_admin
1
0
Fork 0
Code Pull Requests Activity

提示优化

dev
wangpeng 2024-05-21 10:18:07 +08:00
parent 0d9dcabc00
commit bbb72f0839
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/com/zcloud/controller/eduBus/VideoResController.java
View File

@ -101,7 +101,7 @@ public class VideoResController extends BaseController {
map.put("varList", responseResult.getJSONArray("curriculumList"));
map.put("page", responseResult.getJSONObject("page"));
} else {
map.put("message", "请求出错，请联系管理员。");
map.put("msg", "请求出错，请联系管理员。");
}
// List<PageData> varList = videocoursewareService.list(page); //列出VideoCourseware列表
// map.put("page", page);
@ -132,7 +132,7 @@ public class VideoResController extends BaseController {
// String msg = viedoResService.updAllNow(pd);
// if (StringUtils.isNotEmpty(msg)) {
// map.put("result", "error");
// map.put("message", msg);
// map.put("msg", msg);
// } else {
// map.put("result", errInfo);
//
@ -173,7 +173,7 @@ public class VideoResController extends BaseController {
List<PageData> list = analysisService.analysisVideoList(responseResult.getJSONArray("videoList"));
map.put("varList", list);
} else {
map.put("message", "请求出错，请联系管理员。");
map.put("msg", "请求出错，请联系管理员。");
}
map.put("result", errInfo);
return map;
@ -206,8 +206,8 @@ public class VideoResController extends BaseController {
map.put("pd", responseResult.getJSONObject("pd"));
map.put("chapterList", responseResult.getJSONArray("chapterList"));
} else {
errInfo = "warning";
map.put("message", "请求出错，请联系管理员。");
errInfo = "fail";
map.put("msg", "请求出错，请联系管理员。");
}
// map.put("chapterList", chapterList);
map.put("result", errInfo);
@ -235,13 +235,13 @@ public class VideoResController extends BaseController {
if (response.get("code") != null && Tools.notEmpty(response.get("code").toString()) && "0".equals(response.get("code"))) {
map.put("pd", response.getJSONObject("video"));
} else {
errInfo = "warning";
map.put("message", response.get("errorMessage"));
errInfo = "fail";
map.put("msg", response.get("errorMessage"));
}
} else {
errInfo = "warning";
map.put("message", "请求出错，请联系管理员。");
errInfo = "fail";
map.put("msg", "请求出错，请联系管理员。");
}
// map.put("chapterList", chapterList);
map.put("result", errInfo);
@ -268,8 +268,8 @@ public class VideoResController extends BaseController {
// 验证是否添加过此课程
PageData curriculumRes = curriculumService.findByRemoteId(curRemote);
if (curriculumRes != null && curriculumRes.get("CURRICULUM_ID") != null && Tools.notEmpty(curriculumRes.get("CURRICULUM_ID").toString())) {
map.put("message", "该课程已添加。无需二次添加。");
errInfo = "warning";
map.put("msg", "该课程已添加。无需二次添加。");
errInfo = "fail";
} else {
Map<String, String> request = new HashMap<String, String>();
request.put("CURRICULUM_ID", pd.get("CURRICULUM_ID").toString());
@ -353,8 +353,8 @@ public class VideoResController extends BaseController {
}
}
} else {
errInfo = "warning";
map.put("message", "请求出错，请联系管理员。");
errInfo = "fail";
map.put("msg", "请求出错，请联系管理员。");
}
}
@ -409,8 +409,8 @@ public class VideoResController extends BaseController {
// 验证是否添加过此课程
PageData curriculumRes = curriculumService.findByRemoteId(curRemote);
if (curriculumRes != null && curriculumRes.get("CURRICULUM_ID") != null && Tools.notEmpty(curriculumRes.get("CURRICULUM_ID").toString())) {
map.put("message", "该课程已添加。无需二次添加。");
errInfo = "warning";
map.put("msg", "该课程已添加。无需二次添加。");
errInfo = "fail";
} else {
Map<String, String> request = new HashMap<String, String>();
request.put("CURRICULUM_ID", pd.get("CURRICULUM_ID").toString());
@ -492,8 +492,8 @@ public class VideoResController extends BaseController {
}
}
} else {
errInfo = "warning";
map.put("message", "请求出错，请联系管理员。");
errInfo = "fail";
map.put("msg", "请求出错，请联系管理员。");
}
}
@ -524,8 +524,8 @@ public class VideoResController extends BaseController {
// 验证是否添加过此课程
PageData videoRes = videoCoursewareService.findByRemoteId(videoRemote);
if (videoRes != null && videoRes.get("VIDEOCOURSEWARE_ID") != null && Tools.notEmpty(videoRes.get("VIDEOCOURSEWARE_ID").toString())) {
map.put("message", "该课件已添加。无需二次添加。");
errInfo = "warning";
map.put("msg", "该课件已添加。无需二次添加。");
errInfo = "fail";
} else {
pd.put("TYPE", "1");
JSONObject response = synchronizeInformationService.syncVideoInfo(pd);
@ -552,13 +552,13 @@ public class VideoResController extends BaseController {
videoCoursewareService.save(video);
} else {
errInfo = "warning";
map.put("message", response.get("errorMessage"));
errInfo = "fail";
map.put("msg", response.get("errorMessage"));
}
} else {
errInfo = "warning";
map.put("message", "请求出错，请联系管理员。");
errInfo = "fail";
map.put("msg", "请求出错，请联系管理员。");
}
}
map.put("result", errInfo);
@ -584,14 +584,14 @@ public class VideoResController extends BaseController {
if (playAuth != null) {
if (playAuth.get("code") != null && "0".equals(playAuth.get("code"))) {
map.put("playAuth", playAuth.get("PlayAuth"));
map.put("message", "获取成功。");
map.put("msg", "获取成功。");
} else {
map.put("message", playAuth.get("errorMessage"));
errInfo = "warning";
map.put("msg", playAuth.get("errorMessage"));
errInfo = "fail";
}
} else {
map.put("message", "获取失败，请联系管理员。");
errInfo = "warning";
map.put("msg", "获取失败，请联系管理员。");
errInfo = "fail";
}
// map.put("chapterList", chapterList);
map.put("result", errInfo);
@ -616,14 +616,14 @@ public class VideoResController extends BaseController {
if (playInfo != null) {
if (playInfo.get("code") != null && "0".equals(playInfo.get("code"))) {
map.put("urlList", playInfo.get("urlList"));
map.put("message", "获取成功。");
map.put("msg", "获取成功。");
} else {
map.put("message", playInfo.get("errorMessage"));
errInfo = "warning";
map.put("msg", playInfo.get("errorMessage"));
errInfo = "fail";
}
} else {
map.put("message", "获取失败，请联系管理员。");
errInfo = "warning";
map.put("msg", "获取失败，请联系管理员。");
errInfo = "fail";
}
map.put("result", errInfo);
return map;

4
src/main/java/com/zcloud/util/Const.java
View File

@ -61,8 +61,8 @@ public class Const {
// public static final String HTTPFILEURL = "https://qask.qhdsafety.com/file/"; //文件服务器地址
public static final String FILEURL = "/mnt/wwag/file/"; //文件服务器地址
public static final String HTTPFILEURL = "https://wwag.qhdsafety.com/file/"; //文件服务器地址
public static final String FILEURL = "/mnt/qask/file/"; //文件服务器地址
public static final String HTTPFILEURL = "https://file.zcloudchina.com/YTHFile"; //文件服务器地址
public static final Map<String,String> WARNING_TYPE_MAP = new HashMap() {{

6
src/main/resources/application.properties
View File

@ -1,5 +1,9 @@
spring.application.name=integrated_traffic_admin
server.port=7070
server.port=7080
#\u5F00\u53D1
spring.profiles.active=dev
#\u6D4B\u8BD5
#spring.profiles.active=debug
##\u6B63\u5F0F
#spring.profiles.active=master