فهرست منبع

设计师接口提交

hcst_sunzhen 5 سال پیش
والد
کامیت
b7690c88ba

+ 2 - 110
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/PerformanceController2.java

@@ -14,14 +14,14 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 设计师季度绩效表
+ * 设计师季度绩效表2
  *
  * @author jeecg-boot
  * @version V1.0
  * @date 2019-12-10
  */
 @Slf4j
-@Api(tags = "设计师季度绩效表")
+@Api(tags = "设计师季度绩效表2")
 @RestController
 @RequestMapping("/ctop/performance2")
 public class PerformanceController2 {
@@ -86,112 +86,4 @@ public class PerformanceController2 {
         return resultMap;
     }
 
-   /*
-    @AutoLog(value = "设计师季度绩效表-分页列表查询")
-    @ApiOperation(value = "设计师季度绩效表-分页列表查询", notes = "设计师季度绩效表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<Performance>> queryPageList(Performance performance,
-                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-
-    @AutoLog(value = "设计师季度绩效表-添加")
-    @ApiOperation(value = "设计师季度绩效表-添加", notes = "设计师季度绩效表-添加")
-    @PostMapping(value = "/add")
-    public Result<Performance> add(@RequestBody Performance performance) {
-        Result<Performance> result = new Result<Performance>();
-        try {
-            performanceService.save(performance);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-
-    @AutoLog(value = "设计师季度绩效表-编辑")
-    @ApiOperation(value = "设计师季度绩效表-编辑", notes = "设计师季度绩效表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<Performance> edit(@RequestBody Performance performance) {
-        Result<Performance> result = new Result<Performance>();
-        Performance performanceEntity = performanceService.getById(performance.getId());
-        if (performanceEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = performanceService.updateById(performance);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-
-    @AutoLog(value = "设计师季度绩效表-通过id删除")
-    @ApiOperation(value = "设计师季度绩效表-通过id删除", notes = "设计师季度绩效表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            performanceService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-
-    @AutoLog(value = "设计师季度绩效表-批量删除")
-    @ApiOperation(value = "设计师季度绩效表-批量删除", notes = "设计师季度绩效表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<Performance> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<Performance> result = new Result<Performance>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.performanceService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-
-    @AutoLog(value = "设计师季度绩效表-通过id查询")
-    @ApiOperation(value = "设计师季度绩效表-通过id查询", notes = "设计师季度绩效表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<Performance> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<Performance> result = new Result<Performance>();
-        Performance performance = performanceService.getById(id);
-        if (performance == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(performance);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    @GetMapping("/project/list")
-    public Map<String, Object> projectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-        return performanceService.getUserOptimizerProjectList(pageNo, pageSize);
-    }
-
-    @GetMapping("/account/list")
-    public Map<String, Object> accountList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, Long projectId) {
-        return performanceService.getUserOptimizerAccountList(projectId, pageNo, pageSize);
-    }*/
 }

+ 11 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/PerformanceServiceImpl2.java

@@ -11,6 +11,7 @@ import cn.com.ctop.userefficientvideomap.entity.ProjectDTO;
 import cn.com.ctop.userefficientvideomap.entity.UserEfficientVideoMap;
 import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
@@ -32,6 +33,7 @@ import java.util.*;
  * @version V1.0
  * @date 2019-12-10
  */
+@Slf4j
 @Service
 public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Performance> implements IPerformanceService2 {
 
@@ -502,9 +504,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     //{"effiVideoCount有效数":70,"videoCount素材总数":200,"effiRate":40,"cost":2019;performance绩效":20000}
     public Map<String,Object> getPerformanceInfo(){
         Map<String,Object> performanceInfoMap = new HashMap<>();
-        //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        LoginUser sysUser = new LoginUser();
-        sysUser.setId("9712328fddd1443faf566ddb87693658");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        //LoginUser sysUser = new LoginUser();
+        //sysUser.setId("9712328fddd1443faf566ddb87693658");
 
         //获取前一天的时间
         Date date = new Date();
@@ -549,9 +551,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     //{"list":[{"name":"pipi","effiRate":50},{"name":"pipixia","effiRate":40},{"name":"pipiqiu","effiRate":30}],"performance":performance}
     public Map<String,Object> effiRateRank(Integer size){
         Map<String,Object> resultMap = new HashMap<>();
-        //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        LoginUser sysUser = new LoginUser();
-        sysUser.setId("9712328fddd1443faf566ddb87693658");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        //LoginUser sysUser = new LoginUser();
+        //sysUser.setId("9712328fddd1443faf566ddb87693658");
 
         //获取前一天的时间
         Date date = new Date();
@@ -657,9 +659,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
     //素材、素材跑量、封面点击数、封面曝光数、行为数
     //{"videoUrl":"http://dadfadfadf.mp4","videoCost":34.56,"pageClickCount":1200,"pageExposureCount":3939,"behaviorCount":5000}
     public List<DesignMaterialInfo> materialInfoList(){
-        //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        LoginUser sysUser = new LoginUser();
-        sysUser.setId("9712328fddd1443faf566ddb87693658");
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        //LoginUser sysUser = new LoginUser();
+        //sysUser.setId("9712328fddd1443faf566ddb87693658");
         String roleCode = sysRoleMapper.getRoleCodeByUserId(sysUser.getId());
 
         Date date = new Date();