dao/src/main/java/com/sandu/ximon/dao/mapper/ClientMapper.java
@@ -10,7 +10,7 @@ @Mapper public interface ClientMapper extends BaseMapper<Client> { List<Client> clientList(Long userId); List<Client> clientList(Long userId,Integer pageNo,Integer pageSize); Long findClientIdByName(String belongsClient);
@@ -1,9 +1,17 @@ package com.sandu.ximon.admin.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.IpVolumeFileParam; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.service.AdvisementPlayerFileService; import com.sandu.ximon.dao.domain.AdvisementPlayerFile; import com.sandu.ximon.dao.domain.Client; import com.sandu.ximon.dao.enums.AdministratorEnums; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,7 +41,17 @@ } @GetMapping("/list") public ResponseVO<Object> listfile() {/*ReceiveParam param*/ return ResponseUtil.success(advisementPlayerFileService.list()); public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); LambdaQueryWrapper<AdvisementPlayerFile> wrapper = new LambdaQueryWrapper<>(); if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){ wrapper=advisementPlayerFileService.listFile(keyword); return ResponseUtil.successPage(advisementPlayerFileService.list(wrapper)); }else { wrapper= Wrappers.lambdaQuery(AdvisementPlayerFile.class); return ResponseUtil.successPage(advisementPlayerFileService.list(wrapper)); } } } ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -1,11 +1,16 @@ package com.sandu.ximon.admin.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.context.CustomerInspectContextHolder; import com.sandu.ximon.admin.param.ClientPrarm; import com.sandu.ximon.admin.security.SecurityUtils; import com.sandu.ximon.admin.service.ClientService; import com.sandu.ximon.dao.domain.Client; import com.sandu.ximon.dao.enums.AdministratorEnums; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -52,14 +57,29 @@ } @GetMapping("/list") public ResponseVO<Object> listClient(){ /* @GetMapping("/list") public ResponseVO<Object> listClient(BaseConditionVO baseConditionVO) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) { return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId())); return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId(),baseConditionVO)); // }else if("0".equals(SecurityUtils.getAdministratorIdentity())){ }else { return ResponseUtil.success(clientService.list()); return ResponseUtil.successPage(clientService.list()); } }*/ @GetMapping("/list") public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class); if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){ wrapper.eq(Client::getSuperiorId,SecurityUtils.getUserId()); } if(null!=keyword){ wrapper.like(Client::getClientName,keyword) .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile,keyword)) .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan,keyword)); } return ResponseUtil.successPage(clientService.list(wrapper)); } } ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -32,7 +32,7 @@ * * @return */ @GetMapping("/listMonitorByKeyword") @PostMapping("/listMonitorByKeyword") public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) { List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam); return ResponseUtil.success(list); ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -1,9 +1,14 @@ package com.sandu.ximon.admin.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.PlayPlanParam; import com.sandu.ximon.admin.service.PlayPlanNvService; import com.sandu.ximon.dao.domain.PlayPlanNv; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -39,8 +44,13 @@ return ResponseUtil.success(playPlanNvService.pushToLed(plianId)); } @GetMapping("/listPaln") public ResponseVO<Object> list() { return ResponseUtil.success(playPlanNvService.list()); 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); if(null!=keyword){ wrapper.like(PlayPlanNv::getName,keyword); } return ResponseUtil.successPage(playPlanNvService.list(wrapper)); } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdvisementPlayerFileService.java
@@ -48,12 +48,12 @@ return removeById(id); } public LambdaQueryWrapper<AdvisementPlayerFile> listFile(ReceiveParam receiveParam) { public LambdaQueryWrapper<AdvisementPlayerFile> listFile(String keyword) { LambdaQueryWrapper<AdvisementPlayerFile> wrapper = Wrappers.lambdaQuery(AdvisementPlayerFile.class).eq(AdvisementPlayerFile::getClientId, clientService.getClientId()); if (receiveParam.getKeyWord() == null) { if (keyword == null) { return wrapper; } else { return wrapper.like(AdvisementPlayerFile::getFileName, receiveParam.getKeyWord()); return wrapper.like(AdvisementPlayerFile::getFileName, keyword); } } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sandu.common.execption.BusinessException; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.ClientPrarm; import com.sandu.ximon.admin.security.SecurityUtils; @@ -70,8 +71,8 @@ return removeById(id); } public List<Client> clientList(Long userId) { return clientMapper.clientList(userId); public List<Client> clientList(Long userId, BaseConditionVO baseConditionVO) { return clientMapper.clientList(userId,baseConditionVO.getPageNo(),baseConditionVO.getPageSize()); } public Client findByPhone(String phone) {
