fix: 优化机床数据采集

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

@@ -1,7 +1,9 @@
 package com.github.zuihou.business.productionReadyCenter.dao;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.authority.entity.auth.User;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
 import com.github.zuihou.business.productionReadyCenter.entity.MachineCuttingTool;
@@ -22,5 +24,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface MachineCuttingToolMapper extends SuperMapper<MachineCuttingTool> {
 
-    IPage<MachineCuttingTool> findPage(IPage<MachineCuttingTool> page, @Param(Constants.WRAPPER) LbqWrapper<MachineCuttingTool> wrapper);
+    IPage<MachineCuttingTool> findPage(IPage<MachineCuttingTool> page, @Param(Constants.WRAPPER) Wrapper<MachineCuttingTool> wrapper, DataScope dataScope);
 }

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

@@ -9,6 +9,7 @@ import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
 import com.github.zuihou.business.productionReadyCenter.entity.MachineCuttingTool;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,4 +44,5 @@ public interface MachineCuttingToolService extends SuperCacheService<MachineCutt
      * @param param
      */
     void sysCuttingTools(MachineCuttingTool machineCuttingTool) throws Exception;
+
 }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MachineCuttingToolController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 

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

@@ -38,7 +38,7 @@ import static com.github.zuihou.common.constant.InjectionFieldConstants.DICTIONA
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("imcs_collect_cutting")
-@ApiModel(value = "MachineCuttingTool", description = "")
+@ApiModel(value = "MachineCuttingTool", description = "机床刀具数据")
 @AllArgsConstructor
 public class MachineCuttingTool extends Entity<Long> {