docking
/
docking
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分表配置信息

zhaokai 2025-09-23 13:31:15 +08:00
parent 67a50805fd
commit 1f1adac78c
90 changed files with 361 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zcloud/modules/bussiness/controller/BusDataController.java
View File

@ -69,7 +69,7 @@ public class BusDataController {
@SysLog("数据信息-定时数据手动触发推送")
@PostMapping("/record/scheduled/push")
@ApiOperation(value = "定时数据手动出发推送",hidden = true)
public R recordScheduledPush( Integer scheduleId) {
public R recordScheduledPush( Long scheduleId) {
return dataService.recordScheduledPush(scheduleId);
}
@ -77,7 +77,7 @@ public class BusDataController {
@SysLog("数据信息-数据手动重推")
@PostMapping("/record/log/push")
@ApiOperation(value = "数据手动重推",hidden = true)
public R recordLogPush( Integer logId) {
public R recordLogPush( Long logId) {
return dataService.recordLogPush(logId);
}

2
src/main/java/com/zcloud/modules/bussiness/dto/req/AramHandleReqDto.java
View File

@ -13,7 +13,7 @@ public class AramHandleReqDto{
@ApiModelProperty(value = "主键")
@NotNull(message = "主键不能为空")
private Integer id;
private Long id;
@ApiModelProperty(value = "处理状态,(1.未处理,2.处理成功,3.不需要处理)")
@NotNull(message = "处理状态不能为空")

2
src/main/java/com/zcloud/modules/bussiness/dto/req/DataMenuQueryDto.java
View File

@ -22,7 +22,7 @@ public class DataMenuQueryDto extends PageDto {
@NotNull(groups = DeleteGroup.class,message = "数据id不能为空")
@ApiModelProperty(value = "数据id")
private Integer id;
private Long id;
@ApiModelProperty(value = "数据类型")
// @NotNull(message = "数据类型不能为空")

3
src/main/java/com/zcloud/modules/bussiness/dto/req/DataRecordPushReqDto.java
View File

@ -12,10 +12,9 @@ import javax.validation.constraints.NotNull;
@ApiModel("数据请求实体")
public class DataRecordPushReqDto extends PageDto {
@NotNull(message = "数据id不能为空")
@ApiModelProperty(value = "数据id")
private Integer id;
private Long id;
@ApiModelProperty(value = "数据类型")
@NotNull(message = "数据类型不能为空")

2
src/main/java/com/zcloud/modules/data/dao/business/DynamicTableDao.java
View File

@ -7,5 +7,5 @@ public interface DynamicTableDao {
@Update("UPDATE ${tableName} SET push_status = #{status}, push_time = CURRENT_TIMESTAMP WHERE id = #{pushDataId}")
int updatePushStatus(Integer status, String tableName, Integer pushDataId);
int updatePushStatus(Integer status, String tableName, Long pushDataId);
}

4
src/main/java/com/zcloud/modules/data/dao/data/BusDataDao.java
View File

@ -24,9 +24,9 @@ public interface BusDataDao {
List<Map<String, Object>> recordQueryPage(@Param("req") DataRecordPageDto req, @Param("offset") int offset, @Param("limit") Integer limit, @Param("tableName")String tableName);
void deleteById(@Param("id")Integer id, @Param("tableName")String tableName, @Param("username")String username);
void deleteById(@Param("id")Long id, @Param("tableName")String tableName, @Param("username")String username);
Map<String, Object> getDataInfo(@Param("id")Integer id, @Param("tableName")String tableName);
Map<String, Object> getDataInfo(@Param("id")Long id, @Param("tableName")String tableName);
}

2
src/main/java/com/zcloud/modules/data/dto/data/info/DataCheckResultMessageDto.java
View File

@ -17,7 +17,7 @@ public class DataCheckResultMessageDto {
private Integer number;
private Integer dataId;
private Long dataId;
private String indexReq;

2
src/main/java/com/zcloud/modules/data/dto/data/info/DataTryAgainMessageDto.java
View File

@ -17,7 +17,7 @@ public class DataTryAgainMessageDto {
private Integer number;
private Integer dataId;
private Long dataId;
private String indexReq;

2
src/main/java/com/zcloud/modules/data/entity/business/BusLogInfoYearEntity.java
View File

@ -29,7 +29,7 @@ public class BusLogInfoYearEntity extends Model<BusLogInfoYearEntity> {
private Date createdTime;
@ApiModelProperty(value = "业务主键id")
private Integer dataId;
private Long dataId;
@ApiModelProperty(value = "业务数据类型")
private String businessType;

7
src/main/java/com/zcloud/modules/data/entity/data/DataAramEntity.java
View File

@ -1,7 +1,9 @@
package com.zcloud.modules.data.entity.data;
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 com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -21,7 +23,8 @@ import java.util.Date;
public class DataAramEntity extends Model<DataAramEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "三方平台id")
private Integer thirdPlatformId;
@ -42,7 +45,7 @@ public class DataAramEntity extends Model<DataAramEntity> {
private String companyName;
@ApiModelProperty(value = "业务主键id")
private Integer dataId;
private Long dataId;
@ApiModelProperty(value = "业务类型,枚举形式BusinessDataTypeEnum")
private String businessType;

7
src/main/java/com/zcloud/modules/data/entity/data/DataCarRecordEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_car_record")
public class DataCarRecordEntity extends Model<DataCarRecordEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据id")
private String dataId;

14
src/main/java/com/zcloud/modules/data/entity/data/DataCheckDangerEntity.java
View File

@ -1,11 +1,14 @@
package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 专项检查隐患信息(DataCheckDanger)表实体类
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_check_danger")
public class DataCheckDangerEntity extends Model<DataCheckDangerEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

14
src/main/java/com/zcloud/modules/data/entity/data/DataCheckRecordEntity.java
View File

@ -1,11 +1,14 @@
package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 专项检查情况记录(DataCheckRecord)表实体类
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_check_record")
public class DataCheckRecordEntity extends Model<DataCheckRecordEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataComputerInfoEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_computer_info")
public class DataComputerInfoEntity extends Model<DataComputerInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataDangerCheckRecordEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_danger_check_record")
public class DataDangerCheckRecordEntity extends Model<DataDangerCheckRecordEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataDangerInfoEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_danger_info")
public class DataDangerInfoEntity extends Model<DataDangerInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

14
src/main/java/com/zcloud/modules/data/entity/data/DataDeviceInfoEntity.java
View File

@ -1,11 +1,14 @@
package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 设备信息表(DataDeviceInfo)表实体类
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_device_info")
public class DataDeviceInfoEntity extends Model<DataDeviceInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataDeviceRunStatusEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_device_run_status")
public class DataDeviceRunStatusEntity extends Model<DataDeviceRunStatusEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeAlarmEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_employee_alarm")
public class DataEmployeeAlarmEntity extends Model<DataEmployeeAlarmEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeGatherEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_employee_gather")
public class DataEmployeeGatherEntity extends Model<DataEmployeeGatherEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeInfoEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_employee_info")
public class DataEmployeeInfoEntity extends Model<DataEmployeeInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

14
src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeLicenseEntity.java
View File

@ -1,11 +1,14 @@
package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 人员证件信息表(DataEmployeeLicense)表实体类
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_employee_license")
public class DataEmployeeLicenseEntity extends Model<DataEmployeeLicenseEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeLocationEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataEmployeeLocationEntity extends Model<DataEmployeeLocationEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataEnterpriseAlarmEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_enterprise_alarm")
public class DataEnterpriseAlarmEntity extends Model<DataEnterpriseAlarmEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataEnterpriseAlarmRecordEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_enterprise_alarm_record")
public class DataEnterpriseAlarmRecordEntity extends Model<DataEnterpriseAlarmRecordEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataEnterpriseInfoEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_enterprise_info")
public class DataEnterpriseInfoEntity extends Model<DataEnterpriseInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataEnvironmentReceivingEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataEnvironmentReceivingEntity extends Model<DataEnvironmentReceivingEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataEquipDataReceivingEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataEquipDataReceivingEntity extends Model<DataEquipDataReceivingEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataHiddenCheckMissionEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataHiddenCheckMissionEntity extends Model<DataHiddenCheckMissionEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataHiddenDangerPlanEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataHiddenDangerPlanEntity extends Model<DataHiddenDangerPlanEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataHumidityInfoEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_humidity_info")
public class DataHumidityInfoEntity extends Model<DataHumidityInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataMaintenanceEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataMaintenanceEntity extends Model<DataMaintenanceEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataMeanwhileEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataMeanwhileEntity extends Model<DataMeanwhileEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataPerformanceOverviewEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -19,8 +21,9 @@ import java.util.Date;
@TableName("data_performance_overview")
public class DataPerformanceOverviewEntity extends Model<DataPerformanceOverviewEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataPersonCarCountEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_person_car_count")
public class DataPersonCarCountEntity extends Model<DataPersonCarCountEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataPersonRecordEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataPersonRecordEntity extends Model<DataPersonRecordEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataProductionPromiseEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataProductionPromiseEntity extends Model<DataProductionPromiseEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataPromiseTicketEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataPromiseTicketEntity extends Model<DataPromiseTicketEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataPushDataReceivingEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataPushDataReceivingEntity extends Model<DataPushDataReceivingEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

7
src/main/java/com/zcloud/modules/data/entity/data/DataPushScheduledEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataPushScheduledEntity extends Model<DataPushScheduledEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "三方平台id")
private Integer thirdPlatformId;
@ -35,7 +38,7 @@ public class DataPushScheduledEntity extends Model<DataPushScheduledEntity> {
private Integer pushStatus;
@ApiModelProperty(value = "推送数据id,推送业务数据表主键ID")
private Integer pushDataId;
private Long pushDataId;
@ApiModelProperty(value = "业务类型,枚举形式BusinessDataTypeEnum")
private String businessType;

5
src/main/java/com/zcloud/modules/data/entity/data/DataRiskControlMeasureEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataRiskControlMeasureEntity extends Model<DataRiskControlMeasureEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

2
src/main/java/com/zcloud/modules/data/entity/data/DataRiskEventsEntity.java
View File

@ -23,7 +23,7 @@ public class DataRiskEventsEntity extends Model<DataRiskEventsEntity> {
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Integer id;
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataRiskIdentificationEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataRiskIdentificationEntity extends Model<DataRiskIdentificationEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataRiskObjectEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataRiskObjectEntity extends Model<DataRiskObjectEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

2
src/main/java/com/zcloud/modules/data/entity/data/DataRiskUnitEntity.java
View File

@ -23,7 +23,7 @@ public class DataRiskUnitEntity extends Model<DataRiskUnitEntity> {
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Integer id;
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataStartStopWorkEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataStartStopWorkEntity extends Model<DataStartStopWorkEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataStoreInfoEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_store_info")
public class DataStoreInfoEntity extends Model<DataStoreInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataStoreRoomInfoEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_store_room_info")
public class DataStoreRoomInfoEntity extends Model<DataStoreRoomInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

8
src/main/java/com/zcloud/modules/data/entity/data/DataTemperatureInfoEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -18,8 +21,9 @@ import io.swagger.annotations.ApiModelProperty;
@TableName("data_temperature_info")
public class DataTemperatureInfoEntity extends Model<DataTemperatureInfoEntity> {
@ApiModelProperty(value = "主键UUID")
private Integer id;
@ApiModelProperty(value = "主键")
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "数据唯一标识UUID")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataUnitStopEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataUnitStopEntity extends Model<DataUnitStopEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkApprovalEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkApprovalEntity extends Model<DataWorkApprovalEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkBlindplateEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkBlindplateEntity extends Model<DataWorkBlindplateEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkBreakEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkBreakEntity extends Model<DataWorkBreakEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkCheckAcceptEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkCheckAcceptEntity extends Model<DataWorkCheckAcceptEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataWorkFileEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataWorkFileEntity extends Model<DataWorkFileEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkGasAnalysisEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkGasAnalysisEntity extends Model<DataWorkGasAnalysisEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkGroundBreakEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkGroundBreakEntity extends Model<DataWorkGroundBreakEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkHighEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkHighEntity extends Model<DataWorkHighEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkHoisingEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkHoisingEntity extends Model<DataWorkHoisingEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataWorkHotEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataWorkHotEntity extends Model<DataWorkHotEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataWorkInspectionEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataWorkInspectionEntity extends Model<DataWorkInspectionEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkJobEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkJobEntity extends Model<DataWorkJobEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataWorkPouringEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataWorkPouringEntity extends Model<DataWorkPouringEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkPowerEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkPowerEntity extends Model<DataWorkPowerEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkSafetyEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonProperty;
@ -21,7 +23,8 @@ import java.util.Date;
public class DataWorkSafetyEntity extends Model<DataWorkSafetyEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

5
src/main/java/com/zcloud/modules/data/entity/data/DataWorkSpaceEntity.java
View File

@ -1,6 +1,8 @@
package com.zcloud.modules.data.entity.data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
@ -20,7 +22,8 @@ import java.util.Date;
public class DataWorkSpaceEntity extends Model<DataWorkSpaceEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataWorkTankCleaningEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataWorkTankCleaningEntity extends Model<DataWorkTankCleaningEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataWorkVideoEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataWorkVideoEntity extends Model<DataWorkVideoEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataWorkWaterEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataWorkWaterEntity extends Model<DataWorkWaterEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

6
src/main/java/com/zcloud/modules/data/entity/data/DataZoneAlarmEntity.java
View File

@ -2,6 +2,9 @@ package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataZoneAlarmEntity extends Model<DataZoneAlarmEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

12
src/main/java/com/zcloud/modules/data/entity/data/DataZoneInfoEntity.java
View File

@ -1,11 +1,14 @@
package com.zcloud.modules.data.entity.data;
import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 上报区域边界数据表(DataZoneInfo)表实体类
@ -19,7 +22,8 @@ import io.swagger.annotations.ApiModelProperty;
public class DataZoneInfoEntity extends Model<DataZoneInfoEntity> {
@ApiModelProperty(value = "主键")
private Integer id;
@TableId(type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "业务数据id")
private String dataId;

4
src/main/java/com/zcloud/modules/data/service/business/BusLogInfoYearService.java
View File

@ -27,14 +27,14 @@ public interface BusLogInfoYearService extends IService<BusLogInfoYearEntity> {
* @param businessType
* @return
*/
List<BusLogInfoYearEntity> getLogInfo(Integer dataId, String businessType);
List<BusLogInfoYearEntity> getLogInfo(Long dataId, String businessType);
/**
* 获取第一个日志信息
* @param dataId
* @param businessType
* @return
*/
BusLogInfoYearEntity getFirstLogInfo(Integer dataId, String businessType);
BusLogInfoYearEntity getFirstLogInfo(Long dataId, String businessType);
}

4
src/main/java/com/zcloud/modules/data/service/business/impl/BusLogInfoYearServiceImpl.java
View File

@ -39,7 +39,7 @@ public class BusLogInfoYearServiceImpl extends ServiceImpl<BusLogInfoYearDao, Bu
}
@Override
public List<BusLogInfoYearEntity> getLogInfo(Integer dataId, String businessType) {
public List<BusLogInfoYearEntity> getLogInfo(Long dataId, String businessType) {
// 添加分页限制，只查询最新10条
Page<BusLogInfoYearEntity> page = new Page<>(1, 10);
LambdaQueryWrapper<BusLogInfoYearEntity> queryWrapper = new LambdaQueryWrapper<>();
@ -53,7 +53,7 @@ public class BusLogInfoYearServiceImpl extends ServiceImpl<BusLogInfoYearDao, Bu
}
@Override
public BusLogInfoYearEntity getFirstLogInfo(Integer dataId, String businessType) {
public BusLogInfoYearEntity getFirstLogInfo(Long dataId, String businessType) {
LambdaQueryWrapper<BusLogInfoYearEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BusLogInfoYearEntity::getDataId, dataId)
.eq(BusLogInfoYearEntity::getBusinessType, businessType)

2
src/main/java/com/zcloud/modules/data/service/business/impl/DataPushServiceImpl.java
View File

@ -340,7 +340,7 @@ public class DataPushServiceImpl extends AbstractDataPushService {
//循环分页获取
int pageNum = 1;
int pageSize = 50;
Integer lastId = null; // 游标，记录上一次查询的最后一条记录的 id
Long lastId = null; // 游标，记录上一次查询的最后一条记录的 id
List<DataPushScheduledEntity> records;
do {
// 调用分页方法获取数据

4
src/main/java/com/zcloud/modules/data/service/data/BusDataService.java
View File

@ -34,13 +34,13 @@ public interface BusDataService {
* @param scheduleId
* @return
*/
R recordScheduledPush(Integer scheduleId);
R recordScheduledPush(Long scheduleId);
/**
* 数据手动重推
* @param logId
* @return
*/
R recordLogPush(Integer logId);
R recordLogPush(Long logId);
}

4
src/main/java/com/zcloud/modules/data/service/data/DataAramService.java
View File

@ -37,8 +37,8 @@ public interface DataAramService extends IService<DataAramEntity> {
* @param dataId
* @return
*/
DataAramEntity getAramInfo(String businessType, Integer dataId);
DataAramEntity getAramInfo(Integer id);
DataAramEntity getAramInfo(String businessType, Long dataId);
DataAramEntity getAramInfo(Long id);
/**
* 告警取消消息重试

6
src/main/java/com/zcloud/modules/data/service/data/DataPushScheduledService.java
View File

@ -14,11 +14,11 @@ import java.util.Date;
*/
public interface DataPushScheduledService extends IService<DataPushScheduledEntity> {
void saveScheduledData(String businessType, Integer id, String dataId, Integer thirdPlatformId, Object dto, Integer companyId, Object companyCode, Integer frequency, Integer servicePlatformId);
void saveScheduledData(String businessType, Long id, String dataId, Integer thirdPlatformId, Object dto, Integer companyId, Object companyCode, Integer frequency, Integer servicePlatformId);
Page<DataPushScheduledEntity> getPushDataList(Integer frequency, Date startTime, Date endTime, int pageNum, int pageSize, Integer lastId,Integer thirdPlatformId);
Page<DataPushScheduledEntity> getPushDataList(Integer frequency, Date startTime, Date endTime, int pageNum, int pageSize, Long lastId,Integer thirdPlatformId);
DataPushScheduledEntity getScheduledInfo(String businessType, Integer dataId,Integer pushStatus);
DataPushScheduledEntity getScheduledInfo(String businessType, Long dataId,Integer pushStatus);
}

4
src/main/java/com/zcloud/modules/data/service/data/impl/BusDataServiceImpl.java
View File

@ -437,7 +437,7 @@ public class BusDataServiceImpl implements BusDataService {
}
@Override
public R recordScheduledPush(Integer scheduleId) {
public R recordScheduledPush(Long scheduleId) {
DataPushScheduledEntity pushScheduled = dataPushScheduledService.getById(scheduleId);
if(pushScheduled == null){
throw new ZException("定时任务不存在");
@ -456,7 +456,7 @@ public class BusDataServiceImpl implements BusDataService {
}
@Override
public R recordLogPush(Integer logId) {
public R recordLogPush(Long logId) {
BusLogInfoYearEntity logInfo = logInfoYearService.getById(logId);
Map<String, Object> dataInfo = busDataDao.getDataInfo(logInfo.getDataId(), logInfo.getBusinessType());
//判断状态

4
src/main/java/com/zcloud/modules/data/service/data/impl/DataAramServiceImpl.java
View File

@ -212,7 +212,7 @@ public class DataAramServiceImpl extends ServiceImpl<DataAramDao, DataAramEntity
}
@Override
public DataAramEntity getAramInfo(String businessType, Integer dataId) {
public DataAramEntity getAramInfo(String businessType, Long dataId) {
LambdaQueryWrapper<DataAramEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DataAramEntity::getBusinessType, businessType);
queryWrapper.eq(DataAramEntity::getDataId, dataId);
@ -222,7 +222,7 @@ public class DataAramServiceImpl extends ServiceImpl<DataAramDao, DataAramEntity
@Override
public DataAramEntity getAramInfo(Integer id) {
public DataAramEntity getAramInfo(Long id) {
DataAramEntity dataAramEntity = getById(id);
if (dataAramEntity != null) {
dataAramEntity.setBusinessName(BusinessDataTypeEnum.getByTableName(dataAramEntity.getBusinessType()).getDesc());

6
src/main/java/com/zcloud/modules/data/service/data/impl/DataPushScheduledServiceImpl.java
View File

@ -27,7 +27,7 @@ public class DataPushScheduledServiceImpl extends ServiceImpl<DataPushScheduledD
@Override
public void saveScheduledData(String businessType, Integer pushDataId, String dataId, Integer thirdPlatformId, Object dto, Integer companyId, Object companyCode, Integer frequency, Integer servicePlatformId) {
public void saveScheduledData(String businessType, Long pushDataId, String dataId, Integer thirdPlatformId, Object dto, Integer companyId, Object companyCode, Integer frequency, Integer servicePlatformId) {
try {
DataPushScheduledEntity info = getScheduledInfo(businessType, pushDataId, DataPushStatusEnum.SCHEDULED.getCode());
if (info != null) {
@ -55,7 +55,7 @@ public class DataPushScheduledServiceImpl extends ServiceImpl<DataPushScheduledD
@Override
public Page<DataPushScheduledEntity> getPushDataList(Integer frequency, Date startTime, Date endTime, int pageNum, int pageSize, Integer lastId,Integer thirdPlatformId) {
public Page<DataPushScheduledEntity> getPushDataList(Integer frequency, Date startTime, Date endTime, int pageNum, int pageSize, Long lastId,Integer thirdPlatformId) {
if (thirdPlatformId == null) {
return new Page<>();
}
@ -79,7 +79,7 @@ public class DataPushScheduledServiceImpl extends ServiceImpl<DataPushScheduledD
}
@Override
public DataPushScheduledEntity getScheduledInfo(String businessType, Integer dataId,Integer pushStatus) {
public DataPushScheduledEntity getScheduledInfo(String businessType, Long dataId,Integer pushStatus) {
LambdaQueryWrapper<DataPushScheduledEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DataPushScheduledEntity::getBusinessType, businessType)
.eq(DataPushScheduledEntity::getPushDataId, dataId)

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/DjExchangeDataServiceImpl.java
View File

@ -668,7 +668,7 @@ public class DjExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
@ -693,7 +693,7 @@ public class DjExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.saveOrUpdate(busLogInfoYearEntity);
@ -707,7 +707,7 @@ public class DjExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/DsExchangeDataServiceImpl.java
View File

@ -757,7 +757,7 @@ public class DsExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
@ -782,7 +782,7 @@ public class DsExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.saveOrUpdate(busLogInfoYearEntity);
@ -796,7 +796,7 @@ public class DsExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/HbV13ExchangeDataServiceImpl.java
View File

@ -584,7 +584,7 @@ public class HbV13ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -609,7 +609,7 @@ public class HbV13ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -623,7 +623,7 @@ public class HbV13ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/HbV1ExchangeDataServiceImpl.java
View File

@ -758,7 +758,7 @@ public class HbV1ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -783,7 +783,7 @@ public class HbV1ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -797,7 +797,7 @@ public class HbV1ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/NmgExchangeDataServiceImpl.java
View File

@ -729,7 +729,7 @@ public class NmgExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -753,7 +753,7 @@ public class NmgExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -768,7 +768,7 @@ public class NmgExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/NmgV0ExchangeDataServiceImpl.java
View File

@ -602,7 +602,7 @@ public class NmgV0ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -626,7 +626,7 @@ public class NmgV0ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.save(busLogInfoYearEntity);
@ -641,7 +641,7 @@ public class NmgV0ExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/PjExchangeDataServiceImpl.java
View File

@ -628,7 +628,7 @@ public class PjExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
@ -653,7 +653,7 @@ public class PjExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.saveOrUpdate(busLogInfoYearEntity);
@ -667,7 +667,7 @@ public class PjExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/TyExchangeDataServiceImpl.java
View File

@ -766,7 +766,7 @@ public class TyExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
@ -792,7 +792,7 @@ public class TyExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.saveOrUpdate(busLogInfoYearEntity);
@ -806,7 +806,7 @@ public class TyExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(dataService, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

6
src/main/java/com/zcloud/modules/data/thirdservice/data/impl/YhExchangeDataServiceImpl.java
View File

@ -640,7 +640,7 @@ public class YhExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
@ -665,7 +665,7 @@ public class YhExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
busLogInfoYearService.saveOrUpdate(busLogInfoYearEntity);
@ -679,7 +679,7 @@ public class YhExchangeDataServiceImpl implements ExchangeDataCommonService {
saveMethod.invoke(service, entity);
//记录日志中id
Integer id = (Integer) getEntityMethodValue(entity, entityClass, "getId");
Long id = (Long) getEntityMethodValue(entity, entityClass, "getId");
busLogInfoYearEntity.setDataId(id);
// 组装业务数据

4
src/main/resources/mapper/corp/BusDataDao.xml
View File

@ -141,9 +141,9 @@
e.company_id,
c.company_name,
e.push_status,
e.push_time,
DATE_FORMAT(e.push_time, '%Y-%m-%d %H:%i:%s') as push_time,
e.receive_status,
e.receive_time,
DATE_FORMAT(e.receive_time, '%Y-%m-%d %H:%i:%s') as receive_time,
e.business_type
<if test="req.keyList != null and req.keyList.size() > 0">
,