Commit 99d90527 authored by 赵啸非's avatar 赵啸非

添加设备楼层与楼栋

parent d5ccc499
...@@ -175,7 +175,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -175,7 +175,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
Rest<String> rest = deviceFeign.deviceCall(deviceReq, token); Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
log.info("添加结果:{}", JSON.toJSONString(rest));*/ log.info("添加结果:{}", JSON.toJSONString(rest));*/
} else { } else {
String token = getToken(); // String token = getToken();
DeviceReq deviceReq = new DeviceReq(); DeviceReq deviceReq = new DeviceReq();
deviceReq.setReceiveMethod(DeviceMethodEnum.UPDATE.getValue()); deviceReq.setReceiveMethod(DeviceMethodEnum.UPDATE.getValue());
/* deviceReq.setDeviceName(entity.getDeviceName()); /* deviceReq.setDeviceName(entity.getDeviceName());
...@@ -190,7 +190,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -190,7 +190,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone()); deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
deviceReq.setSource(1); deviceReq.setSource(1);
deviceReq.setDeviceStatus(entity.getDeviceStatus()); deviceReq.setDeviceStatus(entity.getDeviceStatus());
Rest<String> rest = deviceFeign.deviceCall(deviceReq, token); Rest<String> rest = deviceFeign.deviceCall(deviceReq);
log.info("更新结果:{}", JSON.toJSONString(rest)); log.info("更新结果:{}", JSON.toJSONString(rest));
} }
...@@ -200,7 +200,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -200,7 +200,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
@Override @Override
protected void deleteBefore(Long[] ids, Context context) throws AppException { protected void deleteBefore(Long[] ids, Context context) throws AppException {
super.deleteBefore(ids, context); super.deleteBefore(ids, context);
String token = getToken(); // String token = getToken();
DeviceQuery deviceQuery = new DeviceQuery(); DeviceQuery deviceQuery = new DeviceQuery();
deviceQuery.setIdList(Arrays.asList(ids)); deviceQuery.setIdList(Arrays.asList(ids));
List<DeviceEntity> deviceEntities = this.service.find(deviceQuery, context); List<DeviceEntity> deviceEntities = this.service.find(deviceQuery, context);
...@@ -208,18 +208,18 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -208,18 +208,18 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
DeviceReq deviceReq = new DeviceReq(); DeviceReq deviceReq = new DeviceReq();
deviceReq.setReceiveMethod(DeviceMethodEnum.DEL.getValue()); deviceReq.setReceiveMethod(DeviceMethodEnum.DEL.getValue());
deviceReq.setDeviceCode(entity.getDeviceCode()); deviceReq.setDeviceCode(entity.getDeviceCode());
Rest<String> rest = deviceFeign.deviceCall(deviceReq, token); Rest<String> rest = deviceFeign.deviceCall(deviceReq);
log.info("删除结果:{}", JSON.toJSONString(rest)); log.info("删除结果:{}", JSON.toJSONString(rest));
} }
} }
private String getToken() { /* private String getToken() {
LoginForm loginForm = new LoginForm(); LoginForm loginForm = new LoginForm();
loginForm.setLoginName(loginName); loginForm.setLoginName(loginName);
loginForm.setPassword(password); loginForm.setPassword(password);
Rest<String> rest = deviceFeign.getToken(loginForm); Rest<String> rest = deviceFeign.getToken(loginForm);
String token = rest.getData(); String token = rest.getData();
return token; return token;
} }*/
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment