| | |
|---|
| | | OperateUser operateUser = operateUserService.updatePassword(uid,password,newpassword);
|
|---|
| | | return new AppData<OperateUser>(operateUser);
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | /**
|
|---|
| | | * 根据 设备id 来获取设备信息
|
|---|
| | | */
|
|---|
| | | @RequestMapping("deviceInfo")
|
|---|
| | | public AppData<Device> deviceInfo(Integer id){
|
|---|
| | | Device device = deviceService.queryById(id);
|
|---|
| | | return new AppData<Device>(device);
|
|---|
| | | }
|
|---|
| | | /**
|
|---|
| | | *
|
|---|
| | | * @param equDeviceAdapter
|
|---|
| | |
|---|
| | | */
|
|---|
| | | @RequestMapping("reportDevice")
|
|---|
| | | public AppData<String> installDevice(EquDeviceAdapter equDeviceAdapter) {
|
|---|
| | | deviceService.saveOrUpdateDevice(equDeviceAdapter.toDevice());
|
|---|
| | | deviceService.addOrModify(equDeviceAdapter.toDevice());
|
|---|
| | | return new AppData<String>("");
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | |
|---|
| | | @RequestMapping("getEquInfoByMac")
|
|---|
| | | public AppData<Map> getDeviceByMac(@RequestParam(value="mac", required=true)String mac) {
|
|---|
| | | Device device = deviceService.getDeviceByMac(mac,false);//不从缓存取
|
|---|
| | | Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));
|
|---|
| | | deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));
|
|---|
| | | deviceMap.remove("monitorPoint");
|
|---|
| | | return new AppData<Map>(deviceMap);
|
|---|
| | | if(device!=null){
|
|---|
| | | Map<String,Object> deviceMap = new HashMap<>(BeanMap.create(device));
|
|---|
| | | deviceMap.put("monitorpointDetail",deviceMap.get("monitorPoint"));
|
|---|
| | | deviceMap.remove("monitorPoint");
|
|---|
| | | return new AppData<Map>(deviceMap);
|
|---|
| | | }else{
|
|---|
| | | return new AppData("mac地址不存在",AppData.FAIL);
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | /**
|
|---|
