Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-19 4999af7326b571e936fbbbab017f6a64f87ba5ad

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

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

@@ -105,7 +105,7 @@
        if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
            wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
        }
        if (null != keyword) {
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(Client::getClientName, keyword)
                    .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
                    .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));

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

@@ -54,7 +54,7 @@
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(LEDProgram::getName, keyword);
        }
        return ResponseUtil.successPage(ledProgramService.list(wrapper));

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

@@ -46,7 +46,7 @@
        }

        LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
        if (!keyword.isEmpty()) {
        if (keyword != null&&!keyword.isEmpty()) {
            wrapper.like(LEDProgramFile::getName, keyword);
        }


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

@@ -53,7 +53,7 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(LedSFile::getOriginName, keyword);
        }


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

@@ -73,7 +73,7 @@
                w.eq(PlayPlanNv::getClientId, SecurityUtils.getUserId());
            });
        }
        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            wrapper = wrapper.like(PlayPlanNv::getName, keyword);
        }
        List<PlayPlanNv> list = playPlanNvService.list(wrapper);

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

@@ -58,11 +58,11 @@

    @PostMapping("/list")
    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
        if(!permissionConfig.check(MenuEnum.POLE_LIST.getCode())){
        if (!permissionConfig.check(MenuEnum.POLE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Pole> results = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),param);
        List<Pole> results = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
        CommonPage commonPage = CommonPage.restPage(results);
        int size = results.size();
        commonPage.setTotal((long) size);
@@ -71,14 +71,14 @@
            commonPage.setTotalPage(size / baseConditionVO.getPageSize());
        }
        return ResponseUtil.success(commonPage);
       // return ResponseUtil.success(poles);
        // return ResponseUtil.success(poles);
    }

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

@@ -219,7 +219,7 @@
     */
    @PostMapping("/getOwnerPole/{cilentId}")
    public ResponseVO<Object> getOwnerPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
            ,@PathVariable Long cilentId) {
            , @PathVariable Long cilentId) {
        List<Pole> results = poleService.getOwnerPole(baseConditionVO, keyword, cilentId);
//        CommonPage commonPage = CommonPage.restPage(results);
//        int size = results.size();

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

@@ -50,11 +50,11 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO,keyword,groupid));
        return ResponseUtil.success(poleGroupService.groupList(baseConditionVO, keyword, groupid));
    }

    @PostMapping("/bind/{groupId}")
    public ResponseVO<Object> bindPole(@PathVariable Long groupId,@RequestBody PoleGroupRelationParam param) {
        return ResponseUtil.success(poleGroupService.bindPole(groupId,param.getPoleIdList()));
    public ResponseVO<Object> bindPole(@PathVariable Long groupId, @RequestBody PoleGroupRelationParam param) {
        return ResponseUtil.success(poleGroupService.bindPole(groupId, param.getPoleIdList()));
    }
}

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

@@ -195,7 +195,9 @@
    @GetMapping("/listLed")
    public ResponseVO<Object> listLed(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
                                      @RequestParam(value = "isOnLine", required = false) boolean isOnLine) {

        if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);

        CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);

 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java

@@ -107,7 +107,7 @@
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
            wrapper = Wrappers.lambdaQuery(WxConfigEntity.class);
        }
        if(!keyword.isEmpty()){
        if(keyword != null&&!keyword.isEmpty()){
           wrapper= wrapper.like(WxConfigEntity::getConfigId,keyword).or(
                    appid->{
                        appid.like(WxConfigEntity::getAppid,keyword);

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

@@ -83,7 +83,7 @@
                    });
        }

        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(IpVolumeFile::getFileName, keyword);
        }
        return wrapper;

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

@@ -345,7 +345,7 @@
                w.eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
            });
        }
        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            eq.like(IpVolumeMission::getMissionName, keyword);
        }
        List<IpVolumeMission> list = list(eq);

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

@@ -158,7 +158,7 @@
            });
        }
        //模糊查询关键字判断
        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            eq = eq.like(LedScheduleEntity::getName, keyword);
        }


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

@@ -34,7 +34,6 @@
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.domain.PoleGroupRelation;
@@ -131,26 +130,10 @@
                        w.eq(Pole::getUserId, SecurityUtils.getUserId());
                    });
        }
        //灯杆
        list = list(wrapper);
        List<Pole> poles = isOnLine(list);
        result.put("poleOnlineCount", poles.size());
        result.put("poleTotalCount", list.size());
        //诺瓦
        // SpringContextHolder.getBean(LightService.class).listLight(SecurityUtils.getUserId(), SecurityUtils.getClientId());
        List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null);
        int munber = 0;
        for (LedPlayerEntity bean : ledPlayerEntities) {
            if (bean.getOnlineStatus() == 1) {
                munber++;
            }
        }
        result.put("novaOnlineCount", munber);
        result.put("novaTotalCount", ledPlayerEntities.size());

        SpringContextHolder.getBean(C3ChargingService.class).list();


        return result;
    }

@@ -165,7 +148,7 @@
                        w.eq(Pole::getUserId, SecurityUtils.getUserId());
                    });
        }
        if (!param.getKeyword().isEmpty()) {
        if (param.getKeyword() != null && !param.getKeyword().isEmpty()) {
            wrapper.like(Pole::getPoleCode, param.getKeyword()).or(
                    wrappers -> {
                        wrappers.like(Pole::getPoleName, param.getKeyword());
@@ -173,7 +156,6 @@
            );
        }

        PageHelper.startPage(pageNo, pageSize);
        list = list(wrapper);
        if (param.getGroupid() != null) {
            //  List<Long> poleIds = new ArrayList<>();

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

@@ -45,14 +45,14 @@
    //熙讯节目列表
    public LambdaQueryWrapper<PoleXixunPlayerEntity> XixunPlayerList(String keyword) {
        if (SecurityUtils.getClientId() == null) {
            if (keyword.isEmpty()) {
            if (keyword != null && keyword.isEmpty()) {
                return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class);
            } else {
                return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).like(PoleXixunPlayerEntity::getProgramName, keyword);
            }

        } else {
            if (keyword.isEmpty()) {
            if (keyword != null && keyword.isEmpty()) {
                return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).eq(PoleXixunPlayerEntity::getCreateUserId, SecurityUtils.getUserId())
                        .or(w -> {
                            w.eq(PoleXixunPlayerEntity::getClientId, SecurityUtils.getClientId());