Merge branch 'master' of http://106.15.38.8:3000/yaoyq/imcs-yj-be into master

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";
 
@@ -180,7 +181,11 @@ public class TaskWorkNode {
         }
         //获取配置节点
         String autoProgrameUrl = getInterfaceUrl(taskNode);
-        ResourceAutoCode resourceAutoCode = taskNode.getAutoNode();
+
+        //填充配置节点内容
+        ResourceAutoCode resourceAutoCode = resourceAutoCodeService.getById(taskNode.getAutoNode().getId());
+        taskNode.setAutoNode(resourceAutoCode);
+
         isFinal = resourceAutoCode.isFinal()? true : false;
         msgUtil.redis_set(CacheKey.TASK_CURRENT_NODE + "_" + taskNode.getResourceId(), resourceAutoCode);
 
@@ -277,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;
     }
 
@@ -422,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);
@@ -648,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;
 
     /**

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/typeHandler/ResourceAutoCodeHandler.java

@@ -1,64 +1,23 @@
 package com.github.zuihou.business.typeHandler;
 
 
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.fastjson.JSONObject;
 import com.baidubce.util.JsonUtils;
 import com.github.zuihou.business.productionResourceCenter.entity.ResourceAutoCode;
-import com.github.zuihou.common.util.StringUtil;
-import com.github.zuihou.context.BaseContextHandler;
-import lombok.Data;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;
 import org.apache.ibatis.type.MappedTypes;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
 
-import javax.sql.DataSource;
-import java.sql.*;
-import java.util.List;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 
 @MappedTypes(ResourceAutoCode.class)
 @MappedJdbcTypes(JdbcType.VARCHAR)
-@Configuration
-@Component
 public class ResourceAutoCodeHandler extends BaseTypeHandler<ResourceAutoCode> {
 
-    private JdbcTemplate jdbcTemplate;
-
-    private static String url;
-    @Value("${zuihou.mysql.url}")
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    private static String username;
-    @Value("${zuihou.mysql.username}")
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    private static String password;
-    @Value("${zuihou.mysql.password}")
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    private static String driverClassName;
-    @Value("${zuihou.mysql.driverClassName}")
-    public void setDriverClassName(String driverClassName) {
-        this.driverClassName = driverClassName;
-    }
-
     @Override
     public void setNonNullParameter(PreparedStatement preparedStatement, int i, ResourceAutoCode resourceAutoCode, JdbcType jdbcType) throws SQLException {
         preparedStatement.setString(i, resourceAutoCode.getId().toString());
@@ -66,17 +25,7 @@ public class ResourceAutoCodeHandler extends BaseTypeHandler<ResourceAutoCode> {
 
     @Override
     public ResourceAutoCode getNullableResult(ResultSet resultSet, String columnName) throws SQLException {
-        //return resourceAutoCodeService.getById(resultSet.getString(columnName));
-        String id = resultSet.getString(columnName);
-        String sql = "select * from zuihou_base_yj_0000.imcs_resource_autocode where id="+ id;
-        DruidDataSource dataSource = new DruidDataSource();
-        dataSource.setUrl(this.url);
-        dataSource.setUsername(this.username);
-        dataSource.setPassword(this.password);
-        dataSource.setDriverClassName(this.driverClassName);
-        jdbcTemplate = new JdbcTemplate(dataSource);
-        ResourceAutoCode resourceAutoCode = jdbcTemplate.queryForObject(sql, new Object[]{},new BeanPropertyRowMapper<ResourceAutoCode>(ResourceAutoCode.class));
-        return  resourceAutoCode;
+        return ResourceAutoCode.builder().id(resultSet.getLong(columnName)).build();
     }
 
     @Override