修复mapper.xml文件配置错误

yangys

2024-01-18 c808c88704bbf7f7ab4c4a33ab9d2e562f296d26

修复mapper.xml文件配置错误

 mdc-parent/mdc-collect/pom.xml

@@ -241,7 +241,7 @@
                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <configuration>

                    <mainClass>cn.net.hx.mdc.MdcApplication</mainClass>

                    <mainClass>com.qianwen.mdc.MdcApplication</mainClass>

                    <layout>ZIP</layout>

                    <includes>

                        <!-- æ‰“包时包含核心模块依赖包，需手动指定 -->


 mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/At.java

ÎļþÒÑɾ³ý

 mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/mapper/MachineFocasMapper.java

ÎļþÒÑɾ³ý

 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/MdcCollectApplication.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/MdcCollectApplication.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc;

package com.qianwen.mdc;



import org.mybatis.spring.annotation.MapperScan;

import org.slf4j.Logger;

@@ -7,14 +7,14 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.boot.web.servlet.ServletComponentScan;



@ServletComponentScan(basePackages = {"cn.net.hx.mdc.listener"})

@ServletComponentScan(basePackages = {"com.qianwen.mdc.listener"})

@SpringBootApplication

@MapperScan("cn.net.hx.mdc.mapper")

@MapperScan("com.qianwen.mdc.mapper")

public class MdcCollectApplication {

    private static final Logger logger = LoggerFactory.getLogger(MdcCollectApplication.class);



    public static void main(String[] args) {

        logger.trace("MdcPluginApplication start");

        logger.trace("MdcCollectionApplication start");

        SpringApplication.run(MdcCollectApplication.class, args);

    }

}

 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/config/RedisConfig.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/config/RedisConfig.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.config;

package com.qianwen.mdc.config;



import com.fasterxml.jackson.annotation.JsonAutoDetect;

import com.fasterxml.jackson.annotation.PropertyAccessor;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/config/ThreadPoolTaskConfig.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/config/ThreadPoolTaskConfig.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.config;

package com.qianwen.mdc.config;



import java.util.concurrent.ThreadPoolExecutor;

import org.springframework.beans.factory.annotation.Value;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/Machine.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/domain/Machine.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.domain;

package com.qianwen.mdc.domain;



import java.io.Serializable;




 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/MachineFocas.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/domain/MachineFocas.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.domain;

package com.qianwen.mdc.domain;



import java.io.Serializable;



