+ 脚手架支持多租户

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.huashe.common.annotation.mybatis.Tenant;
 import com.huashe.park.domain.dto.cons.PileRealtimeIndex;
 import com.huashe.park.domain.entity.ConsPileHoleInfo;
 
@@ -32,6 +33,7 @@ public interface ConsPileHoleInfoMapper {
      */
     public List<ConsPileHoleInfo> selectConsPileHoleInfoList(ConsPileHoleInfo consPileHoleInfo);
 
+    @Tenant(tableAlias = "cphi")
     List<PileRealtimeIndex> selectConsPileHoleRealtimeIndex(ConsPileHoleInfo consPileHoleInfo);
 
     public List<ConsPileHoleInfo> selectNonConsPileHoleInfo(ConsPileHoleInfo consPileHoleInfo);

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.huashe.common.annotation.mybatis.Tenant;
 import com.huashe.park.domain.entity.ConsUnitInfo;
 
 /**
@@ -69,6 +70,7 @@ public interface ConsUnitInfoMapper {
 
     int updateConstUnitChildren(@Param("consUnits") List<ConsUnitInfo> consUnits);
 
+    @Tenant(tableAlias = "unit")
     List<String> qryMachineAssignedUnitAncestors(Long machineId);
 
     List<ConsUnitInfo> qryConsUnitInfoByIds(@Param("ids") List<String> ids);

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

@@ -2,6 +2,7 @@ package com.huashe.park.core.mapper;
 
 import java.util.List;
 
+import com.huashe.common.annotation.mybatis.IgnoreTenant;
 import org.apache.ibatis.annotations.Param;
 
 import com.huashe.park.domain.entity.ConsUnitMachineRel;
@@ -12,6 +13,7 @@ import com.huashe.park.domain.entity.ConsUnitMachineRel;
  * @author ruoyi
  * @date 2025-02-17
  */
+@IgnoreTenant
 public interface ConsUnitMachineRelMapper {
     /**
      * 查询施工单元桩机关系

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

@@ -3,6 +3,7 @@ package com.huashe.park.core.mapper;
 import java.util.HashMap;
 import java.util.List;
 
+import com.huashe.common.annotation.mybatis.Tenant;
 import com.huashe.park.domain.entity.PileMachineInfo;
 
 /**
@@ -64,7 +65,9 @@ public interface PileMachineInfoMapper {
 
     HashMap<String, Integer> cntMachineOnOffline();
 
+    @Tenant(tableAlias = "cpmi")
     List<PileMachineInfo> qryUnitMachine(Long consUnitId);
+    @Tenant(tableAlias = "cpmi")
     List<PileMachineInfo> selectMachineByConsUnitId(Long consUnitId);
 
 }

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

@@ -23,6 +23,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="selectConsPileHoleInfoVo">
@@ -43,7 +44,8 @@
                update_time,
                create_time,
                create_by,
-               update_by
+               update_by,
+               tenant_id
         from cons_pile_hole_info
     </sql>
 
@@ -125,6 +127,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>
@@ -143,6 +146,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>
     <insert id="batchInsertConsPileHoleInfo" parameterType="List" useGeneratedKeys="true" keyProperty="id">
@@ -162,12 +166,13 @@
         diameter,
         cons_unit_id,
         update_time,
-        create_time
+        create_time,
+        tenant_id
         )
         values
         <foreach collection="list" item="item" separator=",">
             (
-             #{item.byteId},
+            #{item.byteId},
             #{item.holeKey},
             #{item.holeNum},
             #{item.deltaX},
@@ -181,7 +186,8 @@
             #{item.diameter},
             #{item.consUnitId},
             now(),
-            now())
+            now(),
+            #{item.tenantId})
         </foreach>
         on duplicate key update
         hole_num= values(hole_num),
@@ -212,6 +218,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/ConsUnitInfoMapper.xml

@@ -20,6 +20,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="selectConsUnitInfoVo">
@@ -37,7 +38,8 @@
                update_time,
                create_time,
                create_by,
-               update_by
+               update_by,
+               tenant_id
         from cons_cons_unit_info
     </sql>
 
@@ -77,6 +79,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 ">#{byteId},</if>
@@ -93,6 +96,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>
     <update id="updateConsUnitInfo" parameterType="ConsUnitInfo">
@@ -112,6 +116,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-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroup.java

@@ -38,11 +38,6 @@ public class ParkAttendGroup extends BaseEntity {
     @Excel(name = "考勤时间")
     private JSONArray timeRange;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
     public void setId(Long id) {
         this.id = id;
     }
@@ -75,13 +70,6 @@ public class ParkAttendGroup extends BaseEntity {
         this.timeRange = timeRange;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroupUsr.java

@@ -48,10 +48,6 @@ public class ParkAttendGroupUsr extends BaseEntity {
     @Excel(name = "部门名称")
     private String usrDept;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
 
     public String getGroupName() {
         return groupName;
@@ -109,13 +105,6 @@ public class ParkAttendGroupUsr extends BaseEntity {
         return usrDept;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendUsrDetail.java

@@ -61,11 +61,6 @@ public class ParkAttendUsrDetail extends BaseEntity {
     @Excel(name = "考勤组主键")
     private Long attendGroupId;
 
-    /**
-     * 租户id
-     */
-    @Excel(name = "租户id")
-    private String tenantId;
 
     public void setId(Long id) {
         this.id = id;
@@ -139,13 +134,6 @@ public class ParkAttendUsrDetail extends BaseEntity {
         return attendGroupId;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectProj.java

@@ -50,10 +50,6 @@ public class ParkInspectProj extends BaseEntity {
     @Excel(name = "巡检项目类型")
     private String projType;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
 
     public void setId(Long id) {
         this.id = id;
@@ -103,13 +99,6 @@ public class ParkInspectProj extends BaseEntity {
         this.projContent = projContent;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTask.java

@@ -26,8 +26,6 @@ public class ParkInspectTask extends BaseEntity
     @Excel(name = "巡检计划")
     private String schedule;
 
-    /** 租户id */
-    private String tenantId;
 
     public void setId(Long id) 
     {
@@ -56,15 +54,6 @@ public class ParkInspectTask extends BaseEntity
     {
         return schedule;
     }
-    public void setTenantId(String tenantId) 
-    {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() 
-    {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTaskUsrTrail.java

@@ -35,8 +35,6 @@ public class ParkInspectTaskUsrTrail extends BaseEntity
     @Excel(name = "巡检轨迹")
     private String trail;
 
-    /** 租户id */
-    private String tenantId;
 
     public void setId(Long id) 
     {
@@ -92,15 +90,7 @@ public class ParkInspectTaskUsrTrail extends BaseEntity
     {
         return trail;
     }
-    public void setTenantId(String tenantId) 
-    {
-        this.tenantId = tenantId;
-    }
 
-    public String getTenantId() 
-    {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

prod-common/src/main/java/com/huashe/common/domain/BaseEntity.java

@@ -3,6 +3,7 @@ package com.huashe.common.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.huashe.common.annotation.mybatis.TenantField;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,32 +15,45 @@ import java.util.Map;
  *
  * @author ruoyi
  */
-public class BaseEntity implements Serializable
-{
+public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 搜索值 */
+    /**
+     * 搜索值
+     */
     @JsonIgnore
     private String searchValue;
 
-    /** 创建者 */
+    /**
+     * 创建者
+     */
     private String createBy;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    /** 更新者 */
+    /**
+     * 更新者
+     */
     private String updateBy;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remark;
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
@@ -47,77 +61,65 @@ public class BaseEntity implements Serializable
 
     private String endRecTime;
 
-    public String getSearchValue()
-    {
+    @TenantField
+    private Long tenantId;
+
+    public String getSearchValue() {
         return searchValue;
     }
 
-    public void setSearchValue(String searchValue)
-    {
+    public void setSearchValue(String searchValue) {
         this.searchValue = searchValue;
     }
 
-    public String getCreateBy()
-    {
+    public String getCreateBy() {
         return createBy;
     }
 
-    public void setCreateBy(String createBy)
-    {
+    public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
 
-    public Date getCreateTime()
-    {
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime)
-    {
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    public String getUpdateBy()
-    {
+    public String getUpdateBy() {
         return updateBy;
     }
 
-    public void setUpdateBy(String updateBy)
-    {
+    public void setUpdateBy(String updateBy) {
         this.updateBy = updateBy;
     }
 
-    public Date getUpdateTime()
-    {
+    public Date getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime)
-    {
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
-    public String getRemark()
-    {
+    public String getRemark() {
         return remark;
     }
 
-    public void setRemark(String remark)
-    {
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
+    public Map<String, Object> getParams() {
+        if (params == null) {
             params = new HashMap<>();
         }
         return params;
     }
 
-    public void setParams(Map<String, Object> params)
-    {
+    public void setParams(Map<String, Object> params) {
         this.params = params;
     }
 
@@ -137,4 +139,12 @@ public class BaseEntity implements Serializable
     public void setEndRecTime(String endRecTime) {
         this.endRecTime = endRecTime;
     }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }