Browse Source

feat(building): add kvm url field for building

add kvm_url column to basic_building table, and add related parameters, return fields and mybatis mappings for building kvm url management
zhc
zhczyx@163.com 1 month ago
parent
commit
487bbef072
  1. BIN
      data-center-business-controller/src/main/resources/.DS_Store
  2. 1
      data-center-business-controller/src/main/resources/db/migration/V86__building_kvm_url.sql
  3. BIN
      data-center-business-controller/src/main/resources/template/.DS_Store
  4. 27
      data-center-business-dao/src/main/resources/mappers/auto/BasicBuildingMapper.xml
  5. 7
      data-center-business-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml
  6. 3
      data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/building/OptBuildingParams.java
  7. 25
      data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicBuilding.java
  8. 70
      data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicBuildingExample.java
  9. 3
      data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/building/BuildingPageVO.java
  10. 3
      data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/BuildingServiceImpl.java

BIN
data-center-business-controller/src/main/resources/.DS_Store

Binary file not shown.

1
data-center-business-controller/src/main/resources/db/migration/V86__building_kvm_url.sql

@ -0,0 +1 @@
ALTER TABLE basic_building ADD `kvm_url` varchar(500) DEFAULT NULL COMMENT 'KVM URL';

BIN
data-center-business-controller/src/main/resources/template/.DS_Store

Binary file not shown.

27
data-center-business-dao/src/main/resources/mappers/auto/BasicBuildingMapper.xml

