+ 脚手架支持多租户

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/event/MachineRealtimeEventListener.java

@@ -72,6 +72,7 @@ public class MachineRealtimeEventListener {
         pileHoleIndexRealtime.setRealLng(message.getLongitude());
         pileHoleIndexRealtime.setRealX(message.getRealX());
         pileHoleIndexRealtime.setRealY(message.getRealY());
+        pileHoleIndexRealtime.setTenantId(consPileHoleInfo.getTenantId());
         int cnt = pileHoleIndexRealtimeService.updatePileHoleIndexRealtimeByHoleIdAndMachineId(pileHoleIndexRealtime);
         String pileRedisKey = String.format(RedisKey.PILE_MACHINE_MQTT.MQTT_TOPIC_PREFIX, message.getPileId());
         if (!redisProxy.hasKey(pileRedisKey)) {
@@ -120,7 +121,7 @@ public class MachineRealtimeEventListener {
         pileHoleIndexRealtime.setSprayVolume(message.getSprayVolume());
         pileHoleIndexRealtime.setVerticalDeviation(message.getVerticalDeviation());
         pileHoleIndexRealtime.setStatus(CONS_STATUS_00.getCode());
-
+        pileHoleIndexRealtime.setTenantId(consPileHoleInfo.getTenantId());
         if (ObjectUtils.isNotEmpty(message.getEndTime())) {
             String dateFromMills = DateTimeUtil.getDateFromMills(message.getEndTime());
             pileHoleIndexRealtime.setEndTime(DateTimeUtil.parseDate(dateFromMills));

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/MachineProcessResultMapper.java

@@ -2,6 +2,7 @@ package com.huashe.park.core.mapper;
 
 import java.util.List;
 
+import com.huashe.common.annotation.mybatis.Tenant;
 import com.huashe.park.domain.dto.cons.ConsUnitResult;
 import com.huashe.park.domain.entity.MachineProcessResult;
 
@@ -62,6 +63,7 @@ public interface MachineProcessResultMapper {
      */
     public int deleteMachineProcessResultByIds(Long[] ids);
 
+    @Tenant(tableAlias = "cmpr")
     List<ConsUnitResult> qeyConsUnitResult(Long consUnitId);
 
 }

bd-park/park-backend/park-core/src/main/resources/mapper/cons/MachineProcessMapper.xml

@@ -44,6 +44,7 @@
         <result property="id" column="id"/>
         <result property="createTime" column="create_time"/>
         <result property="recordTime" column="record_time"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <sql id="selectMachineProcessVo">
@@ -84,7 +85,9 @@
                dt,
                id,
                create_time,
-               record_time, current
+               record_time,
+               `current`,
+               tenant_id
         from cons_machine_process
     </sql>
 
@@ -181,6 +184,7 @@
             <if test="dt != null">dt,</if>
             <if test="recordTime != null">record_time,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="tenantId != null">tenant_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="consType != null">#{consType},</if>
@@ -221,6 +225,7 @@
             <if test="dt != null">#{dt},</if>
             <if test="recordTime != null">#{recordTime},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="tenantId != null">#{tenantId},</if>
         </trim>
     </insert>
 
@@ -265,6 +270,7 @@
             <if test="dt != null">dt,</if>
             <if test="recordTime != null">record_time,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="tenantId != null">tenant_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="consType != null">#{consType},</if>
@@ -305,6 +311,7 @@
             <if test="dt != null">#{dt},</if>
             <if test="recordTime != null">#{recordTime},</if>
             <if test="createTime != null">now(),</if>
+            <if test="tenantId != null">#{tenantId},</if>
         </trim>
         on duplicate key update
         <trim suffixOverrides=",">
@@ -348,6 +355,7 @@
             <if test="dt != null">dt = VALUES(dt),</if>
             <if test="recordTime != null">record_time = VALUES(record_time),</if>
             <if test="createTime != null">create_time = NOW(),</if>
+            <if test="tenantId != null">tenant_id = VALUES(tenant_id),</if>
         </trim>
     </insert>
 
@@ -392,6 +400,7 @@
             <if test="dt != null">dt = #{dt},</if>
             <if test="recordTime != null">record_time = #{recordTime},</if>
             <if test="createTime != null">create_time = NOW(),</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
         </trim>
         where id = #{id}
     </update>

bd-park/park-backend/park-core/src/main/resources/mapper/cons/MachineProcessResultMapper.xml

@@ -48,11 +48,8 @@
         <result property="sendEndTime" column="send_end_time"/>
         <result property="pullingStartTime" column="pulling_start_time"/>
         <result property="pullingEndTime" column="pulling_end_time"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
-<!--    <resultMap id="ConsUnitResultResult" type="com.huashe.park.domain.dto.cons.ConsUnitResult">-->
-<!--        <result property="depthPress" column="depth_press"-->
-<!--                typeHandler="com.huashe.park.core.typehandle.MySqlJsonHandler"/>-->
-<!--    </resultMap>-->
     <sql id="selectMachineProcessResultVo">
         select id,
                cons_type,
@@ -97,7 +94,8 @@
                uuid,
                dt,
                create_time,
-               record_time
+               record_time,
+               tenant_id
         from cons_machine_process_result
     </sql>
 
@@ -196,6 +194,7 @@
             <if test="sendEndTime != null">send_end_time,</if>
             <if test="pullingStartTime != null">pulling_start_time,</if>
             <if test="pullingEndTime != null">pulling_end_time,</if>
+            <if test="tenantId != null">tenant_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="consType != null">#{consType},</if>
@@ -241,6 +240,7 @@
             <if test="sendEndTime != null">#{sendEndTime},</if>
             <if test="pullingStartTime != null">#{pullingStartTime},</if>
             <if test="pullingEndTime != null">#{pullingEndTime},</if>
+            <if test="tenantId != null">#{tenantId},</if>
         </trim>
     </insert>
     <insert id="insertMachineProcessResultOnUpdate" parameterType="MachineProcessResult" useGeneratedKeys="true"
@@ -290,6 +290,7 @@
             <if test="sendEndTime != null">send_end_time,</if>
             <if test="pullingStartTime != null">pulling_start_time,</if>
             <if test="pullingEndTime != null">pulling_end_time,</if>
+            <if test="tenantId != null">tenant_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="consType != null">#{consType},</if>
@@ -335,6 +336,7 @@
             <if test="sendEndTime != null">#{sendEndTime},</if>
             <if test="pullingStartTime != null">#{pullingStartTime},</if>
             <if test="pullingEndTime!= null">#{pullingEndTime},</if>
+            <if test="tenantId != null">#{tenantId},</if>
         </trim>
         ON DUPLICATE KEY UPDATE
         <trim suffixOverrides=",">
@@ -380,6 +382,7 @@
             <if test="sendEndTime != null">send_end_time = VALUES(send_end_time),</if>
             <if test="pullingStartTime != null">pulling_start_time = VALUES(pulling_start_time),</if>
             <if test="pullingEndTime != null">pulling_end_time = VALUES(pulling_end_time),</if>
+            <if test="tenantId != null">tenant_id = VALUES(tenant_id),</if>
         </trim>
 
     </insert>
@@ -430,6 +433,7 @@
             <if test="sendEndTime != null">send_end_time = #{sendEndTime},</if>
             <if test="pullingStartTime != null">pulling_start_time = #{pullingStartTime},</if>
             <if test="pullingEndTime != null">pulling_end_time = #{pullingEndTime},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -453,7 +457,7 @@
                cphir.hole_num,
                cphir.spray_pressure pressure,
                cphir.end_press,
-               cphir.depth_press depth_press
+               cphir.depth_press    depth_press
         from cons_machine_process_result cmpr
                  inner join cons_pile_hole_index_realtime cphir on
             cmpr.pile_id = cphir.hole_byte_key

bd-park/park-backend/park-core/src/main/resources/mapper/cons/PileHoleIndexRealtimeMapper.xml

@@ -27,11 +27,11 @@
         <result property="realLng" column="real_lng"/>
         <result property="consUnitId" column="cons_unit_id"/>
         <result property="holeNum" column="hole_num"/>
-
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <sql id="selectPileHoleIndexRealtimeVo">
@@ -62,7 +62,8 @@
                create_time,
                create_by,
                update_by,
-               cons_unit_id
+               cons_unit_id,
+               tenant_id
         from cons_pile_hole_index_realtime
     </sql>
 
@@ -123,6 +124,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="tenantId != null">tenant_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="holeId != null">#{holeId},</if>
@@ -152,6 +154,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="tenantId != null">#{tenantId},</if>
         </trim>
     </insert>
 
@@ -185,6 +188,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -215,6 +219,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
         </trim>
         where hole_id = #{holeId} and machine_id = #{machineId}
     </update>

bd-park/park-backend/park-core/src/main/resources/mapper/cons/PileMachineInfoMapper.xml

@@ -26,6 +26,7 @@
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <sql id="selectPileMachineInfoVo">
@@ -48,7 +49,9 @@
                update_time,
                create_time,
                create_by,
-               update_by, no
+               update_by,
+               `no`,
+               tenant_id
         from cons_pile_machine_info
     </sql>
 
@@ -96,6 +99,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="tenantId != null">tenant_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="byteId != null and byteId != ''">#{byteId},</if>
@@ -118,6 +122,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="tenantId != null">#{tenantId},</if>
         </trim>
     </insert>
 
@@ -144,6 +149,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
         </trim>
         where id = #{id}
     </update>

bd-park/park-backend/park-core/src/main/resources/mapper/cons/ProjectCoordinateInfoMapper.xml

@@ -1,46 +1,71 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huashe.park.core.mapper.ProjectCoordinateInfoMapper">
-    
+
     <resultMap type="ProjectCoordinateInfo" id="ProjectCoordinateInfoResult">
-        <result property="id"    column="id"    />
-        <result property="projectId"    column="project_id"    />
-        <result property="strName"    column="str_name"    />
-        <result property="da"    column="da"    />
-        <result property="df"    column="df"    />
-        <result property="dreferenceLatitude"    column="dreference_latitude"    />
-        <result property="dcentralMeridian"    column="dcentral_meridian"    />
-        <result property="dreferenceLongitude"    column="dreference_longitude"    />
-        <result property="dprojectionHeight"    column="dprojection_height"    />
-        <result property="projectionName"    column="projection_name"    />
-        <result property="heightFittingParameter"    column="height_fitting_parameter"    />
-        <result property="constructionP4"    column="construction_p4"    />
-        <result property="createType"    column="create_type"    />
-        <result property="projectionId"    column="projection_id"    />
-        <result property="constructionP7"    column="construction_p7"    />
-        <result property="projectType"    column="project_type"    />
-        <result property="dtx"    column="dtx"    />
-        <result property="dty"    column="dty"    />
-        <result property="ntype"    column="ntype"    />
-        <result property="dtk"    column="dtk"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
+        <result property="id" column="id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="strName" column="str_name"/>
+        <result property="da" column="da"/>
+        <result property="df" column="df"/>
+        <result property="dreferenceLatitude" column="dreference_latitude"/>
+        <result property="dcentralMeridian" column="dcentral_meridian"/>
+        <result property="dreferenceLongitude" column="dreference_longitude"/>
+        <result property="dprojectionHeight" column="dprojection_height"/>
+        <result property="projectionName" column="projection_name"/>
+        <result property="heightFittingParameter" column="height_fitting_parameter"/>
+        <result property="constructionP4" column="construction_p4"/>
+        <result property="createType" column="create_type"/>
+        <result property="projectionId" column="projection_id"/>
+        <result property="constructionP7" column="construction_p7"/>
+        <result property="projectType" column="project_type"/>
+        <result property="dtx" column="dtx"/>
+        <result property="dty" column="dty"/>
+        <result property="ntype" column="ntype"/>
+        <result property="dtk" column="dtk"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <sql id="selectProjectCoordinateInfoVo">
-        select id, project_id, str_name, da, df, dreference_latitude, dcentral_meridian, dreference_longitude, dprojection_height, projection_name, height_fitting_parameter, construction_p4, create_type, projection_id, construction_p7, project_type, dtx, dty, ntype, dtk, update_time, create_time, create_by, update_by from cons_project_coordinate_info
+        select id,
+               project_id,
+               str_name,
+               da,
+               df,
+               dreference_latitude,
+               dcentral_meridian,
+               dreference_longitude,
+               dprojection_height,
+               projection_name,
+               height_fitting_parameter,
+               construction_p4,
+               create_type,
+               projection_id,
+               construction_p7,
+               project_type,
+               dtx,
+               dty,
+               ntype,
+               dtk,
+               update_time,
+               create_time,
+               create_by,
+               update_by,
+               tenant_id
+        from cons_project_coordinate_info
     </sql>
 
-    <select id="selectProjectCoordinateInfoList" parameterType="ProjectCoordinateInfo" resultMap="ProjectCoordinateInfoResult">
+    <select id="selectProjectCoordinateInfoList" parameterType="ProjectCoordinateInfo"
+            resultMap="ProjectCoordinateInfoResult">
         <include refid="selectProjectCoordinateInfoVo"/>
-        <where>  
-        </where>
     </select>
-    
+
     <select id="selectProjectCoordinateInfoById" parameterType="Long" resultMap="ProjectCoordinateInfoResult">
         <include refid="selectProjectCoordinateInfoVo"/>
         where id = #{id}
@@ -73,7 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-         </trim>
+            <if test="tenantId != null">tenant_id,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="projectId != null">#{projectId},</if>
@@ -99,7 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-         </trim>
+            <if test="tenantId != null">#{tenantId},</if>
+        </trim>
     </insert>
 
     <update id="updateProjectCoordinateInfo" parameterType="ProjectCoordinateInfo">
@@ -128,16 +155,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteProjectCoordinateInfoById" parameterType="Long">
-        delete from cons_project_coordinate_info where id = #{id}
+        delete
+        from cons_project_coordinate_info
+        where id = #{id}
     </delete>
 
     <delete id="deleteProjectCoordinateInfoByIds" parameterType="String">
-        delete from cons_project_coordinate_info where id in 
+        delete from cons_project_coordinate_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

bd-park/park-backend/park-core/src/main/resources/mapper/cons/ProjectInfoMapper.xml

@@ -1,29 +1,31 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huashe.park.core.mapper.ProjectInfoMapper">
-    
+
     <resultMap type="ProjectInfo" id="ProjectInfoResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
     <sql id="selectProjectInfoVo">
-        select id, name, update_time, create_time, create_by, update_by from cons_project_info
+        select id, name, update_time, create_time, create_by, update_by, tenant_id
+        from cons_project_info
     </sql>
 
     <select id="selectProjectInfoList" parameterType="ProjectInfo" resultMap="ProjectInfoResult">
         <include refid="selectProjectInfoVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
         </where>
     </select>
-    
+
     <select id="selectProjectInfoById" parameterType="Long" resultMap="ProjectInfoResult">
         <include refid="selectProjectInfoVo"/>
         where id = #{id}
@@ -37,14 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-         </trim>
+            <if test="tenantId != null">tenant_id,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-         </trim>
+            <if test="tenantId != null">#{tenantId},</if>
+        </trim>
     </insert>
 
     <update id="updateProjectInfo" parameterType="ProjectInfo">
@@ -55,16 +59,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteProjectInfoById" parameterType="Long">
-        delete from cons_project_info where id = #{id}
+        delete
+        from cons_project_info
+        where id = #{id}
     </delete>
 
     <delete id="deleteProjectInfoByIds" parameterType="String">
-        delete from cons_project_info where id in 
+        delete from cons_project_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>