XMPoleManager.git

			@@ -46,7 +46,7 @@
			public ResponseVO<Object> pushToLed(@PathVariable Long plianId) {
			return ResponseUtil.success(playPlanNvService.pushToLed(plianId));
			}
			@GetMapping("/listPaln")
			@GetMapping("/listPlan")
			public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
			PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
			LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//

			@@ -5,7 +5,9 @@
			import cn.hutool.core.util.StrUtil;
			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.dto.DeviceStatus;
			import com.sandu.ximon.admin.param.PoleBindingParam;
			@@ -60,9 +62,10 @@
			}

			@GetMapping("listPoleAndState")
			public ResponseVO<Object> listPoleAndState() {

			return ResponseUtil.success(poleService.queryStatesAndList());
			public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
			PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
			List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
			return ResponseUtil.successPage(poles);
			}

			@@ -5,6 +5,7 @@
			import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
			import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.github.pagehelper.PageHelper;
			import com.sandu.common.execption.BusinessException;
			import com.sandu.common.redis.RedisService;
			import com.sandu.common.service.impl.BaseServiceImpl;
			@@ -108,9 +109,10 @@
			*
			* @return
			*/
			public List<Pole> queryStatesAndList() {
			public List<Pole> queryStatesAndList(Integer pageNo,Integer pageSize) {
			// List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
			//List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
			PageHelper.startPage(pageNo,pageSize);
			List<Pole> list = new ArrayList<>();
			if (SecurityUtils.getClientId() == null) {
			list = list(Wrappers.lambdaQuery(Pole.class));

	ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史