Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MenuFrom.java

+package com.yeejoin.amos.boot.biz.common.utils;
+
+import java.util.List;
+
+public class MenuFrom {
+	    public String id; 
+	    public String key; 
+	    public String value;  
+	    public String title;  
+	    public String label;
+	    public String name;
+	    public String parentId;
+	    public Boolean isLeaf=true;
+	    public List<MenuFrom> children;
+		public String getKey() {
+			return key;
+		}
+		public void setKey(String key) {
+			this.key = key;
+		}
+		public String getTitle() {
+			return title;
+		}
+		public void setTitle(String title) {
+			this.title = title;
+		}
+		public String getLabel() {
+			return label;
+		}
+		public void setLabel(String label) {
+			this.label = label;
+		}
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+		public String getParentId() {
+			return parentId;
+		}
+		public void setParentId(String parentId) {
+			this.parentId = parentId;
+		}
+		public Boolean getIsLeaf() {
+			return isLeaf;
+		}
+		public void setIsLeaf(Boolean isLeaf) {
+			this.isLeaf = isLeaf;
+		}
+		public List<MenuFrom> getChildren() {
+			return children;
+		}
+		public void setChildren(List<MenuFrom> children) {
+			this.children = children;
+		}
+		public MenuFrom(String id,String value,String key, String title, String label, String name, String parentId) {
+			super();
+			this.id = id;
+			this.value = value;
+			this.key = key;
+			this.title = title;
+			this.label = label;
+			this.name = name;
+			this.parentId = parentId;			
+		}
+		public MenuFrom() {
+			super();
+		}
+	    
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -11,7 +11,9 @@ public class RedisKey {
     //根据动态表单code获取动态表单列表
     public static final String FORM_CODE = "form_code_";
     //根据字典code获取数据字典列表
-    public static final String DATA_DICTIONARY_CODE= "data_dictionary_code_";
+    public static final String DATA_DICTIONARY_CODE= "data_dictionary_code_";    
+    //根据字典code获取数据字典列表
+    public static final String DATA_DICTIONARY_CODE_XIN= "data_dictionary_code_xin_";
     //根据id获取消防人员基本信息
     public static final String FIREFIGHTERS_ID="firefighters_id_";
     //根据id获取消防人员列表基本信息

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/TreeParser.java

@@ -128,4 +128,141 @@ public class TreeParser{
           
         return childList;  
     } 
+    
+    
+    
+    
+    
+    /**
+	 * @param topId  父id
+	 * @param entityList  数据集合
+	 * @param packageURL 集合对象包名+类名
+	 * @param IDMethodName  集合对象获取树id 方法名
+	 * @param IDHierarchy  集合对象获取树id 来源于自己 还是父级(  1自己，2 父级 ，3 父级的父级)
+	 * @param NAMEMethodName 集合对象获取树name 方法名
+	 * @param PARENTIDMethodName 集合对象获取树父id 方法名
+	 * @return java.util.List<com.yeejoin.amos.boot.module.jcs.api.vo.Menu>
+	 * <PRE>
+	 * author tw
+	 * date 2021/6/10
+	 * </PRE>
+	 */
+	@SuppressWarnings("unchecked")
+	public static List<MenuFrom> getTreexin(String topId, @SuppressWarnings("rawtypes") Collection entityList,String packageURL,String IDMethodName,int IDHierarchy, String NAMEMethodName,String PARENTIDMethodName ) throws Exception{
+        List<MenuFrom> resultList=new ArrayList<>();
+        @SuppressWarnings("rawtypes")
+		Class clazz=  Class.forName(packageURL);
+        Method IDMethodNameme = null;
+        switch (IDHierarchy) { case 1:
+			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+			break;
+        case 2:
+        	IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
+			break;
+        case 3:
+        	IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
+	        break;
+		default:
+			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+			break;
+		}
+    	
+     	Method NAMEMethodNameme =     clazz.getDeclaredMethod(NAMEMethodName);
+     	Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
+        //获取顶层元素集合  
+     	String parentId; 
+        for (Object ob : entityList) {  
+       
+        	Object entity = clazz.cast(ob);         	
+        	
+        	   parentId=PARENTIDMethodNameme.invoke(entity)!=null? String.valueOf(PARENTIDMethodNameme.invoke(entity)):null;	
+        	      
+            if(parentId==null||parentId.equals(topId)){  
+            	MenuFrom menu=new MenuFrom(String.valueOf(IDMethodNameme.invoke(entity)),String.valueOf(IDMethodNameme.invoke(entity)),String.valueOf(IDMethodNameme.invoke(entity)), String.valueOf(NAMEMethodNameme.invoke(entity)),String.valueOf(NAMEMethodNameme.invoke(entity)), String.valueOf(NAMEMethodNameme.invoke(entity)),parentId);
+                resultList.add(menu);  
+            }  
+        }           
+        //获取每个顶层元素的子数据集合  
+        for (MenuFrom entity : resultList) {  
+        	 List<MenuFrom>  list=getSubxin(entity.getKey(), entityList, packageURL, IDMethodName,IDHierarchy, NAMEMethodName, PARENTIDMethodName);
+        	 if(list!=null&&list.size()>0) {
+        		 entity.setIsLeaf(false);  
+        	 }
+        	 entity.setChildren(list);  
+        }  
+          
+        return resultList;   
+    }  
+      
+    /** 
+     * 获取子数据集合 
+     */  
+    @SuppressWarnings("unchecked")
+	private  static List<MenuFrom> getSubxin(String topId, @SuppressWarnings("rawtypes") Collection entityList,String packageURL,String IDMethodName,int IDHierarchy,String NAMEMethodName,String PARENTIDMethodName ) throws Exception{  
+    	  List<MenuFrom> childList=new ArrayList<>();   
+         @SuppressWarnings("rawtypes")
+		Class clazz=  Class.forName(packageURL);
+         Method IDMethodNameme = null;
+         switch (IDHierarchy) {
+ 		case 1:
+ 			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+ 			break;
+         case 2:
+         	IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
+ 			break;
+         case 3:
+         	IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
+ 	    break;
+ 		default:
+ 			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+ 			break;
+ 		}
+     	Method NAMEMethodNameme =  clazz.getDeclaredMethod(NAMEMethodName);
+     	Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
+     	String parentId;   
+        //子集的直接子对象  
+     	 for (Object ob : entityList) { 
+     		Object entity = clazz.cast(ob);     
+    		
+     	   parentId=PARENTIDMethodNameme.invoke(entity)!=null? String.valueOf(PARENTIDMethodNameme.invoke(entity)):null;	
+     	   
+     	   if(parentId==null) {
+     		  if(parentId==topId){  
+              	MenuFrom menu=new MenuFrom(String.valueOf(IDMethodNameme.invoke(entity)),String.valueOf(IDMethodNameme.invoke(entity)),String.valueOf(IDMethodNameme.invoke(entity)), String.valueOf(NAMEMethodNameme.invoke(entity)),String.valueOf(NAMEMethodNameme.invoke(entity)), String.valueOf(NAMEMethodNameme.invoke(entity)),parentId);
+                 	childList.add(menu);  
+                 }  
+     	   }else {
+     		  if(topId!=null&&topId.equals(parentId)){  
+                	MenuFrom menu=new MenuFrom(String.valueOf(IDMethodNameme.invoke(entity)),String.valueOf(IDMethodNameme.invoke(entity)),String.valueOf(IDMethodNameme.invoke(entity)), String.valueOf(NAMEMethodNameme.invoke(entity)),String.valueOf(NAMEMethodNameme.invoke(entity)), String.valueOf(NAMEMethodNameme.invoke(entity)),parentId);
+                	menu.setIsLeaf(false);
+                	childList.add(menu);  
+               }     
+     	   }
+            
+        }  
+          
+        //子集的间接子对象  
+        for (MenuFrom entity : childList) {  
+            entity.setChildren(getSubxin(entity.getKey(), entityList, packageURL, IDMethodName,IDHierarchy, NAMEMethodName, PARENTIDMethodName));  
+        }  
+          
+        //递归退出条件  
+        if(childList.size()==0){  
+            return null;  
+        }  
+          
+        return childList;  
+    } 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 } 

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

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
 /**
 * 
 *

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

@@ -6,6 +6,9 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import java.util.Date;
+
 /**
 * 
 *

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="WaterResourceCraneDto", description="")
+public class WaterResourceCraneDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @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 recUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@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;
+
+    @ApiModelProperty(value = "经纬度坐标")
+    private String latLang;
+
+    @ApiModelProperty(value = "资源类型（消火栓、消防水鹤、天然水源、消防水池）")
+    private String type;
+
+    @ApiModelProperty(value = "所在建筑id")
+    private Long belongBuildingId;
+
+    @ApiModelProperty(value = "所在建筑")
+    private String belongBuilding;
+
+    @ApiModelProperty(value = "所属消防系统id")
+    private Long belongFightingSystemId;
+
+    @ApiModelProperty(value = "所属消防系统")
+    private String belongFightingSystem;
+
+    @ApiModelProperty(value = "管理单位id")
+    private Long managementUnitId;
+
+    @ApiModelProperty(value = "管理单位")
+    private String managementUnit;
+
+    @ApiModelProperty(value = "维保单位id")
+    private Long maintenanceUnitId;
+
+    @ApiModelProperty(value = "维保单位")
+    private String maintenanceUnit;
+
+    @ApiModelProperty(value = "建造日期")
+    private Date buildDate;
+
+    @ApiModelProperty(value = "启用日期")
+    private Date enableDate;
+
+    @ApiModelProperty(value = "方位图")
+    private String orientationImg;
+
+    @ApiModelProperty(value = "实景图")
+    private String realityImg;
+
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactUser;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+    @ApiModelProperty(value = "是否有物联参数（1有，0没有）")
+    private Boolean isIot;
+
+    @ApiModelProperty(value = "消防救援机构_通用唯一识别码")
+    private String rescueOrgCode;
+
+    @ApiModelProperty(value = "行政区划代码")
+    private String administrativeCode;
+
+    @ApiModelProperty(value = "更新人员")
+    private String recUserName;
+
+    @ApiModelProperty(value = "组织机构代码")
+    private String orgCode;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="WaterResourceHydrantDto", description="")
+public class WaterResourceHydrantDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @ApiModelProperty(value = "资源id")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "消防栓类型")
+    private String type;
+
+    @ApiModelProperty(value = "类型code")
+    private String typeCode;
+
+    @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 pipeNetwork;
+
+    @ApiModelProperty(value = "消防给水管网形式类型代码")
+    private String pipeTypeCode;
+
+    @ApiModelProperty(value = "消防给水管网形式类型名称")
+    private String pipeTypeName;
+
+    @ApiModelProperty(value = "官网直径（cm）")
+    private Float pipeDiameter;
+
+    @ApiModelProperty(value = "供水单位名称")
+    private String waterSupplyName;
+
+    @ApiModelProperty(value = "更新人员")
+    private String recUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="WaterResourceIotDto", description="")
+public class WaterResourceIotDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @ApiModelProperty(value = "主键id")
+    private Long sequencNbr;
+
+    @ApiModelProperty(value = "资源类型")
+    private String resourceType;
+
+    @ApiModelProperty(value = "资源id")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "储水量容积物联编码")
+    private String iotWaterStorage;
+
+    @ApiModelProperty(value = "流量物联编码")
+    private String iotFlowRate;
+
+    @ApiModelProperty(value = "状态物联编码")
+    private String iotStatus;
+
+    @ApiModelProperty(value = "管网压力物联编码")
+    private String iotPipePressure;
+
+    @ApiModelProperty(value = "更新人员")
+    private String recUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="WaterResourceNaturalDto", description="")
+public class WaterResourceNaturalDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @ApiModelProperty(value = "资源id")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "高度（cm）")
+    private Float height;
+
+    @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 String statusCode;
+
+    @ApiModelProperty(value = "水源可用状态类别名称")
+    private String status;
+
+    @ApiModelProperty(value = "有无枯水期")
+    private Boolean hasDrySeason;
+
+    @ApiModelProperty(value = "枯水期跨度简要情况")
+    private String dryPeriodSpan;
+
+    @ApiModelProperty(value = "更新人员")
+    private String recUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="WaterResourcePoolDto", description="")
+public class WaterResourcePoolDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @ApiModelProperty(value = "资源id")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "容积（m³）")
+    private Float volume;
+
+    @ApiModelProperty(value = "水源可用状态类别代码")
+    private String statusCode;
+
+    @ApiModelProperty(value = "水源可用状态类别名称")
+    private String status;
+
+    @ApiModelProperty(value = "所属路段")
+    private String section;
+
+    @ApiModelProperty(value = "取水方式")
+    private String intakeForm;
+
+    @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 pipeTypeCode;
+
+    @ApiModelProperty(value = "消防给水管网形式类型名称")
+    private String pipeTypeName;
+
+    @ApiModelProperty(value = "供水单位名称")
+    private String waterSupplyName;
+
+    @ApiModelProperty(value = "更新人员")
+    private String recUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_water_resource")
+public class WaterResource extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+	  * 资源名称
+     */
+	@TableField("name")
+    private String name;
+    /**
+	  * 地址
+     */
+	@TableField("address")
+    private String address;
+    /**
+	  * 经纬度坐标
+     */
+	@TableField("lat_lang")
+    private String latLang;
+    /**
+	  * 资源类型（消火栓、消防水鹤、天然水源、消防水池）
+     */
+	@TableField("type")
+    private String type;
+    /**
+	  * 所在建筑id
+     */
+	@TableField("belong_building_id")
+    private Long belongBuildingId;
+    /**
+	  * 所在建筑
+     */
+	@TableField("belong_building")
+    private String belongBuilding;
+    /**
+	  * 所属消防系统id
+     */
+	@TableField("belong_fighting_system_id")
+    private Long belongFightingSystemId;
+    /**
+	  * 所属消防系统
+     */
+	@TableField("belong_fighting_system")
+    private String belongFightingSystem;
+    /**
+	  * 管理单位id
+     */
+	@TableField("management_unit_id")
+    private Long managementUnitId;
+    /**
+	  * 管理单位
+     */
+	@TableField("management_unit")
+    private String managementUnit;
+    /**
+	  * 维保单位id
+     */
+	@TableField("maintenance_unit_id")
+    private Long maintenanceUnitId;
+    /**
+	  * 维保单位
+     */
+	@TableField("maintenance_unit")
+    private String maintenanceUnit;
+    /**
+	  * 建造日期
+     */
+	@TableField("build_date")
+    private Date buildDate;
+    /**
+	  * 启用日期
+     */
+	@TableField("enable_date")
+    private Date enableDate;
+    /**
+	  * 方位图
+     */
+	@TableField("orientation_img")
+    private String orientationImg;
+    /**
+	  * 实景图
+     */
+	@TableField("reality_img")
+    private String realityImg;
+    /**
+	  * 联系人姓名
+     */
+	@TableField("contact_user")
+    private String contactUser;
+    /**
+	  * 联系人电话
+     */
+	@TableField("contact_phone")
+    private String contactPhone;
+    /**
+	  * 是否有物联参数（1有，0没有）
+     */
+	@TableField("is_iot")
+    private Boolean isIot;
+    /**
+	  * 消防救援机构_通用唯一识别码
+     */
+	@TableField("rescue_org_code")
+    private String rescueOrgCode;
+    /**
+	  * 行政区划代码
+     */
+	@TableField("administrative_code")
+    private String administrativeCode;
+    /**
+	  * 更新人员
+     */
+	@TableField("rec_user_name")
+    private String recUserName;
+    /**
+	  * 组织机构代码
+     */
+	@TableField("org_code")
+    private String orgCode;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_water_resource_crane")
+public class WaterResourceCrane extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+	  * 资源id
+     */
+	@TableField("resource_id")
+    private Long resourceId;
+    /**
+	  * 高度（cm）
+     */
+	@TableField("height")
+    private Float height;
+    /**
+	  * 水源可用状态类别代码
+     */
+	@TableField("status_code")
+    private String statusCode;
+    /**
+	  * 水源可用状态类别名称
+     */
+	@TableField("status")
+    private String status;
+    /**
+	  * 所属路段
+     */
+	@TableField("section")
+    private String section;
+    /**
+	  * 所属管网
+     */
+	@TableField("pipe_network")
+    private String pipeNetwork;
+    /**
+	  * 消防给水管网形式类型代码
+     */
+	@TableField("pipe_type_code")
+    private String pipeTypeCode;
+    /**
+	  * 消防给水管网形式类型名称
+     */
+	@TableField("pipe_type_name")
+    private String pipeTypeName;
+    /**
+	  * 官网直径（cm）
+     */
+	@TableField("pipe_diameter")
+    private Float pipeDiameter;
+    /**
+	  * 进水管直径(cm)
+     */
+	@TableField("inlet_pipe_diameter")
+    private Float inletPipeDiameter;
+    /**
+	  * 出水管直径(cm)
+     */
+	@TableField("outlet_pipe_diameter")
+    private Float outletPipeDiameter;
+    /**
+	  * 加水车道数量(个)
+     */
+	@TableField("waterfilling_lane_num")
+    private Integer waterfillingLaneNum;
+    /**
+	  * 供水单位名称
+     */
+	@TableField("water_supply_name")
+    private String waterSupplyName;
+    /**
+	  * 更新人员
+     */
+	@TableField("rec_user_name")
+    private String recUserName;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_water_resource_hydrant")
+public class WaterResourceHydrant extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+	  * 资源id
+     */
+	@TableField("resource_id")
+    private Long resourceId;
+    /**
+	  * 消防栓类型
+     */
+	@TableField("type")
+    private String type;
+    /**
+	  * 类型code
+     */
+	@TableField("type_code")
+    private String typeCode;
+    /**
+	  * 消火栓系统类型
+     */
+	@TableField("system_type")
+    private String systemType;
+    /**
+	  * 消火栓系统类型code
+     */
+	@TableField("system_type_code")
+    private String systemTypeCode;
+    /**
+	  * 消防设施状况分类
+     */
+	@TableField("facilities_category")
+    private String facilitiesCategory;
+    /**
+	  * 消防设施状况分类code
+     */
+	@TableField("facilities_category_code")
+    private String facilitiesCategoryCode;
+    /**
+	  * 道路路口路段简要情况
+     */
+	@TableField("road_junction_info")
+    private String roadJunctionInfo;
+    /**
+	  * 消火栓放置形式
+     */
+	@TableField("place_form")
+    private String placeForm;
+    /**
+	  * 消火栓放置形式code
+     */
+	@TableField("place_form_code")
+    private String placeFormCode;
+    /**
+	  * 消防水带接口
+     */
+	@TableField("hose_connection")
+    private String hoseConnection;
+    /**
+	  * 消防水带接口code
+     */
+	@TableField("hose_connection_code")
+    private String hoseConnectionCode;
+    /**
+	  * 取水方式
+     */
+	@TableField("intake_form")
+    private String intakeForm;
+    /**
+	  * 所属管网
+     */
+	@TableField("pipe_network")
+    private String pipeNetwork;
+    /**
+	  * 消防给水管网形式类型代码
+     */
+	@TableField("pipe_type_code")
+    private String pipeTypeCode;
+    /**
+	  * 消防给水管网形式类型名称
+     */
+	@TableField("pipe_type_name")
+    private String pipeTypeName;
+    /**
+	  * 官网直径（cm）
+     */
+	@TableField("pipe_diameter")
+    private Float pipeDiameter;
+    /**
+	  * 供水单位名称
+     */
+	@TableField("water_supply_name")
+    private String waterSupplyName;
+    /**
+	  * 更新人员
+     */
+	@TableField("rec_user_name")
+    private String recUserName;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_water_resource_iot")
+public class WaterResourceIot extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+	  * 主键id
+     */
+	@TableField("sequenc_nbr")
+    private Long sequencNbr;
+    /**
+	  * 资源类型
+     */
+	@TableField("resource_type")
+    private String resourceType;
+    /**
+	  * 资源id
+     */
+	@TableField("resource_id")
+    private Long resourceId;
+    /**
+	  * 储水量容积物联编码
+     */
+	@TableField("iot_water_storage")
+    private String iotWaterStorage;
+    /**
+	  * 流量物联编码
+     */
+	@TableField("iot_flow_rate")
+    private String iotFlowRate;
+    /**
+	  * 状态物联编码
+     */
+	@TableField("iot_status")
+    private String iotStatus;
+    /**
+	  * 管网压力物联编码
+     */
+	@TableField("iot_pipe_pressure")
+    private String iotPipePressure;
+    /**
+	  * 更新人员
+     */
+	@TableField("rec_user_name")
+    private String recUserName;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_water_resource_natural")
+public class WaterResourceNatural extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+	  * 资源id
+     */
+	@TableField("resource_id")
+    private Long resourceId;
+    /**
+	  * 高度（cm）
+     */
+	@TableField("height")
+    private Float height;
+    /**
+	  * 水源类型代码
+     */
+	@TableField("type_code")
+    private String typeCode;
+    /**
+	  * 水源类型
+     */
+	@TableField("type")
+    private String type;
+    /**
+	  * 容积（m³）
+     */
+	@TableField("volume")
+    private Float volume;
+    /**
+	  * 面积（㎡）
+     */
+	@TableField("area")
+    private Float area;
+    /**
+	  * 水质情况
+     */
+	@TableField("quality_situation_info")
+    private String qualitySituationInfo;
+    /**
+	  * 四季变化简要情况
+     */
+	@TableField("season_change_info")
+    private String seasonChangeInfo;
+    /**
+	  * 水源可用状态类别代码
+     */
+	@TableField("status_code")
+    private String statusCode;
+    /**
+	  * 水源可用状态类别名称
+     */
+	@TableField("status")
+    private String status;
+    /**
+	  * 有无枯水期
+     */
+	@TableField("has_dry_season")
+    private Boolean hasDrySeason;
+    /**
+	  * 枯水期跨度简要情况
+     */
+	@TableField("dry_period_span")
+    private String dryPeriodSpan;
+    /**
+	  * 更新人员
+     */
+	@TableField("rec_user_name")
+    private String recUserName;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_water_resource_pool")
+public class WaterResourcePool extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+	  * 资源id
+     */
+	@TableField("resource_id")
+    private Long resourceId;
+    /**
+	  * 容积（m³）
+     */
+	@TableField("volume")
+    private Float volume;
+    /**
+	  * 水源可用状态类别代码
+     */
+	@TableField("status_code")
+    private String statusCode;
+    /**
+	  * 水源可用状态类别名称
+     */
+	@TableField("status")
+    private String status;
+    /**
+	  * 所属路段
+     */
+	@TableField("section")
+    private String section;
+    /**
+	  * 取水方式
+     */
+	@TableField("intake_form")
+    private String intakeForm;
+    /**
+	  * 取水高度(cm)
+     */
+	@TableField("intake_height")
+    private Float intakeHeight;
+    /**
+	  * 水源标高差(cm)
+     */
+	@TableField("elevation_difference")
+    private Float elevationDifference;
+    /**
+	  * 停车位置
+     */
+	@TableField("parking_position")
+    private String parkingPosition;
+    /**
+	  * 停车数量(个)
+     */
+	@TableField("parking_num")
+    private Integer parkingNum;
+    /**
+	  * 消防给水管网形式类型代码
+     */
+	@TableField("pipe_type_code")
+    private String pipeTypeCode;
+    /**
+	  * 消防给水管网形式类型名称
+     */
+	@TableField("pipe_type_name")
+    private String pipeTypeName;
+    /**
+	  * 供水单位名称
+     */
+	@TableField("water_supply_name")
+    private String waterSupplyName;
+    /**
+	  * 更新人员
+     */
+	@TableField("rec_user_name")
+    private String recUserName;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 
+ * <pre>
+ * 航空器附件文件类型
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: AircraftFileTypeEnum.java, v 0.1 2021年6月29日 下午4:35:34 gwb Exp $
+ */
+@Getter
+@AllArgsConstructor
+public enum AircraftFileTypeEnum {
+
+	APPEARANCE("APPEARANCE", "外观图"),
+	PLANE("PLANE", "平面图"),
+	RESCUE("RESCUE", "救援图"),
+	POSITION("POSITION", "方位图"),
+	MODEL("MODEL", "三维模型");
+
+    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;
+    }
+    
+	public static AircraftFileTypeEnum getEnum(String code)
+	{
+		for (AircraftFileTypeEnum status : AircraftFileTypeEnum.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/WaterResourceCraneMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceCrane;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface WaterResourceCraneMapper extends BaseMapper<WaterResourceCrane> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/WaterResourceHydrantMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceHydrant;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface WaterResourceHydrantMapper extends BaseMapper<WaterResourceHydrant> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/WaterResourceIotMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceIot;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface WaterResourceIotMapper extends BaseMapper<WaterResourceIot> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/WaterResourceMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResource;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface WaterResourceMapper extends BaseMapper<WaterResource> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/WaterResourceNaturalMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceNatural;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface WaterResourceNaturalMapper extends BaseMapper<WaterResourceNatural> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/WaterResourcePoolMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourcePool;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface WaterResourcePoolMapper extends BaseMapper<WaterResourcePool> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceCraneService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IWaterResourceCraneService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceHydrantService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IWaterResourceHydrantService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceIotService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IWaterResourceIotService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceNaturalService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IWaterResourceNaturalService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourcePoolService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IWaterResourcePoolService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+* 接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IWaterResourceService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -29,20 +29,21 @@
 		cb_org_usr u LEFT JOIN
 		jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
 		LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
-		where u.parent_id = #{parentId}
-		AND u.biz_org_type = #{bizOrgType}
-		AND U.is_delete = 0
+		where 
+		u.biz_org_type = #{bizOrgType}
+		AND u.is_delete = 0
+		<if  test="bizOrgName != null">
+			AND u.biz_org_name = #{bizOrgName}
+		</if>
+		<if  test="bizOrgCode != null and bizOrgCode != '-1'">
+			AND u.biz_org_code like concat(#{bizOrgCode}, '%')
+		</if>
 		GROUP BY
 		u.sequence_nbr ,
 		u.biz_org_name ,
 		u.biz_org_code
 		)a where a.sequenceNbr is not null
-		<if  test="bizOrgName != null">
-			AND u.bizOrgName = #{bizOrgName}
-		</if>
-		<if  test="bizOrgCode != null">
-			AND u.bizOrgName = #{bizOrgCode}
-		</if>
+		
 		<if test="fieldsValue != null">
 			<foreach collection="fieldsValue.keys" item="item"> AND a.${item} =  #{fieldsValue[${item}]}  </foreach>
 		</if>
@@ -63,20 +64,20 @@
 		cb_org_usr u LEFT JOIN
 		jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
 		LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
-		where u.parent_id = #{parentId}
-		AND u.biz_org_type = #{bizOrgType}
-		AND U.is_delete = 0
+		where 
+		u.biz_org_type = #{bizOrgType}
+		AND u.is_delete = 0
+		<if  test="bizOrgName != null">
+			AND u.biz_org_name = #{bizOrgName}
+		</if>
+		<if  test="bizOrgCode != null and bizOrgCode != '-1'">
+			AND u.biz_org_code like concat(#{bizOrgCode}, '%')
+		</if>
 		GROUP BY
 		u.sequence_nbr ,
 		u.biz_org_name ,
 		u.biz_org_code
 		)a where a.sequenceNbr is not null
-		<if  test="bizOrgName != null">
-			AND u.bizOrgName = #{bizOrgName}
-		</if>
-		<if  test="bizOrgCode != null">
-			AND u.bizOrgName = #{bizOrgCode}
-		</if>
 		<if test="fieldsValue != null">
 			<foreach collection="fieldsValue.keys" item="item" > AND a.${item} = #{fieldsValue[${item}]} </foreach>
 		</if>
@@ -114,6 +115,7 @@
 		SELECT
 		sequence_nbr,
 		biz_org_name,
+		biz_org_code,
 		biz_org_type,
 		parent_id
 		FROM

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceCraneMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceCraneMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceHydrantMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceHydrantMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceIotMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceIotMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceNaturalMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceNaturalMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourcePoolMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourcePoolMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -34,46 +35,54 @@ public class AircraftController extends BaseController {
     private AircraftServiceImpl aircraftServiceImpl;
 
     /**
-             * 新增航空器信息
+    * 新增航空器信息
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增航空器信息", notes = "新增航空器信息")
-	public ResponseModel<AircraftDto> save(@RequestBody AircraftDto model)
+	public ResponseModel<AircraftDto> save(@RequestBody AircraftDto model) throws Exception
 	{
     	 if (ValidationUtil.isEmpty(model)
                  || ValidationUtil.isEmpty(model.getAircraftModel()))
              throw new BadRequest("参数校验失败.");
     	 
-	    model=aircraftServiceImpl.createWithModel(model);
+	    model=aircraftServiceImpl.createAircraft(RequestContext.getAgencyCode(), model);
 	    return ResponseHelper.buildResponse(model);
 	}
 	/**
-             * 根据sequenceNbr更新
+    * 根据sequenceNbr更新
     * @param sequenceNbr 主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新航空器信息", notes = "根据sequenceNbr更新航空器信息")
-	public ResponseModel<AircraftDto> updateBySequenceNbrAircraft(@RequestBody AircraftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<AircraftDto> updateBySequenceNbrAircraft(@RequestBody AircraftDto model,
+			@PathVariable(value = "sequenceNbr") Long sequenceNbr) throws Exception {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.updateWithModel(model));
+	    return ResponseHelper.buildResponse(aircraftServiceImpl.updateAircraft(RequestContext.getAgencyCode(), model));
 	}
 	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
+	 * 
+	 * <pre>
+	 * 根据物理主键批量删除航空器信息
+	 * </pre>
+	 *
+	 * @param request
+	 * @param ids
+	 * @return
+	 */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除航空器信息", notes = "根据sequenceNbr删除航空器信息")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(aircraftServiceImpl.removeById(sequenceNbr));
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据物理主键批量删除航空器信息", notes = "根据物理主键批量删除航空器信息")
+    public ResponseModel<List<Long>> deleteBySequenceNbr(HttpServletRequest request, 
+    		@PathVariable(value = "ids") String ids) throws Exception{
+    	
+        return ResponseHelper.buildResponse(aircraftServiceImpl.multDeleteAircraft(RequestContext.getAgencyCode(), ids));
     }
     /**
-             * 根据sequenceNbr查询
+    * 根据sequenceNbr查询
     * @param sequenceNbr  主键
     * @return
     */
@@ -82,10 +91,10 @@ public class AircraftController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个航空器信息",  notes = "根据sequenceNbr查询单个航空器信息")
 	public ResponseModel<AircraftDto> seleteOne(@PathVariable Long sequenceNbr)
 	{
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryBySeq(sequenceNbr));
+	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryByAircraftSeq(RequestContext.getAgencyCode(), sequenceNbr));
 	}
 	/**
-             * 列表分页查询
+    * 列表分页查询
     *@param current 当前页
     *@param current 每页大小
     * @return
@@ -93,22 +102,17 @@ public class AircraftController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "航空器信息分页查询",  notes = "航空器信息分页查询")
-	public ResponseModel<Page<AircraftDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	public ResponseModel<Page<AircraftDto>> queryForPage(
+			@RequestParam(value = "aircraftModel", required = false) String aircraftModel,
+            @RequestParam(value = "engineType", required = false) String engineType,
+            @RequestParam(value = "fuelType", required = false) String fuelType,
+			@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size)
 	{
 	    Page<AircraftDto> page=new Page<AircraftDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftPage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "航空器信息列表全部数据查询",   notes = "航空器信息列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<AircraftDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftList());
+	    return ResponseHelper.buildResponse(aircraftServiceImpl.queryForAircraftPage(page, aircraftModel, engineType, fuelType));
 	}
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DataDictionaryController.java

@@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.SignatureSpi.ecCVCDSA;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -20,8 +22,11 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -162,5 +167,33 @@ public class DataDictionaryController extends BaseController {
             return ResponseHelper.buildResponse(menus);
         }
     }
-    }
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/form/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据表态类型多个code查询表单数据项", notes = "根据表态类型多个code查询表单数据项")
+    public ResponseModel<Object> selectFormdListItem(HttpServletRequest request,  String types){
+        HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
+        try {
+   	    String[] typest= types.split(",");
+        for (String type : typest) {
+            QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type", type);
+            queryWrapper.orderByAsc("sort_num");
+            if(redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE_XIN+type)){
+                Object obj= redisUtils.get(RedisKey.DATA_DICTIONARY_CODE_XIN+type);
+                objectObjectHashMap.put(type,obj);
+            }else{
+                Collection<DataDictionary> list=iDataDictionaryService.list(queryWrapper);
+                List<MenuFrom>  menus = null;
+                menus = TreeParser.getTreexin(null, list,  DataDictionary.class.getName(),"getCode",0, "getName", "getParent");
+                redisUtils.set(RedisKey.DATA_DICTIONARY_CODE_XIN+type, JSON.toJSON(menus),time);
+                objectObjectHashMap.put(type,menus);
+            }
+	      }
+        } catch (Exception e) {
+        	e.printStackTrace();
+            throw new RuntimeException("系统异常！");
+        }
+        return ResponseHelper.buildResponse(objectObjectHashMap);
+     }
+}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource")
+public class WaterResourceController extends BaseController {
+
+    @Autowired
+    WaterResourceServiceImpl waterResourceServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceDto> save(@RequestBody WaterResourceDto model)
+	{
+	    model=waterResourceServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceDto> updateBySequenceNbrWaterResource(@RequestBody WaterResourceDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceDto> page=new Page<WaterResourceDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourceList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceCraneController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceCraneServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceCraneDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-crane")
+public class WaterResourceCraneController extends BaseController {
+
+    @Autowired
+    WaterResourceCraneServiceImpl waterResourceCraneServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceCraneDto> save(@RequestBody WaterResourceCraneDto model)
+	{
+	    model=waterResourceCraneServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceCraneDto> updateBySequenceNbrWaterResourceCrane(@RequestBody WaterResourceCraneDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceCraneDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceCraneDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceCraneDto> page=new Page<WaterResourceCraneDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCranePage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceCraneDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCraneList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceHydrantController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceHydrantServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceHydrantDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-hydrant")
+public class WaterResourceHydrantController extends BaseController {
+
+    @Autowired
+    WaterResourceHydrantServiceImpl waterResourceHydrantServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceHydrantDto> save(@RequestBody WaterResourceHydrantDto model)
+	{
+	    model=waterResourceHydrantServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceHydrantDto> updateBySequenceNbrWaterResourceHydrant(@RequestBody WaterResourceHydrantDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceHydrantDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceHydrantDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceHydrantDto> page=new Page<WaterResourceHydrantDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceHydrantDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceIotController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceIotServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceIotDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-iot")
+public class WaterResourceIotController extends BaseController {
+
+    @Autowired
+    WaterResourceIotServiceImpl waterResourceIotServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceIotDto> save(@RequestBody WaterResourceIotDto model)
+	{
+	    model=waterResourceIotServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceIotDto> updateBySequenceNbrWaterResourceIot(@RequestBody WaterResourceIotDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceIotServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceIotDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceIotDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceIotDto> page=new Page<WaterResourceIotDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceIotDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceNaturalController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceNaturalServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceNaturalDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-natural")
+public class WaterResourceNaturalController extends BaseController {
+
+    @Autowired
+    WaterResourceNaturalServiceImpl waterResourceNaturalServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourceNaturalDto> save(@RequestBody WaterResourceNaturalDto model)
+	{
+	    model=waterResourceNaturalServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourceNaturalDto> updateBySequenceNbrWaterResourceNatural(@RequestBody WaterResourceNaturalDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceNaturalDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceNaturalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceNaturalDto> page=new Page<WaterResourceNaturalDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourceNaturalDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourcePoolController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourcePoolServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourcePoolDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+
+/**
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/water-resource-pool")
+public class WaterResourcePoolController extends BaseController {
+
+    @Autowired
+    WaterResourcePoolServiceImpl waterResourcePoolServiceImpl;
+
+    /**
+             * 新增
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<WaterResourcePoolDto> save(@RequestBody WaterResourcePoolDto model)
+	{
+	    model=waterResourcePoolServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+	/**
+             * 根据sequenceNbr更新
+    * @param sequenceNbr 主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<WaterResourcePoolDto> updateBySequenceNbrWaterResourcePool(@RequestBody WaterResourcePoolDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.updateWithModel(model));
+	}
+	/**
+             * 根据sequenceNbr删除
+    * @param sequenceNbr 主键
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourcePoolDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourcePoolDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourcePoolDto> page=new Page<WaterResourcePoolDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<WaterResourcePoolDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolList());
+	}
+}

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -24,7 +23,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
@@ -34,20 +32,17 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.jcs.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.*;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonFormVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -248,6 +243,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<Map<String, Object>> list = this.baseMapper.selectPersonAllList(map);
         return list == null ? new ArrayList<Map<String, Object>>() : list;
     }
+    
+
 
     public IPage<Map<String, Object>> pagePerson(String pageNum, String pageSize, Map<String, Object> req) {
         IPage<Map<String, Object>> pageBean = null;
@@ -261,7 +258,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         if (!ObjectUtils.isEmpty(req.get("bizOrgName"))) {
         	map.put("bizOrgName", req.get("bizOrgName"));
         }
-        map.put("parentId", req.get("parentId"));
+        OrgUsr parent = this.getById( Long.valueOf(req.get("parentId").toString()));
+        map.put("bizOrgCode", parent.getBizOrgCode());
         req.remove("bizOrgName");
         req.remove("pageSize");
         req.remove("pageNum");
@@ -318,7 +316,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         orgUsr.setRecUserName(oriOrgUsr.getRecUserName());
         orgUsr.setAmosOrgId(oriOrgUsr.getAmosOrgId());
         orgUsr.setAmosOrgCode(oriOrgUsr.getAmosOrgCode());
-        if (oriOrgUsr.getParentId() != null && !"-1".equals(oriOrgUsr.getParentId())) {
+        if (oriOrgUsr.getParentId() != null) {
         	OrgUsr parent = getById(oriOrgUsr.getParentId());
             if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) {
             	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
@@ -339,6 +337,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         save(orgUsr);
         // 填充主键
         alertFromValuelist.stream().forEach(alertFromValue -> {
+        	if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+        		alertFromValue.setAlertTypeCode(OrgPersonEnum.公司.getCode());
+        	} else if (OrgPersonEnum.部门.getKey().equals(orgUsr.getBizOrgType())) {
+        		alertFromValue.setAlertTypeCode(OrgPersonEnum.部门.getCode());
+        	}
             alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
         });
         // 保存动态表单数据
@@ -362,6 +365,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                         dis.setRecUserName(orgUsr.getRecUserName());
                         dis.setAlertTypeCode(src.getAlertTypeCode());
                         dis.setAlertFormId(src.getAlertFormId());
+                        dis.setSequenceNbr(src.getSequenceNbr());
                         break;
                     }
                 }
@@ -369,7 +373,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         	// 保存动态表单数据
             alertFormValueServiceImpl.updateBatchById(alertFromValuelist);
             
-            List<AlertFromDto> form = alertFormServiceImpl.queryListByTypeCode(alertFromValuelist.get(0).getAlertTypeCode());
+            List<AlertFromDto> form = alertFormServiceImpl.queryListByTypeCode(formList.get(0).getAlertTypeCode());
             
             if (form.size() != alertFromValuelist.size()) {
             	
@@ -383,7 +387,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                             break;
                         }
                     }
-            		if (!exist) {
+            		if (ObjectUtils.isEmpty(dis) && !exist) {
             			creatList.add(dis);
             		}
                 }
@@ -431,7 +435,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-        if (OrgUsrVo.getParentId() != null && !"-1".equals(OrgUsrVo.getParentId())) {
+        if (OrgUsrVo.getParentId() != null) {
         	OrgUsr parent = getById(OrgUsrVo.getParentId());
             if (parent != null &&  ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
             	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
@@ -447,7 +451,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-        if (OrgPersonVo.getParentId() != null && !"-1".equals(OrgPersonVo.getParentId())) {
+        if (OrgPersonVo.getParentId() != null) {
         	OrgUsr parent = getById(OrgPersonVo.getParentId());
             if (parent != null &&  ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
             	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
@@ -471,7 +475,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
-        if (orgUsr.getParentId() != null && !"-1".equals(orgUsr.getParentId())) {
+        if (orgUsr.getParentId() != null) {
         	OrgUsr parent = getById(orgUsr.getParentId());
             if (parent != null &&  ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
             	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
@@ -603,7 +607,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
-        if (OrgDepartmentVo.getParentId() != null && !"-1".equals(OrgDepartmentVo.getParentId())) {
+        if (OrgDepartmentVo.getParentId() != null) {
         	OrgUsr parent = getById(OrgDepartmentVo.getParentId());
             if (parent != null &&  ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
             	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
@@ -620,7 +624,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
-        if (orgUsr.getParentId() != null && !"-1".equals(orgUsr.getParentId())) {
+        if (orgUsr.getParentId() != null) {
         	OrgUsr parent = getById(orgUsr.getParentId());
             if (parent != null &&  ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
             	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceCrane;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceCraneMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceCraneService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceCraneDto;
+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
+*/
+@Service
+public class WaterResourceCraneServiceImpl extends BaseService<WaterResourceCraneDto,WaterResourceCrane,WaterResourceCraneMapper> implements IWaterResourceCraneService {
+        /**
+                            * 分页查询
+         */
+        public Page<WaterResourceCraneDto> queryForWaterResourceCranePage(Page<WaterResourceCraneDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+                            * 列表查询 示例
+         */
+        public List<WaterResourceCraneDto> queryForWaterResourceCraneList()   {
+                return this.queryForList("" , false);
+        }
+}

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceHydrant;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceHydrantMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceHydrantService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceHydrantDto;
+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
+*/
+@Service
+public class WaterResourceHydrantServiceImpl extends BaseService<WaterResourceHydrantDto,WaterResourceHydrant,WaterResourceHydrantMapper> implements IWaterResourceHydrantService {
+        /**
+                            * 分页查询
+         */
+        public Page<WaterResourceHydrantDto> queryForWaterResourceHydrantPage(Page<WaterResourceHydrantDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+                            * 列表查询 示例
+         */
+        public List<WaterResourceHydrantDto> queryForWaterResourceHydrantList()   {
+                return this.queryForList("" , false);
+        }
+}

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceIot;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceIotMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceIotService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceIotDto;
+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
+*/
+@Service
+public class WaterResourceIotServiceImpl extends BaseService<WaterResourceIotDto,WaterResourceIot,WaterResourceIotMapper> implements IWaterResourceIotService {
+        /**
+                            * 分页查询
+         */
+        public Page<WaterResourceIotDto> queryForWaterResourceIotPage(Page<WaterResourceIotDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+                            * 列表查询 示例
+         */
+        public List<WaterResourceIotDto> queryForWaterResourceIotList()   {
+                return this.queryForList("" , false);
+        }
+}

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceNatural;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceNaturalMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceNaturalService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceNaturalDto;
+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
+*/
+@Service
+public class WaterResourceNaturalServiceImpl extends BaseService<WaterResourceNaturalDto,WaterResourceNatural,WaterResourceNaturalMapper> implements IWaterResourceNaturalService {
+        /**
+                            * 分页查询
+         */
+        public Page<WaterResourceNaturalDto> queryForWaterResourceNaturalPage(Page<WaterResourceNaturalDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+                            * 列表查询 示例
+         */
+        public List<WaterResourceNaturalDto> queryForWaterResourceNaturalList()   {
+                return this.queryForList("" , false);
+        }
+}

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourcePool;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourcePoolMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourcePoolService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourcePoolDto;
+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
+*/
+@Service
+public class WaterResourcePoolServiceImpl extends BaseService<WaterResourcePoolDto,WaterResourcePool,WaterResourcePoolMapper> implements IWaterResourcePoolService {
+        /**
+                            * 分页查询
+         */
+        public Page<WaterResourcePoolDto> queryForWaterResourcePoolPage(Page<WaterResourcePoolDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+                            * 列表查询 示例
+         */
+        public List<WaterResourcePoolDto> queryForWaterResourcePoolList()   {
+                return this.queryForList("" , false);
+        }
+}

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+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.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
+*/
+@Service
+public class WaterResourceServiceImpl extends BaseService<WaterResourceDto,WaterResource,WaterResourceMapper> implements IWaterResourceService {
+        /**
+                            * 分页查询
+         */
+        public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+                            * 列表查询 示例
+         */
+        public List<WaterResourceDto> queryForWaterResourceList()   {
+                return this.queryForList("" , false);
+        }
+}

pom.xml

@@ -28,7 +28,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.20Ty-SNAPSHOT</tyboot-version>
-		<amos.version>1.4.7</amos.version>
+		<amos.version>1.4.8-SNAPSHOT</amos.version>
 	</properties>
 
 	<dependencies>