1

cqcy-ei/cqcy-ei-common/src/main/java/com/example/opc_common/entity/DriverBasicItem.java

@@ -18,6 +18,11 @@ public class DriverBasicItem implements Serializable {
      * 驱动id
      */
     private Integer driverId;
+
+    /**
+     * 数据项类型 0附属属性，1基础属性
+     */
+    private Integer itemType;
     /**
      * 带有此名称的数据项，为基础数据项
      */

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/controller/DataSourceController.java

@@ -156,9 +156,9 @@ public class DataSourceController {
      *
      * @return
      */
-    @GetMapping("/getOpcDaDriverEnum")
-    public Result getOpcDaDriverEnum() {
-        return dataSourceService.getOpcDaDriverEnum();
+    @GetMapping("/getAllDataSouceCls")
+    public Result getAllDataSouceCls() {
+        return dataSourceService.getAllDataSouceCls();
     }
 
     /**

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/service/DataSourceService.java

@@ -30,7 +30,7 @@ public interface DataSourceService {
 
     Result delDataSourceDriver(Integer id);
 
-    Result getOpcDaDriverEnum();
+    Result getAllDataSouceCls();
 
     Result getDataSourceDriverByid(Integer id);
 

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/service/impl/DataSourceServiceImpl.java

@@ -216,7 +216,7 @@ public class DataSourceServiceImpl implements DataSourceService {
     }
 
     @Override
-    public Result getOpcDaDriverEnum() {
+    public Result getAllDataSouceCls() {
         List<DataSource> dataSourceList = dataSourceDao.getDataSourceClsId();
         if (Blank.isNotEmpty(dataSourceList)) {
             Map<String, String> map = new HashMap<>();
@@ -257,7 +257,7 @@ public class DataSourceServiceImpl implements DataSourceService {
                 for (ItemGroup itemGroup : itemGroupList) {
                     Integer runState = itemGroup.getRunState();
                     if (runState.equals(ConstantStr.START_UP)) {
-                        throw new CustomException(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "此数据源配置的数据组，存在处于运行中，不能修改");
+                        throw new CustomException(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "此数据源配置的数据组，存在处于运行中，不能新增");
                     }
                 }
                 List<Item> itemList = itemGroupDao.getItemListByGidList(itemGroupList);

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/util/OpcDaUtil.java

@@ -131,7 +131,7 @@ public class OpcDaUtil {
     public static Boolean isBasicItem(List<DriverBasicItem> driverBasicItemList, String itemName) {
         if (Blank.isNotEmpty(driverBasicItemList)) {
             for (DriverBasicItem dbi : driverBasicItemList) {
-                if (itemName.contains(dbi.getItemName())) {
+                if (dbi.getItemType().equals(ConstantStr.BASIC_ATTRIBUTES) && itemName.equals(dbi.getItemName())) {
                     return true;
                 }
             }

cqcy-ei/cqcy-ei-da/src/main/resources/mapper/DataSourceDao.xml

@@ -45,10 +45,10 @@
     </insert>
 
     <insert id="addDriverBasicItemList">
-        insert into t_driver_basic_item (driver_id, item_name)
+        insert into t_driver_basic_item (driver_id, item_type, item_name)
         values
         <foreach collection="driverBasicItemList" item="driverBasicItem" index="index" separator=",">
-            (#{dataSourceDriverId}, #{driverBasicItem.itemName})
+            (#{dataSourceDriverId}, #{driverBasicItem.itemType}, #{driverBasicItem.itemName})
         </foreach>
     </insert>
 
@@ -228,13 +228,10 @@
     </select>
 
     <select id="getDataSourceClsId" resultType="com.example.opc_common.entity.DataSource">
-        SELECT DISTINCT
-            cls_id,
-            driver_describe
-        FROM
-            t_data_source
-        WHERE
-            cls_id IS NOT NULL
+        SELECT DISTINCT cls_id,
+                        driver_describe
+        FROM t_data_source
+        WHERE cls_id IS NOT NULL
           AND cls_id != ''
     </select>
 </mapper>