From 1f451f9d0e99392fb24827d1675d5f59bb57ffff Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 28 Nov 2024 16:29:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4=EF=BC=9B?=
 =?UTF-8?q?=202.=E6=96=B0=E5=A2=9E=E8=A3=85=E7=BD=AE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/CsEquipmentDeliveryAddParm.java     |  3 ++
 .../param/CsEquipmentDeliveryAuditParm.java   |  3 ++
 .../csdevice/pojo/param/DataArrayParam.java   |  3 ++
 .../pojo/po/CsEquipmentDeliveryPO.java        |  6 +++
 .../mapper/mapping/CsDataArrayMapper.xml      |  1 +
 .../mapper/mapping/CsDevModelMapper.xml       | 45 ++++++++++---------
 .../impl/CsEquipmentDeliveryServiceImpl.java  |  5 ++-
 .../service/impl/CsLedgerServiceImpl.java     |  4 ++
 8 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
index 5016c53..23f7580 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
@@ -125,4 +125,7 @@ public class CsEquipmentDeliveryAddParm{
     @ApiModelProperty(value="模块个数")
     private Integer modelNumber;
 
+    @ApiModelProperty(value="排序")
+    private Integer sort;
+
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
index 39b8810..29b0a47 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
@@ -90,4 +90,7 @@ public class CsEquipmentDeliveryAuditParm {
 
     @ApiModelProperty(value="装置使用状态(0:停用 1:启用)")
     private Integer usageStatus;
+
+    @ApiModelProperty(value="排序")
+    private Integer sort;
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java
index 4a922b6..d5f3fc9 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java
@@ -24,4 +24,7 @@ public class DataArrayParam {
 
     @ApiModelProperty("数据类型")
     private String statMethod;
+
+    @ApiModelProperty("数据集编号")
+    private Integer idx;
 }
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
index 3c67ef0..61d7bfb 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
@@ -114,4 +114,10 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "usage_status")
     private Integer usageStatus;
 
+    /**
+     * 排序
+     */
+    @TableField(value = "sort")
+    private Integer sort;
+
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml
index 1c48727..c2e8c96 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml
@@ -106,6 +106,7 @@
             and t1.did = #{param.did}
             and t3.cl_dev = #{param.cldId}
             and (t3.data_type = 'Stat' or t3.data_type is NULL)
+            and t3.idx = #{param.idx}
             and t4.stat_method = #{param.statMethod}
         order by t4.sort
     </select>
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml
index f89f979..252c599 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml
@@ -19,28 +19,31 @@
     <!--@mbg.generated-->
     id, dev_type, version_no, version_date, file_path, create_by, create_time, update_by, 
     update_time, `status`
-  </sql><select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
-   SELECT a.*
-        FROM cs_dev_model a
-                WHERE
-                1 = 1 And a.`status`='1'
-        <if test="csDevModelQueryParm.versionStartDate != null and csDevModelQueryParm.versionStartDate != ''">
-            AND a.version_date &gt;= #{csDevModelQueryParm.versionStartDate }
-        </if>
-        <if test="csDevModelQueryParm.versionEndDate != null and csDevModelQueryParm.versionEndDate != ''">
-            AND a.version_date &lt;= #{csDevModelQueryParm.versionEndDate }
-        </if>
+  </sql>
+    <select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
+       SELECT a.*
+            FROM cs_dev_model a
+                    WHERE
+                    1 = 1 And a.`status`='1'
+            <if test="csDevModelQueryParm.versionStartDate != null and csDevModelQueryParm.versionStartDate != ''">
+                AND a.version_date &gt;= #{csDevModelQueryParm.versionStartDate }
+            </if>
+            <if test="csDevModelQueryParm.versionEndDate != null and csDevModelQueryParm.versionEndDate != ''">
+                AND a.version_date &lt;= #{csDevModelQueryParm.versionEndDate }
+            </if>
 
-        <if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
-            AND a.dev_type_name LIKE concat('%',#{csDevModelQueryParm.devName},'%')
-        </if>
-<!--        <if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">-->
-<!--            AND a.dev_type = #{csDevModelQueryParm.devType}-->
-<!--        </if>-->
-         <if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
-            AND a.name = #{csDevModelQueryParm.name}
-        </if>
-  </select><select id="queryOne" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
+            <if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
+                AND a.dev_type_name LIKE concat('%',#{csDevModelQueryParm.devName},'%')
+            </if>
+    <!--        <if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">-->
+    <!--            AND a.dev_type = #{csDevModelQueryParm.devType}-->
+    <!--        </if>-->
+             <if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
+                AND a.name = #{csDevModelQueryParm.name}
+            </if>
+       order by a.version_date desc
+  </select>
+    <select id="queryOne" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
    SELECT a.*
         FROM cs_dev_model a
                 WHERE
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 2acf228..8faaa8d 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -371,7 +371,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private void setDataSetValues(CsEquipmentDeliveryPO csEquipmentDeliveryPo, List<CsDataSet> dataSet, List<DeviceManagerVO.DataSetVO> dataSetList, String type, DeviceManagerVO deviceManagerVo) {
         BeanUtils.copyProperties(csEquipmentDeliveryPo, deviceManagerVo);
         if (CollUtil.isNotEmpty(dataSet)) {
-            for (CsDataSet item : dataSet) {
+//            for (CsDataSet item : dataSet) {
+            CsDataSet item = dataSet.get(0);
                 //准实时数据
                 DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
                 dataSetVO.setId(item.getId());
@@ -415,7 +416,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                         dataSetList.add(dataSetVo6);
                     }
                 }
-            }
+//            }
             deviceManagerVo.setDataSetList(dataSetList);
             List<CsLinePO> csLinePOS = csLinePOService.findByNdid(csEquipmentDeliveryPo.getNdid());
             if(!csLinePOS.isEmpty() && csLinePOS.get(0)!=null){
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
index 58f5518..f373fb9 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
@@ -120,7 +120,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             c.setNDId(po.getNdid());
             c.setType("device");
             c.setName(po.getName());
+            c.setSort(po.getSort());
         }
+        portables = portables.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         portables.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
         checkDevSetData(portables);
         portable.setChildren(portables);
@@ -208,7 +210,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             c.setNDId(po.getNdid());
             c.setType("device");
             c.setName(po.getName());
+            c.setSort(po.getSort());
         }
+        portables = portables.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         portable.setChildren(portables);
 
         CsLedgerVO government = new CsLedgerVO();