@ -26,6 +26,7 @@
<result column="salesforce_primary_id" jdbcType="BIGINT" property="salesforcePrimaryId" />
<result column="site_manager" jdbcType="VARCHAR" property="siteManager" />
<result column="king_contract_no" jdbcType="VARCHAR" property="kingContractNo" />
<result column="kvm_url" jdbcType="VARCHAR" property="kvmUrl" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.techsor.datacenter.business.model.BasicBuilding">
<!--
@ -109,7 +110,7 @@
-->
building_id, company_id, `name`, address, flag, create_time, creator_id, modify_time,
modifier_id, udf_building_id, building_bucket, thumbnail_num, show_switch_2d3d, brief_introduction,
latitude, longitude, retain_alert, salesforce_primary_id, site_manager, king_contract_no
latitude, longitude, retain_alert, salesforce_primary_id, site_manager, king_contract_no, kvm_url
</sql>
<sql id="Blob_Column_List">
<!--
@ -202,7 +203,7 @@
building_bucket, thumbnail_num, show_switch_2d3d,
brief_introduction, latitude, longitude,
retain_alert, salesforce_primary_id, site_manager,
king_contract_no, floor_info_list, picture_introduction,
king_contract_no, kvm_url, floor_info_list, picture_introduction,
special_notes)
values (#{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT},
@ -210,7 +211,7 @@
#{buildingBucket,jdbcType=VARCHAR}, #{thumbnailNum,jdbcType=INTEGER}, #{showSwitch2d3d,jdbcType=INTEGER},
#{briefIntroduction,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR},
#{retainAlert,jdbcType=INTEGER}, #{salesforcePrimaryId,jdbcType=BIGINT}, #{siteManager,jdbcType=VARCHAR},
#{kingContractNo,jdbcType=VARCHAR}, #{floorInfoList,jdbcType=LONGVARCHAR}, #{pictureIntroduction,jdbcType=LONGVARCHAR},
#{kingContractNo,jdbcType=VARCHAR}, #{kvmUrl,jdbcType=VARCHAR}, #{floorInfoList,jdbcType=LONGVARCHAR}, #{pictureIntroduction,jdbcType=LONGVARCHAR},
#{specialNotes,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicBuilding">
@ -280,6 +281,9 @@
<if test="kingContractNo != null">
king_contract_no,
</if>
<if test="kvmUrl != null">
kvm_url,
</if>
<if test="floorInfoList != null">
floor_info_list,
</if>
@ -348,6 +352,9 @@
<if test="kingContractNo != null">
#{kingContractNo,jdbcType=VARCHAR},
</if>
<if test="kvmUrl != null">
#{kvmUrl,jdbcType=VARCHAR},
</if>
<if test="floorInfoList != null">
#{floorInfoList,jdbcType=LONGVARCHAR},
</if>
@ -436,6 +443,9 @@
<if test="record.kingContractNo != null">
king_contract_no = #{record.kingContractNo,jdbcType=VARCHAR},
</if>
<if test="record.kvmUrl != null">
kvm_url = #{record.kvmUrl,jdbcType=VARCHAR},
</if>
<if test="record.floorInfoList != null">
floor_info_list = #{record.floorInfoList,jdbcType=LONGVARCHAR},
</if>
@ -476,6 +486,7 @@
salesforce_primary_id = #{record.salesforcePrimaryId,jdbcType=BIGINT},
site_manager = #{record.siteManager,jdbcType=VARCHAR},
king_contract_no = #{record.kingContractNo,jdbcType=VARCHAR},
kvm_url = #{record.kvmUrl,jdbcType=VARCHAR},
floor_info_list = #{record.floorInfoList,jdbcType=LONGVARCHAR},
picture_introduction = #{record.pictureIntroduction,jdbcType=LONGVARCHAR},
special_notes = #{record.specialNotes,jdbcType=LONGVARCHAR}
@ -508,7 +519,8 @@
retain_alert = #{record.retainAlert,jdbcType=INTEGER},
salesforce_primary_id = #{record.salesforcePrimaryId,jdbcType=BIGINT},
site_manager = #{record.siteManager,jdbcType=VARCHAR},
king_contract_no = #{record.kingContractNo,jdbcType=VARCHAR}
king_contract_no = #{record.kingContractNo,jdbcType=VARCHAR},
kvm_url = #{record.kvmUrl,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -577,6 +589,9 @@
<if test="kingContractNo != null">
king_contract_no = #{kingContractNo,jdbcType=VARCHAR},
</if>
<if test="kvmUrl != null">
kvm_url = #{kvmUrl,jdbcType=VARCHAR},
</if>
<if test="floorInfoList != null">
floor_info_list = #{floorInfoList,jdbcType=LONGVARCHAR},
</if>
@ -614,6 +629,7 @@
salesforce_primary_id = #{salesforcePrimaryId,jdbcType=BIGINT},
site_manager = #{siteManager,jdbcType=VARCHAR},
king_contract_no = #{kingContractNo,jdbcType=VARCHAR},
kvm_url = #{kvmUrl,jdbcType=VARCHAR},
floor_info_list = #{floorInfoList,jdbcType=LONGVARCHAR},
picture_introduction = #{pictureIntroduction,jdbcType=LONGVARCHAR},
special_notes = #{specialNotes,jdbcType=LONGVARCHAR}
@ -643,7 +659,8 @@
retain_alert = #{retainAlert,jdbcType=INTEGER},
salesforce_primary_id = #{salesforcePrimaryId,jdbcType=BIGINT},
site_manager = #{siteManager,jdbcType=VARCHAR},
king_contract_no = #{kingContractNo,jdbcType=VARCHAR}
king_contract_no = #{kingContractNo,jdbcType=VARCHAR},
kvm_url = #{kvmUrl,jdbcType=VARCHAR}
where building_id = #{buildingId,jdbcType=BIGINT}
</update>
</mapper>

7
data-center-business-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml

@ -48,6 +48,7 @@
bbuilding.salesforce_primary_id,
bbuilding.site_manager,
bbuilding.king_contract_no,
bbuilding.kvm_url,
bsales.salesforce_id,
GROUP_CONCAT(DISTINCT pa.id ORDER BY pa.id) AS siteIds,
GROUP_CONCAT(DISTINCT pa.code ORDER BY pa.id) AS siteCodes,
@ -129,7 +130,8 @@
bcomp.company_name companyName,
bbuilding.name buildingName,
bbuilding.address,
bbuilding.udf_building_id udfBuildingId
bbuilding.udf_building_id udfBuildingId,
bbuilding.kvm_url
FROM
basic_building bbuilding
INNER JOIN data_center_aeon_admin.basic_company bcomp ON bcomp.id = bbuilding.company_id
@ -148,7 +150,8 @@
bcomp.company_name companyName,
bbuilding.name buildingName,
bbuilding.address,
bbuilding.udf_building_id udfBuildingId
bbuilding.udf_building_id udfBuildingId,
bbuilding.kvm_url
FROM
basic_building bbuilding
INNER JOIN data_center_aeon_admin.basic_company bcomp ON bcomp.id = bbuilding.company_id

3
data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/building/OptBuildingParams.java

@ -63,6 +63,9 @@ public class OptBuildingParams{
@Schema(description = "キング契約先番号", example = "25")
private String kingContractNo;
@Schema(description = "KVM URL", example = "https://kvm.example.com/building/1")
private String kvmUrl;
@Data
public static class CustomFloorInfo {
private String revitName;

25
data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicBuilding.java

@ -210,6 +210,12 @@ public class BasicBuilding implements Serializable {
*/
private String specialNotes;
/**
*
* This field corresponds to the database column basic_building.kvm_url
*/
private String kvmUrl;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table basic_building
@ -698,6 +704,24 @@ public class BasicBuilding implements Serializable {
this.kingContractNo = kingContractNo == null ? null : kingContractNo.trim();
}
/**
* This method returns the value of the database column basic_building.kvm_url
*
* @return the value of basic_building.kvm_url
*/
public String getKvmUrl() {
return kvmUrl;
}
/**
* This method sets the value of the database column basic_building.kvm_url
*
* @param kvmUrl the value for basic_building.kvm_url
*/
public void setKvmUrl(String kvmUrl) {
this.kvmUrl = kvmUrl == null ? null : kvmUrl.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column basic_building.floor_info_list
@ -802,6 +826,7 @@ public class BasicBuilding implements Serializable {
sb.append(", salesforcePrimaryId=").append(salesforcePrimaryId);
sb.append(", siteManager=").append(siteManager);
sb.append(", kingContractNo=").append(kingContractNo);
sb.append(", kvmUrl=").append(kvmUrl);
sb.append(", floorInfoList=").append(floorInfoList);
sb.append(", pictureIntroduction=").append(pictureIntroduction);
sb.append(", specialNotes=").append(specialNotes);

70
data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicBuildingExample.java

@ -1483,6 +1483,76 @@ public class BasicBuildingExample {
addCriterion("king_contract_no not between", value1, value2, "kingContractNo");
return (Criteria) this;
}
public Criteria andKvmUrlIsNull() {
addCriterion("kvm_url is null");
return (Criteria) this;
}
public Criteria andKvmUrlIsNotNull() {
addCriterion("kvm_url is not null");
return (Criteria) this;
}
public Criteria andKvmUrlEqualTo(String value) {
addCriterion("kvm_url =", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlNotEqualTo(String value) {
addCriterion("kvm_url <>", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlGreaterThan(String value) {
addCriterion("kvm_url >", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlGreaterThanOrEqualTo(String value) {
addCriterion("kvm_url >=", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlLessThan(String value) {
addCriterion("kvm_url <", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlLessThanOrEqualTo(String value) {
addCriterion("kvm_url <=", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlLike(String value) {
addCriterion("kvm_url like", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlNotLike(String value) {
addCriterion("kvm_url not like", value, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlIn(List<String> values) {
addCriterion("kvm_url in", values, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlNotIn(List<String> values) {
addCriterion("kvm_url not in", values, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlBetween(String value1, String value2) {
addCriterion("kvm_url between", value1, value2, "kvmUrl");
return (Criteria) this;
}
public Criteria andKvmUrlNotBetween(String value1, String value2) {
addCriterion("kvm_url not between", value1, value2, "kvmUrl");
return (Criteria) this;
}
}
/**

3
data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/building/BuildingPageVO.java

@ -79,6 +79,9 @@ public class BuildingPageVO{
@Schema(description = "キング契約先番号", example = "25")
private String kingContractNo;
@Schema(description = "KVM URL", example = "https://kvm.example.com/building/1")
private String kvmUrl;
private String branchIds;
@Schema(description = "支社名称", example = "user1", required = false)
private String branchNames;

3
data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/BuildingServiceImpl.java

@ -308,6 +308,9 @@ public class BuildingServiceImpl implements BuildingService {
if (StringUtils.isBlank(optBuildingParams.getKingContractNo())) {
basicBuilding.setKingContractNo("");
}
if (StringUtils.isBlank(optBuildingParams.getKvmUrl())) {
basicBuilding.setKvmUrl("");
}
BasicBuildingExample example = new BasicBuildingExample();
BasicBuildingExample.Criteria criteria = example.createCriteria();

Loading…
Cancel
Save