Commit ca8b55c3 authored by tangwei's avatar tangwei

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

parents f31ca8a6 b9bed651

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -9,8 +9,9 @@ import java.util.List;
**/
public class DepartmentBo {
private String departmentName;
private String departmentCode;
private String level;
private Integer deptOrgCode;
private String deptOrgCode;
private String orgCode;
private String departmentDesc;
private Long companySeq;
......@@ -25,16 +26,23 @@ public class DepartmentBo {
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
public String getDepartmentCode() {
return departmentCode;
}
public Integer getDeptOrgCode() {
return deptOrgCode;
}
public void setDepartmentCode(String departmentCode) {
this.departmentCode = departmentCode;
}
public String getDeptOrgCode() {
return deptOrgCode;
}
public void setDeptOrgCode(Integer deptOrgCode) {
this.deptOrgCode = deptOrgCode;
}
public void setDeptOrgCode(String deptOrgCode) {
this.deptOrgCode = deptOrgCode;
}
public String getOrgCode() {
public String getOrgCode() {
return orgCode;
}
......
......@@ -19,6 +19,8 @@ public class ReginParams implements Serializable {
private DepartmentBo department;
//用户基本信息
private AgencyUserModel userModel;
@Deprecated
private String token;
public CompanyBo getCompany() {
return company;
......@@ -51,6 +53,12 @@ public class ReginParams implements Serializable {
public void setUserModel(AgencyUserModel userModel) {
this.userModel = userModel;
}
@Deprecated
public String getToken() {
return token;
}
@Deprecated
public void setToken(String token) {
this.token = token;
}
}
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>amos-boot-jcs-system</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>amos-boot-module-api</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>amos-boot-module-api</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<artifactId>amos-boot-module-command-api</artifactId>
<artifactId>amos-boot-module-command-api</artifactId>
<dependencies>
</dependencies>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
</dependencies>
</project>
package com.yeejoin.amos.boot.module.common.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 公共附件
*
* @author system_generator
* @date 2021-07-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="AttachmentDto", description="附件dto")
public class AttachmentDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "文件地址")
private String url;
@ApiModelProperty(value = "文件名称")
private String name;
@ApiModelProperty(value = "文件类型")
private String type;
}
package com.yeejoin.amos.boot.module.common.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-07-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="KeySiteDto", description="重点部位")
public class KeySiteDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "重点部位名称")
private String name;
@ApiModelProperty(value = "所属单位/部门id")
private Long belongId;
@ApiModelProperty(value = "所属建筑id")
private Long buildingId;
@ApiModelProperty(value = "位置描述")
private String addressDesc;
@ApiModelProperty(value = "建筑面积(㎡)")
private String buildingArea;
@ApiModelProperty(value = "建筑高度(m)")
private String buildingHeight;
@ApiModelProperty(value = "耐火等级")
private String fireEnduranceRate;
@ApiModelProperty(value = "使用性质")
private String useNature;
@ApiModelProperty(value = "责任人")
private String chargePerson;
@ApiModelProperty(value = "责任人身份证")
private String chargePersonId;
@ApiModelProperty(value = "确定重点防火部位的原因")
private String keyPreventionReason;
@ApiModelProperty(value = "消防设施情况")
private String fireFacilitiesInfo;
@ApiModelProperty(value = "防火标志设立情况")
private String firePreventionFlag;
@ApiModelProperty(value = "危险源")
private String hazard;
@ApiModelProperty(value = "消防安全管理措施")
private String safetyManagementMeasures;
@ApiModelProperty(value = "防范手段措施")
private String preventiveMeasures;
@ApiModelProperty(value = "备注")
private String remark;
}
package com.yeejoin.amos.boot.module.common.api.dto;
import java.io.Serializable;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
......@@ -16,74 +18,84 @@ public class MaintenancePersonExcleDto implements Serializable {
/**
*
*/
@ExcelIgnore
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "序号", index = 0)
//@ExcelProperty(value = "序号", index = 0)
@ApiModelProperty(value = "序号")
@ExcelIgnore
private Integer number;
@ExcelProperty(value = "姓名", index = 1)
@ExcelProperty(value = "姓名", index = 0)
@ApiModelProperty(value = "姓名")
private String name;
@ExcelProperty(value = "员工编号", index =2)
@ExcelProperty(value = "员工编号", index =1)
@ApiModelProperty(value = "员工编号")
protected String code;
@ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
@ExplicitConstraint(indexNum = 2, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
@ExcelProperty(value = "所属单位及部门", index =2)
@ApiModelProperty(value = "所属单位及部门")
private String parentId;
private String parentName;
@ExplicitConstraint(type = "XB", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class)
@ExcelIgnore
private Long parentId;
@ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class)
@ExcelProperty(value = "性别", index =3)
@ApiModelProperty(value = "性别")
private String gender;
@ExcelProperty(value = "身份证号码", index =5)
@ExcelProperty(value = "身份证号码", index =4)
@ApiModelProperty(value = "身份证号码")
private String idNumber;
@ExcelProperty(value = "手机号码", index =6)
@ExcelProperty(value = "手机号码", index =5)
@ApiModelProperty(value = "手机号码")
private String tel;
@ExcelProperty(value = "民族", index =7)
@ExcelProperty(value = "民族", index =6)
@ApiModelProperty(value = "民族")
private String nation;
//项目负责人、消防设施操作员
@ExcelProperty(value = "类别", index =8)
@ExcelProperty(value = "类别", index =7)
@ApiModelProperty(value = "类别")
private String category;
@ExcelProperty(value = "统账号", index = 9)
@ExcelProperty(value = "统账号", index = 8)
@ApiModelProperty(value = "系统账户")
private String systemAccount;
@ExplicitConstraint(type = "WBRYZT", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "人员状态", index =9)
@ApiModelProperty(value = "人员状态")
private String status;
@ExplicitConstraint(type = "WBZYZS", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "职业资格证书", index =10)
@ApiModelProperty(value = "职业资格证书")
private String professionalCertificate;
@ExplicitConstraint(type = "WBZYZG", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "职业资格", index =11)
@ApiModelProperty(value = "职业资格")
private String qualification;
@ExcelProperty(value = "证书编号", index =13)
@ExcelProperty(value = "证书编号", index =12)
@ApiModelProperty(value = "证书编号")
private String certificateNo;
@ExcelProperty(value = "注册有效期开始时间", index = 14)
@ExcelProperty(value = "注册有效期开始时间", index = 13)
@ApiModelProperty(value = "注册有效期开始时间")
private String registrationStartTime;
private Date registrationStartTime;
@ExcelProperty(value = "注册有效期结束时间", index = 15)
@ExcelProperty(value = "注册有效期结束时间", index = 14)
@ApiModelProperty(value = "注册有效期结束时间")
private String registrationEndTime;
private Date registrationEndTime;
@ExcelProperty(value = "注册号", index = 16)
@ExcelProperty(value = "注册号", index = 15)
@ApiModelProperty(value = "注册号")
private String amosAccount;
......
package com.yeejoin.amos.boot.module.common.api.entity;
import java.util.Date;
import java.util.Objects;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.Objects;
/**
* 值班人员日期关联关系表
*
......
......@@ -21,7 +21,12 @@ import java.util.Date;
@ApiModel(value = "FireExperts对象", description = "")
public class FireExperts extends BaseEntity {
@ApiModelProperty(value = "姓名")
/**
*
*/
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "证件类型")
......
package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 重点部位
*
* @author system_generator
* @date 2021-07-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("cb_key_site")
public class KeySite extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 重点部位名称
*/
@TableField("name")
private String name;
/**
* 所属单位/部门id
*/
@TableField("belong_id")
private Long belongId;
/**
* 所属建筑id
*/
@TableField("building_id")
private Long buildingId;
/**
* 位置描述
*/
@TableField("address_desc")
private String addressDesc;
/**
* 建筑面积(㎡)
*/
@TableField("building_area")
private String buildingArea;
/**
* 建筑高度(m)
*/
@TableField("building_height")
private String buildingHeight;
/**
* 耐火等级
*/
@TableField("fire_endurance_rate")
private String fireEnduranceRate;
/**
* 使用性质
*/
@TableField("use_nature")
private String useNature;
/**
* 责任人
*/
@TableField("charge_person")
private String chargePerson;
/**
* 责任人身份证
*/
@TableField("charge_person_id")
private String chargePersonId;
/**
* 确定重点防火部位的原因
*/
@TableField("key_prevention_reason")
private String keyPreventionReason;
/**
* 消防设施情况
*/
@TableField("fire_facilities_info")
private String fireFacilitiesInfo;
/**
* 防火标志设立情况
*/
@TableField("fire_prevention_flag")
private String firePreventionFlag;
/**
* 危险源
*/
@TableField("hazard")
private String hazard;
/**
* 消防安全管理措施
*/
@TableField("safety_management_measures")
private String safetyManagementMeasures;
/**
* 防范手段措施
*/
@TableField("preventive_measures")
private String preventiveMeasures;
/**
* 备注
*/
@TableField("remark")
private String remark;
}
package com.yeejoin.amos.boot.module.common.api.entity;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModelProperty;
/**
* 维保单位
*
......@@ -80,4 +83,8 @@ public class MaintenanceCompany extends BaseEntity {
@ApiModelProperty(value = "动态表单值")
@TableField(exist = false)
private List<DynamicFormInstance> dynamicFormValue;
@ApiModelProperty(value = "附件")
@TableField(exist = false)
private Map<String, List<AttachmentDto>> attachments;
}
package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......
......@@ -2,8 +2,9 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -142,18 +143,9 @@ public class WaterResource extends BaseEntity {
@TableField("administrative_code")
private String administrativeCode;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 组织机构代码
*/
@TableField("org_code")
private String orgCode;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -86,14 +87,4 @@ public class WaterResourceCrane extends BaseEntity {
*/
@TableField("water_supply_name")
private String waterSupplyName;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -111,14 +112,4 @@ public class WaterResourceHydrant extends BaseEntity {
*/
@TableField("water_supply_name")
private String waterSupplyName;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -51,14 +52,4 @@ public class WaterResourceIot extends BaseEntity {
*/
@TableField("iot_pipe_pressure")
private String iotPipePressure;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -81,14 +82,4 @@ public class WaterResourceNatural extends BaseEntity {
*/
@TableField("dry_period_span")
private String dryPeriodSpan;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
......@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -86,14 +87,4 @@ public class WaterResourcePool extends BaseEntity {
*/
@TableField("water_supply_name")
private String waterSupplyName;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 是否启用
*/
@TableField("is_delete")
private Boolean isDelete;
}
package com.yeejoin.amos.boot.module.common.api.mapper;
import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 重点部位 Mapper 接口
*
* @author system_generator
* @date 2021-07-26
*/
public interface KeySiteMapper extends BaseMapper<KeySite> {
}
package com.yeejoin.amos.boot.module.common.api.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 维保单位 Mapper 接口
......@@ -24,10 +24,9 @@ public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany>
/**
* 查询机场单位信息 (带分页)
* @param pageNum
* @param pageSize
* @param page
* @param seq
* @return
*/
public List<OrgUsrDto> selectOrgUsrPageList (@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("seq") Long seq);
public Page<OrgUsrDto> selectOrgUsrPageList(Page page, @Param("seq") Long seq);
}
package com.yeejoin.amos.boot.module.common.api.service;
/**
* 重点部位接口类
*
* @author system_generator
* @date 2021-07-26
*/
public interface IKeySiteService {
}
......@@ -8,7 +8,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
/**
* 维保单位接口类
......@@ -29,10 +28,9 @@ public interface IMaintenanceCompanyService {
* 添加保存维保单位人员基本信息
*
* @param maintenanceCompany
* @param sequenceNbr 主键
* @return
*/
public boolean savePersonDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr);
public boolean savePersonDetail(MaintenanceCompany maintenanceCompany);
/**
* 自定义假删除
......@@ -52,10 +50,10 @@ public interface IMaintenanceCompanyService {
/**
* 添加保存维保单位部门基本信息
*
* @param MaintenanceCompany
* @param maintenanceCompany
* @return
*/
public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany, long sequenceNbr);
public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany);
/**
* 检查当前的员工编号是否已经存在
......@@ -98,26 +96,26 @@ public interface IMaintenanceCompanyService {
/**
* 修改维保单位
*
* @param MaintenanceCompany
* @param model
* @return
*/
boolean updateMaintenanceCompanyDetail(MaintenanceCompany model, AgencyUserModel userInfo);
boolean updateMaintenanceCompanyDetail(MaintenanceCompany model) throws Exception;
/**
* 修改维保部门
*
* @param MaintenanceCompany
* @param model
* @return
*/
public boolean updateMaintenancDepartmentDetail(MaintenanceCompany model, AgencyUserModel userInfo);
public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model) throws Exception;
/**
* 修改维保人员
*
* @param MaintenanceCompany
* @param model
* @return
*/
public boolean updateMaintenancePersonDetail(MaintenanceCompany model, AgencyUserModel userInfo);
public boolean updateMaintenancePersonDetail(MaintenanceCompany model) throws Exception;
/**
* 查询所有的单位-部门树
......@@ -158,5 +156,10 @@ public interface IMaintenanceCompanyService {
* @return
*/
public boolean saveMaintenanceCompanyBatch(List<MaintenanceCompany> companyList, List<DynamicFormInstance> list);
/**
* 将所有的维保人员导入到excle中
* @return
*/
public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel();
}
......@@ -90,10 +90,12 @@ public interface IOrgUsrService {
/**
* 更新机构/部门/人员基本信息和动态表单数据
* @param alertFromValuelist
*
* @param instanceId 实例id
* @param fromValueList 动态表单数据列表
* @throws Exception
*/
void updateDynamicFormInstance(OrgUsr orgUsr,Long alertCalledId,List<DynamicFormInstance> alertFromValuelist)throws Exception;
void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList)throws Exception;
/**
*
......
<?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.common.api.mapper.KeySiteMapper">
</mapper>
......@@ -36,6 +36,5 @@ WHERE
sequence_nbr IN ( SELECT DISTINCT signed_company_id FROM cb_contract WHERE company_id = #{seq} )
AND biz_org_type = "COMPANY"
AND is_delete = 0
limit #{pageNum},#{pageSize}
</select>
</mapper>
......@@ -105,7 +105,7 @@
select distinct (case
when ISNULL(belong_fighting_system_id) = 0 and LENGTH(trim(belong_fighting_system_id)) > 0
then belong_fighting_system_id
else -1 end) belong_fighting_system_id,
else 0 end) belong_fighting_system_id,
(case
when ISNULL(belong_fighting_system) = 0 and LENGTH(trim(belong_fighting_system)) > 0
then belong_fighting_system
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>amos-boot-module-api</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<artifactId>amos-boot-module-fas-api</artifactId>
<dependencies>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-biz-common</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.11.2</version>
</dependency>
</dependencies>
</project>
package com.yeejoin.amos.fas.common.constant;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.format.DateTimeFormatter;
/**
* @Description: 常量类
* @Author: duanwei
* @Date: 2019/7/29
*/
public interface Constant {
String SMALL_PRO_PRCODE = "SMALL_PRO_PRCODE_";
String RESULT_SUCCESS = "SUCCESS";
String RESULT_FAILURE = "FAILURE";
/**
* 任务-作业交底
*/
Integer JOB_TYPE = 0;
/**
* 任务-三交三查
*/
Integer HAND_QUERY = 1;
/**
* 违规管理
*/
Integer BAD_MANAGEMENT = 2;
Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
String FILE_SEPARATOR = System.getProperty("file.separator");
DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String PAGE_NUM = "0";
String SIZE_NUM = "20";
String PAGE = "page";
String SIZE = "size";
String ZERO = "0";
String ONE = "1";
String TWO = "2";
String THREE = "3";
String FOUR = "4";
String FIVE = "5";
String NULL = "";
String JSON_NULL = "[]";
/**
* 请求成功
*/
String SUCCESS = "200";
/**
* 请求错误
*/
String ERROR = "300";
/**
* 无权限
*/
String PERMISSION = "401";
/**
* 请求成功,其他错误
*/
String DATA_NULL = "402";
/**
* 请求失败
*/
String FAILED = "999";
/**
* 最大值
*/
Integer MAX = 32767;
/**
* 数据请求返回码
*/
public static final int RESCODE_SUCCESS = 1000; //成功
public static final int RESCODE_SUCCESS_MSG = 1001; //成功(有返回信息)
public static final int RESCODE_EXCEPTION = 1002; //请求抛出异常
public static final int RESCODE_NOLOGIN = 1003; //未登陆状态
public static final int RESCODE_NOEXIST = 1004; //查询结果为空
public static final int RESCODE_NOAUTH = 1005; //无操作权限
public static final int RESCODE_LOGINEXPIRE = 1006; //登录过期
/**
* token
*/
public static final int JWT_ERRCODE_EXPIRE = 1007;//Token过期
public static final int JWT_ERRCODE_FAIL = 1008;//验证不通过
/**
* jwt
*/
public static final String JWT_ID = "jwt-black";//jwt签发者
public static final String JWT_SECRET = "Isi5Ob9OfvJt+4IHoMJlHkS1ttg=";//密匙
public static final int JWT_TTL = 60 * 60 * 1000; // 60*60*1000; //millisecond
public static final int JWT_REFRESH_INTERVAL = 18 * 1000; //55*60*1000; //millisecond
public static final int JWT_REFRESH_TTL = 60 * 1000; // 12*60*60*1000; //millisecond
}
package com.yeejoin.amos.fas.common.enums;
/**
* @ProjectName: YeeFireDataProcessRoot
* @Package: com.yeejoin.dataprocess.common.enums
* @ClassName: TopicName
* @Author: Jianqiang Gao
* @Description: TopicName
* @Date: 2021/3/23 15:55
* @Version: 1.0
*/
public enum AstDataSyncTopic {
AST_REGION_SAVE(10, "ast_save"),
AST_REGION_SAVE_ALL(11, "ast_save_all"),
AST_REGION_DELETE_BY_ID(12, "ast_delete_by_id");
private final Integer key;
private final String value;
private AstDataSyncTopic(Integer key, String value) {
this.key = key;
this.value = value;
}
public Integer getKey() {
return key;
}
public String getValue() {
return value;
}
@Override
public String toString() {
return this.value;
}
}
\ No newline at end of file
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author suhg
*/
public enum CheckStatusEnum {
QUALIFIED("合格","1",""),
UNQUALIFIED("不合格","2","#DF7400"),
OMISSION("漏检", "3","#FF0000");
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private String code;
/**
* 颜色
*/
private String color;
private CheckStatusEnum(String name, String code,String color){
this.name = name;
this.code = code;
this.color = color;
}
public static CheckStatusEnum getEnum(String code) {
CheckStatusEnum checkStatusEnum = null;
for(CheckStatusEnum type: CheckStatusEnum.values()) {
if (type.getCode().equals(code)) {
checkStatusEnum = type;
break;
}
}
return checkStatusEnum;
}
public static List<Map<String,String>> getEnumList() {
List<Map<String,String>> nameList = new ArrayList<>();
for (CheckStatusEnum c: CheckStatusEnum.values()) {
Map<String, String> map = new HashMap<String, String>();
map.put("name", c.getName());
map.put("code", c.getCode());
map.put("color", c.getColor());
nameList.add(map);
}
return nameList;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author wjk
*/
public enum ContingencyPlanStatusEnum {
DRAFT("草稿",1),
AVAILABLE("可用",2),
NOAVAILABLE("不可用", 3),
SIMULATION_START("模拟启动", 4),
ONGOING("进行中", 5);
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private Integer code;
private ContingencyPlanStatusEnum(String name, Integer code){
this.name = name;
this.code = code;
}
public static ContingencyPlanStatusEnum getEnum(Integer code) {
ContingencyPlanStatusEnum checkStatusEnum = null;
for(ContingencyPlanStatusEnum type: ContingencyPlanStatusEnum.values()) {
if (type.getCode().equals(code)) {
checkStatusEnum = type;
break;
}
}
return checkStatusEnum;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
}
package com.yeejoin.amos.fas.common.enums;
/**
* @author suhg
*/
public enum DataRefreshTypeEum {
/**
* 数据刷新触发原因
*/
dateChange("日切","dateChange"),
rpn("rpn变化","rpn"),
alarm("设备报警","alarm"),
monitor("监测数据","monitor"),
planTask("检查任务","planTask"),
check("巡检","check"),
trouble("设备故障","trouble"),
handleDanger("隐患治理","handleDanger"),
dutyChange("值班信息","dutyChange");
private String name;
private String code;
DataRefreshTypeEum(String name,String code){
this.name = name;
this.code = code;
}
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;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author wjk
*/
public enum EquipClassifyEnum {
EQUIPMENT("设备类","0"),
CONSUMABLES("耗材类;","1"),
VIDEO("视频监控", "2"),
FIRE_FIGHTING("灭火器材", "3");
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private String code;
private EquipClassifyEnum(String name, String code){
this.name = name;
this.code = code;
}
public static EquipClassifyEnum getEnum(String code) {
EquipClassifyEnum checkStatusEnum = null;
for(EquipClassifyEnum type: EquipClassifyEnum.values()) {
if (type.getCode().equals(code)) {
checkStatusEnum = type;
break;
}
}
return checkStatusEnum;
}
public static List<Map<String,String>> getEnumList() {
List<Map<String,String>> nameList = new ArrayList<>();
for (EquipClassifyEnum c: EquipClassifyEnum.values()) {
Map<String, String> map = new HashMap<String, String>();
map.put("name", c.getName());
map.put("code", c.getCode());
nameList.add(map);
}
return nameList;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
package com.yeejoin.amos.fas.common.enums;
/**
* @author keyong
* @title: EquipmentRiskTypeEnum
* <pre>
* @description: TODO
* </pre>
* @date 2020/11/10 13:40
*/
public enum EquipmentRiskTypeEnum {
HZGJ("FIREALARM", "火灾告警"),GZ("BREAKDOWN", "故障");
private String code;
private String type;
EquipmentRiskTypeEnum(String code, String type) {
this.code=code;
this.type=type;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}
package com.yeejoin.amos.fas.common.enums;
/**
* @author wjk
*/
public enum ExecutionTypeEnum {
PLANCHECK("预案验证",0),
FIREMANAGEMENT("火灾处置",1);
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private Integer code;
private ExecutionTypeEnum(String name, Integer code){
this.name = name;
this.code = code;
}
public static ExecutionTypeEnum getEnum(Integer code) {
ExecutionTypeEnum checkStatusEnum = null;
for(ExecutionTypeEnum type: ExecutionTypeEnum.values()) {
if (type.getCode().equals(code)) {
checkStatusEnum = type;
break;
}
}
return checkStatusEnum;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 管控级别
*/
public enum ManageLevelEum {
company("单位级",1),
department("部门级",2),
group("班组级",3),
person("个人级",4);
private String name;
private int manageLevel;
ManageLevelEum(String name,int manageLevel){
this.name = name;
this.manageLevel = manageLevel;
}
public static List<Map> getManageLevelEumList(){
List<Map> eumList = new ArrayList<>();
for(ManageLevelEum eum :ManageLevelEum.values()){
Map<String,Object> param = new HashMap<>();
param.put("key",eum.getManageLevel());
param.put("label",eum.getName());
eumList.add(param);
}
return eumList;
}
public static String getNameByManageLevel(int level){
String name = "";
for(ManageLevelEum eum : ManageLevelEum.values()){
if(level == eum.getManageLevel()){
name = eum.getName();
break;
}
}
return name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getManageLevel() {
return manageLevel;
}
public void setManageLevel(int manageLevel) {
this.manageLevel = manageLevel;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*0、运行中,1、完毕,3、中断
* @author suhg
*/
public enum PlanRecordStatusEnum {
OPERATION("运行中",0),
COMPLETE("完毕",1),
INTERRUPT("中断",2);
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private Integer code;
/**
* 颜色
*/
private String color;
private PlanRecordStatusEnum(String name, Integer code){
this.name = name;
this.code = code;
}
public static PlanRecordStatusEnum getEnum(Integer code) {
PlanRecordStatusEnum checkStatusEnum = null;
for(PlanRecordStatusEnum type: PlanRecordStatusEnum.values()) {
if (type.getCode().equals(code)) {
checkStatusEnum = type;
break;
}
}
return checkStatusEnum;
}
public static List<Map<String,Object>> getEnumList() {
List<Map<String,Object>> nameList = new ArrayList<>();
for (PlanRecordStatusEnum c: PlanRecordStatusEnum.values()) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("name", c.getName());
map.put("code", c.getCode());
nameList.add(map);
}
return nameList;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public enum PlanTaskDetailStatusEnum {
NOTSTARTED("未开始","0"),
QUALIFIED("合格","1"),
UNQUALIFIED("不合格","2"),
OMISSION("漏检","3");
/**
* 名称
*/
private String name;
/**
* 值
*/
private String type;
private PlanTaskDetailStatusEnum(String name, String type) {
this.name = name;
this.type = type;
}
public static String getName(String type) {
for (PlanTaskDetailStatusEnum c : PlanTaskDetailStatusEnum.values()) {
if (type.equals(c.getType())) {
return c.name;
}
}
return null;
}
public static String getType(String name) {
for (PlanTaskDetailStatusEnum c : PlanTaskDetailStatusEnum.values()) {
if (c.getName().equals(name)) {
return c.type;
}
}
return "";
}
public static PlanTaskDetailStatusEnum getEnumByType(String type) {
for (PlanTaskDetailStatusEnum c : PlanTaskDetailStatusEnum.values()) {
if (type.equals(c.getType())) {
return c;
}
}
return null;
}
public static PlanTaskDetailStatusEnum getEnumByName(String name) {
for (PlanTaskDetailStatusEnum c : PlanTaskDetailStatusEnum.values()) {
if (c.getName().equals(name)) {
return c;
}
}
return null;
}
public static List<Map<String,Object>> getEnumList() {
List<Map<String,Object>> nameList = new ArrayList<>();
for (PlanTaskDetailStatusEnum c: PlanTaskDetailStatusEnum.values()) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("name", c.getName());
map.put("type", c.getType() +"");
nameList.add(map);
}
return nameList;
}
public static List<String> getEnumNameList() {
List<String> nameList = new ArrayList<String>();
for (PlanTaskDetailStatusEnum c: PlanTaskDetailStatusEnum.values()) {
nameList.add(c.getName());
}
return nameList;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public static List<Map<String,String>> getErrorLevelEnumList() {
List<Map<String,String>> nameList = new ArrayList<>();
for (PlanTaskDetailStatusEnum c: PlanTaskDetailStatusEnum.values()) {
if(!c.getName().equals("合格")) {
Map<String, String> map = new HashMap<String, String>();
map.put("name", c.getName());
map.put("level", c.getType() +"");
nameList.add(map);
}
}
return nameList;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public enum ResourceTypeDefEnum {
riskSource("风险点","riskSource","风险点","riskSource"),
patrol("巡检点","patrol","巡检点","patrol"),
impEquipment("重点设备","impEquipment","重点设备","impEquipment"),
monitorEquipment("探测器","monitorEquipment","探测器","monitorEquipment"),
video("视频设备","video","摄像头","video"),
hydrant("消火栓","hydrant","消防设备","fireEquipment"),
pool("消防水池","pool","消防设备","fireEquipment"),
fireCar("消防车","fireCar","消防设备","fireEquipment"),
fireEquipment("灭火器材","fireEquipment","消防设备","fireEquipment"),
fireChamber("消防小室","fireChamber","消防设备","fireEquipment"),
fireFoamRoom("消防泡沫间","fireFoamRoom","消防设备","fireEquipment");
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private String code;
private String typeName;
private String typeCode;
private ResourceTypeDefEnum(String name,String code,String typeName,String typeCode){
this.name = name;
this.code = code;
this.typeName = typeName;
this.typeCode = typeCode;
}
public static ResourceTypeDefEnum getEnum(String code) {
ResourceTypeDefEnum resourceTypeDefEnum = null;
for(ResourceTypeDefEnum type: ResourceTypeDefEnum.values()) {
if (type.getCode().equals(code)) {
resourceTypeDefEnum = type;
break;
}
}
return resourceTypeDefEnum;
}
public static List<Map<String,String>> getEnumList() {
List<Map<String,String>> list = new ArrayList<>();
for(ResourceTypeDefEnum e : ResourceTypeDefEnum.values()) {
Map<String,String> msgType = new HashMap<>();
msgType.put(e.getCode(),e.getName());
list.add(msgType);
}
return list;
}
public static List<Map<String,String>> getTypeList() {
List<Map<String,String>> list = new ArrayList<>();
for(ResourceTypeDefEnum e : ResourceTypeDefEnum.values()) {
Map<String,String> reso = new HashMap<>();
reso.put("name",e.getTypeName());
reso.put("code",e.getTypeCode());
if(!list.contains(reso)){
list.add(reso);
}
}
return list;
}
public static Boolean containsTypeCode(String typeCode) {
Boolean flag = false;
for(ResourceTypeDefEnum e : ResourceTypeDefEnum.values()) {
Map<String,String> reso = new HashMap<>();
if(e.getTypeCode().equals(typeCode)) {
flag = true;
break;
}
}
return flag;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getTypeCode() {
return typeCode;
}
public void setTypeCode(String typeCode) {
this.typeCode = typeCode;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public enum RiskSourceLevelEum {
/**
* 风险等级 名称 安全提示
*/
level_1("1","1级", "警告"),
level_2("2","2级","注意"),
level_3("3","3级","安全"),
level_4("4","4级","安全"),
level_5("5","5级","安全");
private String level;
private String name;
private String tips;
RiskSourceLevelEum(String level, String name, String tips) {
this.level = level;
this.name = name;
this.tips = tips;
}
public static String getTipsByLevel(String level){
String tips = null;
for (RiskSourceLevelEum eum: RiskSourceLevelEum.values()){
if(eum.getLevel().equals(level) ){
tips = eum.getTips();
break;
}
}
return tips;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public static List<Map<String,String>> getLevelEnumList() {
List<Map<String,String>> nameList = new ArrayList<>();
for (RiskSourceLevelEum c: RiskSourceLevelEum.values()) {
Map<String, String> map = new HashMap<String, String>();
map.put("name", c.getName());
map.put("level", c.getLevel());
nameList.add(map);
}
return nameList;
}
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
}
package com.yeejoin.amos.fas.common.enums;
public enum RiskSourceRegionEum {
TRUE("TRUE"),
FALSE("FALSE");
private String code;
private RiskSourceRegionEum(String code) {
this.code = code;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
package com.yeejoin.amos.fas.common.enums;
/**
* rpn变化类型枚举
*/
public enum RpnChangeLogTypeEum {
/**
* 类型枚举
*/
upper("上升",0),
down("下降",1),
unChange("未发生变化",2);
private String name;
private int code;
RpnChangeLogTypeEum(String name,int code){
this.name = name;
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
}
package com.yeejoin.amos.fas.common.enums;
/**
* @author suhg
*/
public enum RpnChangeTypeEum {
/**
* rpn 上升
*/
upper("上升",0),
/**
* rpn 下降
*/
down("下降",1);
private String label;
private int value;
RpnChangeTypeEum(String label,int value ){
this.label = label;
this.value = value;
}
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
public int getValue() {
return value;
}
public void setValue(int value) {
this.value = value;
}
}
package com.yeejoin.amos.fas.common.enums;
/**
* @author suhg
*/
public enum StatisticsErrorTypeEum {
/**
* 风险异常
*/
risk("risk", "风险异常"),
/**
* 巡检异常
*/
check("check", "巡检异常"),
/**
* 设备故障
*/
equip("equip", "故障告警"),
/**
* 火灾告警
*/
fire("fire", "火灾告警");
/**
* 编号
*/
private String code;
/**
* 名称
*/
private String name;
StatisticsErrorTypeEum(String code, String name) {
this.code = code;
this.name = 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;
}
}
\ No newline at end of file
package com.yeejoin.amos.fas.common.enums;
/**
* @author DELL
*/
public enum TriggerRpnChangeTypeEum {
/**
* 触发类型枚举
*/
patrol("巡检","patrol"),
alarm("设备告警","alarm"),
alarmRecovery("设备告警恢复","recovery"),
fmeaUpdate("危险因素评价","fmeaUpdate"),
fmeaDelete("危险因素删除","fmeaDelete"),
riskDelete("风险点删除","riskDelete");
private String name;
private String code;
TriggerRpnChangeTypeEum(String name,String code){
this.name = name;
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
package com.yeejoin.amos.fas.common.enums;
import java.util.ArrayList;
import java.util.List;
/**
* @author suhg
*/
public enum View3dRefreshAreaEum {
/**
* 3d页面数据区域(triggerBy枚举定义见DataRefreshTypeEum.java)
*/
all("全部区域", "all", "dateChange"),
today_safety_index("今日安全指数", "today_safety_index", "rpn,check,trouble,handleDanger"),
fire_safety("消防安全执行", "fire_safety", "alarm,rpn,check,trouble"),
monitor_data("设备状态检测数据","monitor_data","monitor"),
error_status("异常区域", "error_status", "rpn,trouble"),
week_safety_index("一周安全指数趋势", "week_safety_index", "rpn,check,handleDanger"),
today_check_status("今日巡检情况", "today_check_status", "planTask,check"),
today_duty("今日值班", "today_duty", "dutyChange");
private String code;
private String name;
private String triggerBy;
View3dRefreshAreaEum(String name, String code, String triggerBy) {
this.name = name;
this.code = code;
this.triggerBy = triggerBy;
}
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 String getTriggerBy() {
return triggerBy;
}
public void setTriggerBy(String triggerBy) {
this.triggerBy = triggerBy;
}
public static List<View3dRefreshAreaEum> getEumListByTrigger(String trigger) {
List<View3dRefreshAreaEum> eumList = new ArrayList<>();
for (View3dRefreshAreaEum eum : View3dRefreshAreaEum.values()) {
if (eum.getTriggerBy().contains(trigger)) {
eumList.add(eum);
}
}
return eumList;
}
public static View3dRefreshAreaEum getEumByCode(String code) {
for (View3dRefreshAreaEum eum : View3dRefreshAreaEum.values()) {
if (code.equals(eum.getCode())) {
return eum;
}
}
return null;
}
}
package com.yeejoin.amos.fas.core.common.request;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
/**
*
* <pre>
* 分页实体
* </pre>
*
* @author as-chenjiajun
* @version $Id: CommonPageable.java, v 0.1 2016-12-14 上午10:42:44 as-chenjiajun
* Exp $
*/
public class CommonPageable implements Pageable {
/**
* 页号(大于等于0)
*/
protected int pageNumber = 0;
/**
* 每页大小(大于等于0)
*/
protected int pageSize = 10;
/**
* 起始索引
*/
protected int offset = 0;
/**
* 排序
*/
protected Sort sort = null;
public CommonPageable() {
this.pageNumber = 0;
this.pageSize = 10;
this.offset = pageSize * pageNumber;
}
public CommonPageable(int pageNumber, int pageSize) {
this.pageNumber = pageNumber;
this.pageSize = pageSize;
this.offset = pageSize * pageNumber;
}
public CommonPageable(int pageNumber, int pageSize, Sort sort) {
this.pageNumber = pageNumber;
this.pageSize = pageSize;
this.sort = sort;
this.offset = pageSize * pageNumber;
}
public int getPageNumber() {
return this.pageNumber;
}
public int getPageSize() {
return pageSize;
}
public long getOffset() {
offset = pageSize * pageNumber;
return offset;
}
public Sort getSort() {
return sort;
}
public Pageable next() {
return null;
}
public Pageable previousOrFirst() {
return null;
}
public Pageable first() {
return null;
}
public boolean hasPrevious() {
return false;
}
public void setPageNumber(int pageNumber) {
this.pageNumber = pageNumber;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public void setSort(Sort sort) {
this.sort = sort;
}
public void setOffset(int offset) {
this.offset = offset;
}
}
package com.yeejoin.amos.fas.core.common.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
*
* <pre>
* 公共请求对象
* </pre>
*
* @author as-shibaobao
* @version $Id: CommonRequest.java, v 0.1 2018年1月26日 上午10:59:19 as-shibaobao Exp $
*/
@ApiModel
public class CommonRequest {
/**
* 字段名称
*/
@ApiModelProperty(value="字段名称",required=true)
private String name;
/**
* 字段值
*/
@ApiModelProperty(value="字段值",required=true)
private Object value;
/**
* 查询类型
*/
@ApiModelProperty(value="查询类型",notes="空值时,默认为等于;其它类型按QueryOperatorEnum",required=false)
private String type;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Object getValue() {
return value;
}
public void setValue(Object value) {
this.value = value;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}
/**
* NewHeight.com Inc.
* Copyright (c) 2008-2010 All Rights Reserved.
*/
package com.yeejoin.amos.fas.core.common.response;
import java.util.List;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
/**
* <pre>
* 分页数据
* </pre>
*
* @author as-youjun
* @version $Id: CompanyPage.java, v 0.1 2017年4月13日 上午11:35:25 as-youjun Exp $
*/
public final class CommonPage<T> extends PageImpl<T> {
/**
* <pre>
* uid
* </pre>
*/
private static final long serialVersionUID = -5533124806408380886L;
/**
*
*/
private String message;
/**
* 返回结果状态
*/
private String result;
public CommonPage(List<T> content, Pageable pageable, long total) {
super(content, pageable, total);
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getResult()
{
return result;
}
public void setResult(String result)
{
this.result = result;
}
}
package com.yeejoin.amos.fas.core.common.response;
/**
*
* <pre>
* 三维坐标点实体
* </pre>
*
*/
public class CoordDTO
{
/**
* <pre>
*
* </pre>
*/
private Double x;
private Double y;
private Double z;
public Double getX()
{
return x;
}
public void setX(Double x)
{
this.x = x;
}
public Double getY()
{
return y;
}
public void setY(Double y)
{
this.y = y;
}
public Double getZ()
{
return z;
}
public void setZ(Double z)
{
this.z = z;
}
}
\ No newline at end of file
package com.yeejoin.amos.fas.core.common.response;
public class DepartmentResponse {
/**
* 部门id
*/
private Long depId;
/**
* 部门名称
*/
private String depName;
public Long getDepId() {
return depId;
}
public void setDepId(Long depId) {
this.depId = depId;
}
public String getDepName() {
return depName;
}
public void setDepName(String depName) {
this.depName = depName;
}
}
package com.yeejoin.amos.fas.core.common.response;
public class EquipDetailsResponse {
private String name;
private String code;
private String address;
/**
* 消防小室名称
*/
private String stationName;
private String depName;
private String username;
private String tel;
private String remarks;
private String userId;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getDepName() {
return depName;
}
public void setDepName(String depName) {
this.depName = depName;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
}
package com.yeejoin.amos.fas.core.common.response;
import com.alibaba.fastjson.JSON;
/**
*
* <pre>
* 三维视图节点元素
* </pre>
*/
public class Node3DVoResponse{
protected String id;
private String key;
/**
* 设备名称
*/
private String label;
/**
* 类型,nodeVo中填充View3DNodeType中的name值
*/
private String type;
/**
* 等级
*/
private String level;
/**
* "level_0"
*/
private String levelStr;
/**
* 所属模型,例如floor_1’,‘floor_2’,‘floor_3’
*/
private String objKey;
/**
* 显示图标
*/
private String displayIcon;
/**
* 节点位置,{x: 17.6681, y: 39.7036, z: 13.8012}
*/
private String positionDTO;
/**
* 节点位置,{x: 0, y: 0, z: 0}
*/
private String rotationDTO;
/**
* 节点位置,{x: 1, y: 1, z: 1}
*/
private String scaleDTO;
/**
* 节点位置,包括x,y,z值
*/
private CoordDTO position;
/**
* 节点位置,包括x,y,z值
*/
private CoordDTO rotation;
/**
* 节点位置,包括x,y,z值
*/
private CoordDTO scale;
/**
* 显示图标闪烁标题
*/
private Boolean showInfo = false;
/**
* 闪烁频率
*/
private Integer frequency = 0;
/**
* 显示图标闪烁
*/
private Boolean twinkle = false;
/**
* 显示图标闪烁标题
*/
private String title;
/**
* 点编号
*/
private String dataCode;
/**
* 点等级
*/
private String dataLevel;
/**
* 保护对象名称
*/
private String protectObjName;
/**
* 是否室内(默认false,为室外)
*/
private Boolean isDoor = false;
private String orgCode;
private String code;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Integer getFrequency() {
return frequency;
}
public void setFrequency(Integer frequency) {
this.frequency = frequency;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public String getLevelStr() {
return levelStr;
}
public void setLevelStr(String levelStr) {
this.levelStr = levelStr;
}
public String getObjKey() {
return objKey;
}
public void setObjKey(String objKey) {
this.objKey = objKey;
}
public String getDisplayIcon() {
return displayIcon;
}
public void setDisplayIcon(String displayIcon) {
this.displayIcon = displayIcon;
}
public Boolean getShowInfo() {
return showInfo;
}
public void setShowInfo(Boolean showInfo) {
this.showInfo = showInfo;
}
public Boolean getTwinkle() {
return twinkle;
}
public void setTwinkle(Boolean twinkle) {
this.twinkle = twinkle;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getDataCode() {
return dataCode;
}
public void setDataCode(String dataCode) {
this.dataCode = dataCode;
}
public String getDataLevel() {
return dataLevel;
}
public void setDataLevel(String dataLevel) {
this.dataLevel = dataLevel;
}
public String getProtectObjName() {
return protectObjName;
}
public void setProtectObjName(String protectObjName) {
this.protectObjName = protectObjName;
}
public Boolean getIsDoor() {
return isDoor;
}
public void setIsDoor(Boolean isDoor) {
this.isDoor = isDoor;
}
public String getOrgCode() {
return orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getPositionDTO() {
return positionDTO;
}
public void setPositionDTO(String positionDTO) {
this.positionDTO = positionDTO;
}
public String getRotationDTO() {
return rotationDTO;
}
public void setRotationDTO(String rotationDTO) {
this.rotationDTO = rotationDTO;
}
public String getScaleDTO() {
return scaleDTO;
}
public void setScaleDTO(String scaleDTO) {
this.scaleDTO = scaleDTO;
}
public CoordDTO getPosition() {
return positionDTO == null?null:JSON.parseObject(positionDTO, CoordDTO.class);
}
public void setPosition(CoordDTO position) {
this.position = position;
}
public CoordDTO getRotation() {
return rotationDTO == null?null:JSON.parseObject(rotationDTO, CoordDTO.class);
}
public void setRotation(CoordDTO rotation) {
this.rotation = rotation;
}
public CoordDTO getScale() {
return scaleDTO == null?null:JSON.parseObject(scaleDTO, CoordDTO.class);
}
public void setScale(CoordDTO scale) {
this.scale = scale;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
\ No newline at end of file
package com.yeejoin.amos.fas.core.common.response;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.lang.StringUtils;
//import com.alibaba.druid.util.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
public class RegionTreeResponse {
private Long id;
private String name;
private String code;
private Long parentId;
private JSONArray ue4Location = new JSONArray();
private JSONArray ue4Rotation = new JSONArray();
private JSONArray ue4Extent = new JSONArray();
private Boolean isBind;
private String type;
private Boolean isRegion;
private JSONArray position3d = new JSONArray();;
private String routePath;
private String level;
private String levelStr;
private List<RegionTreeResponse> children = new ArrayList<>();
public JSONArray getPosition3d() {
return position3d;
}
public void setPosition3d(String position3d) {
JSONArray jsonArray = new JSONArray();
if(!StringUtils.isEmpty(position3d)){
String[] arryStr = position3d.split(",");
List<Double> collect = Arrays.stream(arryStr).map(Double::parseDouble).collect(Collectors.toList());
jsonArray.addAll(collect);
}
this.position3d = jsonArray;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public JSONArray getUe4Location() {
return ue4Location;
}
public void setUe4Location(String ue4Location) {
this.ue4Location = StringUtils.isEmpty(ue4Location) ? new JSONArray() : JSONArray.parseArray(ue4Location);
}
public JSONArray getUe4Rotation() {
return ue4Rotation;
}
public void setUe4Rotation(String ue4Rotation) {
this.ue4Rotation = StringUtils.isEmpty(ue4Rotation) ? new JSONArray() : JSON.parseArray(ue4Rotation);
}
public JSONArray getUe4Extent() {
return ue4Extent;
}
public void setUe4Extent(String ue4Extent) {
this.ue4Extent = StringUtils.isEmpty(ue4Extent) ? new JSONArray() : JSON.parseArray(ue4Extent);
}
public Boolean getIsBind() {
return isBind;
}
public void setIsBind(Boolean isBind) {
this.isBind = isBind;
}
public List<RegionTreeResponse> getChildren() {
return children;
}
public void setChildren(List<RegionTreeResponse> children) {
this.children = children;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public Boolean getIsRegion() {
return isRegion;
}
public void setIsRegion(Boolean isRegion) {
this.isRegion = isRegion;
}
/**
* @return the routePath
*/
public String getRoutePath() {
return routePath;
}
/**
* @param routePath the routePath to set
*/
public void setRoutePath(String routePath) {
this.routePath = routePath;
}
/**
* @return the levelStr
*/
public String getLevelStr() {
return levelStr;
}
/**
* @param levelStr the levelStr to set
*/
public void setLevelStr(String levelStr) {
this.levelStr = levelStr;
}
/**
* @return the level
*/
public String getLevel() {
return level;
}
/**
* @param level the level to set
*/
public void setLevel(String level) {
this.level = level;
}
}
package com.yeejoin.amos.fas.core.common.response;
import java.math.BigDecimal;
import java.util.List;
public class RiskSourceTreeResponse {
private Long id;
private Long parentId;
private Long riskLevelId;
private String code;
private String name;
private String level;
private BigDecimal rpn;
private BigDecimal rpni;
private String isRegion;
private Integer isIndoor;
private String position3d;
private String floor3d;
private String status;
private Integer count;
private Integer qualified;
private Integer unqualified;
private Integer omission;
private Integer unplan;
private Long sourceId;
public Long getSourceId() {
return sourceId;
}
public void setSourceId(Long sourceId) {
this.sourceId = sourceId;
}
private Long value;
private Long pId;
private String title;
private String lable;
public Long getValue() {
return id;
}
public Long getpId() {
return parentId;
}
public String getTitle() {
return name;
}
public String getLable() {
return name;
}
private List<RiskSourceTreeResponse> children;
public String getPosition3d() {
return position3d;
}
public void setPosition3d(String position3d) {
this.position3d = position3d;
}
public String getFloor3d() {
return floor3d;
}
public void setFloor3d(String floor3d) {
this.floor3d = floor3d;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
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 List<RiskSourceTreeResponse> getChildren() {
return children;
}
public void setChildren(List<RiskSourceTreeResponse> children) {
this.children = children;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public BigDecimal getRpn() {
return rpn;
}
public void setRpn(BigDecimal rpn) {
this.rpn = rpn;
}
public Long getRiskLevelId() {
return riskLevelId;
}
public void setRiskLevelId(Long riskLevelId) {
this.riskLevelId = riskLevelId;
}
public String getIsRegion() {
return isRegion;
}
public void setIsRegion(String isRegion) {
this.isRegion = isRegion;
}
public Integer getIsIndoor() {
return isIndoor;
}
public void setIsIndoor(Integer isIndoor) {
this.isIndoor = isIndoor;
}
public BigDecimal getRpni() {
return rpni;
}
public void setRpni(BigDecimal rpni) {
this.rpni = rpni;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public Integer getQualified() {
return qualified;
}
public void setQualified(Integer qualified) {
this.qualified = qualified;
}
public Integer getUnqualified() {
return unqualified;
}
public void setUnqualified(Integer unqualified) {
this.unqualified = unqualified;
}
public Integer getOmission() {
return omission;
}
public void setOmission(Integer omission) {
this.omission = omission;
}
public Integer getUnplan() {
return unplan;
}
public void setUnplan(Integer unplan) {
this.unplan = unplan;
}
}
package com.yeejoin.amos.fas.core.util;
import com.yeejoin.amos.fas.common.constant.Constant;
import org.springframework.http.HttpStatus;
public class CommonResponseUtil2 {
public static ResponseModel success() {
ResponseModel res = new ResponseModel();
res.setDevMessage(Constant.RESULT_SUCCESS);
res.setStatus(HttpStatus.OK.value());
return res;
}
public static ResponseModel success(Object obj) {
ResponseModel res = new ResponseModel();
res.setResult(obj);
res.setDevMessage(Constant.RESULT_SUCCESS);
res.setStatus(HttpStatus.OK.value());
return res;
}
public static ResponseModel success(Object obj, String message) {
ResponseModel res = new ResponseModel();
res.setResult(obj);
res.setDevMessage(message);
res.setStatus(HttpStatus.OK.value());
return res;
}
public static ResponseModel failure() {
ResponseModel res = new ResponseModel();
res.setDevMessage(Constant.RESULT_FAILURE);
res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
return res;
}
public static ResponseModel failure(String message) {
ResponseModel res = new ResponseModel();
res.setDevMessage(Constant.RESULT_FAILURE);
res.setMessage(message);
res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
return res;
}
public static ResponseModel failure(Object obj, String message) {
ResponseModel res = new ResponseModel();
res.setResult(obj);
res.setDevMessage(Constant.RESULT_FAILURE);
res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
return res;
}
}
package com.yeejoin.amos.fas.core.util;
import java.io.Serializable;
/**
* @ProjectName: YeeAmosFireAutoSysRoot
* @Package: com.yeejoin.amos.fas.core.util
* @ClassName: ResponseModel
* @Author: Jianqiang Gao
* @Description:
* @Date: 2021/1/7 15:00
* @Version: 1.0
*/
public class ResponseModel<T> implements Serializable {
private static final long serialVersionUID = -1241360949457314497L;
private int status;
private T result;
private String traceId;
private String devMessage = "";
private String message = "";
private String path;
public ResponseModel() {
}
public String getMessage() {
return this.message;
}
public void setMessage(String message) {
this.message = message;
}
public String getPath() {
return this.path;
}
public void setPath(String path) {
this.path = path;
}
public String getDevMessage() {
return this.devMessage;
}
public void setDevMessage(String devMessage) {
this.devMessage = devMessage;
}
public String getTraceId() {
return this.traceId;
}
public void setTraceId(String traceId) {
this.traceId = traceId;
}
public int getStatus() {
return this.status;
}
public void setStatus(int status) {
this.status = status;
}
public T getResult() {
return this.result;
}
public void setResult(T result) {
this.result = result;
}
public String toString() {
return "ResponseModel [status=" + this.status + ", result=" + this.result + ", traceId=" + this.traceId + ", message=" + this.devMessage + "]";
}
}
\ No newline at end of file
package com.yeejoin.amos.fas.dao.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @ProjectName: YeeAmosFireAutoSysRoot
* @Package: com.yeejoin.amos.fas.dao.dto
* @ClassName: EquipmentDTO
* @Author: Jianqiang Gao
* @Description:
* @Date: 2021/1/7 10:23
* @Version: 1.0
*/
@Data
@ApiModel(value = "重点设备DTO")
public class EquipmentDTO {
@ApiModelProperty(value = "设备ID")
private Long id;
@ApiModelProperty(value = "设备名称")
private String name;
@ApiModelProperty(value = "状态:1-启动,0-未启动")
private Integer status;
@ApiModelProperty(value = "重点设备类型")
private String type;
}
\ No newline at end of file
package com.yeejoin.amos.fas.dao.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* The persistent class for the accident_type database table.
*
*/
@Entity
@Table(name="f_accident_type")
@NamedQuery(name="AccidentType.findAll", query="SELECT a FROM AccidentType a")
public class AccidentType extends BasicEntity {
private static final long serialVersionUID = 1L;
@Column(name="create_by")
private String createBy;
@Column(name="dept_id")
private String deptId;
private String name;
@Column(name="evaluation_sid")
private String evaluationSid;
@Column(name="org_code")
private String orgCode;
private String remark;
private String severity;
private String influence;
public AccidentType() {
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getDeptId() {
return deptId;
}
public void setDeptId(String deptId) {
this.deptId = deptId;
}
@Transient
public String getInfluence() {
return this.influence;
}
public void setInfluence(String influence) {
this.influence = influence;
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public String getEvaluationSid() {
return evaluationSid;
}
public void setEvaluationSid(String evaluationSid) {
this.evaluationSid = evaluationSid;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public String getRemark() {
return this.remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
@Transient
public String getSeverity() {
return this.severity;
}
public void setSeverity(String severity) {
this.severity = severity;
}
}
\ No newline at end of file
package com.yeejoin.amos.fas.dao.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* @description: 公共实体
* @author: duanwei
**/
@Data
@Accessors(chain = true)
public class BaseEntity implements Serializable {
private static final long serialVersionUID = -5464322936854328207L;
@TableId(type = IdType.ID_WORKER)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
@TableField(value = "create_date", fill = FieldFill.INSERT) // 新增和更新执行
private Date createDate;
}
package com.yeejoin.amos.fas.dao.entity;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
* <pre>
* 基本实体类
* </pre>
*
*/
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public class BasicEntity /*extends Resource*/ implements Serializable{
private static final long serialVersionUID = -5464322936854328207L;
/**
* id
*/
private long id;
@CreatedDate
@Column(name="create_date")
private Date createDate = new Date();
@Id
@GeneratedValue(strategy=GenerationType.IDENTITY)
@Column(name = "ID",nullable=false,unique=true)
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}
package com.yeejoin.amos.fas.dao.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
/**
*
* <pre>
* 涓氬姟瀹炰綋鎶借薄绫�
* </pre>
*
* @author as-guowubin
* @version $Id: BusinessEntity.java, v 0.1 2018骞�5鏈�18鏃� 涓嬪崍2:27:17 as-guowubin Exp $
*/
@MappedSuperclass
@EntityListeners(value=AuditingEntityListener.class)
public abstract class BusinessEntity implements Serializable
{
/**
* <pre>
*
* </pre>
*/
private static final long serialVersionUID = 1L;
/**
* 鍒涘缓鏃堕棿
*/
@Column(name = "create_date",updatable = false)
private Date createDate;
/**
* 鍒涘缓鐢ㄦ埛
*/
@Column(name = "create_user",updatable = false)
private String createUser;
/**
* 鏇存柊鏃堕棿
*/
@Column(name = "update_date")
private Date updateDate;
/**
* 鏇存柊鐢ㄦ埛
*/
@Column(name = "update_user")
private String updateUser;
/**
* 鏄惁鍒犻櫎
*/
@Column(name = "is_delete")
private Boolean isDelete = false;
public Date getCreateDate()
{
return createDate;
}
public void setCreateDate(Date createDate)
{
this.createDate = createDate;
}
public String getCreateUser()
{
return createUser;
}
public void setCreateUser(String createUser)
{
this.createUser = createUser;
}
public Date getUpdateDate()
{
return updateDate;
}
public void setUpdateDate(Date updateDate)
{
this.updateDate = updateDate;
}
public String getUpdateUser()
{
return updateUser;
}
public void setUpdateUser(String updateUser)
{
this.updateUser = updateUser;
}
public Boolean getIsDelete()
{
return isDelete;
}
public void setIsDelete(Boolean isDelete)
{
this.isDelete = isDelete;
}
}
package com.yeejoin.amos.fas.dao.entity;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
@Entity
@Table(name = "contingency_original_data")
public class ContingencyOriginalData extends BusinessEntity {
/**
* id
*/
@Id
@GeneratedValue(generator = "uuid")
@GenericGenerator(name = "uuid", strategy = "uuid2")
@Column(name = "id", nullable = false, length = 36)
protected String id;
@Column(name = "fire_Equipment_Name")
private String fireEquipmentName;//消防设备名称
@Column(name = "fire_Equipment_Id")
private String fireEquipmentId;//消防设备id
@Column(name = "layer")
private Integer layer;//显示图层
//当前探测器
@Column(name = "fire_Equipment_Layer")
private Integer fireEquipmentLayer;//当前探测器图层
@Column(name = "fire_Equipment_Position")
private String fireEquipmentPosition;//消防设备位置
//重点设备信息
//负责人名称,手机号
@Column(name = "equipment_Id")
private String equipmentId;//重点设备id
@Column(name = "equipment_Name")
private String equipmentName;
@Column(name = "equipment_position3d")
private String equipmentPosition3d;
@Column(name = "mobile")
private String mobile; //负责人手机号
@Column(name = "admin_Name")
private String adminName;//负责人名称
//摄像头
@Column(name = "camera_Codes")
private String cameraCodes;//摄像头编号
@Column(name = "camera_Ids")
private String cameraIds;//摄像头id
@Column(name = "fire_Count")
private Integer fireCount = 1; //火情数量
@Column(name = "confirm")
private String confirm ;//是否确认火情,确认 CONFIRM,取消CANCEL,未操作 NONE
@Column(name = "batch_No")
private String batchNo;
@Column(name = "picture1")
private String picture1;
@Column(name = "picture2")
private String picture2;
@Column(name = "picture3")
private String picture3;
@Column(name = "picture4")
private String picture4;
@Column(name = "fire_Truck_Route")
private String fireTruckRoute;
@Column(name = "runstep")
private boolean runstep; //是否已经执行流程
@Column(name = "step")
private String step;//当前步骤
@Column(name = "step_state")
private String stepState;//步骤的操作状态,由所有按钮的步骤状态拼接而成
public String getEquipmentPosition3d() {
return equipmentPosition3d;
}
public void setEquipmentPosition3d(String equipmentPosition3d) {
this.equipmentPosition3d = equipmentPosition3d;
}
public String getStepState() {
return stepState;
}
public void setStepState(String stepState) {
this.stepState = stepState;
}
public String getStep() {
return step;
}
public void setStep(String step) {
this.step = step;
}
public boolean getRunstep() {
return runstep;
}
public void setRunstep(boolean runstep) {
this.runstep = runstep;
}
public String getFireTruckRoute() {
return fireTruckRoute;
}
public void setFireTruckRoute(String fireTruckRoute) {
this.fireTruckRoute = fireTruckRoute;
}
public String getPicture1() {
return picture1;
}
public void setPicture1(String picture1) {
this.picture1 = picture1;
}
public String getPicture2() {
return picture2;
}
public void setPicture2(String picture2) {
this.picture2 = picture2;
}
public String getPicture3() {
return picture3;
}
public void setPicture3(String picture3) {
this.picture3 = picture3;
}
public String getPicture4() {
return picture4;
}
public void setPicture4(String picture4) {
this.picture4 = picture4;
}
public String getBatchNo() {
return batchNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getFireEquipmentName() {
return fireEquipmentName;
}
public void setFireEquipmentName(String fireEquipmentName) {
this.fireEquipmentName = fireEquipmentName;
}
public String getFireEquipmentId() {
return fireEquipmentId;
}
public void setFireEquipmentId(String fireEquipmentId) {
this.fireEquipmentId = fireEquipmentId;
}
public Integer getLayer() {
return layer;
}
public void setLayer(Integer layer) {
this.layer = layer;
}
public Integer getFireEquipmentLayer() {
return fireEquipmentLayer;
}
public void setFireEquipmentLayer(Integer fireEquipmentLayer) {
this.fireEquipmentLayer = fireEquipmentLayer;
}
public String getFireEquipmentPosition() {
return fireEquipmentPosition;
}
public void setFireEquipmentPosition(String fireEquipmentPosition) {
this.fireEquipmentPosition = fireEquipmentPosition;
}
public String getEquipmentId() {
return equipmentId;
}
public void setEquipmentId(String equipmentId) {
this.equipmentId = equipmentId;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getAdminName() {
return adminName;
}
public void setAdminName(String adminName) {
this.adminName = adminName;
}
public String getCameraCodes() {
return cameraCodes;
}
public void setCameraCodes(String cameraCodes) {
this.cameraCodes = cameraCodes;
}
public String getCameraIds() {
return cameraIds;
}
public void setCameraIds(String cameraIds) {
this.cameraIds = cameraIds;
}
public Integer getFireCount() {
return fireCount;
}
public void setFireCount(Integer fireCount) {
this.fireCount = fireCount;
}
public String getConfirm() {
return confirm;
}
public void setConfirm(String confirm) {
this.confirm = confirm;
}
}
package com.yeejoin.amos.fas.dao.entity;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
@Entity
@Table(name = "contingency_plan_instance")
public class ContingencyPlanInstance extends BusinessEntity {
private static final long serialVersionUID = 292334653532432432L;
/**
* id
*/
@Id
@GeneratedValue(generator = "uuid")
@GenericGenerator(name = "uuid", strategy = "uuid2")
@Column(name = "id", nullable = false, length = 36)
protected String id;
@Column(name = "record_type")
private String recordType;// 记录类型:消息MESSAGE,操作OPERATE
@Column(name = "content")
private String content ;// 记录内容:文本信息或者json数据
@Column(name = "category")
private String category;//一级分类
@Column(name = "icon")
private String icon ; //图标,url,或者文件名
@Column(name = "sort")
private Integer sort ;// 所有节点一起的排序号
@Column(name = "sequence_num")
private String sequenceNum ;// 用于显示的序号
@Column(name = "batch_no")
private String batchNo ;// 预案实例编号,暂时无法区分多个火灾,暂时存储报警设备id
@Column(name = "tips")
private String tips;
@Column(name = "runstate")
private Boolean runstate;
public Boolean getRunstate() {
return runstate;
}
public void setRunstate(Boolean runstate) {
this.runstate = runstate;
}
public String getTips() {
return tips;
}
public void setTips(String tips) {
this.tips = tips;
}
public String getRecordType() {
return recordType;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCategory() {
return category;
}
public void setCategory(String category) {
this.category = category;
}
public void setRecordType(String recordType) {
this.recordType = recordType;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public String getSequenceNum() {
return sequenceNum;
}
public void setSequenceNum(String sequenceNum) {
this.sequenceNum = sequenceNum;
}
public String getBatchNo() {
return batchNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
}
package com.yeejoin.amos.fas.dao.entity;
import org.hibernate.annotations.Proxy;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
/**
* 数据字典
* @author gaodongdong
*
*/
@Entity
@Table(name="f_dict")
@NamedQuery(name="Dict.findAll", query="SELECT d FROM Dict d")
@Proxy(lazy = false)
public class Dict {
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
@Column(name = "ID",nullable=false,unique=true)
private long id;
@Column(name="dict_name")
private String dictName;
@Column(name="dict_code")
private String dictCode;
@Column(name="dict_value")
private String dictValue;
@Column(name="parent_id")
private String parentId;
@Column(name="is_delete")
private byte isDelete;
@Column(name="remark")
private String remark;
@Column(name="dict_order")
private long dictOrder;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getDictName() {
return dictName;
}
public void setDictName(String dictName) {
this.dictName = dictName;
}
public String getDictCode() {
return dictCode;
}
public void setDictCode(String dictCode) {
this.dictCode = dictCode;
}
public String getDictValue() {
return dictValue;
}
public void setDictValue(String dictValue) {
this.dictValue = dictValue;
}
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public byte getIsDelete() {
return isDelete;
}
public void setIsDelete(byte isDelete) {
this.isDelete = isDelete;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public long getDictOrder() {
return dictOrder;
}
public void setDictOrder(long dictOrder) {
this.dictOrder = dictOrder;
}
}
package com.yeejoin.amos.fas.dao.entity;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.util.Date;
/**
* The persistent class for the equipment database table.
*
*/
@Entity
@Table(name="f_equipment")
@NamedQuery(name="Equipment.findAll", query="SELECT e FROM Equipment e")
public class Equipment extends BasicEntity {
private static final long serialVersionUID = 1L;
private String address;
private String building;
/**
* 所属风险区域id
*/
@Column(name="risk_source_id")
private Long riskSourceId;
/**
* 3维坐标
*/
private String position3d;
/**
* 3维楼层
*/
private String floor3d;
/**
* 预案配置
*/
@Column(name="reserve_plan")
private String reservePlan;
/**
* 是否室内 0-否 1-是
*/
@Column(name="is_indoor")
private Boolean isIndoor;
@Column(name="charge_dept_id")
private String chargeDeptId;
@Column(name="charge_user_id")
private String chargeUserId;
private String code;
@Column(name="fire_truck_route")
private String fireTruckRoute;
public String getFireTruckRoute() {
return fireTruckRoute;
}
public void setFireTruckRoute(String fireTruckRoute) {
this.fireTruckRoute = fireTruckRoute;
}
public String getPosition3d() {
return position3d;
}
public void setPosition3d(String position3d) {
this.position3d = position3d;
}
public String getFloor3d() {
return floor3d;
}
public void setFloor3d(String floor3d) {
this.floor3d = floor3d;
}
public Boolean getIsIndoor() {
return isIndoor;
}
public void setIsIndoor(Boolean isIndoor) {
this.isIndoor = isIndoor;
}
private String room;
/**
* 关联消防小室id
*/
@Column(name="fire_station_id")
private Long fireStationId;
@Column(name="create_by")
private String createBy;
private String name;
@Column(name="org_code")
private String orgCode;
private String remark;
/**
* ue4位置
*/
@Lob
private String ue4Location;
/**
* ue4旋转
*/
@Lob
private String ue4Rotation;
private Integer status;
/**
* 预案开始时间
*/
@Column(name="start_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 预案结束时间
*/
@Column(name="end_time")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
* 预案来源:1-手动触发,0-自动触发(默认)
*/
@Column(name="reserve_source")
private Integer reserveSource;
public Equipment() {
}
public String getAddress() {
return this.address;
}
public void setAddress(String address) {
this.address = address;
}
public String getBuilding() {
return this.building;
}
public void setBuilding(String building) {
this.building = building;
}
public Long getRiskSourceId() {
return riskSourceId;
}
public void setRiskSourceId(Long riskSourceId) {
this.riskSourceId = riskSourceId;
}
public String getChargeDeptId() {
return chargeDeptId;
}
public void setChargeDeptId(String chargeDeptId) {
this.chargeDeptId = chargeDeptId;
}
public String getChargeUserId() {
return chargeUserId;
}
public void setChargeUserId(String chargeUserId) {
this.chargeUserId = chargeUserId;
}
public String getCode() {
return this.code;
}
public void setCode(String code) {
this.code = code;
}
public String getCreateBy() {
return this.createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public String getOrgCode() {
return this.orgCode;
}
public void setOrgCode(String orgCode) {
this.orgCode = orgCode;
}
public Long getFireStationId() {
return fireStationId;
}
public void setFireStationId(Long fireStationId) {
this.fireStationId = fireStationId;
}
public String getRemark() {
return this.remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getRoom() {
return room;
}
public void setRoom(String room) {
this.room = room;
}
public String getReservePlan() {
return reservePlan;
}
public void setReservePlan(String reservePlan) {
this.reservePlan = reservePlan;
}
@Column(name = "ue4_location")
public String getUe4Location() {
return ue4Location;
}
public void setUe4Location(String ue4Location) {
this.ue4Location = ue4Location;
}
@Column(name = "ue4_rotation")
public String getUe4Rotation() {
return ue4Rotation;
}
public void setUe4Rotation(String ue4Rotation) {
this.ue4Rotation = ue4Rotation;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getReserveSource() {
return reserveSource;
}
public void setReserveSource(Integer reserveSource) {
this.reserveSource = reserveSource;
}
}
\ No newline at end of file
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