楼宇特记事项、salesforce归属楼宇

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

@@ -0,0 +1,5 @@
+
+ALTER TABLE basic_building ADD `special_notes` text COMMENT '特记事项';
+
+ALTER TABLE basic_salesforce ADD building_id bigint AFTER salesforce_id;
+

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

@@ -31,6 +31,7 @@
     -->
     <result column="floor_info_list" jdbcType="LONGVARCHAR" property="floorInfoList" />
     <result column="picture_introduction" jdbcType="LONGVARCHAR" property="pictureIntroduction" />
+    <result column="special_notes" jdbcType="LONGVARCHAR" property="specialNotes" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -112,7 +113,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    floor_info_list, picture_introduction
+    floor_info_list, picture_introduction, special_notes
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.techsor.datacenter.business.model.BasicBuildingExample" resultMap="ResultMapWithBLOBs">
     <!--
@@ -197,15 +198,15 @@
       modify_time, modifier_id, udf_building_id, 
       building_bucket, thumbnail_num, show_switch_2d3d, 
       brief_introduction, latitude, longitude, 
-      retain_alert, floor_info_list, picture_introduction
+      retain_alert, 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}, 
       #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT}, #{udfBuildingId,jdbcType=VARCHAR}, 
       #{buildingBucket,jdbcType=VARCHAR}, #{thumbnailNum,jdbcType=INTEGER}, #{showSwitch2d3d,jdbcType=INTEGER}, 
       #{briefIntroduction,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, 
-      #{retainAlert,jdbcType=INTEGER}, #{floorInfoList,jdbcType=LONGVARCHAR}, #{pictureIntroduction,jdbcType=LONGVARCHAR}
+      #{retainAlert,jdbcType=INTEGER}, #{floorInfoList,jdbcType=LONGVARCHAR}, #{pictureIntroduction,jdbcType=LONGVARCHAR}, 
-      )
+      #{specialNotes,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicBuilding">
     <!--
@@ -271,6 +272,9 @@
       <if test="pictureIntroduction != null">
         picture_introduction,
       </if>
+      <if test="specialNotes != null">
+        special_notes,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyId != null">
@@ -327,6 +331,9 @@
       <if test="pictureIntroduction != null">
         #{pictureIntroduction,jdbcType=LONGVARCHAR},
       </if>
+      <if test="specialNotes != null">
+        #{specialNotes,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.techsor.datacenter.business.model.BasicBuildingExample" resultType="java.lang.Long">
@@ -403,6 +410,9 @@
       <if test="record.pictureIntroduction != null">
         picture_introduction = #{record.pictureIntroduction,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.specialNotes != null">
+        special_notes = #{record.specialNotes,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -432,7 +442,8 @@
       longitude = #{record.longitude,jdbcType=VARCHAR},
       retain_alert = #{record.retainAlert,jdbcType=INTEGER},
       floor_info_list = #{record.floorInfoList,jdbcType=LONGVARCHAR},
-      picture_introduction = #{record.pictureIntroduction,jdbcType=LONGVARCHAR}
+      picture_introduction = #{record.pictureIntroduction,jdbcType=LONGVARCHAR},
+      special_notes = #{record.specialNotes,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -525,6 +536,9 @@
       <if test="pictureIntroduction != null">
         picture_introduction = #{pictureIntroduction,jdbcType=LONGVARCHAR},
       </if>
+      <if test="specialNotes != null">
+        special_notes = #{specialNotes,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where building_id = #{buildingId,jdbcType=BIGINT}
   </update>
@@ -551,7 +565,8 @@
       longitude = #{longitude,jdbcType=VARCHAR},
       retain_alert = #{retainAlert,jdbcType=INTEGER},
       floor_info_list = #{floorInfoList,jdbcType=LONGVARCHAR},
-      picture_introduction = #{pictureIntroduction,jdbcType=LONGVARCHAR}
+      picture_introduction = #{pictureIntroduction,jdbcType=LONGVARCHAR},
+      special_notes = #{specialNotes,jdbcType=LONGVARCHAR}
     where building_id = #{buildingId,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.techsor.datacenter.business.model.BasicBuilding">

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

@@ -9,6 +9,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="company_id" jdbcType="BIGINT" property="companyId" />
     <result column="salesforce_id" jdbcType="VARCHAR" property="salesforceId" />
