diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java
index 3c7444d..5db68b5 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java
@@ -37,6 +37,10 @@ public class Lines implements Serializable {
private Date updateTime;
+ private Integer photoCount;
+
+ private String photoRate;
+
@ApiModelProperty(value = "电压等级名称", example = "123456")
private String dyLevelName;
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineAndGtAndChannelListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineAndGtAndChannelListModel.java
index ad35957..8e2055a 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineAndGtAndChannelListModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineAndGtAndChannelListModel.java
@@ -28,5 +28,9 @@ public class LineAndGtAndChannelListModel implements Serializable {
@ApiModelProperty(value = "别名", example = "AAAA")
private String alias;
+ private Integer photoCount;
+
+ private String photoRate;
+
}
}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java
index e5ee2fb..d1e36a0 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java
@@ -28,6 +28,10 @@ public class LineVo {
@ApiModelProperty(value = "电压等级编号", example = "型号型号")
@NotBlank(message = "电压编号不能缺少")
private Integer dyLevelId;
+
+ private Integer photoCount;
+
+ private String photoRate;
}
}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java
index 70cb40f..57e4c37 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java
@@ -25,4 +25,8 @@ public class UpdateLineVo {
@NotNull(message = "电压编号不能缺少")
private Integer dyLevelId;
+ private Integer photoCount;
+
+ private String photoRate;
+
}
diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml
index c064cbd..f638475 100644
--- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml
@@ -9,6 +9,8 @@
+
+
@@ -101,16 +103,16 @@
- id, name, bs_manufacturer, dy_level_id, status, create_time, update_time
+ id, name, bs_manufacturer, dy_level_id, status, create_time, update_time, photo_count, photo_rate
insert into `lines`
- (name,bs_manufacturer,dy_level_id,status,create_time,update_time)
+ (name,bs_manufacturer,dy_level_id,status,create_time,update_time, photo_count, photo_rate)
VALUES
- (#{item.name},#{item.bsManufacturer},#{item.dyLevelId},#{status},#{createat},#{updateat})
+ (#{item.name},#{item.bsManufacturer},#{item.dyLevelId},#{status},#{createat},#{updateat},#{item.photoCount},#{item.photoRate})
@@ -293,6 +295,12 @@
update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+ photo_count = #{photoCount,jdbcType=INTEGER},
+
+
+ photo_rate = #{photoRate,jdbcType=INTEGER},
+
where id = #{id,jdbcType=INTEGER}
@@ -304,7 +312,9 @@
dy_level_id = #{dyLevelId,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
- update_time = #{updateTime,jdbcType=TIMESTAMP}
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+ photo_count = #{photoCount,jdbcType=INTEGER},
+ photo_rate = #{photoRate,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java
index 4c6a1e6..648baa5 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java
@@ -213,6 +213,8 @@ public class LineServiceImpl implements LineService {
lines.setBsManufacturer(vo.getBsManufacturer());
lines.setDyLevelId(vo.getDyLevelId());
lines.setUpdateTime(new Date());
+ lines.setPhotoCount(vo.getPhotoCount());
+ lines.setPhotoRate(vo.getPhotoRate());
int i = linesDao.updateByPrimaryKeySelective(lines);
if (i != 0) {
cacheService.updateLineMap();