|
@@ -2,6 +2,7 @@ package cn.com.ctop.kuaishou.modules.ai.service.impl;
|
|
|
|
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
|
|
+import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
import cn.com.ctop.common.module.utils.LoadFileUtil;
|
|
import cn.com.ctop.common.module.utils.LoadFileUtil;
|
|
@@ -29,7 +30,9 @@ import org.apache.poi.ss.usermodel.Row;
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
import org.apache.poi.ss.usermodel.Sheet;
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
|
+import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.MD5Util;
|
|
import org.jeecg.common.util.MD5Util;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -59,7 +62,8 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private KuaishouAppPackageMapper appPackageMapper;
|
|
private KuaishouAppPackageMapper appPackageMapper;
|
|
-
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysRoleExtService sysRoleService;
|
|
@Autowired
|
|
@Autowired
|
|
private KuaishouAppPackageRelMapper relMapper;
|
|
private KuaishouAppPackageRelMapper relMapper;
|
|
|
|
|
|
@@ -324,8 +328,8 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<Long> queryByAppVersion(Long projectId, String appVersion,Integer dataStatus) {
|
|
|
|
- return appPackageMapper.queryByAppVersion(projectId, appVersion,dataStatus);
|
|
|
|
|
|
+ public List<Long> queryByAppVersion(Long projectId, String appVersion, Integer dataStatus) {
|
|
|
|
+ return appPackageMapper.queryByAppVersion(projectId, appVersion, dataStatus);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -340,8 +344,18 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result<Object> queryPageList(KuaishouAppPackage kuaishouAppPackage, Integer pageNo, Integer pageSize) {
|
|
public Result<Object> queryPageList(KuaishouAppPackage kuaishouAppPackage, Integer pageNo, Integer pageSize) {
|
|
|
|
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String userId = null;
|
|
|
|
+ if (!Check.isNull(user)) {
|
|
|
|
+ userId = user.getId();
|
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
|
+ //角色为管理员、销售、媒介可以查看所有项目信息
|
|
|
|
+ if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
|
|
|
|
+ userId = null;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
PageHelper.startPage(pageNo, pageSize);
|
|
- List<JSONObject> list = appPackageMapper.queryPageList(kuaishouAppPackage.getAppName(), kuaishouAppPackage.getAppVersion(), kuaishouAppPackage.getProjectId(), kuaishouAppPackage.getPlatform());
|
|
|
|
|
|
+ List<JSONObject> list = appPackageMapper.queryPageList(userId, kuaishouAppPackage.getAppName(), kuaishouAppPackage.getAppVersion(), kuaishouAppPackage.getProjectId(), kuaishouAppPackage.getPlatform());
|
|
for (JSONObject object : list) {
|
|
for (JSONObject object : list) {
|
|
object.put("unitCount", appPackageMapper.queryUnitCount(object.getLong("id")));
|
|
object.put("unitCount", appPackageMapper.queryUnitCount(object.getLong("id")));
|
|
}
|
|
}
|