解决节点运转获取设备导致的空指针问题

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -22,6 +22,8 @@ import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureProdu
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureTray;
 import com.github.zuihou.business.productionReadyCenter.service.BomProcedureProductionresourceService;
 import com.github.zuihou.business.productionReadyCenter.service.BomProcedureVersionService;
+import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourceBizMapper;
+import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.entity.ResourceAutoCode;
 import com.github.zuihou.business.productionResourceCenter.entity.ResourceBusiness;
@@ -46,7 +48,6 @@ import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.tenant.entity.Module;
 import com.github.zuihou.tenant.entity.ModuleInstruction;
-import com.github.zuihou.tenant.entity.Productionresource;
 import com.github.zuihou.tenant.service.ModuleInstructionService;
 import com.github.zuihou.tenant.service.ModuleService;
 import com.github.zuihou.tenant.service.ProductionresourceService;
@@ -96,9 +97,6 @@ public class TaskWorkNode {
     @Autowired
     private ProductionresourcePositionService productionresourcePositionService;
 
-    @Autowired
-    private ProductionresourceService productionresourceService;
-
     @Autowired
     private MsgUtil msgUtil;
 
@@ -122,6 +120,9 @@ public class TaskWorkNode {
     @Autowired
     private BomProcedureProductionresourceService bomProcedureProductionresourceService;
 
+    @Autowired
+    private ProductionresourceBizMapper productionresourceBizMapper;
+
     //总控端口
     private final String ZK_port = "120";
 
@@ -281,8 +282,9 @@ public class TaskWorkNode {
 
 
     private Module getModuleInfo(String resourceId) {
-        Productionresource productionresource = productionresourceService.getOne(new QueryWrap<Productionresource>().eq("id", resourceId));
-        Module module = moduleService.getById(new QueryWrap<Module>().eq("id", productionresource.getModuleId()));
+        BaseContextHandler.setTenant("0000");
+        Productionresource productionresource = productionresourceBizMapper.selectOne(new LbqWrapper<Productionresource>().eq(Productionresource::getId, resourceId));
+        Module module = moduleService.getById(productionresource.getModuleId());
         return module;
     }
 
@@ -426,7 +428,7 @@ public class TaskWorkNode {
         List<ModuleInstruction> moduleInstructions = moduleInstructionService.list(new LbqWrapper<ModuleInstruction>().eq(ModuleInstruction::getModuleId, module.getId()).eq(ModuleInstruction::getPublishStatus, "1"));
 
         //判断夹具资源
-        List<BomProcedureTray> bomProcedureTrayList = bomProcedureVersionService.getPreProcedureTray(new HashMap());
+        //List<BomProcedureTray> bomProcedureTrayList = bomProcedureVersionService.getPreProcedureTray(new HashMap());
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("taskNode", taskNode);
@@ -652,7 +654,7 @@ public class TaskWorkNode {
             }
             //获取目标设备的点位信息
             ProductionresourcePosition resourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, targetId));
-            Productionresource productionresource = productionresourceService.getOne(new QueryWrap<Productionresource>().eq("id", targetId));
+            Productionresource productionresource = productionresourceBizMapper.selectOne(new LbqWrapper<Productionresource>().eq(Productionresource::getId, targetId));
             //任意设备条件判断
             boolean bool = resourcePosition!=null && resourcePosition.getLockStatus() == "1" && resourcePosition.getStatus() == "1" && resourcePosition.getHaveGoods() == "0";
             Storge storge = null;

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ProductionresourceBizMapper.xml

@@ -14,6 +14,7 @@
         <result column="box_id" jdbcType="BIGINT" property="boxId"/>
         <result column="type" jdbcType="VARCHAR" property="type"/>
         <result column="module_id" jdbcType="VARCHAR" property="moduleId"/>
+        <result column="program_num" jdbcType="INTEGER" property="programNum"/>
         <result column="capital_no" jdbcType="VARCHAR" property="capitalNo"/>
         <result column="capital_name" jdbcType="VARCHAR" property="capitalName"/>
         <result column="capital_type" jdbcType="VARCHAR" property="capitalType"/>
@@ -36,7 +37,7 @@
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
         tenant_id, productionline_id, box_id, type, category, module_id, name, code, status, remark, resources_type,resources_category,lineDesc,moduleDesc,tenantDesc,pic,
-        ip,port,capital_no,capital_name,capital_type,mode_specification,capital_price,production_date,production_no,manufacturer
+        ip,port,capital_no,capital_name,capital_type,mode_specification,capital_price,production_date,production_no,manufacturer,program_num
     </sql>
 
     <!-- 分页 -->

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/Productionresource.java

@@ -224,6 +224,7 @@ public class Productionresource extends Entity<Long> {
 
     @ApiModelProperty(value = "程序数量")
     @TableField("program_num")
+    @Excel(name = "程序数量")
     private Integer programNum;
 
     /**