Commit c2d495d1 authored by 赵啸非's avatar 赵啸非

修改同步逻辑

parent b8603d2f
......@@ -42,4 +42,14 @@ public class DeviceVo extends BaseEntityLong {
private List<DeviceWorkmanEntity> deviceWorkmanEntityList;
/**
* 抬头设置
*/
private String lookUp;
/**
* 播放时间,单位秒
*/
private Integer playTime;
}
\ No newline at end of file
......@@ -13,6 +13,9 @@ import com.mortals.xhx.common.code.EnabledEnum;
import com.mortals.xhx.common.pdu.LoginForm;
import com.mortals.xhx.common.pdu.device.DeviceReq;
import com.mortals.xhx.feign.device.IDeviceFeign;
import com.mortals.xhx.module.basic.model.BasicSetEntity;
import com.mortals.xhx.module.basic.model.BasicSetQuery;
import com.mortals.xhx.module.basic.service.BasicSetService;
import com.mortals.xhx.module.device.model.*;
import com.mortals.xhx.module.device.service.DeviceFileService;
import com.mortals.xhx.module.device.service.DeviceService;
......@@ -61,6 +64,8 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
private DeviceFileService deviceFileService;
@Autowired
private DeviceWorkmanService deviceWorkmanService;
@Autowired
private BasicSetService basicSetService;
public DeviceController() {
super.setModuleDesc("设备");
......@@ -109,6 +114,13 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
if (rest.getCode() != 1) {
throw new AppException(rest.getMsg());
}
BasicSetEntity basicSetEntity = basicSetService.selectOne(new BasicSetQuery());
if (!ObjectUtils.isEmpty(basicSetEntity)) {
deviceEntity.setPlayTime(basicSetEntity.getPlayTime());
deviceEntity.setLookUp(basicSetEntity.getLookUp());
}
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error("设备信息获取", e);
......
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