From c9ab10ae0dd6164877829b6b01e6839beb959486 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Mon, 16 Dec 2024 17:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E=E5=AD=90=E7=B3=BB=E7=BB=9F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=90=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/equipment/controller/SysIotModelController.java | 6 ++++++
 .../modules/equipment/mapper/SysIotModelFieldMapper.java    | 2 ++
 .../das/modules/equipment/service/SysIotModelService.java   | 2 ++
 .../equipment/service/impl/SysIotModelServiceImpl.java      | 5 +++++
 das/src/main/resources/mapper/SysIotModelFieldMapper.xml    | 6 ++++++
 5 files changed, 21 insertions(+)

diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
index 395e8f70..c0b8a9f2 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
@@ -245,5 +245,11 @@ public class SysIotModelController {
         return R.success(sysIotModelService.getSysIotModelByType(sysIotModelDto.getObjectType()));
     }
 
+    /** 物模型属性修改 */
+    @PostMapping("/attribute/getAllSubsystem")
+    public  R<List<String>> getAllSubsystem() {
+        List<String> allSubsystem = sysIotModelService.getAllSubsystem();
+        return R.success(allSubsystem);
+    }
 }
 
diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
index ba102696..f2b8a4e1 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelFieldMapper.java
@@ -33,4 +33,6 @@ public interface SysIotModelFieldMapper extends BaseMapperPlus<SysIotModelField,
      */
     List<SysIotModelFieldVo> selectModelFieldListByModelId(@Param("modelId") Long modelId);
 
+    List<String> getAllSubsystem();
+
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java b/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
index 480385c9..b66abf10 100644
--- a/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
+++ b/das/src/main/java/com/das/modules/equipment/service/SysIotModelService.java
@@ -47,4 +47,6 @@ public interface SysIotModelService {
 
     List<SysIotModelVo> getSysIotModelByType(Integer objectType);
 
+    List<String> getAllSubsystem();
+
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index df5db58e..bb268fdb 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
@@ -544,6 +544,11 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         return list;
     }
 
+    @Override
+    public List<String> getAllSubsystem() {
+        return sysIotModelFieldMapper.getAllSubsystem();
+    }
+
     public void createTdStableOrColumn(SysIotModelField sysIotModelField) {
         //如果type是计算量199，创建单独计算量超级表
         if (sysIotModelField.getAttributeType() == 199) {
diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
index 205674cc..c995d95d 100644
--- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
@@ -28,6 +28,9 @@
             <if test="info.attributeType != null and info.attributeType != ''">
                 and t.attribute_type = #{info.attributeType}
             </if>
+            <if test="info.subSystem != null and info.subSystem != ''">
+                and t.subsystem = #{info.subSystem}
+            </if>
         </where>
         <if test="info.orderColumn != null and info.orderType != ''">
             order by ${info.orderColumn}  ${info.orderType}
@@ -58,4 +61,7 @@
     <select id="selectModelFieldListByModelId" resultMap="SysIotModelFieldMap">
         select * from sys_iot_model_field  where iot_model_id  = #{modelId} order by porder
     </select>
+    <select id="getAllSubsystem" resultType="java.lang.String">
+        select distinct simf.subsystem from sys_iot_model_field simf
+    </select>
 </mapper>