瀏覽代碼

修改测试代码

syh 5 年之前
父節點
當前提交
46555663e9

+ 4 - 3
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceOptimizerServiceImpl.java

@@ -11,6 +11,7 @@ import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -41,9 +42,9 @@ public class PerformanceOptimizerServiceImpl extends ServiceImpl<PerformanceOpti
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
         Integer startIndex = (pageNo - 1) * pageSize;
         Integer startIndex = (pageNo - 1) * pageSize;
         //查询当前登录人信息
         //查询当前登录人信息
-//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        LoginUser sysUser = new LoginUser();
-        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        LoginUser sysUser = new LoginUser();
+//        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
         //查询当前媒体配置信息
         //查询当前媒体配置信息
         OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(mediaType);
         OptimizerConfig config = optimizerConfigService.getEnabledConfigByMediaType(mediaType);
         if (null == config) {
         if (null == config) {

+ 11 - 10
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java

@@ -12,6 +12,7 @@ import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import cn.com.ctop.performanceappraisal.vo.DesignerCostDetailVO;
 import cn.com.ctop.performanceappraisal.vo.DesignerCostDetailVO;
 import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,9 +99,9 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
     @Override
     @Override
     public Map<String, Object> getUserOptimizerProjectList(Integer pageNo, Integer pageSize) {
     public Map<String, Object> getUserOptimizerProjectList(Integer pageNo, Integer pageSize) {
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
-        //        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        LoginUser sysUser = new LoginUser();
-        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        LoginUser sysUser = new LoginUser();
+//        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
         Integer startIndex = (pageNo - 1) * pageSize;
         Integer startIndex = (pageNo - 1) * pageSize;
         Date date = new Date();
         Date date = new Date();
         Date getDate = DateUtils.addDay(date, -1);
         Date getDate = DateUtils.addDay(date, -1);
@@ -117,9 +118,9 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
     @Override
     @Override
     public Map<String, Object> getUserOptimizerAccountList(Long projectId, Integer pageNo, Integer pageSize) {
     public Map<String, Object> getUserOptimizerAccountList(Long projectId, Integer pageNo, Integer pageSize) {
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
-        //        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        LoginUser sysUser = new LoginUser();
-        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        LoginUser sysUser = new LoginUser();
+//        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
         Integer startIndex = (pageNo - 1) * pageSize;
         Integer startIndex = (pageNo - 1) * pageSize;
         Date date = new Date();
         Date date = new Date();
         Date getDate = DateUtils.addDay(date, -1);
         Date getDate = DateUtils.addDay(date, -1);
@@ -137,10 +138,10 @@ public class PerformanceServiceImpl extends ServiceImpl<PerformanceMapper, Perfo
     public Map<String, Object> getMemberPerformanceByUserId(OptimizerConfig config, OptimizerCostDetailVO totalCostVo) {
     public Map<String, Object> getMemberPerformanceByUserId(OptimizerConfig config, OptimizerCostDetailVO totalCostVo) {
         Map<String, Object> result = new HashMap<>();
         Map<String, Object> result = new HashMap<>();
         //查询此机构下其他运营专员跑量数据
         //查询此机构下其他运营专员跑量数据
-        //        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        LoginUser sysUser = new LoginUser();
-        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
-        sysUser.setOrgCode("A01A07A01");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+//        LoginUser sysUser = new LoginUser();
+//        sysUser.setId("fcb3fbf6192640adaadb2a7df9c02dae");
+//        sysUser.setOrgCode("A01A07A01");
         Date date = new Date();
         Date date = new Date();
         Date getDate = DateUtils.addDay(date, -1);
         Date getDate = DateUtils.addDay(date, -1);
         String startDate = DateUtils.getQuarterStartDate(getDate);
         String startDate = DateUtils.getQuarterStartDate(getDate);