提交代码,工程,设备权限,设备数据
This commit is contained in:
@@ -28,4 +28,7 @@ public interface DataArrayFeignClient {
|
||||
|
||||
@PostMapping("/getDataArrayById")
|
||||
HttpResult<List<CsDataArray>> getDataArrayById(@RequestParam("pid") String pid, @RequestParam("name") String name);
|
||||
}
|
||||
@PostMapping("/getDataArrayByIds")
|
||||
HttpResult<List<CsDataArray>> getDataArrayByIds(@RequestParam("ids") List<String> ids);
|
||||
|
||||
}
|
||||
|
||||
@@ -51,6 +51,12 @@ public class DataArrayFeignClientFallbackFactory implements FallbackFactory<Data
|
||||
log.error("{}异常,降级处理,异常为:{}","根据数据集id和名称获取详细数据",cause.toString());
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
|
||||
@Override
|
||||
public HttpResult<List<CsDataArray>> getDataArrayByIds(List<String> ids) {
|
||||
log.error("{}异常,降级处理,异常为:{}","根据id集合称获取详细数据",cause.toString());
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.njcn.csdevice.pojo.param;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2023/6/27 15:50【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class CsTouristDataParm {
|
||||
@ApiModelProperty(value="工程id")
|
||||
private String enginerId;
|
||||
|
||||
@ApiModelProperty(value="项目id")
|
||||
private String projectId;
|
||||
|
||||
@ApiModelProperty(value="设备id")
|
||||
private String deviceId;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.njcn.csdevice.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2023/6/27 9:40【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@ApiModel(description="")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "cs_device_user")
|
||||
public class CsDeviceUserPO {
|
||||
/**
|
||||
* 主用户id
|
||||
*/
|
||||
@TableField(value = "primary_user_id")
|
||||
@ApiModelProperty(value="主用户id")
|
||||
private String primaryUserId;
|
||||
|
||||
/**
|
||||
* 子用户id
|
||||
*/
|
||||
@TableField(value = "sub_user_id")
|
||||
@ApiModelProperty(value="子用户id")
|
||||
private String subUserId;
|
||||
|
||||
/**
|
||||
* 装置Id
|
||||
*/
|
||||
@TableField(value = "device_id")
|
||||
@ApiModelProperty(value="装置Id")
|
||||
private String deviceId;
|
||||
|
||||
@TableField(value = "create_by")
|
||||
@ApiModelProperty(value="")
|
||||
private String createBy;
|
||||
|
||||
@TableField(value = "create_time")
|
||||
@ApiModelProperty(value="")
|
||||
private Date createTime;
|
||||
|
||||
@TableField(value = "update_by")
|
||||
@ApiModelProperty(value="")
|
||||
private String updateBy;
|
||||
|
||||
@TableField(value = "update_time")
|
||||
@ApiModelProperty(value="")
|
||||
private Date updateTime;
|
||||
|
||||
public static final String COL_PRIMARY_USER_ID = "primary_user_id";
|
||||
|
||||
public static final String COL_SUB_USER_ID = "sub_user_id";
|
||||
|
||||
public static final String COL_DEVICE_ID = "device_id";
|
||||
|
||||
public static final String COL_CREATE_BY = "create_by";
|
||||
|
||||
public static final String COL_CREATE_TIME = "create_time";
|
||||
|
||||
public static final String COL_UPDATE_BY = "update_by";
|
||||
|
||||
public static final String COL_UPDATE_TIME = "update_time";
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.njcn.csdevice.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2023/6/27 15:50【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@TableName(value = "cs_tourist_data")
|
||||
public class CsTouristDataPO {
|
||||
@TableField(value = "enginer_id")
|
||||
private String enginerId;
|
||||
|
||||
@TableField(value = "project_id")
|
||||
private String projectId;
|
||||
|
||||
@TableField(value = "device_id")
|
||||
private String deviceId;
|
||||
|
||||
public static final String COL_ENGINER_ID = "enginer_id";
|
||||
|
||||
public static final String COL_PROJECT_ID = "project_id";
|
||||
|
||||
public static final String COL_DEVICE_ID = "device_id";
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.njcn.csdevice.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2023/6/27 15:50【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class CsTouristDataParmVO {
|
||||
@ApiModelProperty(value="工程id")
|
||||
private String enginerId;
|
||||
@ApiModelProperty(value="工程名称")
|
||||
private String enginerName;
|
||||
|
||||
@ApiModelProperty(value="项目id")
|
||||
private String projectId;
|
||||
@ApiModelProperty(value="项目名称")
|
||||
private String projectName;
|
||||
|
||||
@ApiModelProperty(value="设备id")
|
||||
private String deviceId;
|
||||
|
||||
@ApiModelProperty(value="设备名称")
|
||||
private String deviceName;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user