From 2a712c198ef14e08f265c9ef6c0438f2565402a7 Mon Sep 17 00:00:00 2001 From: lenovo <123> Date: Wed, 4 Jan 2023 18:42:22 +0800 Subject: [PATCH] =?UTF-8?q?2023-1-4=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/device/ZyDeviceList.vue | 33 ++++++++++++------- .../process/modules/ZyOperationtoolList.vue | 2 +- .../process/modules/ZyProcessActionList.vue | 2 +- .../process/modules/ZyProcessFabricList.vue | 2 +- .../process/modules/ZyProcessMachineList.vue | 2 +- .../views/process/modules/list/ZyMachine.vue | 2 +- .../demo/pro/entity/ZyProcessMachine.java | 2 +- .../pro/mapper/ZyProcessMachineMapper.java | 2 +- .../device/controller/ZyDeviceController.java | 17 ++++++++-- .../jeecg/modules/device/entity/ZyDevice.java | 33 +++++++++++++------ 10 files changed, 67 insertions(+), 30 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue b/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue index 337229fd..ae6f70a5 100644 --- a/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue +++ b/ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue @@ -130,6 +130,26 @@ return parseInt(index)+1; } }, + { + title:'设备类型', + align:"center", + dataIndex: 'typeCode_dictText' + }, + { + title:'设备型号', + align:"center", + dataIndex: 'modelId_dictText' + }, + { + title:'设备品牌', + align:"center", + dataIndex: 'brandId_dictText' + }, + { + title:'设备名称', + align:"center", + dataIndex: 'name' + }, { title:'设备图片', align:"center", @@ -139,14 +159,10 @@ { title:'设备二维码', align:"center", - dataIndex: 'erweima', + dataIndex: 'qrcode', scopedSlots: {customRender: 'imgeSlot'} }, - { - title:'设备类型', - align:"center", - dataIndex: 'typeid_dictText' - }, + { title:'设备编号', align:"center", @@ -165,11 +181,6 @@ align:"center", dataIndex: 'agent_dictText' }, - { - title:'存放位置', - align:"center", - dataIndex: 'adress' - }, { title:'设备状态', align:"center", diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue index 9f62c1b2..32409666 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue @@ -12,7 +12,7 @@ 查询 - + 重置 diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue index e1b67cad..e652faba 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue @@ -12,7 +12,7 @@ 查询 - + 重置 diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue index 864275d0..db8a05bd 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue @@ -17,7 +17,7 @@ 查询 - + 重置 diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue index 8f2eff00..38c212bb 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue @@ -17,7 +17,7 @@ 查询 - + 重置 diff --git a/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue b/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue index 37f100ac..0dedd3d0 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue @@ -142,7 +142,7 @@ // } ], url: { - list: "/devicetype/zyDevicetype/list1", + list: "/device/zyDevice/list1", importExcelUrl: "base/zyClothAction/importExcel", }, diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java index 70f8a171..02bc86ef 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java @@ -41,7 +41,7 @@ public class ZyProcessMachine implements Serializable { private String processId; /**机器*/ @Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") - @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") + @Dict(dictTable = "zy_device", dicText = "name", dicCode = "id") @ApiModelProperty(value = "机器") private String machineId; /**创建时间*/ diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java index 6518595e..d6a2a5ff 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java @@ -21,6 +21,6 @@ public interface ZyProcessMachineMapper extends BaseMapper { @Select("") IPage page(Page page, @Param("p") String processId, @Param("m") String machineId); - @Select("") + @Select("") IPage page1(Page page, @Param("p") String s, @Param("m") String t); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java index 08872cc5..41ebe983 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java @@ -102,12 +102,25 @@ public class ZyDeviceController extends JeecgController queryPageList1(ZyDevice zyDevice, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) throws WriterException, IOException { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyDevice, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyDeviceService.page(page, queryWrapper); + return Result.OK(pageList); + } - /** + + /** * 添加 * * @param zyDevice diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java index 7b239682..889f74f0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java @@ -53,16 +53,16 @@ public class ZyDevice implements Serializable { private Date updateTime; /**所属部门*/ @ApiModelProperty(value = "所属部门") - private String sysOrgCode; + private String orgCode; /**设备图片*/ @Excel(name = "设备图片", width = 15) @ApiModelProperty(value = "设备图片") private String img; /**设备类型*/ - @Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") - @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") - @ApiModelProperty(value = "设备类型") - private String typeid; +// @Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id") +// @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") +// @ApiModelProperty(value = "设备类型") +// private String typeid; /**设备编号*/ @Excel(name = "设备编号", width = 15) @ApiModelProperty(value = "设备编号") @@ -79,9 +79,9 @@ public class ZyDevice implements Serializable { @ApiModelProperty(value = "经办人") private String agent; /**存放位置*/ - @Excel(name = "存放位置", width = 15) - @ApiModelProperty(value = "存放位置") - private String adress; +// @Excel(name = "存放位置", width = 15) +// @ApiModelProperty(value = "存放位置") +// private String adress; /**设备状态*/ @Excel(name = "设备状态", width = 15) @ApiModelProperty(value = "设备状态") @@ -89,11 +89,11 @@ public class ZyDevice implements Serializable { /**二维码*/ @Excel(name = "二维码", width = 15) @ApiModelProperty(value = "二维码") - private String erweima; + private String qrcode; /**维护周期*/ @Excel(name = "维护周期", width = 15) @ApiModelProperty(value = "维护周期") - private String maintenancecycle; + private Integer maintenancecycle; /**管理人*/ @Excel(name = "管理人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") @@ -109,4 +109,17 @@ public class ZyDevice implements Serializable { @Excel(name = "3d模型", width = 15) @ApiModelProperty(value = "3d模型") private String img3d; +// @Excel(name = "设备品牌", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") + @Dict(dictTable = "zy_devicebrand", dicText = "brand", dicCode = "id") + @ApiModelProperty(value = "设备品牌") + private String brandId; + @Dict(dictTable = "zy_devicemodel", dicText = "model", dicCode = "id") + @ApiModelProperty(value = "设备型号") + private String modelId; + @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id") + @ApiModelProperty(value = "设备类型") + private String typeCode; + + @ApiModelProperty(value = "设备名称") + private String name; }