Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

Merge remote-tracking branch 'origin/cjl' into qa

 screen-manage/src/main/java/com/moral/api/controller/PubController.java

@@ -7,6 +7,7 @@
import com.moral.api.pojo.form.user.UserUpdateForm;
import com.moral.api.pojo.vo.user.UserQueryVO;
import com.moral.api.service.DeviceAdjustValueService;
import com.moral.api.service.DeviceService;
import com.moral.api.service.UserService;
import com.moral.api.util.CacheUtils;
import com.moral.constant.ResponseCodeEnum;
@@ -36,6 +37,8 @@
public class PubController {
    @Autowired
    private CacheUtils cacheUtils;
    @Autowired
    private DeviceService deviceService;
    @Resource
    private DeviceAdjustValueService deviceAdjustValueService;

@@ -70,4 +73,21 @@
        return new ResultMessage();
    }

    @GetMapping(value = "device")
    @ApiOperation(value = "redis重新编译device", notes = "redis重新编译device")
    public ResultMessage device() {
        deviceService.setRedisDevice();
        return new ResultMessage();
    }

    @GetMapping(value = "selectDeviceInfoById")
    @ApiOperation(value = "获取信息", notes = "获取信息")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    public ResultMessage selectDeviceInfoById(Integer mac) {
        Map<String,Object> resultMap = deviceService.selectDeviceInfoById(mac);
        return new ResultMessage();
    }

}

 screen-manage/src/main/java/com/moral/api/service/DeviceService.java

@@ -73,4 +73,6 @@
     **/
    List<Map<String,Object>> selectMonitorPiontAndDeviceByOrgId(int orgId);

    void setRedisDevice();

}

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
@@ -623,4 +624,13 @@
            organizationUnitAlarmMapper.update(null, deleteWrapper);
        }
    }

    @Override
    public void setRedisDevice() {
        List<Device> list = lambdaQuery().eq(Device::getIsDelete,0).list();
        for(Device d : list){
           Map<String, Object> deviceInfo = selectDeviceInfoById(d.getId());
           setDeviceInfoToRedis(d.getMac(), deviceInfo);
        }
    }
}