1.模板调整；

2.新增装置排序

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;
+
 }

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;
 }

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;
 }

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;
+
 }

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>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml

@@ -19,7 +19,8 @@
     <!--@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">
+  </sql>
+    <select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
        SELECT a.*
             FROM cs_dev_model a
                     WHERE
@@ -34,13 +35,15 @@
             <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 != ''">-->
+    <!--        <if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">-->
-<!--            AND a.dev_type = #{csDevModelQueryParm.devType}-->
+    <!--            AND a.dev_type = #{csDevModelQueryParm.devType}-->
-<!--        </if>-->
+    <!--        </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">
+       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

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){

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();