|
@@ -1,6 +1,7 @@
|
|
package cn.com.ctop.kuaishou.modules.dimension.controller;
|
|
package cn.com.ctop.kuaishou.modules.dimension.controller;
|
|
|
|
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
|
|
+import cn.com.ctop.common.module.service.ISysRoleExtService;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.QueryGenerator;
|
|
import cn.com.ctop.common.module.utils.QueryGenerator;
|
|
@@ -23,7 +24,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
+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.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
@@ -73,6 +76,8 @@ public class KuaiShouDimensionStrategyController {
|
|
private IKuaiShouDimensionMaterialService dimensionMaterialService;
|
|
private IKuaiShouDimensionMaterialService dimensionMaterialService;
|
|
@Autowired
|
|
@Autowired
|
|
private IKuaiShouAppListService appListService;
|
|
private IKuaiShouAppListService appListService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysRoleExtService sysRoleService;
|
|
|
|
|
|
|
|
|
|
@GetMapping(value = "/checkStrategyName")
|
|
@GetMapping(value = "/checkStrategyName")
|
|
@@ -176,6 +181,13 @@ public class KuaiShouDimensionStrategyController {
|
|
if (!Check.isNull(strategyName)) {
|
|
if (!Check.isNull(strategyName)) {
|
|
queryWrapper.like("strategy_name", strategyName);
|
|
queryWrapper.like("strategy_name", strategyName);
|
|
}
|
|
}
|
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
|
|
|
|
+ if (!roleCode.equals("admin")) {
|
|
|
|
+ queryWrapper.eq("user_id", sysUser.getId());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ queryWrapper.orderByDesc("create_time");
|
|
Page<KuaiShouDimensionStrategy> page = new Page<KuaiShouDimensionStrategy>(pageNo, pageSize);
|
|
Page<KuaiShouDimensionStrategy> page = new Page<KuaiShouDimensionStrategy>(pageNo, pageSize);
|
|
IPage<KuaiShouDimensionStrategy> pageList = kuaiShouDimensionStrategyService.page(page, queryWrapper);
|
|
IPage<KuaiShouDimensionStrategy> pageList = kuaiShouDimensionStrategyService.page(page, queryWrapper);
|
|
List<KuaiShouDimensionStrategy> records = pageList.getRecords();
|
|
List<KuaiShouDimensionStrategy> records = pageList.getRecords();
|
|
@@ -221,7 +233,10 @@ public class KuaiShouDimensionStrategyController {
|
|
throw new Exception("策略配置应用不能为空");
|
|
throw new Exception("策略配置应用不能为空");
|
|
}
|
|
}
|
|
|
|
|
|
- kuaiShouDimensionStrategyService.insertStrategy(strategyJson);
|
|
|
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ kuaiShouDimensionStrategyService.insertStrategy(sysUser.getId(), strategyJson);
|
|
result.success("添加成功!");
|
|
result.success("添加成功!");
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.error(e.getMessage(), e);
|
|
log.error(e.getMessage(), e);
|