删除ccs模块

.idea/compiler.xml

@@ -37,5 +37,8 @@
         <module name="imcs-business-biz" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="imcs-ccs" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -15,6 +15,8 @@
     <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-business-controller/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-business-entity/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-business-entity/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-ccs/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-ccs/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/imcs-admin-boot/imcs-file-biz/src/main/java" charset="UTF-8" />

.idea/misc.xml

@@ -6,6 +6,11 @@
         <option value="$PROJECT_DIR$/imcs-admin-boot/pom.xml" />
       </list>
     </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/imcs-admin-boot/imcs-ccs/pom.xml" />
+      </set>
+    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

imcs-admin-boot/imcs-authority-server/pom.xml

@@ -30,11 +30,6 @@
             <artifactId>imcs-authority-controller</artifactId>
             <version>${imcs-project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.zuihou</groupId>
-            <artifactId>imcs-ccs</artifactId>
-            <version>${imcs-project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.github.zuihou</groupId>
             <artifactId>imcs-tenant-controller</artifactId>

imcs-admin-boot/imcs-business-biz/pom.xml

@@ -151,12 +151,6 @@
             <artifactId>dom4j</artifactId>
             <version>2.1.3</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.zuihou</groupId>
-            <artifactId>imcs-ccs</artifactId>
-            <version>b.2.5-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 

imcs-admin-boot/imcs-ccs/pom.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.github.zuihou</groupId>
-        <artifactId>imcs-admin-boot</artifactId>
-        <version>b.2.5-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>imcs-ccs</artifactId>
-    <description>连接PLC模块</description>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.github.zuihou</groupId>
-            <artifactId>imcs-authority-biz</artifactId>
-            <version>b.2.5-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- PLC4X S7 驱动 -->
-        <dependency>
-            <groupId>org.apache.plc4x</groupId>
-            <artifactId>plc4j-driver-s7</artifactId>
-            <version>0.9.1</version>
-        </dependency>
-
-        <!-- PLC4X 核心 API -->
-        <dependency>
-            <groupId>org.apache.plc4x</groupId>
-            <artifactId>plc4j-api</artifactId>
-            <version>0.9.1</version>
-        </dependency>
-
-        <!-- 异步处理支持 -->
-        <dependency>
-            <groupId>org.apache.plc4x</groupId>
-            <artifactId>plc4j-spi</artifactId>
-            <version>0.9.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.zuihou</groupId>
-            <artifactId>imcs-business-entity</artifactId>
-            <version>b.2.5-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.milo</groupId>
-            <artifactId>sdk-client</artifactId>
-            <version>0.6.8</version>
-        </dependency>
-
-
-
-    </dependencies>
-</project>

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/controller/CcsTaskCallbackController.java

@@ -1,85 +0,0 @@
-/*
-package com.github.zuihou.controller;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.github.zuihou.base.R;
-import com.github.zuihou.log.annotation.SysLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-*/
-/**
- * <p>
- * 前端控制器
- * 
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- *//*
-
-@Slf4j
-@Validated
-@RestController
-@RequestMapping("/ccsTaskCallback")
-@Api(value = "CcsTaskCallback", tags = "")
-@SysLog(enabled = true)
-public class CcsTaskCallbackController extends SuperCacheController<CcsTaskCallbackService,Integer, CcsTaskCallback, CcsTaskCallbackPageQuery, CcsTaskCallbackSaveDTO, CcsTaskCallbackUpdateDTO> {
-
-
-    @Override
-    public void query(PageParams<CcsTaskCallbackPageQuery> params, IPage<CcsTaskCallback> page, Long defSize) {
-        CcsTaskCallbackPageQuery data = params.getModel();
-        QueryWrap<CcsTaskCallback> wrap = handlerWrapper(null, params);
-        LbqWrapper<CcsTaskCallback> wrapper = wrap.lambda();
-        CcsTaskCallback en = BeanUtil.toBean(data, CcsTaskCallback.class);
-
-        baseService.pageList(page, wrapper);
-    }
-
-
-    */
-/**
-    * 保存
-    *//*
-
-    @Override
-    public R<CcsTaskCallback> handlerSave(CcsTaskCallbackSaveDTO model) {
-        CcsTaskCallback common = baseService.save(model);
-        return success(common);
-    }
-
-    */
-/**
-    *
-    * 修改
-    *//*
-
-    @ApiOperation(value = "修改", notes = "修改")
-    @PostMapping("/update")
-    public R<CcsTaskCallback> update(@RequestBody CcsTaskCallbackUpdateDTO model) {
-        CcsTaskCallback common = baseService.update(model);
-        return success(common);
-    }
-
-    */
-/**
-    *
-    * 删除
-    *//*
-
-    @ApiOperation(value = "删除", notes = "删除")
-    @PostMapping("/delete")
-    public R<Boolean> delete(@RequestBody CcsTaskCallback model) {
-        return success(baseService.delete(model));
-    }
-
-}
-*/

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/dao/CcsActionAddressMapper.java

@@ -1,20 +0,0 @@
-package com.github.zuihou.dao;
-
-
-import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.business.ccs.entity.CcsActionAddress;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * Mapper 接口
- * 
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Repository
-public interface CcsActionAddressMapper extends SuperMapper<CcsActionAddress> {
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/dao/CcsActionMapper.java

@@ -1,20 +0,0 @@
-package com.github.zuihou.dao;
-
-
-import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.business.ccs.entity.CcsAction;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * Mapper 接口
- * 
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Repository
-public interface CcsActionMapper extends SuperMapper<CcsAction> {
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/dao/CcsDeviceMapper.java

@@ -1,20 +0,0 @@
-package com.github.zuihou.dao;
-
-
-import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.business.ccs.entity.CcsDevice;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * Mapper 接口
- * 
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Repository
-public interface CcsDeviceMapper extends SuperMapper<CcsDevice> {
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/dao/CcsDictionaryMapper.java

@@ -1,20 +0,0 @@
-package com.github.zuihou.dao;
-
-
-import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.business.ccs.entity.CcsDictionary;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * Mapper 接口
- * 字典项
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Repository
-public interface CcsDictionaryMapper extends SuperMapper<CcsDictionary> {
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/dao/CcsPointAddressMapper.java

@@ -1,20 +0,0 @@
-package com.github.zuihou.dao;
-
-
-import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.business.ccs.entity.CcsPointAddress;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * Mapper 接口
- * 点位-地址表
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Repository
-public interface CcsPointAddressMapper extends SuperMapper<CcsPointAddress> {
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/dao/CcsTagvalueMapper.java

@@ -1,20 +0,0 @@
-package com.github.zuihou.dao;
-
-
-import com.github.zuihou.base.mapper.SuperMapper;
-import com.github.zuihou.business.ccs.entity.CcsTagvalue;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * Mapper 接口
- * 
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Repository
-public interface CcsTagvalueMapper extends SuperMapper<CcsTagvalue> {
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/dao/CcsTaskCallbackMapper.java

@@ -1,26 +0,0 @@
-package com.github.zuihou.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.base.mapper.SuperMapper;
-import com.github.zuihou.business.ccs.entity.CcsTaskCallback;
-import com.github.zuihou.database.mybatis.auth.DataScope;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * Mapper 接口
- * 
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Repository
-public interface CcsTaskCallbackMapper extends SuperMapper<CcsTaskCallback> {
-
-    IPage<CcsTaskCallback> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<CcsTaskCallback> queryWrapper, DataScope dataScope);
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/plc/PlcClient.java

@@ -1,70 +0,0 @@
-package com.github.zuihou.plc;
-
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-public class PlcClient {
-
-    private final PlcConnection connection;
-
-    public PlcClient(String connectionString) throws Exception {
-        PlcDriverManager manager = new PlcDriverManager();
-        this.connection = manager.getConnection(connectionString);
-
-        if (!connection.getMetadata().canRead() || !connection.getMetadata().canWrite()) {
-            throw new RuntimeException("该PLC连接不支持读写操作");
-        }
-    }
-
-    public Object read(String tag, String address) throws Exception {
-        PlcReadRequest request = connection.readRequestBuilder()
-                .addItem(tag, address)
-                .build();
-
-        PlcReadResponse response = request.execute().get();
-        if (response.getResponseCode(tag) == PlcResponseCode.OK) {
-            return response.getObject(tag);
-        }
-        throw new RuntimeException("读取失败: " + response.getResponseCode(tag));
-    }
-
-    public boolean write(String tag, String address, Object value) throws Exception {
-        PlcWriteRequest request = connection.writeRequestBuilder()
-                .addItem(tag, address, value)
-                .build();
-
-        PlcWriteResponse response = request.execute().get();
-        return response.getResponseCode(tag) == PlcResponseCode.OK;
-    }
-
-    public void close() throws Exception {
-        if (connection != null && connection.isConnected()) {
-            connection.close();
-        }
-    }
-
-    public static void main(String[] args) {
-        try (PlcConnection connection = new PlcDriverManager().getConnection("s7://192.168.10.200:102")) {
-
-            if (!connection.getMetadata().canRead()) {
-                throw new RuntimeException("PLC 不支持读操作");
-            }
-
-            PlcReadRequest.Builder builder = connection.readRequestBuilder();
-            builder.addItem("intVal", "DB1.DBW2");
-            PlcReadRequest request = builder.build();
-
-            PlcReadResponse response = request.execute().get();
-            Object value = response.getObject("intVal");
-
-            System.out.println("读到值: " + value);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/plc/S7PlcHelper.java

@@ -1,361 +0,0 @@
-
-package com.github.zuihou.plc;
-import org.apache.plc4x.java.PlcDriverManager;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
-import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
-import org.apache.plc4x.java.api.messages.*;
-import org.apache.plc4x.java.api.types.PlcResponseCode;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-/**
- * S7 PLC 通信工具类 (修复响应码问题)
- * 支持读写各种数字类型：INT, WORD, SHORT, DINT, REAL等
- */
-public class S7PlcHelper {
-    private PlcConnection connection;
-    private final String plcIp;
-    private final int rack;
-    private final int slot;
-    private boolean isConnected = false;
-
-    // 数据类型常量
-    public static final String TYPE_BOOL = "BOOL";
-    public static final String TYPE_BYTE = "BYTE";
-    public static final String TYPE_WORD = "WORD";
-    public static final String TYPE_DWORD = "DWORD";
-    public static final String TYPE_INT = "INT";
-    public static final String TYPE_DINT = "DINT";
-    public static final String TYPE_REAL = "REAL";
-    public static final String TYPE_STRING = "STRING";
-
-    /**
-     * 构造函数
-     * @param plcIp PLC的IP地址
-     * @param rack 机架号 (通常为0)
-     * @param slot 槽号 (通常为1)
-     */
-    public S7PlcHelper(String plcIp, int rack, int slot) {
-        this.plcIp = plcIp;
-        this.rack = rack;
-        this.slot = slot;
-    }
-
-    /**
-     * 连接到PLC
-     * @throws PlcConnectionException 如果连接失败
-     */
-    public void connect() throws PlcConnectionException {
-        if (isConnected) {
-            return;
-        }
-
-        String connectionString = String.format(
-                "s7://%s?remote-rack=%d&remote-slot=%d&controller-type=S7_1500",
-                plcIp, rack, slot
-        );
-
-        connection = new PlcDriverManager().getConnection(connectionString);
-        isConnected = true;
-        System.out.println("成功连接到S7-1500 PLC: " + plcIp);
-    }
-
-    /**
-     * 断开与PLC的连接
-     */
-    public void disconnect() {
-        if (isConnected && connection != null) {
-            try {
-                connection.close();
-                isConnected = false;
-                System.out.println("已断开与PLC的连接");
-            } catch (Exception e) {
-                System.err.println("断开连接时出错: " + e.getMessage());
-            }
-        }
-    }
-
-    /**
-     * 检查连接状态
-     * @return 是否已连接
-     */
-    public boolean isConnected() {
-        return isConnected;
-    }
-
-    /**
-     * 构建地址字符串
-     * @param dbNumber DB块号
-     * @param offset 偏移量
-     * @param dataType 数据类型
-     * @return 完整的地址字符串
-     */
-    private String buildAddress(int dbNumber, int offset, String dataType) {
-        switch (dataType) {
-            case TYPE_BOOL:
-                // 对于BOOL类型，偏移量应包含字节和位偏移
-                int byteOffset = offset / 8;
-                int bitOffset = offset % 8;
-                return String.format("%s%d.DBX%d.%d:%s", "%DB", dbNumber, byteOffset, bitOffset, TYPE_BOOL);
-            case TYPE_BYTE:
-                return String.format("%s%d.DBB%d:%s", "%DB", dbNumber, offset, TYPE_BYTE);
-            case TYPE_WORD:
-                return String.format("%s%d.DBW%d:%s", "%DB", dbNumber, offset, TYPE_WORD);
-            case TYPE_DWORD:
-                return String.format("%s%d.DBD%d:%s", "%DB", dbNumber, offset, TYPE_DWORD);
-            case TYPE_INT:
-                return String.format("%s%d.DBW%d:%s", "%DB", dbNumber, offset, TYPE_INT);
-            case TYPE_DINT:
-                return String.format("%s%d.DBD%d:%s", "%DB", dbNumber, offset, TYPE_DINT);
-            case TYPE_REAL:
-                return String.format("%s%d.DBD%d:%s", "%DB", dbNumber, offset, TYPE_REAL);
-            case TYPE_STRING:
-                return String.format("%s%d.DBB%d:STRING(%d)", "%DB", dbNumber, offset, 80); // 字符串格式修复
-            default:
-                throw new IllegalArgumentException("不支持的数据类型: " + dataType);
-        }
-    }
-
-    /**
-     * 检查读取响应是否成功
-     * @param response 读取响应对象
-     * @param fieldName 字段名称
-     * @return 是否成功
-     */
-    private boolean isReadSuccess(PlcReadResponse response, String fieldName) {
-        return response.getResponseCode(fieldName) == PlcResponseCode.OK;
-    }
-
-    /**
-     * 检查写入响应是否成功
-     * @param response 写入响应对象
-     * @param fieldName 字段名称
-     * @return 是否成功
-     */
-    private boolean isWriteSuccess(PlcWriteResponse response, String fieldName) {
-        return response.getResponseCode(fieldName) == PlcResponseCode.OK;
-    }
-
-    /**
-     * 读取单个值
-     * @param dbNumber DB块号
-     * @param offset 偏移量
-     * @param dataType 数据类型
-     * @return 读取到的值
-     * @throws Exception 读取失败时抛出异常
-     */
-    public Object readValue(int dbNumber, int offset, String dataType) throws Exception {
-        if (!isConnected) {
-            throw new IllegalStateException("未连接到PLC");
-        }
-
-        String address = buildAddress(dbNumber, offset, dataType);
-        System.out.println("生成地址：" + address);
-        PlcReadRequest readRequest = connection.readRequestBuilder()
-                .addItem("value", address)
-                .build();
-
-        PlcReadResponse response = readRequest.execute().get(5, TimeUnit.SECONDS);
-
-        if (!isReadSuccess(response, "value")) {
-            throw new Exception("读取失败: " + response.getResponseCode("value") +
-                    ", 地址: " + address);
-        }
-
-        switch (dataType) {
-            case TYPE_BOOL:
-                return response.getBoolean("value");
-            case TYPE_BYTE:
-                return response.getByte("value");
-            case TYPE_WORD:
-                return response.getInteger("value"); // WORD在Java中用int表示
-            case TYPE_DWORD:
-                return response.getLong("value"); // DWORD在Java中用long表示
-            case TYPE_INT:
-                return response.getShort("value");
-            case TYPE_DINT:
-                return response.getInteger("value");
-            case TYPE_REAL:
-                return response.getFloat("value");
-            case TYPE_STRING:
-                return response.getString("value");
-            default:
-                throw new IllegalArgumentException("不支持的数据类型: " + dataType);
-        }
-    }
-
-    /**
-     * 写入单个值
-     * @param dbNumber DB块号
-     * @param offset 偏移量
-     * @param dataType 数据类型
-     * @param value 要写入的值
-     * @throws Exception 写入失败时抛出异常
-     */
-    public void writeValue(int dbNumber, int offset, String dataType, Object value) throws Exception {
-        if (!isConnected) {
-            throw new IllegalStateException("未连接到PLC");
-        }
-
-        String address = buildAddress(dbNumber, offset, dataType);
-        PlcWriteRequest writeRequest = connection.writeRequestBuilder()
-                .addItem("value", address, value)
-                .build();
-
-        PlcWriteResponse response = writeRequest.execute().get(5, TimeUnit.SECONDS);
-
-        if (!isWriteSuccess(response, "value")) {
-            throw new Exception("写入失败: " + response.getResponseCode("value") +
-                    ", 地址: " + address);
-        }
-    }
-
-    /**
-     * 批量读取多个值
-     * @param addresses 地址映射 (key: 变量名, value: 地址字符串)
-     * @return 读取结果映射 (key: 变量名, value: 读取到的值)
-     * @throws Exception 读取失败时抛出异常
-     */
-    public Map<String, Object> batchRead(Map<String, String> addresses) throws Exception {
-        if (!isConnected) {
-            throw new IllegalStateException("未连接到PLC");
-        }
-
-        PlcReadRequest.Builder builder = connection.readRequestBuilder();
-        for (Map.Entry<String, String> entry : addresses.entrySet()) {
-            builder.addItem(entry.getKey(), entry.getValue());
-        }
-
-        PlcReadRequest readRequest = builder.build();
-        PlcReadResponse response = readRequest.execute().get(10, TimeUnit.SECONDS);
-
-        Map<String, Object> result = new HashMap<>();
-        for (String fieldName : addresses.keySet()) {
-            if (isReadSuccess(response, fieldName)) {
-                result.put(fieldName, response.getObject(fieldName));
-            } else {
-                result.put(fieldName, null);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 异步读取值
-     * @param dbNumber DB块号
-     * @param offset 偏移量
-     * @param dataType 数据类型
-     * @return CompletableFuture对象，包含读取结果
-     */
-    public CompletableFuture<Object> readValueAsync(int dbNumber, int offset, String dataType) {
-        if (!isConnected) {
-            return CompletableFuture.completedFuture(new IllegalStateException("未连接到PLC"));
-        }
-
-        String address = buildAddress(dbNumber, offset, dataType);
-        PlcReadRequest readRequest = connection.readRequestBuilder()
-                .addItem("value", address)
-                .build();
-
-        return readRequest.execute()
-                .thenApply(response -> {
-                    if (!isReadSuccess(response, "value")) {
-                        throw new PlcRuntimeException("异步读取失败: " +
-                                response.getResponseCode("value") + ", 地址: " + address);
-                    }
-
-                    switch (dataType) {
-                        case TYPE_BOOL: return response.getBoolean("value");
-                        case TYPE_BYTE: return response.getByte("value");
-                        case TYPE_WORD: return response.getInteger("value");
-                        case TYPE_DWORD: return response.getLong("value");
-                        case TYPE_INT: return response.getShort("value");
-                        case TYPE_DINT: return response.getInteger("value");
-                        case TYPE_REAL: return response.getFloat("value");
-                        case TYPE_STRING: return response.getString("value");
-                        default: throw new PlcRuntimeException("不支持的数据类型: " + dataType);
-                    }
-                });
-    }
-
-    // 以下为类型特定的便捷方法
-    public int readInt(int dbNumber, int offset) throws Exception {
-        return (int) readValue(dbNumber, offset, TYPE_INT);
-    }
-
-    public int readWord(int dbNumber, int offset) throws Exception {
-        return (int) readValue(dbNumber, offset, TYPE_WORD);
-    }
-
-    public short readShort(int dbNumber, int offset) throws Exception {
-        return (short) readValue(dbNumber, offset, TYPE_INT);
-    }
-
-    public int readDInt(int dbNumber, int offset) throws Exception {
-        return (int) readValue(dbNumber, offset, TYPE_DINT);
-    }
-
-    public float readReal(int dbNumber, int offset) throws Exception {
-        return (float) readValue(dbNumber, offset, TYPE_REAL);
-    }
-
-    public boolean readBool(int dbNumber, int byteOffset, int bitOffset) throws Exception {
-        return (boolean) readValue(dbNumber, byteOffset * 8 + bitOffset, TYPE_BOOL);
-    }
-
-    public void writeInt(int dbNumber, int offset, int value) throws Exception {
-        writeValue(dbNumber, offset, TYPE_INT, value);
-    }
-
-    public void writeWord(int dbNumber, int offset, int value) throws Exception {
-        writeValue(dbNumber, offset, TYPE_WORD, value);
-    }
-
-    public void writeShort(int dbNumber, int offset, short value) throws Exception {
-        writeValue(dbNumber, offset, TYPE_INT, value);
-    }
-
-    public void writeDInt(int dbNumber, int offset, int value) throws Exception {
-        writeValue(dbNumber, offset, TYPE_DINT, value);
-    }
-
-    public void writeReal(int dbNumber, int offset, float value) throws Exception {
-        writeValue(dbNumber, offset, TYPE_REAL, value);
-    }
-
-    public void writeBool(int dbNumber, int byteOffset, int bitOffset, boolean value) throws Exception {
-        writeValue(dbNumber, byteOffset * 8 + bitOffset, TYPE_BOOL, value);
-    }
-
-    /**
-     * 测试示例
-     */
-    public static void main(String[] args) {
-        // 创建连接助手实例
-        S7PlcHelper plcHelper = new S7PlcHelper("192.168.10.200", 0, 0);
-
-        try {
-            // 连接到PLC
-            plcHelper.connect();
-
-
-
-            // 读取WORD值
-            int wordValue = plcHelper.readWord(1, 2);
-            System.out.println("DB1.DBW2 的WORD值: " + wordValue);
-
-
-
-        } catch (Exception e) {
-            System.err.println("PLC操作出错: " + e.getMessage());
-            e.printStackTrace();
-        } finally {
-            // 断开连接
-            plcHelper.disconnect();
-        }
-    }
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/plc/test.java

@@ -1,85 +0,0 @@
-package com.github.zuihou.plc;
-
-import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig;
-import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider;
-import org.eclipse.milo.opcua.stack.client.DiscoveryClient;
-import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
-import org.eclipse.milo.opcua.stack.core.types.builtin.*;
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
-import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
-import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class test {
-
-
-    public static Map<String, OpcUaClient> opcUaClientMap = new ConcurrentHashMap<>();
-    public static void geOpcUaClient(String deviceName, String url) {
-        try {
-            SecurityPolicy securityPolicy = SecurityPolicy.None;
-            List<EndpointDescription> endpoints;
-            try {
-                endpoints = DiscoveryClient.getEndpoints(url).get();
-            } catch (Throwable ex) {
-                // 发现服务
-                String discoveryUrl = url;
-                if (!discoveryUrl.endsWith("/")) {
-                    discoveryUrl += "/";
-                }
-                discoveryUrl += "discovery";
-                endpoints = DiscoveryClient.getEndpoints(discoveryUrl).get();
-            }
-            EndpointDescription endpoint = endpoints.stream()
-                    .filter(e -> e.getSecurityPolicyUri().equals(securityPolicy.getUri()))
-                    .findFirst()
-                    .orElseThrow(() -> new Exception("没有连接上端点"));
-
-            OpcUaClientConfig config = OpcUaClientConfig.builder()
-                    .setApplicationName(LocalizedText.english("eclipse milo opc-ua client"))
-                    .setApplicationUri("urn:eclipse:milo:examples:client")
-                    //.setCertificate(loader.getClientCertificate())
-                    //.setKeyPair(loader.getClientKeyPair())
-                    .setEndpoint(endpoint)
-                    //根据匿名验证和第三个用户名验证方式设置传入对象 AnonymousProvider（匿名方式）UsernameProvider（账户密码）new UsernameProvider("admin","123456")
-                    .setIdentityProvider(new AnonymousProvider())
-                    .setRequestTimeout(UInteger.valueOf(5000))
-                    .build();
-            opcUaClientMap.put(deviceName, OpcUaClient.create(config));
-        } catch (Exception e) {
-            System.out.println("创建客户端失败");
-        }
-    }
-
-    public static String readStrValue(String deviceName, String identifier) throws Exception {
-        //创建连接
-        opcUaClientMap.get(deviceName).connect().get();
-        NodeId nodeId = new NodeId(3, identifier);
-        DataValue value = opcUaClientMap.get(deviceName).readValue(0.0, TimestampsToReturn.Both, nodeId).get();
-        String result = String.valueOf(value.getValue().getValue());
-        System.out.println("opc_ua 值为 {} 读取字符: {} "+result+identifier);
-        return result;
-    }
-    public static void writeValue(String deviceName, boolean value, String identifier) throws Exception {
-        // 获取全局opcUaClient创建连接
-        opcUaClientMap.get(deviceName).connect().get();
-        StatusCode statusCode = opcUaClientMap.get(deviceName).writeValue(new NodeId(3, identifier), new DataValue(new Variant(value), null, null)).get();
-        System.out.println("opc_ua: 写入值为 {} 写入字符: {}"+value+identifier);
-        if (statusCode.isGood()) {
-            System.out.println("opc_ua 写入回复成功!");
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        geOpcUaClient("PLC1", "opc.tcp://Kino:53530/OPCUA/SimulationServer");
-        String result = readStrValue("PLC1", "add");
-        System.out.println("读取内容:" + result);
-    }
-
-
-
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/service/CcsStrategy.java

@@ -1,13 +0,0 @@
-package com.github.zuihou.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.zuihou.business.ccs.dto.CcsTaskCallbackSaveDTO;
-import com.github.zuihou.business.ccs.entity.CcsTaskCallback;
-import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
-
-public interface CcsStrategy {
-    String save(CcsTaskCallbackSaveDTO dto);
-
-    IPage<CcsTaskCallback> pageList(IPage page, LbqWrapper<CcsTaskCallback> wrapper);
-
-}

imcs-admin-boot/imcs-ccs/src/main/java/com/github/zuihou/service/impl/RobotTaskCallbackServiceImpl.java

@@ -1,51 +0,0 @@
-package com.github.zuihou.service.impl;
-
-
-import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.zuihou.base.service.SuperCacheServiceImpl;
-import com.github.zuihou.business.ccs.dto.CcsTaskCallbackSaveDTO;
-import com.github.zuihou.business.ccs.entity.CcsTaskCallback;
-import com.github.zuihou.dao.CcsTaskCallbackMapper;
-import com.github.zuihou.database.mybatis.auth.DataScope;
-import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
-import com.github.zuihou.service.CcsStrategy;
-import com.github.zuihou.utils.BeanPlusUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import static com.github.zuihou.common.constant.CacheKey.TENANT;
-
-/**
- * <p>
- * 业务实现类
- * 
- * </p>
- *
- * @author zuihou
- * @date 2025-07-06
- */
-@Slf4j
-@Service("RobotAction")
-public class RobotTaskCallbackServiceImpl extends SuperCacheServiceImpl<CcsTaskCallbackMapper, CcsTaskCallback> implements CcsStrategy {
-    @Override
-    public IPage<CcsTaskCallback> pageList(IPage page, LbqWrapper<CcsTaskCallback> wrapper) {
-        return baseMapper.pageList(page, wrapper, new DataScope());
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public String save(CcsTaskCallbackSaveDTO data) {
-        JSONObject jsonObject=new JSONObject();
-        CcsTaskCallback model = BeanPlusUtil.toBean(data, CcsTaskCallback.class);
-        save(model);
-        jsonObject.set("result","true");
-        return jsonObject.toString();
-    }
-
-    @Override
-    protected String getRegion() {
-        return TENANT;
-    }
-}

imcs-admin-boot/imcs-ccs/src/main/resources/mapper_man/base/CcsActionAddressMapper.xml

@@ -1,30 +0,0 @@
-<?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="com.github.zuihou.dao.CcsActionAddressMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.ccs.entity.CcsActionAddress">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="action_id" jdbcType="INTEGER" property="actionId"/>
-        <result column="action_name" jdbcType="VARCHAR" property="actionName"/>
-        <result column="type" jdbcType="VARCHAR" property="type"/>
-        <result column="address" jdbcType="VARCHAR" property="address"/>
-        <result column="value" jdbcType="VARCHAR" property="value"/>
-        <result column="check_type" jdbcType="BIT" property="checkType"/>
-        <result column="sort" jdbcType="INTEGER" property="sort"/>
-        <result column="description" jdbcType="VARCHAR" property="description"/>
-        <result column="data_type" jdbcType="VARCHAR" property="dataType"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        action_id, action_name, type, address, value, check_type, sort, description, data_type
-    </sql>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        select * from ccs_action_address
-        ${ew.customSqlSegment}
-    </select>
-
-</mapper>

imcs-admin-boot/imcs-ccs/src/main/resources/mapper_man/base/CcsActionMapper.xml

@@ -1,29 +0,0 @@
-<?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="com.github.zuihou.dao.CcsActionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.ccs.entity.CcsAction">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="ip" jdbcType="VARCHAR" property="ip"/>
-        <result column="protocol_type" jdbcType="VARCHAR" property="protocolType"/>
-        <result column="operate_type" jdbcType="VARCHAR" property="operateType"/>
-        <result column="operate_name" jdbcType="VARCHAR" property="operateName"/>
-        <result column="file_path" jdbcType="VARCHAR" property="filePath"/>
-        <result column="plc_ip" jdbcType="VARCHAR" property="plcIp"/>
-        <result column="order_index" jdbcType="VARCHAR" property="orderIndex"/>
-        <result column="description" jdbcType="VARCHAR" property="description"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        ip, protocol_type, operate_type, operate_name, file_path, plc_ip, order_index, description
-    </sql>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        select * from ccs_action
-        ${ew.customSqlSegment}
-    </select>
-
-</mapper>

imcs-admin-boot/imcs-ccs/src/main/resources/mapper_man/base/CcsDeviceMapper.xml

@@ -1,33 +0,0 @@
-<?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="com.github.zuihou.dao.CcsDeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.ccs.entity.CcsDevice">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="ip" jdbcType="VARCHAR" property="ip"/>
-        <result column="user_name" jdbcType="VARCHAR" property="userName"/>
-        <result column="port" jdbcType="INTEGER" property="port"/>
-        <result column="password" jdbcType="VARCHAR" property="password"/>
-        <result column="server_url" jdbcType="VARCHAR" property="serverUrl"/>
-        <result column="protocol_type" jdbcType="VARCHAR" property="protocolType"/>
-        <result column="state" jdbcType="BIT" property="state"/>
-        <result column="use_state" jdbcType="BIT" property="useState"/>
-        <result column="description" jdbcType="VARCHAR" property="description"/>
-        <result column="disconnect_update_time" jdbcType="TIMESTAMP" property="disconnectUpdateTime"/>
-        <result column="offline_update_time" jdbcType="TIMESTAMP" property="offlineUpdateTime"/>
-        <result column="timeout_remind_duration" jdbcType="DECIMAL" property="timeoutRemindDuration"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        ip, user_name, port, password, server_url, protocol_type, state, use_state, description, disconnect_update_time, offline_update_time, timeout_remind_duration
-    </sql>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        select * from ccs_device
-        ${ew.customSqlSegment}
-    </select>
-
-</mapper>

imcs-admin-boot/imcs-ccs/src/main/resources/mapper_man/base/CcsDictionaryMapper.xml

@@ -1,27 +0,0 @@
-<?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="com.github.zuihou.dao.CcsDictionaryMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.ccs.entity.CcsDictionary">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="type" jdbcType="VARCHAR" property="type"/>
-        <result column="code" jdbcType="VARCHAR" property="code"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="dict_value" jdbcType="VARCHAR" property="dictValue"/>
-        <result column="description" jdbcType="VARCHAR" property="description"/>
-        <result column="state" jdbcType="BIT" property="state"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        type, code, name, dict_value, description, state
-    </sql>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        select * from ccs_dictionary
-        ${ew.customSqlSegment}
-    </select>
-
-</mapper>

imcs-admin-boot/imcs-ccs/src/main/resources/mapper_man/base/CcsPointAddressMapper.xml

@@ -1,25 +0,0 @@
-<?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="com.github.zuihou.dao.CcsPointAddressMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.ccs.entity.CcsPointAddress">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="point" jdbcType="VARCHAR" property="point"/>
-        <result column="address" jdbcType="VARCHAR" property="address"/>
-        <result column="type" jdbcType="VARCHAR" property="type"/>
-        <result column="machine_type" jdbcType="VARCHAR" property="machineType"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        point, address, type, machine_type
-    </sql>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        select * from ccs_point_address
-        ${ew.customSqlSegment}
-    </select>
-
-</mapper>

imcs-admin-boot/imcs-ccs/src/main/resources/mapper_man/base/CcsTagvalueMapper.xml

@@ -1,33 +0,0 @@
-<?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="com.github.zuihou.dao.CcsTagvalueMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.ccs.entity.CcsTagvalue">
-        <id column="id" jdbcType="BIGINT" property="id"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="address" jdbcType="VARCHAR" property="address"/>
-        <result column="tag_value" jdbcType="VARCHAR" property="tagValue"/>
-        <result column="type" jdbcType="VARCHAR" property="type"/>
-        <result column="unit" jdbcType="VARCHAR" property="unit"/>
-        <result column="protocol_type" jdbcType="VARCHAR" property="protocolType"/>
-        <result column="ip" jdbcType="VARCHAR" property="ip"/>
-        <result column="description" jdbcType="VARCHAR" property="description"/>
-        <result column="component" jdbcType="VARCHAR" property="component"/>
-        <result column="component_number" jdbcType="VARCHAR" property="componentNumber"/>
-        <result column="device_id" jdbcType="VARCHAR" property="deviceId"/>
-        <result column="online_state" jdbcType="BIT" property="onlineState"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,update_time,
-        address, tag_value, type, unit, protocol_type, ip, description, component, component_number, device_id, online_state
-    </sql>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        select * from ccs_tagvalue
-        ${ew.customSqlSegment}
-    </select>
-
-</mapper>

imcs-admin-boot/imcs-ccs/src/main/resources/mapper_man/base/CcsTaskCallbackMapper.xml

@@ -1,48 +0,0 @@
-<?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="com.github.zuihou.dao.CcsTaskCallbackMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.github.zuihou.business.ccs.entity.CcsTaskCallback">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="ip" jdbcType="VARCHAR" property="ip"/>
-        <result column="port" jdbcType="VARCHAR" property="port"/>
-        <result column="task_id" jdbcType="VARCHAR" property="taskId"/>
-        <result column="task_node_id" jdbcType="VARCHAR" property="taskNodeId"/>
-        <result column="operate_name" jdbcType="VARCHAR" property="operateName"/>
-        <result column="operate_type" jdbcType="VARCHAR" property="operateType"/>
-        <result column="address" jdbcType="VARCHAR" property="address"/>
-        <result column="address2" jdbcType="VARCHAR" property="address2"/>
-        <result column="address3" jdbcType="VARCHAR" property="address3"/>
-        <result column="callback_value" jdbcType="VARCHAR" property="callbackValue"/>
-        <result column="callback_value2" jdbcType="VARCHAR" property="callbackValue2"/>
-        <result column="callback_value3" jdbcType="VARCHAR" property="callbackValue3"/>
-        <result column="state" jdbcType="INTEGER" property="state"/>
-        <result column="data" jdbcType="VARCHAR" property="data"/>
-        <result column="fail_address" jdbcType="VARCHAR" property="failAddress"/>
-        <result column="fail_address2" jdbcType="VARCHAR" property="failAddress2"/>
-        <result column="fail_address3" jdbcType="VARCHAR" property="failAddress3"/>
-        <result column="success_reset_address" jdbcType="VARCHAR" property="successResetAddress"/>
-        <result column="success_reset_address2" jdbcType="VARCHAR" property="successResetAddress2"/>
-        <result column="success_reset_value" jdbcType="VARCHAR" property="successResetValue"/>
-        <result column="success_reset_value2" jdbcType="VARCHAR" property="successResetValue2"/>
-        <result column="callback_fail_value" jdbcType="VARCHAR" property="callbackFailValue"/>
-        <result column="callback_fail_value2" jdbcType="VARCHAR" property="callbackFailValue2"/>
-        <result column="callback_fail_value3" jdbcType="VARCHAR" property="callbackFailValue3"/>
-        <result column="description" jdbcType="VARCHAR" property="description"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,create_time,update_time,
-        ip, port, task_id, task_node_id, operate_name, operate_type, address, address2, address3, callback_value, callback_value2, callback_value3, state, data, fail_address, fail_address2, fail_address3, success_reset_address, success_reset_address2, success_reset_value, success_reset_value2, callback_fail_value, callback_fail_value2, callback_fail_value3, description
-    </sql>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        select * from ccs_task_callback
-        ${ew.customSqlSegment}
-    </select>
-
-</mapper>

imcs-admin-boot/pom.xml

@@ -76,7 +76,6 @@
         <module>imcs-wms-biz</module>
         <module>imcs-wms-controller</module>
         <module>imcs-wms-entity</module>
-        <module>imcs-ccs</module>
     </modules>
 
     <properties>