zy-asrs-master.git

			@@ -3,6 +3,8 @@
			import java.text.SimpleDateFormat;
			import java.util.Date;

			import com.zy.asrs.wcs.core.entity.DeviceCtg;
			import com.zy.asrs.wcs.core.service.DeviceCtgService;
			import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
			import com.zy.asrs.wcs.system.entity.Host;
			import com.zy.asrs.wcs.system.entity.User;
			@@ -43,7 +45,7 @@
			* 设备类型
			*/
			@ApiModelProperty(value= "设备类型")
			private Long deviceType;
			private Long deviceCtg;

			/**
			* 编号
			@@ -116,8 +118,8 @@

			public MotionCtg() {}

			public MotionCtg(Long deviceType,String uuid,String name,String flag,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
			this.deviceType = deviceType;
			public MotionCtg(Long deviceCtg,String uuid,String name,String flag,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer deleted,Long hostId) {
			this.deviceCtg = deviceCtg;
			this.uuid = uuid;
			this.name = name;
			this.flag = flag;
			@@ -146,11 +148,11 @@
			// null // 所属机构
			// );

			public String getDeviceType$(){
			DeviceTypeService service = SpringUtils.getBean(DeviceTypeService.class);
			DeviceType deviceType = service.getById(this.deviceType);
			if (!Cools.isEmpty(deviceType)){
			return String.valueOf(deviceType.getId());
			public String getDeviceCtg$(){
			DeviceCtgService service = SpringUtils.getBean(DeviceCtgService.class);
			DeviceCtg deviceCtg = service.getById(this.deviceCtg);
			if (!Cools.isEmpty(deviceCtg)){
			return String.valueOf(deviceCtg.getId());
			}
			return null;
			}