Merge remote-tracking branch 'origin/master'

cl

2024-03-05 0b13e2c2d85f3515bb20e9398529d128f9ad3a8f

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/cert/MethodName.java
#	jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/client/ClientHandler.java
#	jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java

 jcdm-admin/src/main/resources/application-druid.yml

@@ -28,6 +28,10 @@
#                 username: dt
#                 password: dtroot
            # 从库数据源
#            master:
#                url: jdbc:sqlserver://183.134.244.158:1433;DataBaseName=Jcdm041-Mes
#                username: sa
#                password: JCDM@2023
            slave:
                # 从数据源开关/默认关闭
                enabled: false

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java

@@ -59,4 +59,12 @@
     * @return 结果
     */
    public int deleteDaParamCollectionById(Long id);

    /**
     * 使用sqlSessionFactory实现批量插入数据
     *
     * @param list 设备产品过程参数采集主键
     * @return 结果
     */
    void saveBeachDaParamCollection(List<DaParamCollection> list);
}

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java

@@ -6,8 +6,13 @@
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * 设备产品过程参数采集Service业务层处理
@@ -23,6 +28,9 @@

    @Autowired
    private IDaParamCollectionService daParamCollectionService;

    @Resource
    private SqlSessionFactory sqlSessionFactory;

    /**
     * 查询设备产品过程参数采集
@@ -102,4 +110,25 @@
    {
        return daParamCollectionMapper.deleteDaParamCollectionById(id);
    }

    @Override
    public void saveBeachDaParamCollection(List<DaParamCollection> list) {
        // ExecutorType.SIMPLE: 这个执行器类型不做特殊的事情。它为每个语句的执行创建一个新的预处理语句。
        // ExecutorType.REUSE: 这个执行器类型会复用预处理语句。
        // ExecutorType.BATCH: 这个执行器会批量执行所有更新语句,如果 SELECT 在它们中间执行还会标定它们是 必须的,来保证一个简单并易于理解的行为。

        // 关闭session的自动提交
        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
        try {
            DaParamCollectionMapper userMapper = sqlSession.getMapper(DaParamCollectionMapper.class);
            list.stream().forEach(DaParamCollection -> userMapper.insertDaParamCollection(DaParamCollection));
            // 提交数据
            sqlSession.commit();
            sqlSession.rollback();
        } catch (Exception e) {
            sqlSession.rollback();
        } finally {
            sqlSession.close();
        }
    }
}