运管开发

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJbxxController.java

@@ -172,7 +172,7 @@ public class BsSgcDfJbxxController extends BaseController
     @ApiOperation("堤防基本信息新增")
     public AjaxResult add(@RequestBody BsSgcDfJbxx bsSgcDfJbxx)
     {
-        String embankmentCode = bsSgcDfJbxx.getEmbankmentCode();
+        String embankmentCode = bsSgcDfJbxx.getDikeCode();
 
         QueryWrapper<BsSgcDfJbxx> queryWrapper = new QueryWrapper<>();
 

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJbxx.java

@@ -28,7 +28,7 @@ public class BsSgcDfJbxx extends BaseEntity
     /** 堤防名称 */
     @Excel(name = "堤防名称")
     @ApiModelProperty("堤防名称")
-    private String embankmentName;
+    private String dikeName;
 
     /** 起点行政区划 */
     @Excel(name = "起点行政区划")
@@ -38,7 +38,7 @@ public class BsSgcDfJbxx extends BaseEntity
     /** 堤防编码 */
     @Excel(name = "堤防编码")
     @ApiModelProperty("堤防编码")
-    private String embankmentCode;
+    private String dikeCode;
 
     /** 标绘堤防 */
     @Excel(name = "标绘堤防")
@@ -53,17 +53,17 @@ public class BsSgcDfJbxx extends BaseEntity
     /** 起点桩号 */
     @Excel(name = "起点桩号")
     @ApiModelProperty("起点桩号")
-    private String startingStationNumber;
+    private String dikeStartNum;
 
     /** 终点桩号 */
     @Excel(name = "终点桩号")
     @ApiModelProperty("终点桩号")
-    private String endStationNumber;
+    private String dikeEndNum;
 
     /** 堤防类型 */
     @Excel(name = "堤防类型")
     @ApiModelProperty("堤防类型")
-    private String embankmentType;
+    private String dikeType;
 
     /** 是否为蓄滞洪区堤防 */
     @Excel(name = "是否为蓄滞洪区堤防")
@@ -103,13 +103,13 @@ public class BsSgcDfJbxx extends BaseEntity
     /** 堤防型式 */
     @Excel(name = "堤防型式")
     @ApiModelProperty("堤防型式")
-    private String embankmentTyper;
+    private String dikePatt;
 
     /** 建成时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "建成时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("建成时间")
-    private Date completionTime;
+    private Date compDate;
 
     /** 最近达标加固完工状态 */
     @Excel(name = "最近达标加固完工状态")
@@ -125,12 +125,12 @@ public class BsSgcDfJbxx extends BaseEntity
     /** 工程任务 */
     @Excel(name = "工程任务")
     @ApiModelProperty("工程任务")
-    private String engineeringTasks;
+    private String engTask;
 
     /** 堤防级别 */
     @Excel(name = "堤防级别")
     @ApiModelProperty("堤防级别")
-    private String embankmentLevel;
+    private String dikeGrad;
 
     /** 设计防洪（潮）标准[重现期（年）] */
     @Excel(name = "设计防洪", readConverterExp = "潮=")
@@ -140,7 +140,7 @@ public class BsSgcDfJbxx extends BaseEntity
     /** 堤防长度(m) */
     @Excel(name = "堤防长度(m)")
     @ApiModelProperty("堤防长度(m)")
-    private String embankmentLength;
+    private String dikeLen;
 
     /** 规划防洪（潮）标准[重现期（年）] */
     @Excel(name = "规划防洪", readConverterExp = "潮=")

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfJbxxService.java

@@ -33,12 +33,12 @@ public class BsSgcDfJbxxService extends BaseService<BsSgcDfJbxxMapper, BsSgcDfJb
         BsSgcDfJbxx projectInfo = sp.getData();
 
         if (projectInfo != null) {
-            String projectName = projectInfo.getEmbankmentName();
-            String projectType = projectInfo.getEmbankmentType();
+            String projectName = projectInfo.getDikeName();
+            String projectType = projectInfo.getDikeType();
 
             queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
-            queryWrapper.like(projectName != null, "embankment_name", projectName);
-            queryWrapper.like(projectType != null, "embankment_type", projectType);
+            queryWrapper.like(projectName != null, "dike_name", projectName);
+            queryWrapper.like(projectType != null, "dike_type", projectType);
             queryWrapper.likeRight(adcd != null, "ADCD", adcd);
             queryWrapper.isNull("record_lose_efficacy_time");
         }

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcdaController.java

@@ -171,7 +171,7 @@ public class BsSgcSzGcdaController extends BaseController
     @ApiOperation("水闸工程基础信息新增")
     public AjaxResult add(@RequestBody BsSgcSzGcda bsSgcSzGcda)
     {
-        String sluiceCode = bsSgcSzGcda.getSluiceCode();
+        String sluiceCode = bsSgcSzGcda.getWagaCode();
 
         QueryWrapper<BsSgcSzGcda> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("sluice_code", sluiceCode);

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcda.java

@@ -28,7 +28,7 @@ public class BsSgcSzGcda extends BaseEntity
     /** 水闸名称 */
     @Excel(name = "水闸名称")
     @ApiModelProperty("水闸名称")
-    private String sluiceName;
+    private String wagaName;
 
     /** 行政区划 */
     @Excel(name = "行政区划")
@@ -38,12 +38,12 @@ public class BsSgcSzGcda extends BaseEntity
     /** 水闸编码 */
     @Excel(name = "水闸编码")
     @ApiModelProperty("水闸编码")
-    private String sluiceCode;
+    private String wagaCode;
 
     /** 所在位置 */
     @Excel(name = "所在位置")
     @ApiModelProperty("所在位置")
-    private String location;
+    private String wagaLoc;
 
     /** 标绘水闸 */
     @Excel(name = "标绘水闸")
@@ -78,7 +78,7 @@ public class BsSgcSzGcda extends BaseEntity
     /** 水闸类型 */
     @Excel(name = "水闸类型")
     @ApiModelProperty("水闸类型")
-    private String sluiceType;
+    private String wagaType;
 
     /** 设计过闸流量（m³/s） */
     @Excel(name = "设计过闸流量", readConverterExp = "m=³/s")
@@ -93,12 +93,12 @@ public class BsSgcSzGcda extends BaseEntity
     /** 工程规模 */
     @Excel(name = "工程规模")
     @ApiModelProperty("工程规模")
-    private String projectScale;
+    private String engScal;
 
     /** 建筑物级别 */
     @Excel(name = "建筑物级别")
     @ApiModelProperty("建筑物级别")
-    private String buildingLevel;
+    private String mainBuildGrad;
 
     /** 设计标准[重现期（年）] */
     @Excel(name = "设计标准[重现期", readConverterExp = "年=")
@@ -129,17 +129,17 @@ public class BsSgcSzGcda extends BaseEntity
     /** 闸孔数量 */
     @Excel(name = "闸孔数量")
     @ApiModelProperty("闸孔数量")
-    private String gateHolesNumber;
+    private String gaorNum;
 
     /** 闸孔总净宽(m) */
     @Excel(name = "闸孔总净宽(m)")
     @ApiModelProperty("闸孔总净宽(m)")
-    private String gateHoleWidth;
+    private String gaorTotNetWid;
 
     /** 闸门型式 */
     @Excel(name = "闸门型式")
     @ApiModelProperty("闸门型式")
-    private String gateType;
+    private String gtst;
 
     /** 启闭机数量 */
     @Excel(name = "启闭机数量")
@@ -164,7 +164,7 @@ public class BsSgcSzGcda extends BaseEntity
     /** 消能方式 */
     @Excel(name = "消能方式")
     @ApiModelProperty("消能方式")
-    private String energyDissipationMethod;
+    private String endsst;
 
     /** 自动化控制 */
     @Excel(name = "自动化控制")

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzGcdaService.java

@@ -31,13 +31,13 @@ public class BsSgcSzGcdaService extends BaseService<BsSgcSzGcdaMapper, BsSgcSzGc
         BsSgcSzGcda projectInfo = sp.getData();
 
         if (projectInfo != null) {
-            String projectName = projectInfo.getSluiceName();
-            String projectType = projectInfo.getSluiceType();
+            String projectName = projectInfo.getWagaName();
+            String projectType = projectInfo.getWagaType();
 
             queryWrapper.isNull("record_lose_efficacy_time");
             queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
-            queryWrapper.like(projectName != null, "sluice_name", projectName);
-            queryWrapper.like(projectType != null, "sluice_type", projectType);
+            queryWrapper.like(projectName != null, "waga_name", projectName);
+            queryWrapper.like(projectType != null, "waga_type", projectType);
             queryWrapper.likeRight(adcd != null, "ADCD", adcd);
 
         }