+    <result column="building_id" jdbcType="BIGINT" property="buildingId" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="flag" jdbcType="INTEGER" property="flag" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
@@ -87,8 +88,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, company_id, salesforce_id, remark, flag, create_time, creator_id, modify_time, 
+    id, company_id, salesforce_id, building_id, remark, flag, create_time, creator_id, 
-    modifier_id
+    modify_time, modifier_id
   </sql>
   <select id="selectByExample" parameterType="com.techsor.datacenter.business.model.BasicSalesforceExample" resultMap="BaseResultMap">
     <!--
@@ -145,12 +146,14 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into basic_salesforce (company_id, salesforce_id, remark, 
+    insert into basic_salesforce (company_id, salesforce_id, building_id, 
-      flag, create_time, creator_id, 
+      remark, flag, create_time, 
-      modify_time, modifier_id)
+      creator_id, modify_time, modifier_id
-    values (#{companyId,jdbcType=BIGINT}, #{salesforceId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      )
-      #{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, 
+    values (#{companyId,jdbcType=BIGINT}, #{salesforceId,jdbcType=VARCHAR}, #{buildingId,jdbcType=BIGINT}, 
-      #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT})
+      #{remark,jdbcType=VARCHAR}, #{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, 
+      #{creatorId,jdbcType=BIGINT}, #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicSalesforce">
     <!--
@@ -168,6 +171,9 @@
       <if test="salesforceId != null">
         salesforce_id,
       </if>
+      <if test="buildingId != null">
+        building_id,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -194,6 +200,9 @@
       <if test="salesforceId != null">
         #{salesforceId,jdbcType=VARCHAR},
       </if>
+      <if test="buildingId != null">
+        #{buildingId,jdbcType=BIGINT},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
@@ -240,6 +249,9 @@
       <if test="record.salesforceId != null">
         salesforce_id = #{record.salesforceId,jdbcType=VARCHAR},
       </if>
+      <if test="record.buildingId != null">
+        building_id = #{record.buildingId,jdbcType=BIGINT},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
@@ -272,6 +284,7 @@
     set id = #{record.id,jdbcType=BIGINT},
       company_id = #{record.companyId,jdbcType=BIGINT},
       salesforce_id = #{record.salesforceId,jdbcType=VARCHAR},
+      building_id = #{record.buildingId,jdbcType=BIGINT},
       remark = #{record.remark,jdbcType=VARCHAR},
       flag = #{record.flag,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=BIGINT},
@@ -295,6 +308,9 @@
       <if test="salesforceId != null">
         salesforce_id = #{salesforceId,jdbcType=VARCHAR},
       </if>
+      <if test="buildingId != null">
+        building_id = #{buildingId,jdbcType=BIGINT},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
@@ -324,6 +340,7 @@
     update basic_salesforce
     set company_id = #{companyId,jdbcType=BIGINT},
       salesforce_id = #{salesforceId,jdbcType=VARCHAR},
+      building_id = #{buildingId,jdbcType=BIGINT},
       remark = #{remark,jdbcType=VARCHAR},
       flag = #{flag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=BIGINT},

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

@@ -42,6 +42,7 @@
         	bbuilding.show_switch_2d3d,
         	bbuilding.brief_introduction,
         	bbuilding.picture_introduction,
+        	bbuilding.special_notes,
         	bbuilding.latitude,
         	bbuilding.longitude,
             GROUP_CONCAT(pa.id) AS siteIds,

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

@@ -23,6 +23,7 @@
         SELECT
             bsales.id,
             bsales.company_id,
+            bsales.building_id,
             bcomp.company_name,
             bsales.salesforce_id,
             bsales.remark,

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

@@ -51,6 +51,9 @@ public class OptBuildingParams{
 	@Schema(description = "归属site的ID，可以属于多个上级层级",example = "[]")
 	private List<Long> siteIdList;
 
+	@Schema(description ="特记事项", example = "Abiko City, Japan", required = false)
+	private String specialNotes;
+	
 	
 	@Data
 	public static class CustomFloorInfo {

data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/salesforce/OptSalesforceParams.java

@@ -21,6 +21,9 @@ public class OptSalesforceParams{
 	@Schema(description = "Salesforce id", example = "testSalesforce1", required = true)
 	private String salesforceId;
 
+	@Schema(description = "Building ID", example = "25")
+	private Long buildingId;
+
 	@Schema(description = "device primary key ID list", example = "[]")
 	private List<Long> deviceInfoIdList;
 	

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

@@ -174,6 +174,15 @@ public class BasicBuilding implements Serializable {
      */
     private String pictureIntroduction;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_building.special_notes
+     *
+     * @mbg.generated
+     */
+    private String specialNotes;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table basic_building
@@ -638,6 +647,30 @@ public class BasicBuilding implements Serializable {
         this.pictureIntroduction = pictureIntroduction == null ? null : pictureIntroduction.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_building.special_notes
+     *
+     * @return the value of basic_building.special_notes
+     *
+     * @mbg.generated
+     */
+    public String getSpecialNotes() {
+        return specialNotes;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_building.special_notes
+     *
+     * @param specialNotes the value for basic_building.special_notes
+     *
+     * @mbg.generated
+     */
+    public void setSpecialNotes(String specialNotes) {
+        this.specialNotes = specialNotes == null ? null : specialNotes.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table basic_building
@@ -669,6 +702,7 @@ public class BasicBuilding implements Serializable {
         sb.append(", retainAlert=").append(retainAlert);
         sb.append(", floorInfoList=").append(floorInfoList);
         sb.append(", pictureIntroduction=").append(pictureIntroduction);
+        sb.append(", specialNotes=").append(specialNotes);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -30,6 +30,15 @@ public class BasicSalesforce implements Serializable {
      */
     private String salesforceId;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_salesforce.building_id
+     *
+     * @mbg.generated
+     */
+    private Long buildingId;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -164,6 +173,30 @@ public class BasicSalesforce implements Serializable {
         this.salesforceId = salesforceId == null ? null : salesforceId.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_salesforce.building_id
+     *
+     * @return the value of basic_salesforce.building_id
+     *
+     * @mbg.generated
+     */
+    public Long getBuildingId() {
+        return buildingId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_salesforce.building_id
+     *
+     * @param buildingId the value for basic_salesforce.building_id
+     *
+     * @mbg.generated
+     */
+    public void setBuildingId(Long buildingId) {
+        this.buildingId = buildingId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column basic_salesforce.remark
@@ -323,6 +356,7 @@ public class BasicSalesforce implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", companyId=").append(companyId);
         sb.append(", salesforceId=").append(salesforceId);
+        sb.append(", buildingId=").append(buildingId);
         sb.append(", remark=").append(remark);
         sb.append(", flag=").append(flag);
         sb.append(", createTime=").append(createTime);

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

@@ -384,6 +384,66 @@ public class BasicSalesforceExample {
             return (Criteria) this;
         }
 
+        public Criteria andBuildingIdIsNull() {
+            addCriterion("building_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdIsNotNull() {
+            addCriterion("building_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdEqualTo(Long value) {
+            addCriterion("building_id =", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdNotEqualTo(Long value) {
+            addCriterion("building_id <>", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdGreaterThan(Long value) {
+            addCriterion("building_id >", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("building_id >=", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdLessThan(Long value) {
+            addCriterion("building_id <", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdLessThanOrEqualTo(Long value) {
+            addCriterion("building_id <=", value, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdIn(List<Long> values) {
+            addCriterion("building_id in", values, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdNotIn(List<Long> values) {
+            addCriterion("building_id not in", values, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdBetween(Long value1, Long value2) {
+            addCriterion("building_id between", value1, value2, "buildingId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBuildingIdNotBetween(Long value1, Long value2) {
+            addCriterion("building_id not between", value1, value2, "buildingId");
+            return (Criteria) this;
+        }
+
         public Criteria andRemarkIsNull() {
             addCriterion("remark is null");
             return (Criteria) this;

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

@@ -62,4 +62,7 @@ public class BuildingPageVO{
 	@Schema(description = "site层级名称",example = "2")
 	private String siteNames;
 
+	@Schema(description ="特记事项", example = "Abiko City, Japan", required = false)
+	private String specialNotes;
+
 }

data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/salesforce/SalesforcePageVO.java

@@ -19,6 +19,9 @@ public class SalesforcePageVO {
 	@Schema(description = "Salesforce id", example = "testSalesforce1", required = true)
 	private String salesforceId;
 
+	@Schema(description = "Building ID", example = "25")
+	private Long buildingId;
+
 	@Schema(description = "备注", example = "user1", required = true, hidden = true)
 	private String remark;
 

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

@@ -299,6 +299,9 @@ public class BuildingServiceImpl implements BuildingService {
 			} else {
 				basicBuilding.setFloorInfoList("[]");
 			}
+			if (StringUtils.isBlank(optBuildingParams.getSpecialNotes())) {
+				basicBuilding.setSpecialNotes("");
+			}
 
 			BasicBuildingExample example = new BasicBuildingExample();
 			BasicBuildingExample.Criteria criteria = example.createCriteria();