From 6416562761ae0f15f8d59f68f3cc53ece8ceb12e Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Mon, 17 Apr 2023 16:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=B8=A9=E6=9C=BA=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/tteqtbase/TtEqtBaseList.vue | 33 +- .../TtMoldingEquipList.vue} | 63 ++-- .../TtMoldingEquip_menu_insert.sql} | 16 +- .../modules/TtMoldingEquipForm.vue | 35 +- .../TtMoldingEquipModal.Style#Drawer.vue | 8 +- .../modules/TtMoldingEquipModal.vue} | 8 +- .../TtMoldTemperatureEquip_menu_insert.sql | 26 -- .../src/views/vue/TestShoptypeTreeList.vue | 354 ------------------ .../vue/modules/TestShoptypeTreeModal.vue | 156 -------- .../controller/TtElectricMeterController.java | 13 +- .../entity/TtElectricMeter.java | 2 +- .../controller/TtFeedingEquipController.java | 14 +- .../ttinjectequip/entity/TtInjectEquip.java | 2 +- .../controller/TtMoldingEquipController.java | 200 ++++++++++ .../entity/TtMoldingEquip.java} | 62 +-- .../mapper/TtMoldingEquipMapper.java | 17 + .../mapper/xml/TtMoldingEquipMapper.xml} | 2 +- .../service/ITtMoldingEquipService.java | 14 + .../impl/TtMoldingEquipServiceImpl.java | 19 + .../vue/TtMoldingEquipList.vue} | 62 ++- .../vue/TtMoldingEquip_menu_insert.sql} | 16 +- .../vue/modules/TtMoldingEquipForm.vue | 39 +- .../TtMoldingEquipModal.Style#Drawer.vue | 8 +- .../vue/modules/TtMoldingEquipModal.vue} | 8 +- .../TtMoldTemperatureEquipController.java | 226 ----------- .../mapper/TtMoldTemperatureEquipMapper.java | 17 - .../ITtMoldTemperatureEquipService.java | 14 - .../TtMoldTemperatureEquipServiceImpl.java | 19 - .../ttpouringequip/entity/TtPouringEquip.java | 2 +- 29 files changed, 452 insertions(+), 1003 deletions(-) rename ant-design-vue/src/views/{ttmoldtemperatureequip/TtMoldTemperatureEquipList.vue => ttmoldingequip/TtMoldingEquipList.vue} (75%) rename ant-design-vue/src/views/{vue/TestShoptypeTree_menu_insert.sql => ttmoldingequip/TtMoldingEquip_menu_insert.sql} (55%) rename linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipForm.vue => ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipForm.vue (65%) rename linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue => ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipModal.Style#Drawer.vue (84%) rename ant-design-vue/src/views/{ttmoldtemperatureequip/modules/TtMoldTemperatureEquipModal.vue => ttmoldingequip/modules/TtMoldingEquipModal.vue} (78%) delete mode 100644 ant-design-vue/src/views/ttmoldtemperatureequip/TtMoldTemperatureEquip_menu_insert.sql delete mode 100644 ant-design-vue/src/views/vue/TestShoptypeTreeList.vue delete mode 100644 ant-design-vue/src/views/vue/modules/TestShoptypeTreeModal.vue create mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/controller/TtMoldingEquipController.java rename linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/{ttmoldtemperatureequip/entity/TtMoldTemperatureEquip.java => ttmoldingequip/entity/TtMoldingEquip.java} (52%) create mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/mapper/TtMoldingEquipMapper.java rename linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/{ttmoldtemperatureequip/mapper/xml/TtMoldTemperatureEquipMapper.xml => ttmoldingequip/mapper/xml/TtMoldingEquipMapper.xml} (56%) create mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/ITtMoldingEquipService.java create mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/impl/TtMoldingEquipServiceImpl.java rename linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/{ttmoldtemperatureequip/vue/TtMoldTemperatureEquipList.vue => ttmoldingequip/vue/TtMoldingEquipList.vue} (67%) rename linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/{ttmoldtemperatureequip/vue/TtMoldTemperatureEquip_menu_insert.sql => ttmoldingequip/vue/TtMoldingEquip_menu_insert.sql} (53%) rename ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipForm.vue => linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipForm.vue (61%) rename ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue => linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipModal.Style#Drawer.vue (84%) rename linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/{ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipModal.vue => ttmoldingequip/vue/modules/TtMoldingEquipModal.vue} (78%) delete mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/controller/TtMoldTemperatureEquipController.java delete mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/mapper/TtMoldTemperatureEquipMapper.java delete mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/service/ITtMoldTemperatureEquipService.java delete mode 100644 linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/service/impl/TtMoldTemperatureEquipServiceImpl.java diff --git a/ant-design-vue/src/views/tteqtbase/TtEqtBaseList.vue b/ant-design-vue/src/views/tteqtbase/TtEqtBaseList.vue index e6dc81b..5218e6c 100644 --- a/ant-design-vue/src/views/tteqtbase/TtEqtBaseList.vue +++ b/ant-design-vue/src/views/tteqtbase/TtEqtBaseList.vue @@ -45,11 +45,11 @@
新增 导出 - + - + 删除 @@ -144,16 +144,16 @@ description: '设备基础信息管理页面', // 表头 columns: [ - { - title: '#', - dataIndex: '', - key:'rowIndex', - width:60, - align:"center", - customRender:function (t,r,index) { - return parseInt(index)+1; - } - }, + // { + // title: '#', + // dataIndex: '', + // key:'rowIndex', + // width:60, + // align:"center", + // customRender:function (t,r,index) { + // return parseInt(index)+1; + // } + // }, { title:'设备编号', align:"center", @@ -212,6 +212,13 @@ }, dictOptions:{}, superFieldList:[], + isorter:{ + column: 'createTime,eqtType,eqtNo', + order: 'desc,asc,asc', + }, + ipagination:{ + pageSize: 20 + } } }, created() { diff --git a/ant-design-vue/src/views/ttmoldtemperatureequip/TtMoldTemperatureEquipList.vue b/ant-design-vue/src/views/ttmoldingequip/TtMoldingEquipList.vue similarity index 75% rename from ant-design-vue/src/views/ttmoldtemperatureequip/TtMoldTemperatureEquipList.vue rename to ant-design-vue/src/views/ttmoldingequip/TtMoldingEquipList.vue index daef60f..649d1fb 100644 --- a/ant-design-vue/src/views/ttmoldtemperatureequip/TtMoldTemperatureEquipList.vue +++ b/ant-design-vue/src/views/ttmoldingequip/TtMoldingEquipList.vue @@ -5,8 +5,8 @@ - - + + @@ -33,19 +33,19 @@
- 新增 - 导出 - + + 导出 + - +
@@ -111,7 +111,7 @@
- + @@ -120,17 +120,17 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import TtMoldTemperatureEquipModal from './modules/TtMoldTemperatureEquipModal' + import TtMoldingEquipModal from './modules/TtMoldingEquipModal' export default { - name: 'TtMoldTemperatureEquipList', + name: 'TtMoldingEquipList', mixins:[JeecgListMixin, mixinDevice], components: { - TtMoldTemperatureEquipModal + TtMoldingEquipModal }, data () { return { - description: 'tt_mold_temperature_equip管理页面', + description: '模温机设备管理管理页面', // 表头 columns: [ { @@ -144,27 +144,29 @@ } }, { - title:'模温机设备编号', + title:'设备编号', align:"center", dataIndex: 'eqtNo' }, { - title:'描述', + title:'设备名称', align:"center", dataIndex: 'descr' }, { - title:'温度(℃)', + title:'设备Ip', align:"center", - dataIndex: 'moldTemperature' + dataIndex: 'eqtIp' }, { - title:'采集时间', + title:'温度', align:"center", - dataIndex: 'createTime', - // customRender:function (text) { - // return !text?"":(text.length>10?text.substr(0,10):text) - // } + dataIndex: 'temperature' + }, + { + title:'记录的创建时间', + align:"center", + dataIndex: 'createTime' }, { title: '操作', @@ -176,12 +178,12 @@ } ], url: { - list: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/list", - delete: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/delete", - deleteBatch: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/deleteBatch", - exportXlsUrl: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/exportXls", - importExcelUrl: "ttmoldtemperatureequip/ttMoldTemperatureEquip/importExcel", - + list: "/ttmoldingequip/ttMoldingEquip/list", + delete: "/ttmoldingequip/ttMoldingEquip/delete", + deleteBatch: "/ttmoldingequip/ttMoldingEquip/deleteBatch", + exportXlsUrl: "/ttmoldingequip/ttMoldingEquip/exportXls", + importExcelUrl: "ttmoldingequip/ttMoldingEquip/importExcel", + }, dictOptions:{}, superFieldList:[], @@ -200,8 +202,9 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'BigDecimal',value:'moldTemperature',text:'温度',dictCode:''}) - fieldList.push({type:'string',value:'eqtNo',text:'模温机设备编号，只有1和2两种值',dictCode:''}) + fieldList.push({type:'string',value:'eqtNo',text:'设备编号',dictCode:''}) + fieldList.push({type:'string',value:'eqtIp',text:'设备Ip',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/vue/TestShoptypeTree_menu_insert.sql b/ant-design-vue/src/views/ttmoldingequip/TtMoldingEquip_menu_insert.sql similarity index 55% rename from ant-design-vue/src/views/vue/TestShoptypeTree_menu_insert.sql rename to ant-design-vue/src/views/ttmoldingequip/TtMoldingEquip_menu_insert.sql index 1177f40..9901d67 100644 --- a/ant-design-vue/src/views/vue/TestShoptypeTree_menu_insert.sql +++ b/ant-design-vue/src/views/ttmoldingequip/TtMoldingEquip_menu_insert.sql @@ -1,26 +1,26 @@ --- 注意：该页面对应的前台目录为views/demo888文件夹下 +-- 注意：该页面对应的前台目录为views/ttmoldingequip文件夹下 -- 如果你想更改到其他目录，请修改sql中component字段对应的值 INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) -VALUES ('2023041302342260040', NULL, '商品分类', '/demo888/testShoptypeTreeList', 'demo888/TestShoptypeTreeList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-04-13 14:34:04', NULL, NULL, 0); +VALUES ('2023041703392350320', NULL, '模温机设备管理', '/ttmoldingequip/ttMoldingEquipList', 'ttmoldingequip/TtMoldingEquipList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0); -- 权限控制sql -- 新增 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023041302342260041', '2023041302342260040', '添加商品分类', NULL, NULL, 0, NULL, NULL, 2, 'demo888:test_shoptype_tree:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-13 14:34:04', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350321', '2023041703392350320', '添加模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 编辑 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023041302342260042', '2023041302342260040', '编辑商品分类', NULL, NULL, 0, NULL, NULL, 2, 'demo888:test_shoptype_tree:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-13 14:34:04', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350322', '2023041703392350320', '编辑模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 删除 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023041302342260043', '2023041302342260040', '删除商品分类', NULL, NULL, 0, NULL, NULL, 2, 'demo888:test_shoptype_tree:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-13 14:34:04', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350323', '2023041703392350320', '删除模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 批量删除 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023041302342260044', '2023041302342260040', '批量删除商品分类', NULL, NULL, 0, NULL, NULL, 2, 'demo888:test_shoptype_tree:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-13 14:34:04', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350324', '2023041703392350320', '批量删除模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 导出excel INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023041302342260045', '2023041302342260040', '导出excel_商品分类', NULL, NULL, 0, NULL, NULL, 2, 'demo888:test_shoptype_tree:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-13 14:34:04', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350325', '2023041703392350320', '导出excel_模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 导入excel INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023041302342260046', '2023041302342260040', '导入excel_商品分类', NULL, NULL, 0, NULL, NULL, 2, 'demo888:test_shoptype_tree:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-13 14:34:04', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file +VALUES ('2023041703392350326', '2023041703392350320', '导入excel_模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipForm.vue b/ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipForm.vue similarity index 65% rename from linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipForm.vue rename to ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipForm.vue index 6ee18f1..e4da59e 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipForm.vue +++ b/ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipForm.vue @@ -4,13 +4,23 @@ - - + + - - + + + + + + + + + + + + @@ -25,7 +35,7 @@ import { validateDuplicateValue } from '@/utils/util' export default { - name: 'TtMoldTemperatureEquipForm', + name: 'TtMoldingEquipForm', components: { }, props: { @@ -50,17 +60,20 @@ }, confirmLoading: false, validatorRules: { - moldTemperature: [ + eqtNo: [ + { required: true, message: '请输入设备编号!'}, + ], + temperature: [ { required: true, message: '请输入温度!'}, ], - eqtNo: [ - { required: true, message: '请输入模温机设备编号，只有1和2两种值!'}, + createTime: [ + { required: true, message: '请输入记录的创建时间!'}, ], }, url: { - add: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/add", - edit: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/edit", - queryById: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/queryById" + add: "/ttmoldingequip/ttMoldingEquip/add", + edit: "/ttmoldingequip/ttMoldingEquip/edit", + queryById: "/ttmoldingequip/ttMoldingEquip/queryById" } } }, diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue b/ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipModal.Style#Drawer.vue similarity index 84% rename from linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue rename to ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipModal.Style#Drawer.vue index 08dc124..876888a 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue +++ b/ant-design-vue/src/views/ttmoldingequip/modules/TtMoldingEquipModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@ - \ No newline at end of file diff --git a/ant-design-vue/src/views/vue/modules/TestShoptypeTreeModal.vue b/ant-design-vue/src/views/vue/modules/TestShoptypeTreeModal.vue deleted file mode 100644 index 120e077..0000000 --- a/ant-design-vue/src/views/vue/modules/TestShoptypeTreeModal.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - \ No newline at end of file diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/controller/TtElectricMeterController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/controller/TtElectricMeterController.java index 3b639a0..8c8e623 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/controller/TtElectricMeterController.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/controller/TtElectricMeterController.java @@ -25,25 +25,14 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.demo.tteqtbase.entity.TtEqtBase; import org.jeecg.modules.demo.tteqtbase.service.ITtEqtBaseService; -import org.jeecg.modules.demo.ttfeedingequip.entity.TtFeedingEquip; -import org.jeecg.modules.demo.ttmoldtemperatureequip.entity.TtMoldTemperatureEquip; -import org.jeecg.modules.demo.ttpouringequip.entity.TtPouringEquip; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; + import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: tt_electric_meter diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/entity/TtElectricMeter.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/entity/TtElectricMeter.java index c17cdf9..4e25d03 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/entity/TtElectricMeter.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttelectricmeter/entity/TtElectricMeter.java @@ -31,7 +31,7 @@ public class TtElectricMeter implements Serializable { private static final long serialVersionUID = 1L; /**id*/ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @ApiModelProperty(value = "id") private java.lang.Integer id; diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttfeedingequip/controller/TtFeedingEquipController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttfeedingequip/controller/TtFeedingEquipController.java index e7f80be..8959dfd 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttfeedingequip/controller/TtFeedingEquipController.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttfeedingequip/controller/TtFeedingEquipController.java @@ -12,10 +12,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.checkerframework.checker.units.qual.A; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.tteqtbase.entity.TtEqtBase; import org.jeecg.modules.demo.tteqtbase.service.ITtEqtBaseService; @@ -27,24 +25,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecg.modules.demo.ttmoldtemperatureequip.entity.TtMoldTemperatureEquip; -import org.jeecg.modules.demo.ttpouringequip.entity.TtPouringEquip; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; + import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: tt_feeding_equip diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/entity/TtInjectEquip.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/entity/TtInjectEquip.java index cd89cba..3e771db 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/entity/TtInjectEquip.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttinjectequip/entity/TtInjectEquip.java @@ -33,7 +33,7 @@ public class TtInjectEquip implements Serializable { private static final long serialVersionUID = 1L; /**id*/ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @ApiModelProperty(value = "id") private java.lang.Integer id; /**日期*/ diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/controller/TtMoldingEquipController.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/controller/TtMoldingEquipController.java new file mode 100644 index 0000000..7ad237b --- /dev/null +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/controller/TtMoldingEquipController.java @@ -0,0 +1,200 @@ +package org.jeecg.modules.demo.ttmoldingequip.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.tteqtbase.entity.TtEqtBase; +import org.jeecg.modules.demo.tteqtbase.service.ITtEqtBaseService; +import org.jeecg.modules.demo.ttmoldingequip.entity.TtMoldingEquip; +import org.jeecg.modules.demo.ttmoldingequip.service.ITtMoldingEquipService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.modules.demo.ttpouringequip.entity.TtPouringEquip; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 模温机设备管理 + * @Author: jeecg-boot + * @Date: 2023-04-17 + * @Version: V1.0 + */ +@Api(tags="模温机设备管理") +@RestController +@RequestMapping("/ttmoldingequip/ttMoldingEquip") +@Slf4j +public class TtMoldingEquipController extends JeecgController { + @Autowired + private ITtMoldingEquipService ttMoldingEquipService; + + @Autowired + private ITtEqtBaseService ttEqtBaseService; + + /** + * 分页列表查询 + * + * @param ttMoldingEquip + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "模温机设备管理-分页列表查询") + @ApiOperation(value="模温机设备管理-分页列表查询", notes="模温机设备管理-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TtMoldingEquip ttMoldingEquip, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ttMoldingEquip, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = ttMoldingEquipService.page(page, queryWrapper); + List list = pageList.getRecords(); + if (list.size() > 0) { + // 查询所有浇注设备,按ip标注 + LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); + lwq.eq(TtEqtBase::getEqtStatus, 1); + lwq.eq(TtEqtBase::getEqtType, 7); + List deviceList = ttEqtBaseService.list(lwq); + Map deviceMap = deviceList.stream().collect(Collectors.toMap(TtEqtBase::getEqtIp, v -> v)); + for (TtMoldingEquip molding : list) { + TtEqtBase eqtBase = deviceMap.get(molding.getEqtIp()); + if(eqtBase != null) { + molding.setDescr(eqtBase.getDescr()); + } + } + } + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param ttMoldingEquip + * @return + */ + @AutoLog(value = "模温机设备管理-添加") + @ApiOperation(value="模温机设备管理-添加", notes="模温机设备管理-添加") + //@RequiresPermissions("ttmoldingequip:tt_molding_equip:add") + @PostMapping(value = "/add") + public Result add(@RequestBody TtMoldingEquip ttMoldingEquip) { + ttMoldingEquipService.save(ttMoldingEquip); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param ttMoldingEquip + * @return + */ + @AutoLog(value = "模温机设备管理-编辑") + @ApiOperation(value="模温机设备管理-编辑", notes="模温机设备管理-编辑") + //@RequiresPermissions("ttmoldingequip:tt_molding_equip:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TtMoldingEquip ttMoldingEquip) { + ttMoldingEquipService.updateById(ttMoldingEquip); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "模温机设备管理-通过id删除") + @ApiOperation(value="模温机设备管理-通过id删除", notes="模温机设备管理-通过id删除") + //@RequiresPermissions("ttmoldingequip:tt_molding_equip:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + ttMoldingEquipService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "模温机设备管理-批量删除") + @ApiOperation(value="模温机设备管理-批量删除", notes="模温机设备管理-批量删除") + //@RequiresPermissions("ttmoldingequip:tt_molding_equip:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.ttMoldingEquipService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "模温机设备管理-通过id查询") + @ApiOperation(value="模温机设备管理-通过id查询", notes="模温机设备管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TtMoldingEquip ttMoldingEquip = ttMoldingEquipService.getById(id); + if(ttMoldingEquip==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(ttMoldingEquip); + } + + /** + * 导出excel + * + * @param request + * @param ttMoldingEquip + */ + //@RequiresPermissions("ttmoldingequip:tt_molding_equip:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TtMoldingEquip ttMoldingEquip) { + return super.exportXls(request, ttMoldingEquip, TtMoldingEquip.class, "模温机设备管理"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("ttmoldingequip:tt_molding_equip:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TtMoldingEquip.class); + } + +} diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/entity/TtMoldTemperatureEquip.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/entity/TtMoldingEquip.java similarity index 52% rename from linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/entity/TtMoldTemperatureEquip.java rename to linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/entity/TtMoldingEquip.java index 88d930b..0f04d78 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/entity/TtMoldTemperatureEquip.java +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/entity/TtMoldingEquip.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.ttmoldtemperatureequip.entity; +package org.jeecg.modules.demo.ttmoldingequip.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -17,52 +17,66 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: tt_mold_temperature_equip + * @Description: 模温机设备管理 * @Author: jeecg-boot - * @Date: 2023-02-14 + * @Date: 2023-04-17 * @Version: V1.0 */ @Data -@TableName("tt_mold_temperature_equip") +@TableName("tt_molding_equip") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="tt_mold_temperature_equip对象", description="tt_mold_temperature_equip") -public class TtMoldTemperatureEquip implements Serializable { +@ApiModel(value="tt_molding_equip对象", description="模温机设备管理") +public class TtMoldingEquip implements Serializable { private static final long serialVersionUID = 1L; /**id*/ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.AUTO) @ApiModelProperty(value = "id") - private Integer id; - /**模温机设备编号，只有1和2两种值*/ - @Excel(name = "模温机设备编号", width = 15) - @ApiModelProperty(value = "模温机设备编号，只有1和2两种值") - private String eqtNo; - /**描述*/ - @Excel(name = "描述", width = 15) - @TableField(exist = false) - private String descr; + private java.lang.Integer id; + /**设备编号*/ + @Excel(name = "设备编号", width = 15) + @ApiModelProperty(value = "设备编号") + private java.lang.String eqtNo; + /**设备Ip*/ + @Excel(name = "设备Ip", width = 15) + @ApiModelProperty(value = "设备Ip") + private java.lang.String eqtIp; /**温度*/ @Excel(name = "温度", width = 15) @ApiModelProperty(value = "温度") - private BigDecimal moldTemperature; + private java.math.BigDecimal temperature; /**记录的创建时间*/ - @Excel(name = "采集时间", width = 15, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "记录的创建时间") - private Date createTime; + private java.util.Date createTime; /**记录的创建人，默认admin*/ @ApiModelProperty(value = "记录的创建人，默认admin") - private String createBy; + private java.lang.String createBy; /**记录的修改时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "记录的修改时间") - private Date updateTime; + private java.util.Date updateTime; /**记录的修改人，修改人员的登录账号*/ @ApiModelProperty(value = "记录的修改人，修改人员的登录账号") - private String updateBy; + private java.lang.String updateBy; + + + @ApiModelProperty(value = "设备状态") + @TableField(exist = false) + private Integer eqtStatus; + + @ApiModelProperty(value = "设备近7天使用率") + @TableField(exist = false) + private BigDecimal utilizeRate; + @ApiModelProperty(value = "设备描述") + @TableField(exist = false) + private String descr; + @ApiModelProperty(value = "设备位置") + @TableField(exist = false) + private String location; } diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/mapper/TtMoldingEquipMapper.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/mapper/TtMoldingEquipMapper.java new file mode 100644 index 0000000..b02d472 --- /dev/null +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/mapper/TtMoldingEquipMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.ttmoldingequip.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.ttmoldingequip.entity.TtMoldingEquip; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 模温机设备管理 + * @Author: jeecg-boot + * @Date: 2023-04-17 + * @Version: V1.0 + */ +public interface TtMoldingEquipMapper extends BaseMapper { + +} diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/mapper/xml/TtMoldTemperatureEquipMapper.xml b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/mapper/xml/TtMoldingEquipMapper.xml similarity index 56% rename from linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/mapper/xml/TtMoldTemperatureEquipMapper.xml rename to linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/mapper/xml/TtMoldingEquipMapper.xml index c86df0f..6013251 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/mapper/xml/TtMoldTemperatureEquipMapper.xml +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/mapper/xml/TtMoldingEquipMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/ITtMoldingEquipService.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/ITtMoldingEquipService.java new file mode 100644 index 0000000..8e5db0a --- /dev/null +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/ITtMoldingEquipService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.ttmoldingequip.service; + +import org.jeecg.modules.demo.ttmoldingequip.entity.TtMoldingEquip; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 模温机设备管理 + * @Author: jeecg-boot + * @Date: 2023-04-17 + * @Version: V1.0 + */ +public interface ITtMoldingEquipService extends IService { + +} diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/impl/TtMoldingEquipServiceImpl.java b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/impl/TtMoldingEquipServiceImpl.java new file mode 100644 index 0000000..44cc8d8 --- /dev/null +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/service/impl/TtMoldingEquipServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.ttmoldingequip.service.impl; + +import org.jeecg.modules.demo.ttmoldingequip.entity.TtMoldingEquip; +import org.jeecg.modules.demo.ttmoldingequip.mapper.TtMoldingEquipMapper; +import org.jeecg.modules.demo.ttmoldingequip.service.ITtMoldingEquipService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 模温机设备管理 + * @Author: jeecg-boot + * @Date: 2023-04-17 + * @Version: V1.0 + */ +@Service +public class TtMoldingEquipServiceImpl extends ServiceImpl implements ITtMoldingEquipService { + +} diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/TtMoldTemperatureEquipList.vue b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/TtMoldingEquipList.vue similarity index 67% rename from linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/TtMoldTemperatureEquipList.vue rename to linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/TtMoldingEquipList.vue index 72b03dc..0b265c9 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/TtMoldTemperatureEquipList.vue +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/TtMoldingEquipList.vue @@ -4,28 +4,6 @@
- - - - - - - - - - - - - - - 查询 - 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - - -
@@ -34,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -111,7 +89,7 @@
- + @@ -120,17 +98,17 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import TtMoldTemperatureEquipModal from './modules/TtMoldTemperatureEquipModal' + import TtMoldingEquipModal from './modules/TtMoldingEquipModal' export default { - name: 'TtMoldTemperatureEquipList', + name: 'TtMoldingEquipList', mixins:[JeecgListMixin, mixinDevice], components: { - TtMoldTemperatureEquipModal + TtMoldingEquipModal }, data () { return { - description: 'tt_mold_temperature_equip管理页面', + description: '模温机设备管理管理页面', // 表头 columns: [ { @@ -144,14 +122,19 @@ } }, { - title:'温度', + title:'设备编号', align:"center", - dataIndex: 'moldTemperature' + dataIndex: 'eqtNo' }, { - title:'模温机设备编号，只有1和2两种值', + title:'设备Ip', align:"center", - dataIndex: 'eqtNo' + dataIndex: 'eqtIp' + }, + { + title:'温度', + align:"center", + dataIndex: 'temperature' }, { title:'记录的创建时间', @@ -171,11 +154,11 @@ } ], url: { - list: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/list", - delete: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/delete", - deleteBatch: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/deleteBatch", - exportXlsUrl: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/exportXls", - importExcelUrl: "ttmoldtemperatureequip/ttMoldTemperatureEquip/importExcel", + list: "/ttmoldingequip/ttMoldingEquip/list", + delete: "/ttmoldingequip/ttMoldingEquip/delete", + deleteBatch: "/ttmoldingequip/ttMoldingEquip/deleteBatch", + exportXlsUrl: "/ttmoldingequip/ttMoldingEquip/exportXls", + importExcelUrl: "ttmoldingequip/ttMoldingEquip/importExcel", }, dictOptions:{}, @@ -195,8 +178,9 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'BigDecimal',value:'moldTemperature',text:'温度',dictCode:''}) - fieldList.push({type:'string',value:'eqtNo',text:'模温机设备编号，只有1和2两种值',dictCode:''}) + fieldList.push({type:'string',value:'eqtNo',text:'设备编号',dictCode:''}) + fieldList.push({type:'string',value:'eqtIp',text:'设备Ip',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''}) fieldList.push({type:'date',value:'createTime',text:'记录的创建时间'}) this.superFieldList = fieldList } diff --git a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/TtMoldTemperatureEquip_menu_insert.sql b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/TtMoldingEquip_menu_insert.sql similarity index 53% rename from linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/TtMoldTemperatureEquip_menu_insert.sql rename to linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/TtMoldingEquip_menu_insert.sql index ac1d03a..9901d67 100644 --- a/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldtemperatureequip/vue/TtMoldTemperatureEquip_menu_insert.sql +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/TtMoldingEquip_menu_insert.sql @@ -1,26 +1,26 @@ --- 注意：该页面对应的前台目录为views/ttmoldtemperatureequip文件夹下 +-- 注意：该页面对应的前台目录为views/ttmoldingequip文件夹下 -- 如果你想更改到其他目录，请修改sql中component字段对应的值 INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) -VALUES ('2023021404033310470', NULL, 'tt_mold_temperature_equip', '/ttmoldtemperatureequip/ttMoldTemperatureEquipList', 'ttmoldtemperatureequip/TtMoldTemperatureEquipList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-02-14 16:03:47', NULL, NULL, 0); +VALUES ('2023041703392350320', NULL, '模温机设备管理', '/ttmoldingequip/ttMoldingEquipList', 'ttmoldingequip/TtMoldingEquipList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0); -- 权限控制sql -- 新增 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023021404033310471', '2023021404033310470', '添加tt_mold_temperature_equip', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldtemperatureequip:tt_mold_temperature_equip:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-02-14 16:03:47', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350321', '2023041703392350320', '添加模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 编辑 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023021404033310472', '2023021404033310470', '编辑tt_mold_temperature_equip', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldtemperatureequip:tt_mold_temperature_equip:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-02-14 16:03:47', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350322', '2023041703392350320', '编辑模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 删除 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023021404033320473', '2023021404033310470', '删除tt_mold_temperature_equip', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldtemperatureequip:tt_mold_temperature_equip:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-02-14 16:03:47', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350323', '2023041703392350320', '删除模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 批量删除 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023021404033320474', '2023021404033310470', '批量删除tt_mold_temperature_equip', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldtemperatureequip:tt_mold_temperature_equip:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-02-14 16:03:47', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350324', '2023041703392350320', '批量删除模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 导出excel INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023021404033320475', '2023021404033310470', '导出excel_tt_mold_temperature_equip', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldtemperatureequip:tt_mold_temperature_equip:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-02-14 16:03:47', NULL, NULL, 0, 0, '1', 0); +VALUES ('2023041703392350325', '2023041703392350320', '导出excel_模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); -- 导入excel INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) -VALUES ('2023021404033320476', '2023021404033310470', '导入excel_tt_mold_temperature_equip', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldtemperatureequip:tt_mold_temperature_equip:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-02-14 16:03:47', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file +VALUES ('2023041703392350326', '2023041703392350320', '导入excel_模温机设备管理', NULL, NULL, 0, NULL, NULL, 2, 'ttmoldingequip:tt_molding_equip:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-04-17 15:39:32', NULL, NULL, 0, 0, '1', 0); \ No newline at end of file diff --git a/ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipForm.vue b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipForm.vue similarity index 61% rename from ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipForm.vue rename to linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipForm.vue index 131966c..e4da59e 100644 --- a/ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipForm.vue +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipForm.vue @@ -4,13 +4,23 @@ - - + + - - + + + + + + + + + + + + @@ -25,7 +35,7 @@ import { validateDuplicateValue } from '@/utils/util' export default { - name: 'TtMoldTemperatureEquipForm', + name: 'TtMoldingEquipForm', components: { }, props: { @@ -50,17 +60,20 @@ }, confirmLoading: false, validatorRules: { - moldTemperature: [ + eqtNo: [ + { required: true, message: '请输入设备编号!'}, + ], + temperature: [ { required: true, message: '请输入温度!'}, ], - // eqtNo: [ - // { required: true, message: '请输入模温机设备编号，只有1和2两种值!'}, - // ], + createTime: [ + { required: true, message: '请输入记录的创建时间!'}, + ], }, url: { - add: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/add", - edit: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/edit", - queryById: "/ttmoldtemperatureequip/ttMoldTemperatureEquip/queryById" + add: "/ttmoldingequip/ttMoldingEquip/add", + edit: "/ttmoldingequip/ttMoldingEquip/edit", + queryById: "/ttmoldingequip/ttMoldingEquip/queryById" } } }, @@ -107,7 +120,7 @@ that.confirmLoading = false; }) } - + }) }, } diff --git a/ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipModal.Style#Drawer.vue similarity index 84% rename from ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue rename to linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipModal.Style#Drawer.vue index 08dc124..876888a 100644 --- a/ant-design-vue/src/views/ttmoldtemperatureequip/modules/TtMoldTemperatureEquipModal.Style#Drawer.vue +++ b/linkage-boot/linkage-module-demo/src/main/java/org/jeecg/modules/demo/ttmoldingequip/vue/modules/TtMoldingEquipModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +
关闭 提交 @@ -17,12 +17,12 @@