Skip to content

A
amos-boot-biz
Commit d1cc0336 authored by chenhao's avatar chenhao
Browse files
Options

提交对于消防水源和队伍的升级代码

parent 1a9bb873
Hide whitespace changes
Inline Side-by-side
Showing with 843 additions and 553 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java
View file @ d1cc0336
...@@ -28,4 +28,8 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> { ...@@ -28,4 +28,8 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
* @return * @return
*/ */
public DataDictionary getByCode(String code,String type); public DataDictionary getByCode(String code,String type);
public List<DataDictionary> getFireTeamTypeTree(String bizOrgCode);
public List<DataDictionary> getwaterResourceTypeTree(String bizOrgCode);
} }
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/impl/DataDictionaryServiceImpl.java
View file @ d1cc0336
...@@ -12,6 +12,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService; ...@@ -12,6 +12,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper; import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto; import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
...@@ -113,4 +114,20 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da ...@@ -113,4 +114,20 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
wrapper.eq(DataDictionary::getType, type); wrapper.eq(DataDictionary::getType, type);
return this.baseMapper.selectList(wrapper); return this.baseMapper.selectList(wrapper);
} }
public List<Menu> getFireTeamTypeTree(String bizOrgCode) throws Exception {
Menu root = new Menu(null, "消防队伍类型", null, null,0);
List<DataDictionary> list= dataDictionaryMapper.getFireTeamTypeTree(bizOrgCode);
List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
"getParent", null);
root.setChildren(menus);
return Lists.newArrayList(root);
}
public List<DataDictionary> getwaterResourceTypeTree(String bizOrgCode) throws Exception {
List<DataDictionary> list= dataDictionaryMapper.getwaterResourceTypeTree(bizOrgCode);
// List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
// "getParent", null);
// root.setChildren(menus);
return list;
}
} }
amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml
View file @ d1cc0336
...@@ -57,4 +57,48 @@ GROUP BY ...@@ -57,4 +57,48 @@ GROUP BY
WHERE WHERE
cbb.code = #{code} and cbb.is_delete = 0 and cbb.type = #{type} cbb.code = #{code} and cbb.is_delete = 0 and cbb.type = #{type}
</select> </select>
<select id="getFireTeamTypeTree" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
SELECT
cdd.*, case when fire.count is null then 0 else fire.count end as count
FROM
cb_data_dictionary cdd
LEFT JOIN (
SELECT
cf.type_code,
COUNT(cf.sequence_nbr) AS count
FROM
cb_fire_team cf
WHERE
cf.is_delete = 0
<if test='bizOrgCode != null and bizOrgCode!=""'>and cf.biz_org_code like CONCAT( #{bizOrgCode},'%')</if>
GROUP BY
cf.type_code
) fire ON cdd.`code` = fire.type_code
WHERE
cdd.type = 'XFJGLX'
</select>
<select id="getwaterResourceTypeTree" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
SELECT
cdd.*, case when fire.count is null then 0 else fire.count end as count
FROM
cb_data_dictionary cdd
LEFT JOIN (
SELECT
cf.resource_type,
COUNT(cf.sequence_nbr) AS count
FROM
cb_water_resource cf
WHERE
cf.is_delete = 0
<if test='bizOrgCode != null and bizOrgCode!=""'>and cf.biz_org_code like CONCAT( #{bizOrgCode},'%')</if>
GROUP BY
cf.resource_type
) fire ON cdd.`code` = fire.resource_type
WHERE
cdd.type = 'XFSYLX'
</select>
</mapper> </mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamCardDto.java
View file @ d1cc0336
...@@ -15,6 +15,11 @@ import lombok.Data; ...@@ -15,6 +15,11 @@ import lombok.Data;
public class FireTeamCardDto { public class FireTeamCardDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "机构/部门名称")
private String bizOrgName;
@ApiModelProperty(value = "机构编码")
private String bizOrgCode;
@ApiModelProperty(value = "消防队伍图片") @ApiModelProperty(value = "消防队伍图片")
private String img; private String img;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamListDto.java
View file @ d1cc0336
...@@ -11,32 +11,37 @@ import java.util.List; ...@@ -11,32 +11,37 @@ import java.util.List;
*/ */
@Data @Data
public class FireTeamListDto { public class FireTeamListDto {
@ApiModelProperty(value = "机构/部门名称")
private String bizOrgName;
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "机构编码")
private String name; private String bizOrgCode;
@ApiModelProperty(value = "机构code") @ApiModelProperty(value = "单位名称")
private String companyCode; private String name;
@ApiModelProperty(value = "队伍code") @ApiModelProperty(value = "机构code")
private String typeCode; private String companyCode;
@ApiModelProperty(value = "父级id") @ApiModelProperty(value = "队伍code")
private Long parent; private String typeCode;
@ApiModelProperty(value = "树节点类型（1：单位，0：队伍）") @ApiModelProperty(value = "父级id")
private String nodeType; private Long parent;
@ApiModelProperty(value = "树节点id") @ApiModelProperty(value = "树节点类型（1：单位，0：队伍）")
private Long nodeId; private String nodeType;
@ApiModelProperty(value = "树节点子节点id集合") @ApiModelProperty(value = "树节点id")
private List<String> nodeIds; private Long nodeId;
@ApiModelProperty(value = "地址") @ApiModelProperty(value = "树节点子节点id集合")
private String address; private List<String> nodeIds;
@ApiModelProperty(value = "所属单位") @ApiModelProperty(value = "地址")
private String company; private String address;
@ApiModelProperty(value = "所属单位")
private String company;
} }
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
View file @ d1cc0336
...@@ -23,332 +23,338 @@ import java.util.Map; ...@@ -23,332 +23,338 @@ import java.util.Map;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value = "WaterResourceDto", description = "水资源") @ApiModel(value = "WaterResourceDto", description = "水资源")
public class WaterResourceDto extends BaseDto { public class WaterResourceDto extends BaseDto {
@ExcelIgnore
@ExcelIgnore @ApiModelProperty(value = "机构/部门名称")
private static final long serialVersionUID = 1L; private String bizOrgName;
@ExcelIgnore
@ExcelProperty(value = "名称", index = 0) @ApiModelProperty(value = "机构编码")
@ApiModelProperty(value = "资源名称") private String bizOrgCode;
private String name;
@ExcelIgnore
@ExcelProperty(value = "地址", index = 1) private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "地址")
private String address; @ExcelProperty(value = "名称", index = 0)
@ApiModelProperty(value = "资源名称")
private String name;
@ExcelIgnore
@ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）") @ExcelProperty(value = "地址", index = 1)
private String resourceType; @ApiModelProperty(value = "地址")
private String address;
@ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "资源类型", index = 2) @ExcelIgnore
@ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）") @ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
private String resourceTypeName; private String resourceType;
@ExcelIgnore @ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "所在建筑id") @ExcelProperty(value = "资源类型", index = 2)
private Long belongBuildingId; @ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
private String resourceTypeName;
@ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class, method = "getBuildingList")
@ExcelProperty(value = "所在建筑", index = 3) @ExcelIgnore
@ApiModelProperty(value = "所在建筑") @ApiModelProperty(value = "所在建筑id")
private String belongBuilding; private Long belongBuildingId;
@ExcelIgnore @ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class, method = "getBuildingList")
@ApiModelProperty(value = "所属消防系统id") @ExcelProperty(value = "所在建筑", index = 3)
private Long belongFightingSystemId; @ApiModelProperty(value = "所在建筑")
private String belongBuilding;
@ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getFireSystemList")
@ExcelProperty(value = "所属消防系统", index = 4) @ExcelIgnore
@ApiModelProperty(value = "所属消防系统") @ApiModelProperty(value = "所属消防系统id")
private String belongFightingSystem; private Long belongFightingSystemId;
@ExcelIgnore @ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getFireSystemList")
@ApiModelProperty(value = "管理单位id") @ExcelProperty(value = "所属消防系统", index = 4)
private Long managementUnitId; @ApiModelProperty(value = "所属消防系统")
private String belongFightingSystem;
@ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "管理单位", index = 9) @ExcelIgnore
@ApiModelProperty(value = "管理单位") @ApiModelProperty(value = "管理单位id")
private String managementUnit; private Long managementUnitId;
@ExcelIgnore @ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ApiModelProperty(value = "维保单位id") @ExcelProperty(value = "管理单位", index = 9)
private Long maintenanceUnitId; @ApiModelProperty(value = "管理单位")
private String managementUnit;
@ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "维保单位", index = 10) @ExcelIgnore
@ApiModelProperty(value = "维保单位") @ApiModelProperty(value = "维保单位id")
private String maintenanceUnit; private Long maintenanceUnitId;
@ExcelProperty(value = "建造日期", index = 7) @ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ApiModelProperty(value = "建造日期") @ExcelProperty(value = "维保单位", index = 10)
private Date buildDate; @ApiModelProperty(value = "维保单位")
private String maintenanceUnit;
@ExcelProperty(value = "启用日期", index = 8)
@ApiModelProperty(value = "启用日期") @ExcelProperty(value = "建造日期", index = 7)
private Date enableDate; @ApiModelProperty(value = "建造日期")
private Date buildDate;
@ExcelIgnore
@ApiModelProperty(value = "方位图集合") @ExcelProperty(value = "启用日期", index = 8)
private List<Object> orientationImgList; @ApiModelProperty(value = "启用日期")
private Date enableDate;
@ExcelIgnore
@ApiModelProperty(value = "实景图集合") @ExcelIgnore
private List<Object> realityImgList; @ApiModelProperty(value = "方位图集合")
private List<Object> orientationImgList;
@ExcelIgnore
@ApiModelProperty(value = "方位图") @ExcelIgnore
private String orientationImg; @ApiModelProperty(value = "实景图集合")
private List<Object> realityImgList;
@ExcelIgnore
@ApiModelProperty(value = "实景图") @ExcelIgnore
private String realityImg; @ApiModelProperty(value = "方位图")
private String orientationImg;
@ExcelProperty(value = "联系人姓名", index = 38)
@ApiModelProperty(value = "联系人姓名") @ExcelIgnore
private String contactUser; @ApiModelProperty(value = "实景图")
private String realityImg;
@ExcelProperty(value = "联系人电话", index =39)
@ApiModelProperty(value = "联系人电话") @ExcelProperty(value = "联系人姓名", index = 38)
private String contactPhone; @ApiModelProperty(value = "联系人姓名")
private String contactUser;
@ExcelIgnore
@ApiModelProperty(value = "是否有物联参数（1有，0没有）") @ExcelProperty(value = "联系人电话", index = 39)
private Boolean isIot; @ApiModelProperty(value = "联系人电话")
private String contactPhone;
@ExcelIgnore
@ApiModelProperty(value = "消防救援机构_通用唯一识别码") @ExcelIgnore
private String rescueOrgCode; @ApiModelProperty(value = "是否有物联参数（1有，0没有）")
private Boolean isIot;
@ExcelIgnore
@ApiModelProperty(value = "行政区划代码") @ExcelIgnore
private String administrativeCode; @ApiModelProperty(value = "消防救援机构_通用唯一识别码")
private String rescueOrgCode;
@ExcelIgnore
@ApiModelProperty(value = "更新人员") @ExcelIgnore
private String recUserName; @ApiModelProperty(value = "行政区划代码")
private String administrativeCode;
@ExcelIgnore
@ApiModelProperty(value = "组织机构代码") @ExcelIgnore
private String orgCode; @ApiModelProperty(value = "更新人员")
private String recUserName;
@ExcelIgnore
@ApiModelProperty(value = "资源id") @ExcelIgnore
private Long resourceId; @ApiModelProperty(value = "组织机构代码")
private String orgCode;
@ExcelProperty(value = "高度（cm）", index = 11)
@ApiModelProperty(value = "高度（cm）") @ExcelIgnore
private Float height; @ApiModelProperty(value = "资源id")
private Long resourceId;
@ExcelIgnore
@ApiModelProperty(value = "水源可用状态类别代码") @ExcelProperty(value = "高度（cm）", index = 11)
private String statusCode; @ApiModelProperty(value = "高度（cm）")
private Float height;
@ExplicitConstraint(type = "SYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "水源可用状态", index = 12) @ExcelIgnore
@ApiModelProperty(value = "水源可用状态类别名称") @ApiModelProperty(value = "水源可用状态类别代码")
private String status; private String statusCode;
@ExcelProperty(value = "所属路段", index = 13) @ExplicitConstraint(type = "SYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "所属路段") @ExcelProperty(value = "水源可用状态", index = 12)
private String section; @ApiModelProperty(value = "水源可用状态类别名称")
private String status;
@ExcelProperty(value = "所属管网", index = 14)
@ApiModelProperty(value = "所属管网") @ExcelProperty(value = "所属路段", index = 13)
private String pipeNetwork; @ApiModelProperty(value = "所属路段")
private String section;
@ExcelIgnore
@ApiModelProperty(value = "消防给水管网形式类型代码") @ExcelProperty(value = "所属管网", index = 14)
private String pipeTypeCode; @ApiModelProperty(value = "所属管网")
private String pipeNetwork;
@ExplicitConstraint(type = "XFJSGW", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防给水管网形式", index = 15) @ExcelIgnore
@ApiModelProperty(value = "消防给水管网形式") @ApiModelProperty(value = "消防给水管网形式类型代码")
private String pipeTypeName; private String pipeTypeCode;
@ExcelProperty(value = "管网直径（cm）", index = 16) @ExplicitConstraint(type = "XFJSGW", indexNum = 15, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "管网直径（cm）") @ExcelProperty(value = "消防给水管网形式", index = 15)
private Float pipeDiameter; @ApiModelProperty(value = "消防给水管网形式")
private String pipeTypeName;
@ExcelProperty(value = "进水管直径(cm)", index = 17)
@ApiModelProperty(value = "进水管直径(cm)") @ExcelProperty(value = "管网直径（cm）", index = 16)
private Float inletPipeDiameter; @ApiModelProperty(value = "管网直径（cm）")
private Float pipeDiameter;
@ExcelProperty(value = "出水管直径(cm)", index = 18)
@ApiModelProperty(value = "出水管直径(cm)") @ExcelProperty(value = "进水管直径(cm)", index = 17)
private Float outletPipeDiameter; @ApiModelProperty(value = "进水管直径(cm)")
private Float inletPipeDiameter;
@ExcelProperty(value = "加水车道数量(个)", index = 19)
@ApiModelProperty(value = "加水车道数量(个)") @ExcelProperty(value = "出水管直径(cm)", index = 18)
private Integer waterfillingLaneNum; @ApiModelProperty(value = "出水管直径(cm)")
private Float outletPipeDiameter;
@ExcelProperty(value = "供水单位名称", index = 20)
@ApiModelProperty(value = "供水单位名称") @ExcelProperty(value = "加水车道数量(个)", index = 19)
private String waterSupplyName; @ApiModelProperty(value = "加水车道数量(个)")
private Integer waterfillingLaneNum;
@ExplicitConstraint(type = "XHSXTLX", indexNum = 21, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓系统类型", index = 21) @ExcelProperty(value = "供水单位名称", index = 20)
@ApiModelProperty(value = "消火栓系统类型") @ApiModelProperty(value = "供水单位名称")
private String systemType; private String waterSupplyName;
@ExcelIgnore @ExplicitConstraint(type = "XHSXTLX", indexNum = 21, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "消火栓系统类型code") @ExcelProperty(value = "消火栓系统类型", index = 21)
private String systemTypeCode; @ApiModelProperty(value = "消火栓系统类型")
private String systemType;
@ExcelProperty(value = "消防设施状况", index = 22)
@ApiModelProperty(value = "消防设施状况分类") @ExcelIgnore
private String facilitiesCategory; @ApiModelProperty(value = "消火栓系统类型code")
private String systemTypeCode;
@ExcelIgnore
@ApiModelProperty(value = "消防设施状况分类code") @ExcelProperty(value = "消防设施状况", index = 22)
private String facilitiesCategoryCode; @ApiModelProperty(value = "消防设施状况分类")
private String facilitiesCategory;
@ExcelProperty(value = "道路路口路段", index = 23)
@ApiModelProperty(value = "道路路口路段简要情况") @ExcelIgnore
private String roadJunctionInfo; @ApiModelProperty(value = "消防设施状况分类code")
private String facilitiesCategoryCode;
@ExplicitConstraint(type = "XHSFZXS", indexNum = 24, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓放置形式", index = 24) @ExcelProperty(value = "道路路口路段", index = 23)
@ApiModelProperty(value = "消火栓放置形式") @ApiModelProperty(value = "道路路口路段简要情况")
private String placeForm; private String roadJunctionInfo;
@ExcelIgnore @ExplicitConstraint(type = "XHSFZXS", indexNum = 24, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "消火栓放置形式code") @ExcelProperty(value = "消火栓放置形式", index = 24)
private String placeFormCode; @ApiModelProperty(value = "消火栓放置形式")
private String placeForm;
@ExplicitConstraint(type = "XFSDJK", indexNum = 25, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防水带接口", index = 25) @ExcelIgnore
@ApiModelProperty(value = "消防水带接口") @ApiModelProperty(value = "消火栓放置形式code")
private String hoseConnection; private String placeFormCode;
@ExcelIgnore @ExplicitConstraint(type = "XFSDJK", indexNum = 25, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "消防水带接口code") @ExcelProperty(value = "消防水带接口", index = 25)
private String hoseConnectionCode; @ApiModelProperty(value = "消防水带接口")
private String hoseConnection;
@ExplicitConstraint(type = "QSXS", indexNum = 26, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "取水形式", index = 26) @ExcelIgnore
@ApiModelProperty(value = "取水形式") @ApiModelProperty(value = "消防水带接口code")
private String intakeForm; private String hoseConnectionCode;
@ExcelIgnore @ExplicitConstraint(type = "QSXS", indexNum = 26, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "水源类型代码") @ExcelProperty(value = "取水形式", index = 26)
private String typeCode; @ApiModelProperty(value = "取水形式")
private String intakeForm;
@ExplicitConstraint(type = "TRSYLX", indexNum = 27, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "水源类型", index = 27) @ExcelIgnore
@ApiModelProperty(value = "水源类型") @ApiModelProperty(value = "水源类型代码")
private String type; private String typeCode;
@ExcelProperty(value = "容积（m³）", index = 28) @ExplicitConstraint(type = "TRSYLX", indexNum = 27, sourceClass = CommonExplicitConstraint.class) // 动态下拉内容
@ApiModelProperty(value = "容积（m³）") @ExcelProperty(value = "水源类型", index = 27)
private Float volume; @ApiModelProperty(value = "水源类型")
private String type;
@ExcelProperty(value = "面积（㎡）", index = 29)
@ApiModelProperty(value = "面积（㎡）") @ExcelProperty(value = "容积（m³）", index = 28)
private Float area; @ApiModelProperty(value = "容积（m³）")
private Float volume;
@ExcelProperty(value = "水质情况", index = 30)
@ApiModelProperty(value = "水质情况") @ExcelProperty(value = "面积（㎡）", index = 29)
private String qualitySituationInfo; @ApiModelProperty(value = "面积（㎡）")
private Float area;
@ExcelProperty(value = "四季变化简要情况", index = 31)
@ApiModelProperty(value = "四季变化简要情况") @ExcelProperty(value = "水质情况", index = 30)
private String seasonChangeInfo; @ApiModelProperty(value = "水质情况")
private String qualitySituationInfo;
@ExcelProperty(value = "四季变化简要情况", index = 31)
@ApiModelProperty(value = "四季变化简要情况")
private String seasonChangeInfo;
// @ExplicitConstraint(indexNum = 32, source = {"0", "1"}) //固定下拉内容 // @ExplicitConstraint(indexNum = 32, source = {"0", "1"}) //固定下拉内容
// @ExcelProperty(value = "有无枯水期", index = 32) // @ExcelProperty(value = "有无枯水期", index = 32)
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "有无枯水期") @ApiModelProperty(value = "有无枯水期")
private Boolean hasDrySeason; private Boolean hasDrySeason;
@ExplicitConstraint(indexNum = 32, source = {"有", "无"}) //固定下拉内容 @ExplicitConstraint(indexNum = 32, source = { "有", "无" }) // 固定下拉内容
@ExcelProperty(value = "有无枯水期", index = 32) @ExcelProperty(value = "有无枯水期", index = 32)
@ApiModelProperty(value = "有无枯水期") @ApiModelProperty(value = "有无枯水期")
private String hasDrySeasonType; private String hasDrySeasonType;
@ExcelProperty(value = "枯水期跨度简要情况", index = 33)
@ApiModelProperty(value = "枯水期跨度简要情况")
@ExcelProperty(value = "枯水期跨度简要情况", index = 33) private String dryPeriodSpan;
@ApiModelProperty(value = "枯水期跨度简要情况")
private String dryPeriodSpan; @ExcelProperty(value = "取水高度(cm)", index = 34)
@ApiModelProperty(value = "取水高度(cm)")
@ExcelProperty(value = "取水高度(cm)", index = 34) private Float intakeHeight;
@ApiModelProperty(value = "取水高度(cm)")
private Float intakeHeight; @ExcelProperty(value = "水源标高差(cm)", index = 35)
@ApiModelProperty(value = "水源标高差(cm)")
@ExcelProperty(value = "水源标高差(cm)", index = 35) private Float elevationDifference;
@ApiModelProperty(value = "水源标高差(cm)")
private Float elevationDifference; @ExcelProperty(value = "停车位置", index = 36)
@ApiModelProperty(value = "停车位置")
@ExcelProperty(value = "停车位置", index = 36) private String parkingPosition;
@ApiModelProperty(value = "停车位置")
private String parkingPosition; @ExcelProperty(value = "停车数量(个)", index = 37)
@ApiModelProperty(value = "停车数量(个)")
@ExcelProperty(value = "停车数量(个)", index = 37) private Integer parkingNum;
@ApiModelProperty(value = "停车数量(个)")
private Integer parkingNum; // 物联参数改为动态加载，原先字段作废，字段做隐藏
@ExcelIgnore
// 物联参数改为动态加载，原先字段作废，字段做隐藏 @ApiModelProperty(value = "储水量容积物联编码")
@ExcelIgnore private String iotWaterStorage;
@ApiModelProperty(value = "储水量容积物联编码")
private String iotWaterStorage; @ExcelIgnore
@ApiModelProperty(value = "流量物联编码")
@ExcelIgnore private String iotFlowRate;
@ApiModelProperty(value = "流量物联编码")
private String iotFlowRate; @ExcelIgnore
@ApiModelProperty(value = "状态物联编码")
@ExcelIgnore private String iotStatus;
@ApiModelProperty(value = "状态物联编码")
private String iotStatus; // BUG 2920 管网压力字段冗余 2021-09-18 陈召
@ExcelIgnore
//BUG 2920 管网压力字段冗余 2021-09-18 陈召 @ApiModelProperty(value = "管网压力物联编码")
@ExcelIgnore private String iotPipePressure;
@ApiModelProperty(value = "管网压力物联编码")
private String iotPipePressure; @ExcelIgnore
@ApiModelProperty(value = "物联参数")
@ExcelIgnore private Map<String, Object> waterResourceIotDto;
@ApiModelProperty(value = "物联参数")
private Map<String,Object> waterResourceIotDto; @ExcelIgnore
@ApiModelProperty("设施定义id")
@ExcelIgnore private Long equipId;
@ApiModelProperty("设施定义id")
private Long equipId; @ApiModelProperty("设施定义名称")
@ExcelProperty(value = "设施定义名称", index = 5)
@ApiModelProperty("设施定义名称") @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
@ExcelProperty(value = "设施定义名称", index = 5) private String equipName;
@ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
private String equipName; @ExcelIgnore
@ApiModelProperty("设施分类id")
@ExcelIgnore private Long equipCategoryId;
@ApiModelProperty("设施分类id") // BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
private Long equipCategoryId; @ApiModelProperty("设施分类名称")
// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17 @ExcelIgnore
@ApiModelProperty("设施分类名称")
@ExcelIgnore
// @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory") // @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
// @ExcelProperty(value = "设施分类名称", index = 42) // @ExcelProperty(value = "设施分类名称", index = 42)
private String equipCategoryName; private String equipCategoryName;
@ApiModelProperty("设施编码") @ApiModelProperty("设施分类编码")
@ExcelIgnore @ExcelIgnore
private String equipCode; private String equipCategoryCode;
@ApiModelProperty("维保周期") @ApiModelProperty("设施编码")
@ExcelProperty(value = "维保周期(月)", index = 6) @ExcelIgnore
private String maintenancePeriod; private String equipCode;
@ApiModelProperty("维保周期")
@ApiModelProperty(value = "经度") @ExcelProperty(value = "维保周期(月)", index = 6)
@ExcelProperty(value = "经度", index = 40) private String maintenancePeriod;
private Double longitude;
@ApiModelProperty(value = "经度")
@ApiModelProperty(value = "纬度") @ExcelProperty(value = "经度", index = 40)
@ExcelProperty(value = "纬度", index = 41) private Double longitude;
private Double latitude;
@ApiModelProperty(value = "纬度")
@ExcelIgnore @ExcelProperty(value = "纬度", index = 41)
@ApiModelProperty(value = "附件") private Double latitude;
@TableField(exist = false)
private Map<String, List<AttachmentDto>> attachments; @ExcelIgnore
@ApiModelProperty(value = "附件")
@TableField(exist = false)
private Map<String, List<AttachmentDto>> attachments;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireTeam.java
View file @ d1cc0336
...@@ -28,6 +28,12 @@ public class FireTeam extends BaseEntity { ...@@ -28,6 +28,12 @@ public class FireTeam extends BaseEntity {
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "机构/部门名称")
private String bizOrgName;
@ApiModelProperty(value = "机构编码")
private String bizOrgCode;
@ApiModelProperty(value = "消防队伍图片") @ApiModelProperty(value = "消防队伍图片")
private String img; private String img;
......
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
View file @ d1cc0336
package com.yeejoin.amos.boot.module.common.api.entity; package com.yeejoin.amos.boot.module.common.api.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
...@@ -12,181 +13,189 @@ import lombok.experimental.Accessors; ...@@ -12,181 +13,189 @@ import lombok.experimental.Accessors;
import java.util.Date; import java.util.Date;
/** /**
* *
* *
* @author system_generator * @author system_generator
* @date 2021-06-29 * @date 2021-06-29
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("cb_water_resource") @TableName("cb_water_resource")
public class WaterResource extends BaseEntity { public class WaterResource extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "机构/部门名称")
private String bizOrgName;
@ApiModelProperty(value = "机构编码")
private String bizOrgCode;
/**
/** * 资源名称
* 资源名称 */
*/
@TableField("name") @TableField("name")
private String name; private String name;
/** /**
* 地址 * 地址
*/ */
@TableField("address") @TableField("address")
private String address; private String address;
/** /**
* 经纬度坐标 * 经纬度坐标
*/ */
@ApiModelProperty(value = "经度") @ApiModelProperty(value = "经度")
private Double longitude; private Double longitude;
@ApiModelProperty(value = "纬度") @ApiModelProperty(value = "纬度")
private Double latitude; private Double latitude;
/** /**
* 资源类型（消火栓、消防水鹤、天然水源、消防水池） * 资源类型（消火栓、消防水鹤、天然水源、消防水池）
*/ */
@TableField("resource_type") @TableField("resource_type")
private String resourceType; private String resourceType;
/** /**
* 资源类型名称（消火栓、消防水鹤、天然水源、消防水池） * 资源类型名称（消火栓、消防水鹤、天然水源、消防水池）
*/ */
@TableField("resource_type_name") @TableField("resource_type_name")
private String resourceTypeName; private String resourceTypeName;
/** /**
* 所在建筑id * 所在建筑id
*/ */
@TableField("belong_building_id") @TableField("belong_building_id")
private Long belongBuildingId; private Long belongBuildingId;
/** /**
* 所在建筑 * 所在建筑
*/ */
@TableField("belong_building") @TableField("belong_building")
private String belongBuilding; private String belongBuilding;
/** /**
* 所属消防系统id * 所属消防系统id
*/ */
@TableField("belong_fighting_system_id") @TableField("belong_fighting_system_id")
private Long belongFightingSystemId; private Long belongFightingSystemId;
/** /**
* 所属消防系统 * 所属消防系统
*/ */
@TableField("belong_fighting_system") @TableField("belong_fighting_system")
private String belongFightingSystem; private String belongFightingSystem;
/** /**
* 管理单位id * 管理单位id
*/ */
@TableField("management_unit_id") @TableField("management_unit_id")
private Long managementUnitId; private Long managementUnitId;
/** /**
* 管理单位 * 管理单位
*/ */
@TableField("management_unit") @TableField("management_unit")
private String managementUnit; private String managementUnit;
/** /**
* 维保单位id * 维保单位id
*/ */
@TableField("maintenance_unit_id") @TableField("maintenance_unit_id")
private Long maintenanceUnitId; private Long maintenanceUnitId;
/** /**
* 维保单位 * 维保单位
*/ */
@TableField("maintenance_unit") @TableField("maintenance_unit")
private String maintenanceUnit; private String maintenanceUnit;
/** /**
* 建造日期 * 建造日期
*/ */
@TableField("build_date") @TableField("build_date")
private Date buildDate; private Date buildDate;
/** /**
* 启用日期 * 启用日期
*/ */
@TableField("enable_date") @TableField("enable_date")
private Date enableDate; private Date enableDate;
/** /**
* 方位图 * 方位图
*/ */
@TableField("orientation_img") @TableField("orientation_img")
private String orientationImg; private String orientationImg;
/** /**
* 实景图 * 实景图
*/ */
@TableField("reality_img") @TableField("reality_img")
private String realityImg; private String realityImg;
/** /**
* 联系人姓名 * 联系人姓名
*/ */
@TableField("contact_user") @TableField("contact_user")
private String contactUser; private String contactUser;
/** /**
* 联系人电话 * 联系人电话
*/ */
@TableField("contact_phone") @TableField("contact_phone")
private String contactPhone; private String contactPhone;
/** /**
* 是否有物联参数（1有，0没有） * 是否有物联参数（1有，0没有）
*/ */
@TableField("is_iot") @TableField("is_iot")
private Boolean isIot; private Boolean isIot;
/** /**
* 消防救援机构_通用唯一识别码 * 消防救援机构_通用唯一识别码
*/ */
@TableField("rescue_org_code") @TableField("rescue_org_code")
private String rescueOrgCode; private String rescueOrgCode;
/** /**
* 行政区划代码 * 行政区划代码
*/ */
@TableField("administrative_code") @TableField("administrative_code")
private String administrativeCode; private String administrativeCode;
/** /**
* 组织机构代码 * 组织机构代码
*/ */
@TableField("org_code") @TableField("org_code")
private String orgCode; private String orgCode;
@ApiModelProperty("设施定义") @ApiModelProperty("设施定义")
@TableField("equip_id") @TableField("equip_id")
private Long equipId; private Long equipId;
@ApiModelProperty("设施定义名称") @ApiModelProperty("设施定义名称")
@TableField("equip_name") @TableField("equip_name")
private String equipName; private String equipName;
@ApiModelProperty("设施分类") @ApiModelProperty("设施分类")
@TableField("equip_category_id") @TableField("equip_category_id")
private Long equipCategoryId; private Long equipCategoryId;
@ApiModelProperty("设施分类名称") @ApiModelProperty("设施分类名称")
@TableField("equip_category_name") @TableField("equip_category_name")
private String equipCategoryName; private String equipCategoryName;
@ApiModelProperty("设施编码") @ApiModelProperty("设施分类编码")
@TableField("equip_code") @TableField("equip_category_code")
private String equipCode; private String equipCategoryCode;
@ApiModelProperty("维保周期") @ApiModelProperty("设施编码")
@TableField("maintenance_period") @TableField("equip_code")
private String maintenancePeriod; private String equipCode;
@ApiModelProperty("维保周期")
@TableField("maintenance_period")
private String maintenancePeriod;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java
View file @ d1cc0336
package com.yeejoin.amos.boot.module.common.api.feign; package com.yeejoin.amos.boot.module.common.api.feign;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig; import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
import com.yeejoin.amos.boot.module.common.api.dto.EquipmentIndexDto; import com.yeejoin.amos.boot.module.common.api.dto.EquipmentIndexDto;
import com.yeejoin.amos.boot.module.common.api.dto.PerfQuotaIotDTO; import com.yeejoin.amos.boot.module.common.api.dto.PerfQuotaIotDTO;
import com.yeejoin.amos.boot.module.common.api.dto.VideoDto; import com.yeejoin.amos.boot.module.common.api.dto.VideoDto;
import com.yeejoin.amos.component.feign.config.InnerInvokException; import com.yeejoin.amos.component.feign.config.InnerInvokException;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/** /**
* 装备服务feign * 装备服务feign
...@@ -349,4 +354,7 @@ public interface EquipFeignClient { ...@@ -349,4 +354,7 @@ public interface EquipFeignClient {
@RequestMapping(value = "/equipment/list/{typeCode}", method = RequestMethod.GET) @RequestMapping(value = "/equipment/list/{typeCode}", method = RequestMethod.GET)
ResponseModel<List> getEquipmentList(@PathVariable("typeCode") String typeCode); ResponseModel<List> getEquipmentList(@PathVariable("typeCode") String typeCode);
@RequestMapping(value = "equipment-category/list-tree", method = RequestMethod.GET)
ResponseModel<Object> list() ;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java
View file @ d1cc0336
...@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param; ...@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Mapper 接口 * Mapper 接口
...@@ -46,5 +47,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> { ...@@ -46,5 +47,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
*/ */
Page<WaterResourceDto> getWaterResourcePageByParams(Page<WaterResourceDto> page, String name, String resourceType, Page<WaterResourceDto> getWaterResourcePageByParams(Page<WaterResourceDto> page, String name, String resourceType,
ArrayList<Long> belongBuildingId, Long belongFightingSystemId, ArrayList<Long> belongBuildingId, Long belongFightingSystemId,
Long sequenceNbr, String equipId); Long sequenceNbr, String equipId,String bizOrgCode);
}
Map<String, Object> getWaterTypeByBizOrgCode(String bizOrgCode);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml
View file @ d1cc0336
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
a.NAME, a.NAME,
a.contact_user contactUser, a.contact_user contactUser,
a.contact_phone contactPhone, a.contact_phone contactPhone,
a.address a.address,
a.biz_org_code as bizOrgCode,
a.biz_org_name as bizOrgName
FROM FROM
cb_fire_team a cb_fire_team a
WHERE WHERE
...@@ -65,6 +67,7 @@ ...@@ -65,6 +67,7 @@
and a.sequence_nbr = #{par.nodeId} and a.sequence_nbr = #{par.nodeId}
</if> </if>
</if> </if>
<if test='par.bizOrgCode != null'>and a.biz_org_code like CONCAT( #{par.bizOrgCode},'%')</if>
order by a.rec_date desc order by a.rec_date desc
</select> </select>
<select id="listFireTeamDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto"> <select id="listFireTeamDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto">
...@@ -131,6 +134,8 @@ ...@@ -131,6 +134,8 @@
a.name , a.name ,
a.contact_user contactUser, a.contact_user contactUser,
a.contact_phone contactPhone, a.contact_phone contactPhone,
a.biz_org_code as bizOrgCode,
a.biz_org_name as bizOrgName
( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum, ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum,
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
FROM cb_fire_team a FROM cb_fire_team a
...@@ -197,6 +202,4 @@ ...@@ -197,6 +202,4 @@
AND is_delete = 0 AND is_delete = 0
</select> </select>
</mapper> </mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml
View file @ d1cc0336
...@@ -147,8 +147,23 @@ ...@@ -147,8 +147,23 @@
<if test="belongBuildingId != null and belongBuildingId.size() > 0"> <if test="belongBuildingId != null and belongBuildingId.size() > 0">
and find_in_set(belong_building_id, #{belongBuildingId}) > 0 and find_in_set(belong_building_id, #{belongBuildingId}) > 0
</if> </if>
<if test="bizOrgCode != null and bizOrgCode != ''">and biz_org_code like concat( #{bizOrgCode}, '%')</if>
order by cb_water_resource.rec_date desc order by cb_water_resource.rec_date desc
</select> </select>
<select id="getWaterTypeByBizOrgCode" resultType="map">
SELECT
equip_category_code,
COUNT(sequence_nbr) as num
FROM
cb_water_resource
WHERE
is_delete = 0
<if test="bizOrgCode != null and bizOrgCode != ''">AND biz_org_code like concat( #{bizOrgCode}, '%')</if>
GROUP BY
equip_category_code
</select>
</mapper> </mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireTeamController.java
View file @ d1cc0336
package com.yeejoin.amos.boot.module.jcs.biz.controller; package com.yeejoin.amos.boot.module.common.biz.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -22,19 +23,27 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest; ...@@ -22,19 +23,27 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.utils.Menu; import com.yeejoin.amos.boot.biz.common.utils.Menu;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom; import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
import com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto; import com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto;
import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto; import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto; import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.entity.FireTeam; import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -52,6 +61,10 @@ public class FireTeamController extends BaseController { ...@@ -52,6 +61,10 @@ public class FireTeamController extends BaseController {
@Autowired @Autowired
FireTeamServiceImpl iFireTeamService; FireTeamServiceImpl iFireTeamService;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
/** /**
* 新增消防队伍 * 新增消防队伍
...@@ -278,4 +291,25 @@ public class FireTeamController extends BaseController { ...@@ -278,4 +291,25 @@ public class FireTeamController extends BaseController {
public ResponseModel<List<Menu>> getFirstTeamToDesignatedDepartment(@RequestParam String dicCode,@RequestParam String typeCode) throws Exception { public ResponseModel<List<Menu>> getFirstTeamToDesignatedDepartment(@RequestParam String dicCode,@RequestParam String typeCode) throws Exception {
return ResponseHelper.buildResponse(iFireTeamService.getFirstTeamToDesignatedDepartment(dicCode,typeCode)); return ResponseHelper.buildResponse(iFireTeamService.getFirstTeamToDesignatedDepartment(dicCode,typeCode));
} }
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false) String type) throws Exception {
// 获取登陆人角色
ReginParams reginParams = getSelectedOrgInfo();
List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, type);
return ResponseHelper.buildResponse(menus);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/typeTree/XFJGLX", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据bizOrgCode的值获取对应的消防队伍树信息，含有队伍下统计数据", notes = "根据bizOrgCode的值获取对应的消防队伍树信息，含有队伍下统计数据")
public ResponseModel<List<Menu>> getFireTeamType(@RequestParam(required = false) String bizOrgCode) throws Exception {
List<Menu> list = iFireTeamService.getFireTeamTypeTree(bizOrgCode);
return ResponseHelper.buildResponse(list);
}
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ d1cc0336
...@@ -502,7 +502,7 @@ public class OrgUsrController extends BaseController { ...@@ -502,7 +502,7 @@ public class OrgUsrController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getAmosId/{amosId}", method = RequestMethod.GET) @RequestMapping(value = "/getAmosId/{amosId}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联") @ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联")
public ResponseModel<Object> getAmosId(@PathVariable String amosId) { public ResponseModel<Object> getAmosId(@PathVariable String amosId) {
return ResponseHelper.buildResponse(iOrgUsrService.amosIdExist(amosId)); return ResponseHelper.buildResponse(iOrgUsrService.amosIdExist(amosId));
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java
View file @ d1cc0336
package com.yeejoin.amos.boot.module.common.biz.controller; package com.yeejoin.amos.boot.module.common.biz.controller;
import com.alibaba.fastjson.JSON; import java.util.ArrayList;
import com.alibaba.fastjson.JSONArray; import java.util.HashMap;
import com.alibaba.fastjson.JSONObject; import java.util.LinkedList;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.Optional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.stream.Collectors;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.entity.*;
import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.biz.service.impl.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.checkerframework.checker.units.qual.K;
import org.openxmlformats.schemas.drawingml.x2006.chart.STRadarStyle;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -35,16 +18,57 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -35,16 +18,57 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*; import com.alibaba.fastjson.JSONArray;
import java.util.stream.Collectors; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
import com.yeejoin.amos.boot.biz.common.utils.Menu;
import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.EquipmentIndexDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.PerfQuotaIotDTO;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDyDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIndex;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceCraneServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceHydrantServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceIndexServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceIotServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceNaturalServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourcePoolServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
...@@ -74,7 +98,8 @@ public class WaterResourceController extends BaseController { ...@@ -74,7 +98,8 @@ public class WaterResourceController extends BaseController {
EquipFeignClient equipFeignClient; EquipFeignClient equipFeignClient;
@Autowired @Autowired
WaterResourceIndexServiceImpl waterResourceIndexServiceImpl; WaterResourceIndexServiceImpl waterResourceIndexServiceImpl;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
/** /**
* 新增 * 新增
* *
...@@ -440,14 +465,15 @@ public class WaterResourceController extends BaseController { ...@@ -440,14 +465,15 @@ public class WaterResourceController extends BaseController {
@RequestParam(value = "belongBuildingId", required = false) ArrayList<Long> belongBuildingId, @RequestParam(value = "belongBuildingId", required = false) ArrayList<Long> belongBuildingId,
Long belongFightingSystemId, Long sequenceNbr, Long belongFightingSystemId, Long sequenceNbr,
String resourceType, String resourceType,
String classifyId) { String classifyId,
String bizOrgCode) {
Page<WaterResourceDto> page = new Page<>(); Page<WaterResourceDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
/*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/ /*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
Page<WaterResourceDto> waterResourceDtoPage = waterResourceServiceImpl.queryForWaterResourcePage(page, name, resourceType, Page<WaterResourceDto> waterResourceDtoPage = waterResourceServiceImpl.queryForWaterResourcePage(page, name, resourceType,
belongBuildingId, belongFightingSystemId, sequenceNbr, classifyId); belongBuildingId, belongFightingSystemId, sequenceNbr, classifyId,bizOrgCode);
List<WaterResourceDto> records = waterResourceDtoPage.getRecords(); List<WaterResourceDto> records = waterResourceDtoPage.getRecords();
records.forEach(i->{ records.forEach(i->{
Map<String, List<AttachmentDto>> attachments = sourceFileService.getAttachments(i.getSequenceNbr()); Map<String, List<AttachmentDto>> attachments = sourceFileService.getAttachments(i.getSequenceNbr());
...@@ -515,4 +541,23 @@ public class WaterResourceController extends BaseController { ...@@ -515,4 +541,23 @@ public class WaterResourceController extends BaseController {
public ResponseModel<String> genQrCode() { public ResponseModel<String> genQrCode() {
return ResponseHelper.buildResponse(QRCodeUtil.generateQRCode()); return ResponseHelper.buildResponse(QRCodeUtil.generateQRCode());
} }
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false) String type) throws Exception {
// 获取登陆人角色
ReginParams reginParams = getSelectedOrgInfo();
List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, type);
return ResponseHelper.buildResponse(menus);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/typeTree/XFSYLX", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据bizOrgCode的值获取对应的消防水源树信息，含有队伍下统计数据", notes = "根据bizOrgCode的值获取对应的消防水源树信息，含有队伍下统计数据")
public ResponseModel<JSONObject> getwaterResourceTypeTree(@RequestParam(required = false) String bizOrgCode) throws Exception {
JSONObject list = waterResourceServiceImpl.getwaterResourceTypeTree(bizOrgCode);
return ResponseHelper.buildResponse(list);
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireTeamServiceImpl.java
View file @ d1cc0336
package com.yeejoin.amos.boot.module.jcs.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import static org.hamcrest.CoreMatchers.nullValue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
...@@ -29,7 +27,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -29,7 +27,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
import com.yeejoin.amos.boot.biz.common.constants.BizConstant; import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
...@@ -49,8 +46,6 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; ...@@ -49,8 +46,6 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient; import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper; import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService; import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
/** /**
* 消防队伍 服务实现类 * 消防队伍 服务实现类
...@@ -73,6 +68,8 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire ...@@ -73,6 +68,8 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
@Autowired @Autowired
DataDictionaryServiceImpl iDataDictionaryService; DataDictionaryServiceImpl iDataDictionaryService;
/** /**
* 获取监控大队列表 * 获取监控大队列表
...@@ -483,5 +480,9 @@ public List<Menu> getFirstTeamToDesignatedDepartment(String dicCode, String type ...@@ -483,5 +480,9 @@ public List<Menu> getFirstTeamToDesignatedDepartment(String dicCode, String type
null); null);
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
public List<Menu> getFireTeamTypeTree(String bizOrgCode) throws Exception {
return iDataDictionaryService.getFireTeamTypeTree(bizOrgCode);
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java
View file @ d1cc0336
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import javax.annotation.Resource;
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.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -7,12 +25,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -7,12 +25,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.constants.BizConstant; import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils; import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
import com.yeejoin.amos.boot.module.common.api.dto.RequestData; import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto; import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto; import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto; import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto; import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto; import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto; import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
...@@ -21,27 +40,12 @@ import com.yeejoin.amos.boot.module.common.api.entity.WaterResource; ...@@ -21,27 +40,12 @@ import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane; import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant; import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIndex; import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIndex;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIot;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural; import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool; import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum; import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper; import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper;
import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService; import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
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.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/** /**
* 服务实现类 * 服务实现类
...@@ -66,7 +70,11 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate ...@@ -66,7 +70,11 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
WaterResourceMapper waterResourceMapper; WaterResourceMapper waterResourceMapper;
@Autowired @Autowired
WaterResourceIndexServiceImpl waterResourceIndexServiceImpl; WaterResourceIndexServiceImpl waterResourceIndexServiceImpl;
@Autowired
DataDictionaryServiceImpl dataDictionaryService;
@Autowired
EquipFeignClient equipFeignClient;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -76,9 +84,10 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate ...@@ -76,9 +84,10 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
@Condition(Operator.in) ArrayList<Long> belongBuildingId, @Condition(Operator.in) ArrayList<Long> belongBuildingId,
@Condition(Operator.eq) Long belongFightingSystemId, @Condition(Operator.eq) Long belongFightingSystemId,
@Condition(Operator.eq) Long sequenceNbr, @Condition(Operator.eq) Long sequenceNbr,
String equipId) { String equipId,
String bizOrgCode) {
return this.waterResourceMapper.getWaterResourcePageByParams(page, name, resourceType, belongBuildingId, return this.waterResourceMapper.getWaterResourcePageByParams(page, name, resourceType, belongBuildingId,
belongFightingSystemId, sequenceNbr, equipId); belongFightingSystemId, sequenceNbr, equipId,bizOrgCode);
} }
/** /**
...@@ -315,4 +324,60 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate ...@@ -315,4 +324,60 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
} }
return result; return result;
} }
public JSONObject getwaterResourceTypeTree(String bizOrgCode) throws Exception {
ResponseModel <Object> response= equipFeignClient.list();
if(response.getStatus() != 200) {
return null;
}
Object resultObject = response.getResult();
JSONArray childrenArray = null;
JSONArray waterTypeDetailArray = null;
JSONObject waterTypeDetailJson=null;
JSONArray resultArray = JSONArray.parseArray(JSONArray.toJSONString(resultObject));
for (Object obj : resultArray) {
JSONObject detailJsonObject= JSONObject.parseObject(JSONObject.toJSONString(obj));
String codeString = detailJsonObject.getString("code");
if(codeString.equals("90000000")) {
childrenArray = detailJsonObject.getJSONArray("children");
break;
}
}
if(childrenArray!=null && childrenArray.size()>0) {
for (Object childObject : childrenArray) {
JSONObject detailChildJsonObject= JSONObject.parseObject(JSONObject.toJSONString(childObject));
String codeStr = detailChildJsonObject.getString("code");
if(codeStr.equals("93000000")) {
waterTypeDetailArray=detailChildJsonObject.getJSONArray("children");
break;
}
}
}
if(waterTypeDetailArray!=null && waterTypeDetailArray.size()>0) {
for (Object childObject : waterTypeDetailArray) {
JSONObject waterTypeDetail= JSONObject.parseObject(JSONObject.toJSONString(childObject));
String codeStr = waterTypeDetail.getString("code");
if(codeStr.equals("93060000")) {
waterTypeDetailJson = waterTypeDetail;
break;
}
}
}
if(waterTypeDetailJson!=null) {
Map<String, Object> map= waterResourceMapper.getWaterTypeByBizOrgCode(bizOrgCode);
int num=0;
JSONArray waterTypeDetailChildrenArray = waterTypeDetailJson.getJSONArray("children");
for (Object childObject : waterTypeDetailChildrenArray) {
JSONObject detail= JSONObject.parseObject(JSONObject.toJSONString(childObject));
String codeStr = detail.getString("code");
if(map.containsKey(codeStr)) {
num=num+Integer.parseInt( map.get("codeStr").toString());
detail.put("num", map.get("codeStr"));
}
}
waterTypeDetailJson.put("num", num);
}
return waterTypeDetailJson;
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java
View file @ d1cc0336
package com.yeejoin.amos.boot.module.jcs.biz.controller; package com.yeejoin.amos.boot.module.jcs.biz.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -16,29 +36,28 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; ...@@ -16,29 +36,28 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto; import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto; import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto; import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
import com.yeejoin.amos.boot.module.common.api.entity.*; import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
import com.yeejoin.amos.boot.module.common.biz.service.impl.*; import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl; import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContractServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersEducationServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersPostServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel; import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/** /**
* 消防队员 * 消防队员
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment