数据权限管理后台代码应用处理

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/BBomMapper.java

@@ -7,6 +7,7 @@ import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.productionReadyCenter.entity.BBom;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,6 +24,6 @@ import org.springframework.stereotype.Repository;
 public interface BBomMapper extends SuperMapper<BBom> {
 
 
-    IPage<BBom> pageList(IPage page,@Param("version")String version, @Param(Constants.WRAPPER) Wrapper<BBom> queryWrapper);
+    IPage<BBom> pageList(IPage page, @Param("version")String version, @Param(Constants.WRAPPER) Wrapper<BBom> queryWrapper, DataScope dataScope);
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/CuttingToolMapper.java

@@ -22,5 +22,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface CuttingToolMapper extends SuperMapper<CuttingTool> {
 
-    IPage<CuttingTool> findPage(IPage<CuttingTool> page, @Param(Constants.WRAPPER) LbqWrapper<CuttingTool> wrapper, DataScope dataScope);
+    IPage<CuttingTool> findPage(IPage<CuttingTool> page, @Param(Constants.WRAPPER) LbqWrapper<CuttingTool> wrapper);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/MMeterialMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
 import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -20,5 +21,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface MMeterialMapper extends SuperMapper<MMeterial> {
-    IPage<MMeterial> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<MMeterial> queryWrapper);
+    IPage<MMeterial> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<MMeterial> queryWrapper, DataScope dataScope);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/MToolClampMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,6 +24,6 @@ public interface MToolClampMapper extends SuperMapper<MToolClamp> {
     /**
      * 分页
      */
-    IPage<MToolClamp> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<MToolClamp> queryWrapper);
+    IPage<MToolClamp> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<MToolClamp> queryWrapper, DataScope dataScope);
 
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/TrayMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,5 +24,5 @@ public interface TrayMapper extends SuperMapper<Tray> {
     /**
      * 分页
      */
-    IPage<Tray> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<Tray> queryWrapper);
+    IPage<Tray> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<Tray> queryWrapper, DataScope dataScope);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BBomServiceImpl.java

@@ -17,6 +17,7 @@ import com.github.zuihou.business.modelingCenter.entity.MModuleField;
 import com.github.zuihou.business.util.CommonUtil;
 import com.github.zuihou.common.constant.BizConstant;
 import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.properties.DatabaseProperties;
