From 5fe3cb766102259bcc85a229ac87d121d62afe98 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Thu, 7 Dec 2023 13:44:51 +0800
Subject: [PATCH] fix: plc

---
 .../org/nl/acs/plc/service/OpcPlcService.java | 29 ++++++++++++++++++-
 .../plc/service/impl/OpcPlcServiceImpl.java   | 13 +--------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java
index 38ad781..280f346 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java
@@ -36,19 +36,46 @@ public interface OpcPlcService extends CommonService<OpcPlc> {
      */
     List<OpcPlcDto> queryAll(OpcPlcQueryParam query);
 
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
     OpcPlc getById(String id);
 
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
     OpcPlcDto findById(String id);
 
     /**
      * 插入一条新数据。
+     * @param resources
+     * @return
      */
     int insert(OpcPlcDto resources);
 
+    /**
+     * 根据ID更新数据
+     * @param resources
+     * @return
+     */
     int updateById(OpcPlcDto resources);
 
+    /**
+     * 根据id删除
+     * @param id
+     * @return
+     */
     int removeById(String id);
 
+    /**
+     * 根据多个id删除
+     * @param ids
+     * @return
+     */
     int removeByIds(Set<String> ids);
 
     /**
@@ -68,7 +95,7 @@ public interface OpcPlcService extends CommonService<OpcPlc> {
 
     /**
      * 根据OPC标识得到前端PLC下拉选列表
-     *
+     * @param opc_uuid
      * @return
      */
     List<OpcPlc> selectListByOpcID(String opc_uuid);
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java
index a2e2f24..2fd72e4 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java
@@ -106,18 +106,7 @@ public class OpcPlcServiceImpl extends CommonServiceImpl<OpcPlcMapper, OpcPlc> i
 
     @Override
     public List<OpcPlc> selectListByOpcID(String opc_uuid) {
-        //OPC_PLC表【acs_opc_plc】
-//        JSONArray arr = WQLObject.getWQLObject("acs_opc_plc").query("is_delete= '0' AND is_active= '1' and opc_server_id = '" + opc_uuid + "'").getResultJSONArray(0);
-//        JSONArray result = new JSONArray();
-//        for (int i = 0; i < arr.size(); i++) {
-//            JSONObject obj = arr.getJSONObject(i);
-//            JSONObject json = new JSONObject();
-//            json.put("plc_id", obj.getString("plc_id"));
-//            json.put("plc_code", obj.getString("plc_code"));
-//            json.put("plc_name", obj.getString("plc_name"));
-//            result.add(json);
-//        }
-//        return result;
+
 
         List<OpcPlc> lists = opcPlcMapper.selectList(new LambdaQueryWrapper<OpcPlc>()
                 .eq(OpcPlc::getIs_delete, "0")