消防水源接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/WaterResourceCraneDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceCraneDto", description="")
+@ApiModel(value="WaterResourceCraneDto", description="消防水鹤")
 public class WaterResourceCraneDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/WaterResourceDto.java

@@ -7,25 +7,22 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
+ * @author system_generator
+ * @date 2021-06-29
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceDto", description="")
+@ApiModel(value = "WaterResourceDto", description = "水资源")
 public class WaterResourceDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
 
-
     @ApiModelProperty(value = "资源名称")
     private String name;
-
     @ApiModelProperty(value = "地址")
     private String address;
 
@@ -33,7 +30,10 @@ public class WaterResourceDto  extends BaseDto {
     private String latLang;
 
     @ApiModelProperty(value = "资源类型（消火栓、消防水鹤、天然水源、消防水池）")
-    private String type;
+    private String resourceType;
+
+    @ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
+    private String resourceTypeName;
 
     @ApiModelProperty(value = "所在建筑id")
     private Long belongBuildingId;
@@ -65,6 +65,12 @@ public class WaterResourceDto  extends BaseDto {
     @ApiModelProperty(value = "启用日期")
     private Date enableDate;
 
+    @ApiModelProperty(value = "方位图集合")
+    private List<Object> orientationImgList;
+
+    @ApiModelProperty(value = "实景图集合")
+    private List<Object> realityImgList;
+
     @ApiModelProperty(value = "方位图")
     private String orientationImg;
 
@@ -92,4 +98,123 @@ public class WaterResourceDto  extends BaseDto {
     @ApiModelProperty(value = "组织机构代码")
     private String orgCode;
 
+    @ApiModelProperty(value = "资源id")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "高度（cm）")
+    private Float height;
+
+    @ApiModelProperty(value = "水源可用状态类别代码")
+    private String statusCode;
+
+    @ApiModelProperty(value = "水源可用状态类别名称")
+    private String status;
+
+    @ApiModelProperty(value = "所属路段")
+    private String section;
+
+    @ApiModelProperty(value = "所属管网")
+    private String pipeNetwork;
+
+    @ApiModelProperty(value = "消防给水管网形式类型代码")
+    private String pipeTypeCode;
+
+    @ApiModelProperty(value = "消防给水管网形式类型名称")
+    private String pipeTypeName;
+
+    @ApiModelProperty(value = "管网直径（cm）")
+    private Float pipeDiameter;
+
+    @ApiModelProperty(value = "进水管直径(cm)")
+    private Float inletPipeDiameter;
+
+    @ApiModelProperty(value = "出水管直径(cm)")
+    private Float outletPipeDiameter;
+
+    @ApiModelProperty(value = "加水车道数量(个)")
+    private Integer waterfillingLaneNum;
+
+    @ApiModelProperty(value = "供水单位名称")
+    private String waterSupplyName;
+
+    @ApiModelProperty(value = "消火栓系统类型")
+    private String systemType;
+
+    @ApiModelProperty(value = "消火栓系统类型code")
+    private String systemTypeCode;
+
+    @ApiModelProperty(value = "消防设施状况分类")
+    private String facilitiesCategory;
+
+    @ApiModelProperty(value = "消防设施状况分类code")
+    private String facilitiesCategoryCode;
+
+    @ApiModelProperty(value = "道路路口路段简要情况")
+    private String roadJunctionInfo;
+
+    @ApiModelProperty(value = "消火栓放置形式")
+    private String placeForm;
+
+    @ApiModelProperty(value = "消火栓放置形式code")
+    private String placeFormCode;
+
+    @ApiModelProperty(value = "消防水带接口")
+    private String hoseConnection;
+
+    @ApiModelProperty(value = "消防水带接口code")
+    private String hoseConnectionCode;
+
+    @ApiModelProperty(value = "取水方式")
+    private String intakeForm;
+
+    @ApiModelProperty(value = "水源类型代码")
+    private String typeCode;
+
+    @ApiModelProperty(value = "水源类型")
+    private String type;
+
+    @ApiModelProperty(value = "容积（m³）")
+    private Float volume;
+
+    @ApiModelProperty(value = "面积（㎡）")
+    private Float area;
+
+    @ApiModelProperty(value = "水质情况")
+    private String qualitySituationInfo;
+
+    @ApiModelProperty(value = "四季变化简要情况")
+    private String seasonChangeInfo;
+
+    @ApiModelProperty(value = "有无枯水期")
+    private Boolean hasDrySeason;
+
+    @ApiModelProperty(value = "枯水期跨度简要情况")
+    private String dryPeriodSpan;
+
+    @ApiModelProperty(value = "取水高度(cm)")
+    private Float intakeHeight;
+
+    @ApiModelProperty(value = "水源标高差(cm)")
+    private Float elevationDifference;
+
+    @ApiModelProperty(value = "停车位置")
+    private String parkingPosition;
+
+    @ApiModelProperty(value = "停车数量(个)")
+    private Integer parkingNum;
+
+    @ApiModelProperty(value = "储水量容积物联编码")
+    private String iotWaterStorage;
+
+    @ApiModelProperty(value = "流量物联编码")
+    private String iotFlowRate;
+
+    @ApiModelProperty(value = "状态物联编码")
+    private String iotStatus;
+
+    @ApiModelProperty(value = "管网压力物联编码")
+    private String iotPipePressure;
+
+    @ApiModelProperty(value = "物联参数")
+    private WaterResourceIotDto waterResourceIotDto;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/WaterResourceHydrantDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceHydrantDto", description="")
+@ApiModel(value="WaterResourceHydrantDto", description="消火栓")
 public class WaterResourceHydrantDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/WaterResourceIotDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceIotDto", description="")
+@ApiModel(value="WaterResourceIotDto", description="物联参数")
 public class WaterResourceIotDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
@@ -21,7 +21,7 @@ public class WaterResourceIotDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "主键id")
-    private Long sequencNbr;
+    private Long sequenceNbr;
 
     @ApiModelProperty(value = "资源类型")
     private String resourceType;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/WaterResourceNaturalDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceNaturalDto", description="")
+@ApiModel(value="WaterResourceNaturalDto", description="天然水源")
 public class WaterResourceNaturalDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/WaterResourcePoolDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourcePoolDto", description="")
+@ApiModel(value="WaterResourcePoolDto", description="消防水池")
 public class WaterResourcePoolDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/WaterResource.java

@@ -42,8 +42,13 @@ public class WaterResource extends BaseEntity {
     /**
 	  * 资源类型（消火栓、消防水鹤、天然水源、消防水池）
      */
-	@TableField("type")
-    private String type;
+	@TableField("resource_type")
+    private String resourceType;
+    /**
+     * 资源类型名称（消火栓、消防水鹤、天然水源、消防水池）
+     */
+    @TableField("resource_type_name")
+    private String resourceTypeName;
     /**
 	  * 所在建筑id
      */
@@ -139,4 +144,9 @@ public class WaterResource extends BaseEntity {
      */
 	@TableField("org_code")
     private String orgCode;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/WaterResourceCrane.java

@@ -91,4 +91,9 @@ public class WaterResourceCrane extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/WaterResourceHydrant.java

@@ -116,4 +116,9 @@ public class WaterResourceHydrant extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/WaterResourceIot.java

@@ -22,11 +22,6 @@ public class WaterResourceIot extends BaseEntity {
 
 
     /**
-	  * 主键id
-     */
-	@TableField("sequenc_nbr")
-    private Long sequencNbr;
-    /**
 	  * 资源类型
      */
 	@TableField("resource_type")
@@ -61,4 +56,9 @@ public class WaterResourceIot extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/WaterResourceNatural.java

@@ -86,4 +86,9 @@ public class WaterResourceNatural extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/WaterResourcePool.java

@@ -91,4 +91,9 @@ public class WaterResourcePool extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/WaterResourceTypeEnum.java

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum WaterResourceTypeEnum {
+    消火栓("hydrant", "消火栓"),
+    消防水鹤("crane", "消防水鹤"),
+    消防水池("pool", "消防水池"),
+    天然水源("natural", "天然水源");
+
+    private String code;
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/pom.xml

@@ -15,6 +15,12 @@
 			<artifactId>amos-boot-module-jcs-api</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
+      <dependency>
+          <groupId>net.sf.json-lib</groupId>
+          <artifactId>json-lib</artifactId>
+          <version>2.4</version>
+          <classifier>jdk15</classifier>
+      </dependency>
   </dependencies>
 
 </project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WaterResourceServiceImpl.java

@@ -4,29 +4,36 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResource;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceService;
 import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceDto;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import java.util.List;
+
 /**
-* 服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
 @Service
-public class WaterResourceServiceImpl extends BaseService<WaterResourceDto,WaterResource,WaterResourceMapper> implements IWaterResourceService {
+public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, WaterResource, WaterResourceMapper> implements IWaterResourceService {
     /**
      * 分页查询
      */
-        public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page)   {
-                return this.queryForPage(page, null, false);
+    public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page,
+                                                            @Condition(Operator.like) String name,
+                                                            @Condition(Operator.eq) String resourceType,
+                                                            @Condition(Operator.eq) Boolean isDelete) {
+        return this.queryForPage(page, null, false, name, resourceType, isDelete);
     }
 
     /**
      * 列表查询 示例
      */
-        public List<WaterResourceDto> queryForWaterResourceList()   {
-                return this.queryForList("" , false);
+    public List<WaterResourceDto> queryForWaterResourceList(@Condition(Operator.eq) Boolean isDelete) {
+        return this.queryForList("", false, isDelete);
     }
 }