@@ -84,7 +84,7 @@
      return false; 

    if (getClass() != that.getClass())

      return false; 

    cn.net.hx.mdc.domain.MachineFocas other = (cn.net.hx.mdc.domain.MachineFocas)that;

    com.qianwen.mdc.domain.MachineFocas other = (com.qianwen.mdc.domain.MachineFocas)that;

    return (((getId() == null) ? (other.getId() == null) : getId().equals(other.getId())) && (

      (getMachineId() == null) ? (other.getMachineId() == null) : getMachineId().equals(other.getMachineId())) && (

      (getCncType() == null) ? (other.getCncType() == null) : getCncType().equals(other.getCncType())) && (


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/MachineModbus.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/domain/MachineModbus.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.domain;

package com.qianwen.mdc.domain;



import java.io.Serializable;




 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/MachineOpcua.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/domain/MachineOpcua.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.domain;

package com.qianwen.mdc.domain;



import java.io.Serializable;




 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/MachineProtocol.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/domain/MachineProtocol.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.domain;
package com.qianwen.mdc.domain;

import java.io.Serializable;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/domain/MachiningData.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/domain/MachiningData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.domain;

package com.qianwen.mdc.domain;



import java.io.Serializable;



@@ -348,7 +348,7 @@
      return false; 

    if (getClass() != that.getClass())

      return false; 

    cn.net.hx.mdc.domain.MachiningData other = (cn.net.hx.mdc.domain.MachiningData)that;

    com.qianwen.mdc.domain.MachiningData other = (com.qianwen.mdc.domain.MachiningData)that;

    if (((getId() == null) ? (other.getId() == null) : getId().equals(other.getId())) && (

      (getMachineId() == null) ? (other.getMachineId() == null) : getMachineId().equals(other.getMachineId())) && (

      (getMdcTime() == null) ? (other.getMdcTime() == null) : getMdcTime().equals(other.getMdcTime())) && (


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/listener/MdcListener.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/listener/MdcListener.java ÐÞ¸Ä
@@ -1,22 +1,5 @@
package cn.net.hx.mdc.listener;

package com.qianwen.mdc.listener;



import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.domain.MachineOpcua;

import cn.net.hx.mdc.domain.MachineProtocol;

import cn.net.hx.mdc.mapper.MachineProtocolMapper;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.mapper.MachineFocasMapper;

import cn.net.hx.mdc.mapper.MachineMapper;

import cn.net.hx.mdc.mapper.MachineModbusMapper;

import cn.net.hx.mdc.mapper.MachineOpcuaMapper;

import cn.net.hx.mdc.service.focas.FocasThread;

import cn.net.hx.mdc.service.jdmon.JDMonThread;

import cn.net.hx.mdc.service.modbus.ModbusThread;

import cn.net.hx.mdc.service.moxa.MoxaThread;

import cn.net.hx.mdc.service.opcua.OpcUaThread;

import cn.net.hx.mdc.service.scanet.ScanetThread;

import cn.net.hx.mdc.service.siemenslib.SiemensLibThread;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

@@ -32,6 +15,23 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachineOpcua;

import com.qianwen.mdc.domain.MachineProtocol;

import com.qianwen.mdc.mapper.MachineFocasMapper;

import com.qianwen.mdc.mapper.MachineMapper;

import com.qianwen.mdc.mapper.MachineModbusMapper;

import com.qianwen.mdc.mapper.MachineOpcuaMapper;

import com.qianwen.mdc.mapper.MachineProtocolMapper;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.service.focas.FocasThread;

import com.qianwen.mdc.service.jdmon.JDMonThread;

import com.qianwen.mdc.service.modbus.ModbusThread;

import com.qianwen.mdc.service.moxa.MoxaThread;

import com.qianwen.mdc.service.opcua.OpcUaThread;

import com.qianwen.mdc.service.scanet.ScanetThread;

import com.qianwen.mdc.service.siemenslib.SiemensLibThread;

import com.qianwen.mdc.utils.redis.RedisUtil;



@WebListener

public class MdcListener implements ServletContextListener {


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/mapper/MachineFocasMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.qianwen.mdc.mapper;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.qianwen.mdc.domain.MachineFocas;

import com.qianwen.mdc.domain.MachiningData;



public interface MachineFocasMapper extends BaseMapper<MachineFocas>{}


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/mapper/MachineMapper.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/mapper/MachineMapper.java ÐÞ¸Ä
@@ -1,10 +1,9 @@
package cn.net.hx.mdc.mapper;

package com.qianwen.mdc.mapper;



import org.apache.ibatis.annotations.Param;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;



import cn.net.hx.mdc.domain.Machine;

import com.qianwen.mdc.domain.Machine;



public interface MachineMapper extends BaseMapper<Machine> {




 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/mapper/MachineModbusMapper.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/mapper/MachineModbusMapper.java ÐÞ¸Ä
@@ -1,8 +1,7 @@
package cn.net.hx.mdc.mapper;

package com.qianwen.mdc.mapper;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;



import cn.net.hx.mdc.domain.MachineModbus;

import com.qianwen.mdc.domain.MachineModbus;



public interface MachineModbusMapper extends BaseMapper<MachineModbus> {

    


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/mapper/MachineOpcuaMapper.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/mapper/MachineOpcuaMapper.java ÐÞ¸Ä
@@ -1,7 +1,6 @@
package cn.net.hx.mdc.mapper;

package com.qianwen.mdc.mapper;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;



import cn.net.hx.mdc.domain.MachineOpcua;

import com.qianwen.mdc.domain.MachineOpcua;



public interface MachineOpcuaMapper extends BaseMapper<MachineOpcua> {}


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/mapper/MachineProtocolMapper.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/mapper/MachineProtocolMapper.java ÐÞ¸Ä
@@ -1,7 +1,6 @@
package cn.net.hx.mdc.mapper;
package com.qianwen.mdc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import cn.net.hx.mdc.domain.MachineProtocol;
import com.qianwen.mdc.domain.MachineProtocol;

public interface MachineProtocolMapper extends BaseMapper<MachineProtocol> {}

 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/mapper/MachiningDataMapper.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/mapper/MachiningDataMapper.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package cn.net.hx.mdc.mapper;

package com.qianwen.mdc.mapper;



import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import cn.net.hx.mdc.domain.MachiningData;

import com.qianwen.mdc.domain.MachiningData;



public interface MachiningDataMapper extends BaseMapper<MachiningData>{

    


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/focas/FocasClient.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/focas/FocasClient.java ÐÞ¸Ä
@@ -1,7 +1,7 @@
package cn.net.hx.mdc.service.focas;

package com.qianwen.mdc.service.focas;



import cn.net.hx.mdc.utils.MdcException;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.utils.MdcException;

import com.sun.jna.ptr.IntByReference;

import com.sun.jna.ptr.ShortByReference;

import java.io.UnsupportedEncodingException;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/focas/FocasThread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/focas/FocasThread.java ÐÞ¸Ä
@@ -1,13 +1,13 @@
package cn.net.hx.mdc.service.focas;

package com.qianwen.mdc.service.focas;



import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.domain.MachineFocas;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.mapper.MachineFocasMapper;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachineFocas;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachineFocasMapper;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



import java.util.Collections;

import java.util.List;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/focas/JNAFocas.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/focas/JNAFocas.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.focas;

package com.qianwen.mdc.service.focas;



import com.sun.jna.Library;

import com.sun.jna.Native;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/AppDataFormat.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/AppDataFormat.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



class AppDataFormat {

  int Ver;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/BasicModalInfo.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/BasicModalInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



class BasicModalInfo {

  int CurrWCoord;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/GroupInfo.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/GroupInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



class GroupInfo {

  int LifeType;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/JDMonClient.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/JDMonClient.java ÐÞ¸Ä
@@ -1,6 +1,5 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



import cn.net.hx.mdc.utils.MdcException;

import java.io.File;

import java.io.IOException;

import java.util.ArrayList;

@@ -12,6 +11,9 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.boot.system.ApplicationHome;



import com.qianwen.mdc.utils.MdcException;



import siemens_lib.SINUMERIK;

import system.Array;

import system.Object;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/JDMonService.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/JDMonService.java ÐÞ¸Ä
@@ -1,15 +1,15 @@
/*     */ package cn.net.hx.mdc.service.jdmon;

/*     */ 
/*     */ import cn.net.hx.mdc.service.jdmon.AppDataFormat;

/*     */ import cn.net.hx.mdc.service.jdmon.BasicModalInfo;

/*     */ import cn.net.hx.mdc.service.jdmon.GroupInfo;

/*     */ import cn.net.hx.mdc.service.jdmon.ToolAInfo;

/*     */ import cn.net.hx.mdc.service.jdmon.ToolBInfo;

/*     */ import cn.net.hx.mdc.service.jdmon.ToolBPceInfo;

/*     */ import cn.net.hx.mdc.service.jdmon.ToolBSegInfo;

/*     */ import cn.net.hx.mdc.service.jdmon.ToolDef;

/*     */ import cn.net.hx.mdc.service.jdmon.ToolLifeGlbSetting;

/*     */ package com.qianwen.mdc.service.jdmon;

/*     */ import java.util.List;



import com.qianwen.mdc.service.jdmon.AppDataFormat;

import com.qianwen.mdc.service.jdmon.BasicModalInfo;

import com.qianwen.mdc.service.jdmon.GroupInfo;

import com.qianwen.mdc.service.jdmon.ToolAInfo;

import com.qianwen.mdc.service.jdmon.ToolBInfo;

import com.qianwen.mdc.service.jdmon.ToolBPceInfo;

import com.qianwen.mdc.service.jdmon.ToolBSegInfo;

import com.qianwen.mdc.service.jdmon.ToolDef;

import com.qianwen.mdc.service.jdmon.ToolLifeGlbSetting;

/*     */ 

/*     */ 

/*     */ 


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/JDMonThread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/JDMonThread.java ÐÞ¸Ä
@@ -1,13 +1,14 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.service.jdmon.BasicModalInfo;

import cn.net.hx.mdc.service.jdmon.JDMonService;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.service.jdmon.BasicModalInfo;

import com.qianwen.mdc.service.jdmon.JDMonService;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



import java.util.ArrayList;

import java.util.List;

import java.util.Map;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/ToolAInfo.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/ToolAInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;

class ToolAInfo {

    int ToolNo;

    int GroupNo;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/ToolBInfo.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/ToolBInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



/* compiled from: JDMonService.java */

/* loaded from: mdc-plugin-0.0.1-SNAPSHOT-删除lib.jar:BOOT-INF/classes/cn/net/hx/mdc/service/jdmon/ToolBInfo.class */


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/ToolBPceInfo.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/ToolBPceInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



/* compiled from: JDMonService.java */

/* loaded from: mdc-plugin-0.0.1-SNAPSHOT-删除lib.jar:BOOT-INF/classes/cn/net/hx/mdc/service/jdmon/ToolBPceInfo.class */


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/ToolBSegInfo.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/ToolBSegInfo.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



/* compiled from: JDMonService.java */

/* loaded from: mdc-plugin-0.0.1-SNAPSHOT-删除lib.jar:BOOT-INF/classes/cn/net/hx/mdc/service/jdmon/ToolBSegInfo.class */


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/ToolDef.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/ToolDef.java ÐÞ¸Ä
@@ -1,6 +1,6 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



import cn.net.hx.mdc.service.jdmon.ToolType;

import com.qianwen.mdc.service.jdmon.ToolType;



class ToolDef {

  String pszToolName;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/ToolLifeGlbSetting.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/ToolLifeGlbSetting.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



class ToolLifeGlbSetting {

  boolean LifeEnable;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/jdmon/ToolType.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/jdmon/ToolType.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.jdmon;

package com.qianwen.mdc.service.jdmon;



class ToolType {

  float D1;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/lsv2/Lsv2Client.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/lsv2/Lsv2Client.java ÐÞ¸Ä
@@ -1,7 +1,5 @@
package cn.net.hx.mdc.service.lsv2;

package com.qianwen.mdc.service.lsv2;



import cn.net.hx.mdc.utils.Lsv2Util;

import cn.net.hx.mdc.utils.MdcException;

import org.eclipse.swt.ole.win32.OleAutomation;

import org.eclipse.swt.ole.win32.OleClientSite;

import org.eclipse.swt.ole.win32.OleControlSite;

@@ -12,6 +10,9 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.qianwen.mdc.utils.Lsv2Util;

import com.qianwen.mdc.utils.MdcException;



public class Lsv2Client {

  private Shell shell;

  


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/lsv2/Lsv2Thread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/lsv2/Lsv2Thread.java ÐÞ¸Ä
@@ -1,11 +1,12 @@
package cn.net.hx.mdc.service.lsv2;

package com.qianwen.mdc.service.lsv2;



import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



import java.util.Map;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/modbus/HxModbusClient.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/modbus/HxModbusClient.java ÐÞ¸Ä
@@ -1,7 +1,5 @@
package cn.net.hx.mdc.service.modbus;

package com.qianwen.mdc.service.modbus;



import cn.net.hx.mdc.service.modbus.processor.HxModbusMasterResponseProcessor;

import cn.net.hx.mdc.utils.MdcException;

import com.github.zengfr.easymodbus4j.client.ModbusClient;

import com.github.zengfr.easymodbus4j.client.ModbusClientRtuFactory;

import com.github.zengfr.easymodbus4j.client.ModbusClientTcpFactory;

@@ -13,6 +11,9 @@
import com.github.zengfr.easymodbus4j.handler.ModbusResponseHandler;

import com.github.zengfr.easymodbus4j.processor.ModbusMasterResponseProcessor;

import com.github.zengfr.easymodbus4j.sender.ChannelSender;

import com.qianwen.mdc.service.modbus.processor.HxModbusMasterResponseProcessor;

import com.qianwen.mdc.utils.MdcException;



import io.netty.channel.Channel;

import java.util.BitSet;

import org.slf4j.Logger;

@@ -179,5 +180,5 @@
    this.masterProcessor = masterProcessor;

  }

  

  private static final Logger logger = LoggerFactory.getLogger(cn.net.hx.mdc.service.modbus.HxModbusClient.class);

  private static final Logger logger = LoggerFactory.getLogger(com.qianwen.mdc.service.modbus.HxModbusClient.class);

}


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/modbus/ModbusThread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/modbus/ModbusThread.java ÐÞ¸Ä
@@ -1,16 +1,17 @@
package cn.net.hx.mdc.service.modbus;

package com.qianwen.mdc.service.modbus;



import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.domain.MachineModbus;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.mapper.MachineModbusMapper;

import cn.net.hx.mdc.service.modbus.HxModbusClient;

import cn.net.hx.mdc.service.modbus.processor.ModbusRespCb;

import cn.net.hx.mdc.utils.DataTypeUtil;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachineModbus;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachineModbusMapper;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.service.modbus.HxModbusClient;

import com.qianwen.mdc.service.modbus.processor.ModbusRespCb;

import com.qianwen.mdc.utils.DataTypeUtil;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

@@ -312,5 +313,5 @@
    } 

  }

  

  private static final Logger logger = LoggerFactory.getLogger(cn.net.hx.mdc.service.modbus.ModbusThread.class);

  private static final Logger logger = LoggerFactory.getLogger(com.qianwen.mdc.service.modbus.ModbusThread.class);

}


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/modbus/processor/HxModbusMasterResponseProcessor.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/modbus/processor/HxModbusMasterResponseProcessor.java ÐÞ¸Ä
@@ -1,6 +1,5 @@
package cn.net.hx.mdc.service.modbus.processor;

package com.qianwen.mdc.service.modbus.processor;



import cn.net.hx.mdc.service.modbus.processor.ModbusRespCb;

import com.github.zengfr.easymodbus4j.func.AbstractRequest;

import com.github.zengfr.easymodbus4j.func.request.ReadCoilsRequest;

import com.github.zengfr.easymodbus4j.func.request.ReadDiscreteInputsRequest;

@@ -13,6 +12,8 @@
import com.github.zengfr.easymodbus4j.processor.AbstractModbusProcessor;

import com.github.zengfr.easymodbus4j.processor.ModbusMasterResponseProcessor;

import com.github.zengfr.easymodbus4j.protocol.ModbusFunction;

import com.qianwen.mdc.service.modbus.processor.ModbusRespCb;



import io.netty.channel.Channel;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

@@ -92,5 +93,5 @@
    this.unitId = unitId;

  }

  

  private static final Logger logger = LoggerFactory.getLogger(cn.net.hx.mdc.service.modbus.processor.HxModbusMasterResponseProcessor.class);

  private static final Logger logger = LoggerFactory.getLogger(com.qianwen.mdc.service.modbus.processor.HxModbusMasterResponseProcessor.class);

}


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/modbus/processor/ModbusRespCb.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/modbus/processor/ModbusRespCb.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.modbus.processor;

package com.qianwen.mdc.service.modbus.processor;



public interface ModbusRespCb {

  int respCb(int paramInt1, int paramInt2, int paramInt3, float paramFloat);


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/moxa/MoxaClient.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/moxa/MoxaClient.java ÐÞ¸Ä
@@ -1,9 +1,10 @@
package cn.net.hx.mdc.service.moxa;

package com.qianwen.mdc.service.moxa;



import cn.net.hx.mdc.utils.MdcException;

import cn.net.hx.mdc.utils.PooledHttpClientUtil;

import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.utils.MdcException;

import com.qianwen.mdc.utils.PooledHttpClientUtil;



import java.util.HashMap;

import java.util.Map;




 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/moxa/MoxaThread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/moxa/MoxaThread.java ÐÞ¸Ä
@@ -1,12 +1,13 @@
package cn.net.hx.mdc.service.moxa;

package com.qianwen.mdc.service.moxa;





import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



import java.util.Map;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/opcua/HxOpcuaClient.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/opcua/HxOpcuaClient.java ÐÞ¸Ä
@@ -1,7 +1,5 @@
package cn.net.hx.mdc.service.opcua;

package com.qianwen.mdc.service.opcua;



import cn.net.hx.mdc.utils.MdcException;

import cn.net.hx.mdc.utils.SpringUtil;

import java.nio.file.Files;

import java.nio.file.LinkOption;

import java.nio.file.Path;

@@ -48,6 +46,9 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.qianwen.mdc.utils.MdcException;

import com.qianwen.mdc.utils.SpringUtil;



/* loaded from: mdc-plugin-0.0.1-SNAPSHOT-删除lib.jar:BOOT-INF/classes/cn/net/hx/mdc/service/opcua/HxOpcuaClient.class */

public class HxOpcuaClient {

    private final String endPointUrl;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/opcua/KeyStoreLoader.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/opcua/KeyStoreLoader.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
/*     */ package cn.net.hx.mdc.service.opcua;

/*     */ package com.qianwen.mdc.service.opcua;

/*     */ 

/*     */ import java.io.InputStream;

/*     */ import java.io.OutputStream;

@@ -31,7 +31,7 @@
/*     */ @Component

/*     */ public class KeyStoreLoader

/*     */ {

/*     */   public cn.net.hx.mdc.service.opcua.KeyStoreLoader load(Path baseDir) throws Exception {

/*     */   public com.qianwen.mdc.service.opcua.KeyStoreLoader load(Path baseDir) throws Exception {

/*  35 */     KeyStore keyStore = KeyStore.getInstance("PKCS12");

/*     */ 

/*     */ 


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/opcua/OpcUaThread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/opcua/OpcUaThread.java ÐÞ¸Ä
@@ -1,13 +1,5 @@
package cn.net.hx.mdc.service.opcua;

package com.qianwen.mdc.service.opcua;



import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.domain.MachineOpcua;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.service.opcua.HxOpcuaClient;

import cn.net.hx.mdc.service.opcua.SubscribeHandler;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import java.util.ArrayList;

import java.util.List;

import java.util.Map;

@@ -16,6 +8,15 @@
import org.springframework.beans.BeanUtils;

import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;



import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachineOpcua;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.service.opcua.HxOpcuaClient;

import com.qianwen.mdc.service.opcua.SubscribeHandler;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



public class OpcUaThread implements Runnable, SubscribeHandler {

  private ThreadPoolTaskExecutor executor;

  


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/opcua/SubscribeHandler.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/opcua/SubscribeHandler.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.opcua;

package com.qianwen.mdc.service.opcua;



public interface SubscribeHandler {

  int handler(String paramString1, String paramString2);


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/scanet/PlcBitValue.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/scanet/PlcBitValue.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
/*    */ package cn.net.hx.mdc.service.scanet;

/*    */ package com.qianwen.mdc.service.scanet;

/*    */ 

/*    */ import com.github.s7connector.api.annotation.S7Variable;

/*    */ import com.github.s7connector.impl.utils.S7Type;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/scanet/PlcByteValue.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/scanet/PlcByteValue.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.scanet;

package com.qianwen.mdc.service.scanet;



import com.github.s7connector.api.annotation.S7Variable;

import com.github.s7connector.impl.utils.S7Type;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/scanet/PlcFloatValue.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/scanet/PlcFloatValue.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.scanet;

package com.qianwen.mdc.service.scanet;



import com.github.s7connector.api.annotation.S7Variable;

import com.github.s7connector.impl.utils.S7Type;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/scanet/PlcLongValue.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/scanet/PlcLongValue.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.scanet;

package com.qianwen.mdc.service.scanet;



import com.github.s7connector.api.annotation.S7Variable;

import com.github.s7connector.impl.utils.S7Type;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/scanet/PlcTimeValue.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/scanet/PlcTimeValue.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.scanet;

package com.qianwen.mdc.service.scanet;



import com.github.s7connector.api.annotation.S7Variable;

import com.github.s7connector.impl.utils.S7Type;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/scanet/ScanetClient.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/scanet/ScanetClient.java ÐÞ¸Ä
@@ -1,13 +1,13 @@
/*     */ package cn.net.hx.mdc.service.scanet;

/*     */ 
/*     */ import cn.net.hx.mdc.service.scanet.PlcByteValue;

/*     */ import cn.net.hx.mdc.utils.MdcException;

/*     */ package com.qianwen.mdc.service.scanet;

/*     */ import com.github.s7connector.api.DaveArea;

/*     */ import com.github.s7connector.api.S7Connector;

/*     */ import com.github.s7connector.api.S7Serializer;

/*     */ import com.github.s7connector.api.factory.S7ConnectorFactory;

/*     */ import com.github.s7connector.api.factory.S7SerializerFactory;

/*     */ import com.github.s7connector.exception.S7Exception;

import com.qianwen.mdc.service.scanet.PlcByteValue;

import com.qianwen.mdc.utils.MdcException;



/*     */ import java.io.IOException;

/*     */ import org.slf4j.Logger;

/*     */ import org.slf4j.LoggerFactory;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/scanet/ScanetThread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/scanet/ScanetThread.java ÐÞ¸Ä
@@ -1,12 +1,13 @@
package cn.net.hx.mdc.service.scanet;

package com.qianwen.mdc.service.scanet;



import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.service.scanet.ScanetClient;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.service.scanet.ScanetClient;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



import java.util.Map;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/siemenslib/JNISiemensLib.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/siemenslib/JNISiemensLib.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.service.siemenslib;

package com.qianwen.mdc.service.siemenslib;



import java.io.File;

import java.io.IOException;

@@ -17,7 +17,7 @@


public class JNISiemensLib {

  static {

    ApplicationHome ah = new ApplicationHome(cn.net.hx.mdc.service.siemenslib.JNISiemensLib.class);

    ApplicationHome ah = new ApplicationHome(com.qianwen.mdc.service.siemenslib.JNISiemensLib.class);

    String dllPath = ah.getSource().getParentFile().toString() + "\\lib\\siemenslib\\";

    Bridge.setVerbose(true);

    try {

@@ -428,5 +428,5 @@
    return list;

  }

  

  Logger logger = LoggerFactory.getLogger(cn.net.hx.mdc.service.siemenslib.JNISiemensLib.class);

  Logger logger = LoggerFactory.getLogger(com.qianwen.mdc.service.siemenslib.JNISiemensLib.class);

}


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/siemenslib/SiemensLibClient.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/siemenslib/SiemensLibClient.java ÐÞ¸Ä
@@ -1,6 +1,5 @@
package cn.net.hx.mdc.service.siemenslib;

package com.qianwen.mdc.service.siemenslib;



import cn.net.hx.mdc.utils.MdcException;

import java.io.File;

import java.io.IOException;

import java.util.ArrayList;

@@ -12,6 +11,9 @@
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.boot.system.ApplicationHome;



import com.qianwen.mdc.utils.MdcException;



import siemens_lib.SINUMERIK;

import system.Array;

import system.Object;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/service/siemenslib/SiemensLibThread.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/service/siemenslib/SiemensLibThread.java ÐÞ¸Ä
@@ -1,12 +1,13 @@
package cn.net.hx.mdc.service.siemenslib;

package com.qianwen.mdc.service.siemenslib;



import cn.net.hx.mdc.domain.MachiningData;

import cn.net.hx.mdc.domain.Machine;

import cn.net.hx.mdc.mapper.MachiningDataMapper;

import cn.net.hx.mdc.service.siemenslib.SiemensLibClient;

import cn.net.hx.mdc.utils.TimestampUtils;

import cn.net.hx.mdc.utils.redis.RedisUtil;

import com.alibaba.fastjson.JSONObject;

import com.qianwen.mdc.domain.Machine;

import com.qianwen.mdc.domain.MachiningData;

import com.qianwen.mdc.mapper.MachiningDataMapper;

import com.qianwen.mdc.service.siemenslib.SiemensLibClient;

import com.qianwen.mdc.utils.TimestampUtils;

import com.qianwen.mdc.utils.redis.RedisUtil;



import java.util.ArrayList;

import java.util.List;

import java.util.Map;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/DataTypeConversion.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/DataTypeConversion.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
/*    */ package cn.net.hx.mdc.utils;

/*    */ package com.qianwen.mdc.utils;

/*    */ 

/*    */ import java.io.UnsupportedEncodingException;

/*    */ import java.nio.ByteBuffer;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/DataTypeUtil.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/DataTypeUtil.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
/*     */ package cn.net.hx.mdc.utils;

/*     */ package com.qianwen.mdc.utils;

/*     */ 

/*     */ import java.math.BigDecimal;

/*     */ import java.math.BigInteger;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/Lsv2Util.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/Lsv2Util.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
/*     */ package cn.net.hx.mdc.utils;

/*     */ package com.qianwen.mdc.utils;

/*     */ 

/*     */ import org.eclipse.swt.ole.win32.OleAutomation;

/*     */ import org.eclipse.swt.ole.win32.Variant;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/MdcException.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/MdcException.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.utils;

package com.qianwen.mdc.utils;



public class MdcException extends RuntimeException {}




 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/PooledHttpClientUtil.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/PooledHttpClientUtil.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.utils;

package com.qianwen.mdc.utils;



import java.io.IOException;

import java.io.UnsupportedEncodingException;


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/SpringUtil.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/SpringUtil.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
/*    */ package cn.net.hx.mdc.utils;

/*    */ package com.qianwen.mdc.utils;

/*    */ 

/*    */ import org.springframework.beans.BeansException;

/*    */ import org.springframework.context.ApplicationContext;

@@ -21,7 +21,7 @@
/*    */   private static ApplicationContext applicationContext;

/*    */   

/*    */   public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {

/* 24 */     cn.net.hx.mdc.utils.SpringUtil.applicationContext = applicationContext;

/* 24 */     com.qianwen.mdc.utils.SpringUtil.applicationContext = applicationContext;

/*    */   }

/*    */ 

/*    */ 


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/TimestampUtils.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/TimestampUtils.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
/*     */ package cn.net.hx.mdc.utils;

/*     */ package com.qianwen.mdc.utils;

/*     */ 

/*     */ import java.util.Calendar;

/*     */ 


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/redis/RedisUtil.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/redis/RedisUtil.java ÐÞ¸Ä
@@ -1,6 +1,4 @@
/*     */ package cn.net.hx.mdc.utils.redis;

/*     */ 
/*     */ import cn.net.hx.mdc.utils.redis.Status;

/*     */ package com.qianwen.mdc.utils.redis;

/*     */ import java.util.List;

/*     */ import java.util.Map;

/*     */ import java.util.Set;

@@ -10,6 +8,8 @@
/*     */ import org.springframework.data.redis.core.RedisTemplate;

/*     */ import org.springframework.stereotype.Component;

/*     */ import org.springframework.util.CollectionUtils;



import com.qianwen.mdc.utils.redis.Status;

/*     */ 

/*     */ 

/*     */ 


 mdc-parent/mdc-collect/src/main/java/com/qianwen/mdc/utils/redis/Status.java

ÎļþÃû´Ó mdc-parent/mdc-collect/src/main/java/cn/net/hx/mdc/utils/redis/Status.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package cn.net.hx.mdc.utils.redis;

package com.qianwen.mdc.utils.redis;



import java.util.concurrent.TimeUnit;




 mdc-parent/mdc-collect/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@
      #基本属性

      url: jdbc:mysql://localhost:3306/mdc?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true

      username: mdc

      password: hangxing

      password: Kknd_1234

      #配置初始化大小/最小/最大

      initial-size: 10

      min-idle: 5


 mdc-parent/mdc-collect/src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@
      #基本属性

      url: jdbc:mysql://192.168.240.22:3306/hx_mdc?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true

      username: mdc

      password: hangxing

      password: Kknd_1234

      #配置初始化大小/最小/最大

      initial-size: 10

      min-idle: 5

@@ -45,5 +45,5 @@
  thymeleaf:

    cache: false



mdc:

collect:

  interval: 10000


 mdc-parent/mdc-collect/src/main/resources/application.yml

@@ -10,4 +10,4 @@
    cache-enabled: true

    map-underscore-to-camel-case: true

  mapper-locations: classpath:mapper/*.xml

  type-aliases-package: cn.net.hx.mdc.domain

  type-aliases-package: com.qianwen.mdc.domain


 mdc-parent/mdc-collect/src/main/resources/logback-spring.xml

@@ -136,10 +136,6 @@
        <!-- æ–‡ä»¶è¾“出 -->

        <appender-ref ref="ERROR"/>

        <appender-ref ref="INFO"/>

        <!--

        <appender-ref ref="WARN"/>

        <appender-ref ref="DEBUG"/>

        <appender-ref ref="TRACE"/>

        -->

       
    </root>

</configuration>


 mdc-parent/mdc-collect/src/main/resources/mapper/MachineFocasMapper.xml

@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.net.hx.mdc.mapper.MachineFocasMapper">
  <resultMap id="BaseResultMap" type="cn.net.hx.mdc.domain.MachineFocas">
    <!--
      WARNING - @mbg.generated
    -->
<mapper namespace="com.qianwen.mdc.mapper.MachineFocasMapper">
  <resultMap id="BaseResultMap" type="com.qianwen.mdc.domain.MachineFocas">

    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="machine_id" jdbcType="INTEGER" property="machineId" />
    <result column="cnc_type" jdbcType="VARCHAR" property="cncType" />

 mdc-parent/mdc-collect/src/main/resources/mapper/MachineMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="cn.net.hx.mdc.mapper.MachineMapper">

  <resultMap id="BaseResultMap" type="cn.net.hx.mdc.domain.Machine">

<mapper namespace="com.qianwen.mdc.mapper.MachineMapper">

  <resultMap id="BaseResultMap" type="com.qianwen.mdc.domain.Machine">

    <!--

      WARNING - @mbg.generated

    -->

@@ -11,24 +11,16 @@
    <result column="ip" jdbcType="VARCHAR" property="ip" />

    <result column="port" jdbcType="INTEGER" property="port" />

    

    <result column="type_id" jdbcType="INTEGER" property="typeId" />

    <result column="protocol_id" jdbcType="INTEGER" property="protocolId" />

    <result column="workshop_id" jdbcType="INTEGER" property="workshopId" />

    <result column="section_id" jdbcType="INTEGER" property="sectionId" />

    <result column="user_id" jdbcType="INTEGER" property="userId" />

    <result column="concern_flag" jdbcType="INTEGER" property="concernFlag" />

   

    <result column="collect_flag" jdbcType="INTEGER" property="collectFlag" />

    <result column="shift_type" jdbcType="INTEGER" property="shiftType" />

    <result column="dnc_name" jdbcType="VARCHAR" property="dncName" />

    <result column="trans_type" jdbcType="INTEGER" property="transType" />

    <result column="var1" jdbcType="VARCHAR" property="var1" />

    <result column="var2" jdbcType="VARCHAR" property="var2" />

    <result column="var3" jdbcType="VARCHAR" property="var3" />

    <result column="var4" jdbcType="VARCHAR" property="var4" />

    <result column="var5" jdbcType="VARCHAR" property="var5" />

    <result column="var6" jdbcType="VARCHAR" property="var6" />

    <result column="var7" jdbcType="VARCHAR" property="var7" />

    <result column="var8" jdbcType="VARCHAR" property="var8" />

    <result column="trans_mode" jdbcType="INTEGER" property="transMode" />

    
  </resultMap>



</mapper>

 mdc-parent/mdc-collect/src/main/resources/mapper/MachineModbusMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.net.hx.mdc.mapper.MachineModbusMapper">
  <resultMap id="BaseResultMap" type="cn.net.hx.mdc.domain.MachineModbus">
<mapper namespace="com.qianwen.mdc.mapper.MachineModbusMapper">
  <resultMap id="BaseResultMap" type="com.qianwen.mdc.domain.MachineModbus">
    <!--
      WARNING - @mbg.generated
    -->

 mdc-parent/mdc-collect/src/main/resources/mapper/MachineOpcuaMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.net.hx.mdc.mapper.MachineOpcuaMapper">
  <resultMap id="BaseResultMap" type="cn.net.hx.mdc.domain.MachineOpcua">
<mapper namespace="com.qianwen.mdc.mapper.MachineOpcuaMapper">
  <resultMap id="BaseResultMap" type="com.qianwen.mdc.domain.MachineOpcua">
    <!--
      WARNING - @mbg.generated
    -->

 mdc-parent/mdc-collect/src/main/resources/mapper/MachineProtocolMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.net.hx.mdc.mapper.MachineProtocolMapper">
  <resultMap id="BaseResultMap" type="cn.net.hx.mdc.domain.MachineProtocol">
<mapper namespace="com.qianwen.mdc.mapper.MachineProtocolMapper">
  <resultMap id="BaseResultMap" type="com.qianwen.mdc.domain.MachineProtocol">

    <id column="id" jdbcType="INTEGER" property="id" />
    <result column="name" jdbcType="VARCHAR" property="name" />

 mdc-parent/mdc-collect/src/main/resources/mapper/MachiningDataMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="cn.net.hx.mdc.mapper.MachiningDataMapper">

  <resultMap id="BaseResultMap" type="cn.net.hx.mdc.domain.MachiningData">

<mapper namespace="com.qianwen.mdc.mapper.MachiningDataMapper">

  <resultMap id="BaseResultMap" type="com.qianwen.mdc.domain.MachiningData">

    <!--

      WARNING - @mbg.generated

    -->


 mdc-parent/mdc-show/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@
      #基本属性

      url: jdbc:mysql://localhost:3306/mdc?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true

      username: mdc

      password: hangxing

      password: Kknd_1234

      #password: Hlhy@2017

      #配置初始化大小/最小/最大

      initial-size: 10