普通用户修改密码

zhanzhiqin

2022-03-21 34cc9fb821d30b64947c8a62d952f1621a515149

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

@@ -462,22 +462,17 @@
                .build();
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(deviceName, build);

        System.out.println(commonFrame.toString());

        CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(deviceName,
                        FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
                                .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
        if ("00".equals(rebootFrame.getPayload())) {
            System.out.println("重启成功");
        }

        CommonFrame result = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(deviceName,
                        FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
                                .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());

        boolean b = false;
        if ("00".equals(result.getPayload())) {
        if ("00".equals(rebootFrame.getPayload())) {
            byId.setDeviceCode(null);
            b = updateById(byId);
            System.out.println("重启成功");
@@ -572,16 +567,29 @@
        }

        Pole pole = new Pole();
        String strh = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
        pole.setDeviceCode(strh);
        pole.setPoleName(strh);
        String strm = uniqueMac.substring(0, uniqueMac.length() - 2);
        int i = Integer.parseInt(strm);
        pole.setPoleCode(generatePoleCode());
        pole.setDeviceType(i);
        setMac = save(pole);
      /*  String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
        String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
        pole.setDeviceCode(uniqueMac);
        pole.setPoleName(uniqueMac);
      /*  int i = Integer.parseInt(strm);*/
        if("00".equals(a1DeviceMacRespInnerFrame.getType())){
            pole.setDeviceType(0);
        }else if("01".equals(a1DeviceMacRespInnerFrame.getType())){
            pole.setDeviceType(1);
        }

        return setMac;
        pole.setPoleCode(generatePoleCode());
        Pole one = getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, uniqueMac));
//        setMac = save(pole);
        if(one==null){
            return save(pole);
        }else {
            pole.setId(one.getId());
            return updateById(pole);
        }



    }

    public List<String> listDeviceCodeByIds(List<Long> poleIdList) {