diff --git a/cloud-property-common/src/main/java/com/muyu/common/domain/ProductData.java b/cloud-property-common/src/main/java/com/muyu/common/domain/ProductData.java index cf682e9..a7a2a56 100644 --- a/cloud-property-common/src/main/java/com/muyu/common/domain/ProductData.java +++ b/cloud-property-common/src/main/java/com/muyu/common/domain/ProductData.java @@ -30,7 +30,7 @@ public class ProductData extends BaseEntity { * 主键/编号 */ @TableId(value = "id",type = IdType.AUTO) - private Integer id; + private Integer pid; /** * 姓名 @@ -72,5 +72,10 @@ public class ProductData extends BaseEntity { */ private String credit; + /** + * 编号 + */ + private String id; + } diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataSourceServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataSourceServiceImpl.java index 277b46d..cc99d25 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataSourceServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataSourceServiceImpl.java @@ -75,9 +75,9 @@ public class DataSourceServiceImpl while (rs.next()) { - int id = 0; - if (substring.contains("id")){ - id = rs.getInt("id"); + int pid = 0; + if (substring.contains("pid")){ + pid = rs.getInt("pid"); } String name = (rs.getString("COLUMN_NAME")); String gender = (rs.getString("gender")); @@ -87,10 +87,11 @@ public class DataSourceServiceImpl String idCard = (rs.getString("idCard")); String email = (rs.getString("email")); String credit = (rs.getString("credit")); - ProductData productData = new ProductData( - id,name,gender,birthday,address,mibile,idCard,email,credit + String id = (rs.getString("id")); + ProductData productDatas = new ProductData( + pid,name,gender,birthday,address,mibile,idCard,email,credit,id ); - productData.add(productData); + productData.add(productDatas); } if (!rs.next()){ break;