@@ -52,7 +53,7 @@ public class BBomServiceImpl extends SuperServiceImpl<BBomMapper, BBom> implemen
 
     @Override
     public IPage<BBom> pageList(IPage page, String version,LbqWrapper<BBom> wrapper) {
-        return baseMapper.pageList(page,version, wrapper);
+        return baseMapper.pageList(page,version, wrapper, new DataScope());
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/CuttingToolServiceImpl.java

@@ -51,7 +51,7 @@ public class CuttingToolServiceImpl extends SuperCacheServiceImpl<CuttingToolMap
     @Override
     @InjectionResult
     public IPage<CuttingTool> findPage(IPage<CuttingTool> page, LbqWrapper<CuttingTool> wrapper) {
-        return baseMapper.findPage(page, wrapper, new DataScope());
+        return baseMapper.findPage(page, wrapper);
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MMeterialServiceImpl.java

@@ -16,6 +16,7 @@ import com.github.zuihou.business.productionReadyCenter.service.MMeterialService
 import com.github.zuihou.business.productionReadyCenter.service.PlateService;
 import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
 import com.github.zuihou.common.constant.CodeRuleModule;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.injection.annonation.InjectionResult;
 import com.github.zuihou.tenant.service.CodeRuleService;
@@ -40,7 +41,7 @@ public class MMeterialServiceImpl extends SuperServiceImpl<MMeterialMapper, MMet
 
     @Override
     public IPage<MMeterial> pageList(IPage page, LbqWrapper<MMeterial> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+        return baseMapper.pageList(page, wrapper, new DataScope());
     }
     @Override
     public MMeterial save(MMeterialSaveDTO data) {

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MToolClampServiceImpl.java

@@ -8,6 +8,7 @@ import com.github.zuihou.business.productionReadyCenter.dto.MToolClampUpdateDTO;
 import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.business.productionReadyCenter.service.MToolClampService;
 import com.github.zuihou.common.constant.CodeRuleModule;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.injection.annonation.InjectionResult;
@@ -40,7 +41,7 @@ public class MToolClampServiceImpl extends SuperServiceImpl<MToolClampMapper, MT
     // 启用属性自动注入
     @InjectionResult
     public IPage<MToolClamp> pageList(IPage page, LbqWrapper<MToolClamp> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+        return baseMapper.pageList(page, wrapper, new DataScope());
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/TrayServiceImpl.java

@@ -14,6 +14,7 @@ import com.github.zuihou.business.productionReadyCenter.service.TrayService;
 import com.github.zuihou.base.service.SuperServiceImpl;
 
 import com.github.zuihou.common.constant.CodeRuleModule;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.injection.annonation.InjectionResult;
@@ -47,9 +48,9 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
     CodeRuleService codeRuleService;
 
     @Override
-    @InjectionResult
+    @InjectionResult()
     public IPage<Tray> pageList(IPage page, LbqWrapper<Tray> wrapper) {
-        return baseMapper.pageList(page, wrapper);
+        return baseMapper.pageList(page, wrapper, new DataScope());
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/dao/ProgramMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionResourceCenter.entity.Program;
 
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/ProgramServiceImpl.java

@@ -17,6 +17,7 @@ import com.github.zuihou.business.productionResourceCenter.service.ProgramServic
 import com.github.zuihou.business.productionResourceCenter.service.ProgramSuitProductionresourceService;
 import com.github.zuihou.common.constant.UrlConfConstant;
 import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.auth.DataScope;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.file.entity.Attachment;

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BBomMapper.xml

@@ -26,7 +26,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,parts_no,parts_alias,bom_alias,meterial_id,remark,
-        audit_status, parent_id, name, no, status, model, brand, specification, module_id,materialBrandName,version
+        audit_status, parent_id, name, no, status, model, brand, specification, module_id,materialBrandName,version,org_id
     </sql>
 
 
@@ -35,9 +35,10 @@
         select
         <include refid="Base_Column_List"/>
         from (select b.*,m.trade_mark materialBrandName
-            ,bi.version
+            ,bi.version,z.org_id
         from imcs_b_bom b LEFT JOIN imcs_m_meterial m on b.meterial_id = m.id
             LEFT JOIN imcs_b_bom_version_info bi on b.id = bi.bom_id and bi.use_status = 1
+            LEFT JOIN imcs_z_zone z on z.id = b.zone_id
         where 1=1
         ) s ${ew.customSqlSegment}
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MMeterialMapper.xml

@@ -21,7 +21,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        meterial_code, equipment_name, trade_mark, specification, handle_status, status, num
+        meterial_code, equipment_name, trade_mark, specification, handle_status, status, num, org_id
     </sql>
 
     <select id="pageList" resultMap="BaseResultMap">
@@ -29,7 +29,7 @@
         <include refid="Base_Column_List"/>
         from (
             SELECT
-            m.*,a.num
+            m.*,a.num,z.org_id
             FROM
             imcs_m_meterial m
             LEFT JOIN (
@@ -43,6 +43,7 @@
             GROUP BY
             l.meterial_id
             ) a on m.id = a.meterial_id
+            LEFT JOIN imcs_z_zone z ON z.id = m.zone_id
         ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MToolClampMapper.xml

@@ -26,15 +26,17 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,join_date,factory,
-        no, name, status, model, category, brand,map_no,period,expiry_date,num,material_type
+        no, name, status, model, category, brand,map_no,period,expiry_date,num,material_type,org_id
     </sql>
 
     <!-- 分页 -->
     <select id="pageList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from imcs_m_frock_clamp s ${ew.customSqlSegment}
+        from (
+         select a.*, z.org_id from imcs_m_frock_clamp a
+         left join imcs_z_zone z on a.zone_id = z.id
+        ) s ${ew.customSqlSegment}
     </select>
 
-
 </mapper>

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/TrayMapper.xml

@@ -15,12 +15,13 @@
         <result column="num" jdbcType="INTEGER" property="num"/>
         <result column="specification" jdbcType="VARCHAR" property="specification"/>
         <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="zone_id" jdbcType="BIGINT" property="zoneId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,material_type,factory,period,expiry_date,join_date,
-        name, no, brand, num, specification, status,positionSort
+        name, no, brand, zone_id, num, specification, status,positionSort,org_id
     </sql>
 
     <!-- 分页 -->
@@ -28,9 +29,13 @@
     select
     <include refid="Base_Column_List"/>
     from (
-        select a.*,b.positionSort from imcs_t_tray a
-        left join (select tray_id,GROUP_CONCAT(position_sort) as positionSort
-        from imcs_t_tray_position group by tray_id) b on a.id = b.tray_id
+        SELECT a.*, b.positionSort,z.org_id
+        FROM
+             imcs_t_tray a
+             LEFT JOIN (
+                 SELECT tray_id,GROUP_CONCAT(position_sort) as positionSort
+                 FROM imcs_t_tray_position GROUP BY tray_id) b ON a.id = b.tray_id
+                 LEFT JOIN imcs_z_zone z ON z.id = a.zone_id
       ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MToolClampPageDTO.java

@@ -1,5 +1,6 @@
 package com.github.zuihou.business.productionReadyCenter.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.github.zuihou.model.RemoteData;
 import io.swagger.annotations.ApiModel;
@@ -96,4 +97,7 @@ public class MToolClampPageDTO implements Serializable {
     @ApiModelProperty(value = "同步状态 0：未同步 1：已同步")
     private Integer synFlag;
 
+    @ApiModelProperty(value = "产线")
+    private Long zoneId;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TrayPageDTO.java

@@ -82,4 +82,7 @@ public class TrayPageDTO implements Serializable {
     @ApiModelProperty(value = "托盘数量")
     private Integer num;
 
+    @ApiModelProperty(value = "产线")
+    private Long zoneId;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TraySaveDTO.java

@@ -109,6 +109,9 @@ public class TraySaveDTO implements Serializable {
     @ApiModelProperty(value = "周期(月)")
     private Integer period;
 
+    @ApiModelProperty(value = "产线")
+    private Long zoneId;
+
     private List<TrayPositionSaveDTO> trayPositionList;
 
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/TrayUpdateDTO.java

@@ -109,5 +109,8 @@ public class TrayUpdateDTO implements Serializable {
     @ApiModelProperty(value = "周期(月)")
     private Integer period;
 
+    @ApiModelProperty(value = "产线")
+    private Long zoneId;
+
     private List<TrayPositionUpdateDTO> trayPositionList;
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/Tray.java

@@ -153,7 +153,7 @@ public class Tray extends Entity<Long> {
 
 
     @Builder
-    public Tray(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
+    public Tray(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, Long zoneId,
                     String name, String no, RemoteData<String, String> brand, String specification, String status) {
         this.id = id;
         this.createTime = createTime;
@@ -162,6 +162,7 @@ public class Tray extends Entity<Long> {
         this.updateUser = updateUser;
         this.name = name;
         this.no = no;
+        this.zoneId = zoneId;
         this.brand = brand;
         this.specification = specification;
         this.status = status;

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/properties/IgnoreTokenProperties.java

@@ -39,8 +39,8 @@ public class IgnoreTokenProperties {
             "/agv/**",
             "/taskNode/taskNodeCallback/**",
             "/workpiece/handMode/**",
-            "/tray/**",
-            "/mToolClamp/**",
+            //"/tray/**",
+            //"/mToolClamp/**",
             "/wms/**",
             "/wms/**",
             "/productionresource/getStations"