Commit e61dfe9c authored by liqin's avatar liqin 💬

bug fixed

parent cff21df3
...@@ -616,60 +616,73 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -616,60 +616,73 @@ public class ChinaMobileRestApiController extends BaseController {
return getResult(page); return getResult(page);
} }
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "_index", value = "分页起始偏移量", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "_size", value = "返回条数", paramType = "query", dataType = "Integer")
})
@PostMapping("/asset/search")
@RequiresPermissions("learning:content:board:page")
@ApiOperation(value = "获取当前用户可查看的视频信息", notes = "获取当前用户可查看的视频信息")
public Map<String, Object> getAssetPageByOrganId() {
final TUser tUser = getcurUser();
final String orgId = tUser.getOrgId();
IPage<Asset> page = this.learningContentBoardService.getAssetPageByOrganId(getPage(), orgId);
return getResult(page);
}
@ApiOperation(value = "app最新版本查询") @ApiOperation(value = "app最新版本查询")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "versionNo", value = "app版本号", dataType = "String", paramType = "query") @ApiImplicitParam(name = "versionNo", value = "app版本号", dataType = "String", paramType = "query")
}) })
@GetMapping(value = "/version/check") @GetMapping(value = "/version/check")
@RequiresPermissions("app:version:check") @RequiresPermissions("app:version:check")
public Map<String,Object> versionCheck(String versionNo) { public Map<String, Object> versionCheck(String versionNo) {
TAppVersion current = new TAppVersion();//当前版本 TAppVersion current = new TAppVersion();//当前版本
// 查询最新版本号信息 // 查询最新版本号信息
QueryWrapper<TAppVersion> qw = new QueryWrapper<>(); QueryWrapper<TAppVersion> qw = new QueryWrapper<>();
qw.eq("is_current",1); qw.eq("is_current", 1);
qw.select().orderByDesc("update_time"); qw.select().orderByDesc("update_time");
List<TAppVersion> currentList = appVersionService.list(qw); List<TAppVersion> currentList = appVersionService.list(qw);
if (currentList == null || currentList.size() == 0){ if (currentList == null || currentList.size() == 0) {
return getFailResult("未设置当前版本信息"); return getFailResult("未设置当前版本信息");
}else { } else {
current = currentList.get(0); current = currentList.get(0);
} }
Map map = new HashMap(); Map map = new HashMap();
map.put("isLatest",versionNo.equals(current.getAppVersion())); map.put("isLatest", versionNo.equals(current.getAppVersion()));
map.put("versionNo",current.getAppVersion()); map.put("versionNo", current.getAppVersion());
map.put("versionUrl",current.getApkUrl()); map.put("versionUrl", current.getApkUrl());
map.put("updateLog",current.getUpdateLog()); map.put("updateLog", current.getUpdateLog());
map.put("updateTime", DateUtil.format(current.getUpdateTime(),DateUtil.FORMAT_ONE)); map.put("updateTime", DateUtil.format(current.getUpdateTime(), DateUtil.FORMAT_ONE));
return getResult(map); return getResult(map);
} }
@ApiOperation(value = "app界面图片查询") @ApiOperation(value = "app界面图片查询")
@GetMapping(value = "/app/picSelect") @GetMapping(value = "/app/picSelect")
@RequiresPermissions("app:pic:select") @RequiresPermissions("app:pic:select")
public Map<String,Object> appPicSelect() { public Map<String, Object> appPicSelect() {
TAppDirPic currentDir = null;// 当前目录页面 TAppDirPic currentDir = null;// 当前目录页面
TAppRunPic currentRun = null;// 当前运行画面 TAppRunPic currentRun = null;// 当前运行画面
// 查询当前目录界面信息 // 查询当前目录界面信息
QueryWrapper<TAppDirPic> qw = new QueryWrapper<>(); QueryWrapper<TAppDirPic> qw = new QueryWrapper<>();
qw.eq("is_current",1); qw.eq("is_current", 1);
qw.select().orderByDesc("create_time"); qw.select().orderByDesc("create_time");
List<TAppDirPic> currentDirList = appDirPicService.list(qw); List<TAppDirPic> currentDirList = appDirPicService.list(qw);
if (currentDirList != null && currentDirList.size() > 0){ if (currentDirList != null && currentDirList.size() > 0) {
currentDir = currentDirList.get(0); currentDir = currentDirList.get(0);
} }
QueryWrapper<TAppRunPic> qw1 = new QueryWrapper<>(); QueryWrapper<TAppRunPic> qw1 = new QueryWrapper<>();
qw1.eq("is_current",1); qw1.eq("is_current", 1);
qw1.select().orderByDesc("create_time"); qw1.select().orderByDesc("create_time");
List<TAppRunPic> currentRunList = appRunPicService.list(qw1); List<TAppRunPic> currentRunList = appRunPicService.list(qw1);
if (currentRunList != null && currentRunList.size() > 0){ if (currentRunList != null && currentRunList.size() > 0) {
currentRun = currentRunList.get(0); currentRun = currentRunList.get(0);
} }
Map map = new HashMap(); Map map = new HashMap();
map.put("dirImgUrl",currentDir != null? currentDir.getAppDirPic() : "未设置目录图片"); map.put("dirImgUrl", currentDir != null ? currentDir.getAppDirPic() : "未设置目录图片");
map.put("runImgUrl",currentRun != null ? currentRun.getAppRunPic() : "未设置运行图片"); map.put("runImgUrl", currentRun != null ? currentRun.getAppRunPic() : "未设置运行图片");
return getResult(map); return getResult(map);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment