Skip to content

A
amos-boot-biz
Commit 5d8f10ac authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

人大金仓适配

parent 48c587c9
Hide whitespace changes
Inline Side-by-side
Showing with 314 additions and 50 deletions
amos-boot-biz-common/pom.xml
View file @ 5d8f10ac
......@@ -14,6 +14,11 @@
<dependencies>
<dependency>
<groupId>com.kingbase8</groupId>
<artifactId>kingbase8</artifactId>
<version>8.6.0</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
<version>1.8.3-SNAPSHOT</version>
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/BitTypeHandler.java 0 → 100644
View file @ 5d8f10ac
package com.yeejoin.amos.boot.biz.config;
import org.apache.ibatis.type.BaseTypeHandler;
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.MappedJdbcTypes;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@MappedJdbcTypes(JdbcType.BIT)
public class BitTypeHandler extends BaseTypeHandler<Boolean> {
@Override
public void setNonNullParameter(PreparedStatement ps, int i, Boolean parameter, JdbcType jdbcType)
throws SQLException {
//原生的boolean会再sql上加上引号比如'0'或者'1',人大金仓不支持,支持不带引号的
//ps.setBoolean(i, parameter);
ps.setInt(i, parameter?1:0);
}
@Override
public Boolean getNullableResult(ResultSet rs, String columnName) throws SQLException {
return rs.getBoolean(columnName);
}
@Override
public Boolean getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
return rs.getBoolean(columnIndex);
}
@Override
public Boolean getNullableResult(java.sql.CallableStatement cs, int columnIndex) throws SQLException {
return cs.getBoolean(columnIndex);
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/Building.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -78,7 +79,7 @@ public class Building implements Serializable {
private BigDecimal length;
@ApiModelProperty(value = "对角坐标标识")
@TableField("rect")
@TableField(value = "rect",typeHandler = BitTypeHandler.class)
private Boolean rect;
@ApiModelProperty(value = "建筑占地面积")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipment.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -138,7 +139,7 @@ public class FireEquipment implements Serializable {
private String assetsource = "";
@ApiModelProperty(value = "是否组合设备")
@TableField("combinedequipment")
@TableField(value = "combinedequipment",typeHandler = BitTypeHandler.class)
private Boolean combinedequipment = false;
@ApiModelProperty(value = "出厂编号")
......@@ -170,7 +171,7 @@ public class FireEquipment implements Serializable {
private String baselinelossoflife;
@ApiModelProperty(value = "重要性")
@TableField("critical")
@TableField(value = "critical",typeHandler = BitTypeHandler.class)
private Boolean critical = false;
@ApiModelProperty(value = "电子地址")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipmentDefectAlarm.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -77,7 +78,7 @@ public class FireEquipmentDefectAlarm implements Serializable {
private Integer frequency;
@ApiModelProperty(value = "报警状态")
@TableField("status")
@TableField(value = "status",typeHandler = BitTypeHandler.class)
private Boolean status;
@ApiModelProperty(value = "量测数据类型")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipmentFaultAlarm.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -77,7 +78,7 @@ public class FireEquipmentFaultAlarm implements Serializable {
private Integer frequency;
@ApiModelProperty(value = "报警状态")
@TableField("status")
@TableField(value = "status",typeHandler = BitTypeHandler.class)
private Boolean status;
@ApiModelProperty(value = "量测数据类型")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipmentFireAlarm.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -77,7 +78,7 @@ public class FireEquipmentFireAlarm implements Serializable {
private Integer frequency;
@ApiModelProperty(value = "报警状态")
@TableField("status")
@TableField(value = "status",typeHandler = BitTypeHandler.class)
private Boolean status = true;
@ApiModelProperty(value = "量测数据类型")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipmentInfo.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -57,7 +58,7 @@ public class FireEquipmentInfo implements Serializable {
private String measureUnit;
@ApiModelProperty(value = "是否必填")
@TableField("ismust")
@TableField(value = "ismust",typeHandler = BitTypeHandler.class)
private Boolean isMust;
@ApiModelProperty(value = "排序")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireVehicleInfo.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -57,7 +58,7 @@ public class FireVehicleInfo implements Serializable {
private String measureUnit;
@ApiModelProperty(value = "是否必填")
@TableField("ismust")
@TableField(value = "ismust",typeHandler = BitTypeHandler.class)
private Boolean isMust;
@ApiModelProperty(value = "排序")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/Floor.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -57,7 +58,7 @@ public class Floor implements Serializable {
private Integer no;
@ApiModelProperty(value = "对角坐标标识")
@TableField("rect")
@TableField(value = "rect",typeHandler = BitTypeHandler.class)
private Boolean rect;
@ApiModelProperty(value = "安全出口位置图")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/Room.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.datasync.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -77,7 +78,7 @@ public class Room implements Serializable {
private String floorId;
@ApiModelProperty(value = "对角坐标标识")
@TableField("rect")
@TableField(value = "rect",typeHandler = BitTypeHandler.class)
private Boolean rect;
@ApiModelProperty(value = "中文描述")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/BuildingDto.java
View file @ 5d8f10ac
......@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.common.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -75,7 +76,7 @@ public class BuildingDto {
private String height;
@ApiModelProperty(value = "对角坐标标识")
@TableField("rect")
@TableField(value = "rect",typeHandler = BitTypeHandler.class)
private Boolean rect;
@ApiModelProperty(value = "建筑占地面积")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/AccessRecording.java
View file @ 5d8f10ac
package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
......@@ -66,6 +68,7 @@ public class AccessRecording extends BaseEntity {
/**
* 进/出，0-进
*/
@TableField(value = "in_or_out",typeHandler = BitTypeHandler.class)
private Boolean inOrOut;
/**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Area.java
View file @ 5d8f10ac
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -47,6 +48,7 @@ public class Area extends BaseEntity {
private Long riskPointId;
@ApiModelProperty(value = "是否删除:0-否；1-是")
@TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
private Boolean isDelete;
@ApiModelProperty(value = "单位编码")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/BuildingAudit.java
View file @ 5d8f10ac
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -48,6 +49,7 @@ public class BuildingAudit extends BaseEntity {
private Date auditTime;
@ApiModelProperty(value = "是否删除:0-否；1-是")
@TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
private Boolean isDelete;
@ApiModelProperty(value = "单位编码")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Car.java
View file @ 5d8f10ac
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentOnCarAppVO;
import io.swagger.annotations.ApiModel;
......@@ -64,6 +65,7 @@ public class Car extends BaseEntity {
private String country;
@ApiModelProperty(value = "进口国产")
@TableField(value = "is_import",typeHandler = BitTypeHandler.class)
private Boolean isImport;
@ApiModelProperty(value = "二维码")
......@@ -77,6 +79,7 @@ public class Car extends BaseEntity {
private BigDecimal maintenanceCycle;
@ApiModelProperty(value = "3c认证")
@TableField(value = "ccc_auth",typeHandler = BitTypeHandler.class)
private Boolean cccAuth;
@ApiModelProperty(value = "负责人")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/DynamicFormColumn.java
View file @ 5d8f10ac
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -43,6 +44,7 @@ public class DynamicFormColumn extends BaseEntity {
private String queryStrategy;
@ApiModelProperty(value = "不能为空")
@TableField(value = "not_null",typeHandler = BitTypeHandler.class)
private Boolean notNull;
@ApiModelProperty(value = "分组类型")
......@@ -65,5 +67,6 @@ public class DynamicFormColumn extends BaseEntity {
private Boolean isDelete = false;
@ApiModelProperty(value = "是否必须：0-否；1-是；控制是否可勾选掉字段，暂时没用到标准版使用")
@TableField(value = "is_must",typeHandler = BitTypeHandler.class)
private Boolean isMust;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/DynamicFormGroup.java
View file @ 5d8f10ac
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -46,6 +47,7 @@ public class DynamicFormGroup extends BaseEntity {
private Long creatorId;
@ApiModelProperty(value = "是否必须：0-否；1-是；控制前端tab是否可勾选掉")
@TableField(value = "is_must",typeHandler = BitTypeHandler.class)
private Boolean isMust;
@ApiModelProperty(value = "分组配置")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentCategory.java
View file @ 5d8f10ac
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -38,6 +39,7 @@ public class EquipmentCategory extends BaseEntity implements TreeNode<EquipmentC
private String name;
@ApiModelProperty(value = "消耗性装备标志")
@TableField(value = "is_consumptive",typeHandler = BitTypeHandler.class)
private Boolean isConsumptive;
@ApiModelProperty(value = "用途或性能")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java
View file @ 5d8f10ac
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -120,7 +121,7 @@ public class EquipmentDetail extends BaseEntity {
@ApiModelProperty(value = "国别")
private String country;
@TableField("is_import")
@TableField(value = "is_import",typeHandler = BitTypeHandler.class)
@ApiModelProperty(value = "是否进口")
private Boolean isImport;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentIndex.java
View file @ 5d8f10ac
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
......@@ -50,7 +51,7 @@ public class EquipmentIndex extends BaseEntity {
/**
* 是否物联
*/
@TableField(value = "is_iot")
@TableField(value = "is_iot",typeHandler = BitTypeHandler.class)
private Boolean isIot;
/**
* 物联类型
......@@ -107,7 +108,7 @@ public class EquipmentIndex extends BaseEntity {
/**
* 是否支持趋势查看
*/
@TableField(value = "is_trend")
@TableField(value = "is_trend",typeHandler = BitTypeHandler.class)
private Boolean isTrend;
@TableField(value = "emergency_level_color")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentQrcode.java
View file @ 5d8f10ac
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
......@@ -32,6 +33,7 @@ public class EquipmentQrcode extends BaseEntity {
/**
* 单件并已被使用,默认false; 当入库成功后判断二维码所对应的装备符合当前条件时,设为true
*/
@TableField(value = "is_single_used",typeHandler = BitTypeHandler.class)
private boolean isSingleUsed = false;
private Long carId;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java
View file @ 5d8f10ac
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -32,7 +33,7 @@ public class EquipmentSpecific extends BaseEntity {
private String qrCode;
@ApiModelProperty(value = "管理方式(默认单件)")
@TableField("single")
@TableField(value = "single",typeHandler = BitTypeHandler.class)
private Boolean single;
@ApiModelProperty(value = "所属系统")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/TopographyLine.java
View file @ 5d8f10ac
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import lombok.Data;
import java.io.Serializable;
......@@ -48,7 +49,7 @@ public class TopographyLine implements Serializable {
private Date createDate;
@TableField("create_user")
private String createUser;
@TableField("is_delete")
@TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
private Boolean isDelete;
@TableField("update_date")
private Date updateDate;
......@@ -57,7 +58,7 @@ public class TopographyLine implements Serializable {
/**
* 可点击
*/
@TableField("clickable")
@TableField(value = "clickable",typeHandler = BitTypeHandler.class)
private Boolean clickable;
/**
* 树节点id
......@@ -82,7 +83,7 @@ public class TopographyLine implements Serializable {
/**
* 有箭头
*/
@TableField("has_arrow")
@TableField(value = "has_arrow",typeHandler = BitTypeHandler.class)
private Boolean hasArrow;
/**
* 起点位置
......@@ -97,7 +98,7 @@ public class TopographyLine implements Serializable {
/**
* 是虚线
*/
@TableField("is_dash")
@TableField(value = "is_dash",typeHandler = BitTypeHandler.class)
private Boolean isDash;
/**
* 颜色
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/TopographyNode.java
View file @ 5d8f10ac
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import lombok.Data;
import java.io.Serializable;
......@@ -60,7 +61,7 @@ public class TopographyNode implements Serializable {
/**
* 是否是组
*/
@TableField("is_group")
@TableField(value = "is_group",typeHandler = BitTypeHandler.class)
private Boolean isGroup;
/**
* 图片
......@@ -78,7 +79,7 @@ public class TopographyNode implements Serializable {
private Date createDate;
@TableField("create_user")
private String createUser;
@TableField("is_delete")
@TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
private Boolean isDelete;
@TableField("update_date")
private Date updateDate;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/TopographyNodeDetail.java
View file @ 5d8f10ac
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import lombok.Data;
import java.io.Serializable;
......@@ -33,7 +34,7 @@ public class TopographyNodeDetail implements Serializable {
private Date createDate;
@TableField("create_user")
private String createUser;
@TableField("is_delete")
@TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
private Boolean isDelete;
@TableField("update_date")
private Date updateDate;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/TopographyTree.java
View file @ 5d8f10ac
......@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.config.BitTypeHandler;
import lombok.Data;
import java.io.Serializable;
......@@ -61,7 +62,7 @@ public class TopographyTree implements Serializable {
private Date createDate;
@TableField("create_user")
private String createUser;
@TableField("is_delete")
@TableField(value = "is_delete",typeHandler = BitTypeHandler.class)
private Boolean isDelete;
@TableField("update_date")
private Date updateDate;
......
amos-boot-system-equip/src/main/resources/application-kingbase.properties 0 → 100644
View file @ 5d8f10ac
spring.datasource.driver-class-name=com.kingbase8.Driver
spring.datasource.url = jdbc:kingbase8://172.16.10.248:54321/equipment_cl?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&binaryTransferDisable=TINYINT
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
spring.datasource.hikari.maximum-pool-size= 30
spring.datasource.hikari.auto-commit= true
spring.datasource.hikari.idle-timeout= 500000
spring.datasource.hikari.max-lifetime= 1800000
spring.datasource.hikari.connection-timeout= 60000
spring.datasource.hikari.connection-test-query= SELECT 1
##########eureka配置信息###############
eureka.instance.prefer-ip-address = true
#服务实例ip地址，若eureka.instance.prefer-ip-address=false,ip-address设置失效，一般情况不用设置。
#eureka.instance.ip-address= 172.16.3.135
#eureka服务ip配置，可填写固定ip地址
eureka.instance.hostname=172.16.10.234
#eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
spring.security.user.name=admin
spring.security.user.password=a1234560
eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
##########eureka配置信息###############
#redis
spring.redis.database=1
spring.redis.host=172.16.10.234
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=30000
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.234:18083
emqx.user-name=super
emqx.password=123456
mqtt.scene.host=mqtt://172.16.10.234:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
# influxDB
spring.influx.url=http://172.16.10.234:8086
spring.influx.password=Yeejoin@2020
spring.influx.user=root
spring.influx.database=iot_platform
spring.influx.retention_policy=default
spring.influx.retention_policy_time=30d
spring.influx.actions=10000
spring.influx.bufferLimit=20000
#系统机器人账号
amos.system.user.user-name=fas_system
amos.system.user.password=a1234560
amos.system.user.app-key=studio_normalapp_3056965
amos.system.user.product=STUDIO_APP_WEB
security.productApp=STUDIO_APP_MOBILE
#向数字站同步设备，巡查点台账信息开关，适用于数字站1.0版本，目前停止同步，默认为false
systemctl.sync.switch=false
#数据JCS开关 设备资源数据权限配置，站端部署，库里只有单站数据可不进行开启（false），中心级部署或存在多站数据时需开启（true）数据权限过滤
systemctl.jcs.switch=true
#给平台同步告警数据,若不同步影响消防自动化告警消息框数据展示
systemctl.amos.switch=true
#告警数据是否发送给App端，发送是通过jpush实现，需要有网情况下。目前电力消防不支持网络使用，默认不进行APP推送
isSendApp=false
###############向数字化平台3.0进行告警转发配置信息################################
#告警推送开关，若无推送需求进行关闭（false）
dcs.send.message=false
#请求头参数
dcs.client-id=fire_system
dcs.client.secret=fire_system
dcs.grant-type=client_credentials
dcs.scope=all
dcs.token-key=dcs_token_key
#华为roma秘钥每个站有区别与集成商索取
dcs.x.hw.id=io.cs
dcs.x.hw.appKey=i!YmnHgJ=Ysz8V+O@ZG237inQKfixkQ.-#-P3IlR8fO%.#F!g%35Z#@tp$6G+52v
# \u7531\u4E8E\u76EE\u524D\u6709\u4E0D\u6B62\u4E00\u4E2A\u6570\u5B57\u7AD9\u5E73\u53F0\u5BF9\u5E94\u63A5\u53E3\u89C4\u8303\u4E0D\u4E00\u81F4\uFF0C\u6240\u4EE5\u6B64\u5904\u589E\u52A0\u914D\u7F6E\uFF0Ctrue\u8868\u793A\u9002\u7528\u4E8E\u5357\u745E\u79D1\u6280\u7684\u63A5\u53E3\u89C4\u8303
#平台集成商是否科技接口，(科技为true、继保和许继为false）
dcs.NRKJ.use=false
dcs.source.type=\u9ad8\u7ea7\u5e94\u7528
#数字化平台3.0权限接口
dcs.url.token=http://172.21.101.123/udaap-ddis/v1/cs/auth-service/oauth/token
#数字化平台3.0告警存储接口
dcs.url.sendalarm=http://172.21.101.101/v1/cs/alarm-service/appalarm/sendalarm
#################################################################################
#\u7CFB\u7EDF\u4E0A\u7EBF\u65F6\u95F4
param.system.online.date = 2019-02-12
############数字1.0视频接入服务配置，其他版本不支持##################################
# 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站1.0使用时开启
window.vedioFormat = hls
# 航天视频服务地址
param.htvideo.url=http://192.168.4.174:9001;
# 南瑞视频转码服务地址
param.nrvideo.url=http://198.87.103.158:8001;
#南瑞视频平台通过视频id获取flv格式视频播放地址
param.nrflvbyvoideoid.url=http://192.168.4.159:10010/api/media/live
#####################################################################################
#装备服务在接收到站端iot推送的装备数据后进行influxdb存库
#1.在装备接口消息处向influxdb/{productKey}/{deviceName} 消息地址推送数据，iot负责存库
#2.配置文件添加配置项开关，默认为关闭，该功能只使用于中心及系统
#是否向iot推送消息
isSendIot=false
#站端编码及中文名称，用于数据上送
state.code=GW190301
state.name=\u9526\u5c4f\u6362\u6d41\u7ad9
#站端编码，用于物联报表查询
stationCode=LSHLZ1bZAJU645Pgl7
#用于总部系统与站端系统逻辑区分，站端写zd总部默认为空
system.type=zd
#遥测信号是否向直流中心推送，数字站默认不推送
is.open.telemetering=false
# message 接收来自南瑞平台的告警事件描述，如：出现（即为true）
message.alarm.char=\u51FA\u73B0
# 电建项目配置
mileage.parameter=0.5
# 电建项目配置
mileage.segmentation.cron=0 0 0 * * ?
mileage.splitmileage.cron=0 0/1 * * * ?
mileage.clippingtime=600000
equip.car.alarmBattery= 10
equip.car.maxTravel=400
equip.risk.model.topic=""
#mileage.segmentation.cron= 0 */2 * * * ?
# 机场使用特殊配置iotCode前缀，装备、车辆及导入使用到
# 机场使用
#iot.code.prefix.have.used=20210003,20210004,20210005
# 电力使用
iot.code.prefix.have.used=
#kafka
spring.kafka.bootstrap-servers=172.16.10.215:9092
spring.kafka.producer.retries=1
spring.kafka.producer.bootstrap-servers=172.16.10.215:9092
spring.kafka.producer.batch-size=16384
spring.kafka.producer.buffer-memory=33554432
spring.kafka.producer.acks=1
spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
spring.kafka.consumer.group-id=messageConsumerGroup
spring.kafka.consumer.bootstrap-servers=172.16.10.215:9092
spring.kafka.consumer.enable-auto-commit=false
spring.kafka.consumer.auto-offset-reset=earliest
spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
spring.kafka.listener.ack-mode=manual_immediate
spring.kafka.listener.type=batch
kafka.topic=PERSPECTIVE
emq.topic=iot/data/perspective
kafka.alarm.topic=EQUIPMENT_ALARM
iot.async.flag = false
# message\u670D\u52A1\u8F6C\u53D1\u544A\u8B66\u4FE1\u53F7\u7279\u6B8A\u5224\u65AD\u5B57\u7B26\u96C6
#message.alarm.char=\u51FA\u73B0
update.car.qrCode=-
power.station.url=-
equip.patrol.cron=0 0 23 * * ?
\ No newline at end of file
amos-boot-system-equip/src/main/resources/application.properties
View file @ 5d8f10ac
......@@ -4,8 +4,8 @@ server.port=8100
#server.servlet.context-path=/case
spring.profiles.active=dev
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.profiles.active=kingbase
spring.datasource.driver-class-name=com.kingbase8.Driver
#mybatis mapper file
mybatis.mapper-locations=classpath:mapper/*.xml
#mybatis-plus
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentMapper.xml
View file @ 5d8f10ac
......@@ -83,7 +83,7 @@
LEFT JOIN wl_equipment_category cate ON cate.id = eq.category_id
<where>
<if test="whereConditionStr != null and whereConditionStr != '' ">
eq.name like CONCAT("%",#{whereConditionStr},"%" )
eq.name like CONCAT('%',#{whereConditionStr},'%' )
</if>
<if test="isIot != null and isIot != '' ">
eq.is_iot = #{isIot}
......@@ -102,7 +102,7 @@
LEFT JOIN wl_equipment_category cate ON cate.id = eq.category_id
<where>
<if test="whereConditionStr != null and whereConditionStr != '' ">
eq.name like CONCAT("%",#{whereConditionStr},"%" )
eq.name like CONCAT('%',#{whereConditionStr},'%' )
</if>
</where>
</select>
......@@ -263,7 +263,7 @@ FROM
LEFT JOIN wl_equipment_category cate ON cate.id = eq.category_id
<where>
<if test="code != null and code != '' ">
eq.code like CONCAT(#{code},"%" )
eq.code like CONCAT(#{code},'%' )
</if>
</where>
</select>
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ 5d8f10ac
......@@ -221,10 +221,10 @@
<where>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
CONCAT_WS(' ', wles.position,wled.area) like
concat(concat("%",#{param.warehouseStructureName}),"%")
concat(concat('%',#{param.warehouseStructureName}),'%')
</if>
<if test="param.equipCode != null and param.equipCode != ''">AND wles.code like
concat(concat("%",#{param.equipCode}),"%")
concat(concat('%',#{param.equipCode}),'%')
</if>
<if test="param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
<if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
......@@ -400,10 +400,10 @@
and wlesal.id = #{param.alarmLogId}
</if>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
and wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")
and wlesal.location like concat(concat('%',#{param.warehouseStructureName}),'%')
</if>
<if test="param.equipCode != null and param.equipCode != ''">
AND wlesal.equipment_specific_code like concat(concat("%",#{param.equipCode}),"%")
AND wlesal.equipment_specific_code like concat(concat('%',#{param.equipCode}),'%')
</if>
<if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 1">
AND wlesal.confirm_type <![CDATA[<>]]> ''
......@@ -443,16 +443,16 @@
wlesal.type != 'FIREALARM'
</if>
<if test="param.equipmentCode != null and param.equipmentCode != ''">
AND wlesal.equipment_code like concat(concat("%",#{param.equipmentCode}),"%")
AND wlesal.equipment_code like concat(concat('%',#{param.equipmentCode}),'%')
</if>
<if test="param.equipDetailCode != null and param.equipDetailCode != ''">
AND wlesal.equipment_code like concat(concat("%",#{param.equipDetailCode}),"%")
AND wlesal.equipment_code like concat(concat('%',#{param.equipDetailCode}),'%')
</if>
<if test="param.indexTypeCode != null and param.indexTypeCode != ''">
AND wlesal.type = #{param.indexTypeCode}
</if>
<if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
AND wlesal.equipment_specific_index_key like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
AND wlesal.equipment_specific_index_key like concat(concat('%',#{param.fireEquipmentSpecificIndexKey}),'%')
</if>
</where>
ORDER BY wlesal.create_date DESC
......@@ -526,10 +526,10 @@
<where>
<if test="warehouseStructureName != null and warehouseStructureName != ''">
d.warehouseStructureName like
concat(concat("%",#{warehouseStructureName}),"%")
concat(concat('%',#{warehouseStructureName}),'%')
</if>
<if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
concat(concat("%",#{equipCode}),"%")
concat(concat('%',#{equipCode}),'%')
</if>
<if test="beginDate!=null">AND d.createDate >= #{beginDate}</if>
<if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
......@@ -1530,7 +1530,7 @@
and update_date >=
#{startTime} and #{endTime} >= update_date
<if test="orgCode != null and orgCode != ''">
and wes.biz_org_code like concat(#{orgCode}, "%")
and wes.biz_org_code like concat(#{orgCode}, '%')
</if>
) as allNum,
(
......@@ -1544,7 +1544,7 @@
where
wed.code like '92010800%'
<if test="orgCode != null and orgCode != ''">
and wes.biz_org_code like concat(#{orgCode}, "%")
and wes.biz_org_code like concat(#{orgCode}, '%')
</if>
) as allEqu) as allEqu,
(
......@@ -1563,7 +1563,7 @@
and wesi.update_date >=
#{startTime} and #{endTime} >= update_date
<if test="orgCode != null and orgCode != ''">
and wes.biz_org_code like concat(#{orgCode}, "%")
and wes.biz_org_code like concat(#{orgCode}, '%')
</if>
) as startNum) as startNum
</select>
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @ 5d8f10ac
......@@ -190,7 +190,7 @@
`wes`.`system_id`
)) AS `code`,
wes.system_id systemId,
( SELECT GROUP_CONCAT(fs.name) FROM f_fire_fighting_system fs WHERE `wes`.`system_id` like CONCAT("%",fs.id,'%') ) AS systemName
( SELECT GROUP_CONCAT(fs.name) FROM f_fire_fighting_system fs WHERE `wes`.`system_id` like CONCAT('%',fs.id,'%') ) AS systemName
FROM
wl_equipment_specific AS wes
......@@ -454,9 +454,9 @@
<if test="companyId != null and companyId != ''">
and spec.agency_id = #{companyId}
</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat("%", #{equipCode}, "%")</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat('%', #{equipCode}, '%')</if>
<if test="equipName != '' and equipName != null">
and spec.name like CONCAT("%", #{equipName},'%')
and spec.name like CONCAT('%', #{equipName},'%')
</if>
<if test="current != null and size != null">
Limit #{current},#{size}
......@@ -501,9 +501,9 @@
<if test="companyId != null and companyId != ''">
and spec.agency_id = #{companyId}
</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat("%", #{equipCode}, "%")</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat('%', #{equipCode}, '%')</if>
<if test="equipName != '' and equipName != null">
and spec.name like CONCAT("%", #{equipName},'%')
and spec.name like CONCAT('%', #{equipName},'%')
</if>
</select>
......
amos-boot-system-equip/src/main/resources/mapper/ExtinguishantOnCarMapper.xml
View file @ 5d8f10ac
......@@ -32,10 +32,10 @@ SELECT table_1.car_id,
<where>
<if test="code != null and code != '' ">
equipment_detail.code like CONCAT(#{code},"%" )
equipment_detail.code like CONCAT(#{code},'%' )
</if>
<if test="codedate != null and codedate != '' ">
and equipment_detail.code like CONCAT(#{codedate},"%" )
and equipment_detail.code like CONCAT(#{codedate},'%' )
</if>
</where>
LIMIT #{start},#{page}
......@@ -52,10 +52,10 @@ SELECT table_1.car_id,
<where>
<if test="code != null and code != '' ">
equipment_detail.code like CONCAT(#{code},"%" )
equipment_detail.code like CONCAT(#{code},'%' )
</if>
<if test="codedate != null and codedate != '' ">
and equipment_detail.code like CONCAT(#{codedate},"%" )
and equipment_detail.code like CONCAT(#{codedate},'%' )
</if>
</where>
......
amos-boot-system-equip/src/main/resources/mapper/UnitMapper.xml
View file @ 5d8f10ac
......@@ -46,7 +46,7 @@
LEFT JOIN wl_unit u1 ON u1.id = u.id
OR u1.parent_id = u.id
WHERE
u1.`name` LIKE concat(concat("%",#{name}),"%")
u1.`name` LIKE concat(concat('%',#{name}),'%')
</if>
ORDER BY
u.code
......
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