From 04a441341566dfb157109f59fc74086592f364bf Mon Sep 17 00:00:00 2001
From: ccongli <1441652193@qq.com>
Date: Wed, 12 Apr 2023 15:00:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=8F=B0=E7=A5=A5=E5=92=8C=20?=
 =?UTF-8?q?=E7=A1=AB=E5=8C=96=E6=9C=BA=E3=80=81=E6=B5=87=E6=B3=A8=E6=9C=BA?=
 =?UTF-8?q?=20=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue/src/mixins/JeecgListMixin.js   |  2 +-
 .../ttpouringequip/TtPouringEquipList.vue     | 36 ++++++++++---------
 .../modules/TtPouringEquipForm.vue            | 14 ++------
 .../modules/TtPouringEquipModal.vue           |  1 -
 .../src/views/ttsulfequip/TtSulfEquipList.vue | 32 +++++++++--------
 .../controller/TtPouringEquipController.java  | 18 ++++++----
 .../ttpouringequip/entity/TtPouringEquip.java |  9 -----
 7 files changed, 53 insertions(+), 59 deletions(-)

diff --git a/ant-design-vue/src/mixins/JeecgListMixin.js b/ant-design-vue/src/mixins/JeecgListMixin.js
index 1ad33c0..fdad3c8 100644
--- a/ant-design-vue/src/mixins/JeecgListMixin.js
+++ b/ant-design-vue/src/mixins/JeecgListMixin.js
@@ -236,7 +236,7 @@ export const JeecgListMixin = {
     handleTableChange(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       //TODO 筛选
-      console.log(pagination)
+      console.log(pagination, filters, sorter)
       if (Object.keys(sorter).length > 0) {
         this.isorter.column = sorter.field;
         this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
diff --git a/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue b/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue
index 2e77189..7818afc 100644
--- a/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue
+++ b/ant-design-vue/src/views/ttpouringequip/TtPouringEquipList.vue
@@ -130,38 +130,38 @@
     },
     data () {
       return {
-        description: 'tt_pouring_equip管理页面',
+        description: '浇注设备历史数据',
         // 表头
         columns: [
           {
-            title: '#',
-            dataIndex: '',
+            title: 'ID',
+            dataIndex: 'id',
             key:'rowIndex',
             width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
+            align:"center"
           },
           {
             title:'设备编号',
             align:"center",
-            dataIndex: 'eqtNo'
+            dataIndex: 'eqtNo',
+            customRender:function (text) {
+              return "浇注机" + text;
+            }
           },
           {
-            title:'设备供应商',
+            title:'设备名称',
             align:"center",
-            dataIndex: 'eqtSupplier'
+            dataIndex: 'descr'
           },
           {
-            title:'料罐温度(℃)',
+            title:'设备IP',
             align:"center",
-            dataIndex: 'bucketTemperature'
+            dataIndex: 'eqtIp',
           },
           {
-            title:'模具温度(℃)',
+            title:'温度(℃)',
             align:"center",
-            dataIndex: 'moldTemperature'
+            dataIndex: 'temperature'
           },
           {
             title:'采集时间',
@@ -188,6 +188,11 @@
           importExcelUrl: "ttpouringequip/ttPouringEquip/importExcel",
 
         },
+        // 排序
+        isorter: {
+          column: "createTime",
+          order: "desc"
+        },
         dictOptions:{},
         superFieldList:[],
       }
@@ -205,9 +210,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'BigDecimal',value:'bucketTemperature',text:'料罐温度',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'moldTemperature',text:'模具温度',dictCode:''})
         fieldList.push({type:'string',value:'eqtNo',text:'浇筑设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
         fieldList.push({type:'date',value:'createTime',text:'记录的创建时间'})
         this.superFieldList = fieldList
       }
diff --git a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue
index 5d8f16a..29c5878 100644
--- a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue
+++ b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipForm.vue
@@ -9,13 +9,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="料罐温度(℃)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bucketTemperature">
-              <a-input-number v-model="model.bucketTemperature" placeholder="请输入料罐温度" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="模具温度(℃)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moldTemperature">
-              <a-input-number v-model="model.moldTemperature" placeholder="请输入模具温度" style="width: 100%" />
+            <a-form-model-item label="温度(℃)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperature">
+              <a-input-number v-model="model.temperature" placeholder="请输入温度" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -55,12 +50,9 @@
         },
         confirmLoading: false,
         validatorRules: {
-           bucketTemperature: [
+           temperature: [
               { required: true, message: '请输入料罐温度!'},
            ],
-           moldTemperature: [
-              { required: true, message: '请输入模具温度!'},
-           ],
            // eqtNo: [
            //    { required: true, message: '请输入浇筑设备编号!'},
            // ],
diff --git a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue
index 7aa112c..c0bbbfe 100644
--- a/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue
+++ b/ant-design-vue/src/views/ttpouringequip/modules/TtPouringEquipModal.vue
@@ -13,7 +13,6 @@
 </template>
 
 <script>
-
   import TtPouringEquipForm from './TtPouringEquipForm'
   export default {
     name: 'TtPouringEquipModal',
diff --git a/ant-design-vue/src/views/ttsulfequip/TtSulfEquipList.vue b/ant-design-vue/src/views/ttsulfequip/TtSulfEquipList.vue
index 90e2fbb..ca31b17 100644
--- a/ant-design-vue/src/views/ttsulfequip/TtSulfEquipList.vue
+++ b/ant-design-vue/src/views/ttsulfequip/TtSulfEquipList.vue
@@ -36,16 +36,16 @@
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('tt_sulf_equip')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
+       <!-- <a-button type="primary" icon="import">导入</a-button> -->
       </a-upload>
       <!-- 高级查询区域 -->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
-<!--        <a-menu slot="overlay">-->
-<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
-<!--        </a-menu>-->
-<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
-<!--      </a-dropdown>-->
+     <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+     <a-dropdown v-if="selectedRowKeys.length > 0">
+       <a-menu slot="overlay">
+         <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+       </a-menu>
+       <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+     </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
@@ -133,7 +133,7 @@
     },
     data () {
       return {
-        description: 'tt_sulf_equip管理页面',
+        description: '硫化机历史数据',
         // 表头
         columns: [
           // {
@@ -208,11 +208,10 @@
             title:'采集时间',
             align:"center",
             dataIndex: 'createTime',
-      customRender:function (createTime) {
-        return    createTime.substring(0,10)
-      },
+            customRender:function (createTime) {
+              return    createTime.substring(0,10)
+            },
           },
-
           {
             title: '操作',
             dataIndex: 'action',
@@ -222,6 +221,11 @@
             scopedSlots: { customRender: 'action' }
           }
         ],
+        // 排序
+        isorter: {
+          column: "createTime",
+          order: "desc"
+        },
         url: {
           list: "/ttsulfequip/ttSulfEquip/list",
           delete: "/ttsulfequip/ttSulfEquip/delete",
@@ -235,7 +239,7 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){
diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java
index d4fcadd..9763211 100644
--- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java
+++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/controller/TtPouringEquipController.java
@@ -66,14 +66,17 @@ public class TtPouringEquipController extends JeecgController<TtPouringEquip, IT
         IPage<TtPouringEquip> pageList = ttPouringEquipService.page(page, queryWrapper);
         List<TtPouringEquip> list = pageList.getRecords();
         if (list.size() > 0) {
+            // 查询所有浇注设备,按ip标注
+            LambdaQueryWrapper<TtEqtBase> lwq = new LambdaQueryWrapper<>();
+            lwq.eq(TtEqtBase::getEqtStatus, 1);
+            lwq.eq(TtEqtBase::getEqtType, 2);
+            List<TtEqtBase> deviceList = ttEqtBaseService.list(lwq);
+            Map<String, TtEqtBase> deviceMap = deviceList.stream().collect(Collectors.toMap(TtEqtBase::getEqtIp, v -> v));
             for (TtPouringEquip pouring : list) {
-                QueryWrapper<TtEqtBase> eqtBase = new QueryWrapper<>();
-                eqtBase.eq("eqt_no", pouring.getEqtNo());
-                eqtBase.eq("eqt_type", 2);
-                TtEqtBase ttEqtBase = ttEqtBaseService.getOne(eqtBase);
-//                if (ttEqtBase != null) {
-//                    pouring.setEqtSupplier(ttEqtBase.getEqtSupplier());
-//                }
+                TtEqtBase eqtBase = deviceMap.get(pouring.getEqtIp());
+                if(eqtBase != null) {
+                    pouring.setDescr(eqtBase.getDescr());
+                }
             }
         }
         return Result.OK(pageList);
@@ -94,6 +97,7 @@ public class TtPouringEquipController extends JeecgController<TtPouringEquip, IT
         lwq.eq(TtEqtBase::getEqtStatus, 1);
         lwq.eq(TtEqtBase::getEqtType, 2);
         List<TtEqtBase> JZ_DeviceList = ttEqtBaseService.list(lwq);
+
         long timestamp = System.currentTimeMillis();
         Map<String,PouringModel> pouringModelMap = new HashMap<>();
         PouringModel model;
diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/entity/TtPouringEquip.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/entity/TtPouringEquip.java
index a97bbd1..6e8f457 100644
--- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/entity/TtPouringEquip.java
+++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttpouringequip/entity/TtPouringEquip.java
@@ -88,13 +88,4 @@ public class TtPouringEquip implements Serializable {
     @ApiModelProperty(value = "设备位置")
     @TableField(exist = false)
     private String location;
-
-//    @TableField(exist = false)
-//    private BigDecimal utilizeRate;
-
-//    @TableField(exist = false)
-//    private String createTime2;
-//
-//    @TableField(exist = false)
-//    private Integer DiffDate;
 }