功能完善

liuhaonan

2022-01-04 6fdb42abb942d258448e009bede60b2d341f5fa4

功能完善

 dao/src/main/java/com/sandu/ximon/dao/mapper/IpVolumeMissionMapper.java

@@ -14,7 +14,7 @@
public interface IpVolumeMissionMapper extends BaseMapper<IpVolumeMission> {


   List<IpVolumeMissionBo> listAllByClientId();
   List<IpVolumeMissionBo> listAllByClientId();// todo 任务归属

}


 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java

@@ -1,6 +1,8 @@
package com.sandu.ximon.admin.controller;

import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.service.IpVolumeMissionService;
@@ -79,11 +81,8 @@

    // @AnonymousAccess
    @GetMapping("/list")
    public ResponseVO<Object> listMission() {
        //List<LampPost> list = lampPostService.list();
        // return ResponseUtil.success(list);
       // return ResponseUtil.success(ipVolumeMissionService.list());
        // todo
        return ResponseUtil.success(ipVolumeMissionService.missionList());
    public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());// todo
        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO,keyword));
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java

@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.param.ReceiveParam;
@@ -37,9 +39,13 @@


    @GetMapping("/list")
    public ResponseVO<Object> listProgram() {
        //LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
        return ResponseUtil.success(ledProgramService.list(ledProgramService.listProgram()));
    public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
        if(null!=keyword){
            wrapper.like(LEDProgram::getName,keyword);
        }
        return ResponseUtil.successPage(ledProgramService.list(wrapper));

    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java

@@ -1,10 +1,14 @@
package com.sandu.ximon.admin.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LEDProgramFileParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LEDProgramFileService;
import com.sandu.ximon.dao.domain.LEDProgramFile;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -33,8 +37,13 @@
    }

    @GetMapping("/list")
    public ResponseVO<Object> listfile() {
        return ResponseUtil.success(ledProgramFileService.list(ledProgramFileService.listFile()));
    public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
        if(null!=keyword){
            wrapper.like(LEDProgramFile::getName,keyword);
        }
        return ResponseUtil.successPage(ledProgramFileService.list(wrapper));
    }

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java

@@ -8,7 +8,7 @@
import org.springframework.web.bind.annotation.*;

/**
 * 路灯任务
 * 路灯任务   已弃用
 */
@RestController
@AllArgsConstructor

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java

@@ -7,8 +7,11 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.PlayPlanNvService;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -46,7 +49,11 @@
    @GetMapping("/listPaln")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<PlayPlanNv> wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
        LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//
        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){
           wrapper= Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId,SecurityUtils.getUserId());
        }
        wrapper=Wrappers.lambdaQuery(PlayPlanNv.class);
        if(null!=keyword){
            wrapper.like(PlayPlanNv::getName,keyword);
        }

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -2,7 +2,9 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.config.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
@@ -315,7 +317,8 @@
        return list(wrapper);
    }

    public List<IpVolumeMissionBo> missionList() {
    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO,String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
        List<IpVolumeMissionBo> ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();

        for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java

@@ -39,7 +39,6 @@
    public LambdaQueryWrapper<LEDProgramFile> listFile(){
        LambdaQueryWrapper<LEDProgramFile> ledProgramFileLambdaQueryWrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
        if(SecurityUtils.getClientId()!=null){

            return ledProgramFileLambdaQueryWrapper.eq(LEDProgramFile::getUserId,SecurityUtils.getUserId());
        }else {
            return ledProgramFileLambdaQueryWrapper;