设备台账导出+字典值新增sql

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java

@@ -95,9 +95,9 @@ public class EquipmentEntity extends BaseEntity {
 	@Schema(description = "规格型号")
 	private String macSpec;
 	/**
-	 * 服役状态;1、正常服役，2、暂停服役
+	 * 服役状态;1、正常服役，2、服役中，3、暂停服役
 	 */
-	@Schema(description = "服役状态;1、正常服役，2、暂停服役，3、暂停服役")
+	@Schema(description = "1、正常服役，2、服役中，3、暂停服役")
 	private Long used;
 	/**
 	 * RFID

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/EquipmentExcel.java

@@ -26,6 +26,7 @@
 package org.springblade.desk.device.pojo.excel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -52,12 +53,6 @@ public class EquipmentExcel implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * ID
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("ID")
-	private BigDecimal id;
 	/**
 	 * 设备编码
 	 */
@@ -83,29 +78,22 @@ public class EquipmentExcel implements Serializable {
 	@ExcelProperty("规格型号")
 	private String macSpec;
 	/**
-	 * 服役状态;1、正常服役，2、暂停服役
+	 * 服役状态;1、正常服役，2、服役中，3、暂停服役
 	 */
-	@ColumnWidth(20)
+	@ExcelIgnore
-	@ExcelProperty("服役状态;1、正常服役，2、暂停服役")
+	private Integer used;
-	private BigDecimal used;
 	/**
-	 * RFID
+	 * 服役状态名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("RFID")
+	@ExcelProperty("服役状态")
-	private String rfId;
+	private String usedName;
 	/**
 	 * 虚拟设备;1.是,   0.否
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("虚拟设备;1.是,   0.否")
+	@ExcelProperty("虚拟设备")
 	private String virtualMac;
-	/**
-	 * 是否对接;1.是,   0.否
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否对接;1.是,   0.否")
-	private String docking;
 	/**
 	 * 类别说明
 	 */
@@ -121,9 +109,9 @@ public class EquipmentExcel implements Serializable {
 	/**
 	 * 设备分类
 	 */
-	@ColumnWidth(20)
+//	@ColumnWidth(20)
-	@ExcelProperty("设备分类")
+//	@ExcelProperty("设备分类")
-	private String category;
+//	private String category;
 	/**
 	 * 设备ip
 	 */
@@ -136,16 +124,8 @@ public class EquipmentExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("设备分类")
 	private String categorys;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Long isDeleted;
-	/**
-	 * 是否已删除
-	 */
 	@ColumnWidth(20)
+
 	@ExcelProperty("附件链接")
 	private String attachLink;
 

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/pojo/enums/DictEnum.java

@@ -101,6 +101,10 @@ public enum DictEnum {
 	 * 工装状态
 	 */
 	WORKWEAR_STATUS("workwear_status"),
+	/**
+	 * 设备服役状态
+	 */
+	EQUIPMENT_USED("equipment_used"),
 	;
 
 	final String name;

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java

@@ -170,7 +170,7 @@ public class EquipmentController extends BladeController {
 	/**
 	 * 导出数据
 	 */
-	@IsAdmin
+//	@IsAdmin
 	@GetMapping("/export-equipment")
 	@ApiOperationSupport(order = 9)
 	@Operation(summary = "导出数据", description  = "传入equipment")

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java

@@ -33,6 +33,8 @@ import org.springblade.desk.device.pojo.vo.EquipmentStatusStatisticsVO;
 import org.springblade.desk.device.pojo.vo.EquipmentVO;
 import org.springblade.desk.device.mapper.EquipmentMapper;
 import org.springblade.desk.device.service.IEquipmentService;
+import org.springblade.system.cache.DictCache;
+import org.springblade.system.pojo.enums.DictEnum;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -72,9 +74,10 @@ public class EquipmentServiceImpl extends BaseServiceImpl<EquipmentMapper, Equip
 	@Override
 	public List<EquipmentExcel> exportEquipment(Wrapper<EquipmentEntity> queryWrapper) {
 		List<EquipmentExcel> equipmentList = baseMapper.exportEquipment(queryWrapper);
-		//equipmentList.forEach(equipment -> {
+		equipmentList.forEach(equipment -> {
-		//	equipment.setTypeName(DictCache.getValue(DictEnum.YES_NO, Equipment.getType()));
+			equipment.setUsedName(DictCache.getValue(DictEnum.EQUIPMENT_USED, equipment.getUsed()));
-		//});
+			equipment.setVirtualMac("1".equalsIgnoreCase(equipment.getVirtualMac()) ? "是" : "否");
+		});
 		return equipmentList;
 	}
 

doc/sql/mes/insert-260106.sql

@@ -7,3 +7,12 @@ Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK,
 values (2008068905799974913, 2008068723414859778, 'workwear_status', '2', '已绑定', 1, '已绑定', 0, 1, 0);
 Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED)
 values (2008068946371477506, 2008068723414859778, 'workwear_status', '3', '使用中', 2, '使用中', 0, 1, 0);
+
+Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED)
+values (2008364878937874434, 0, 'equipment_used', '-1', '设备服役状态', 1021, '设备服役状态', 0, 1, 0);
+Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED)
+values (2008364966972121090, 2008364878937874434, 'equipment_used', '1', '正常服役', 0, '正常服役', 0, 1, 0);
+Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED)
+values (2008365020491440129, 2008364878937874434, 'equipment_used', '2', '服役中', 1, '服役中', 0, 1, 0);
+Insert into BLADE_DICT (ID, PARENT_ID, CODE, DICT_KEY, DICT_VALUE, SORT, REMARK, IS_SEALED, STATUS, IS_DELETED)
+values (2008365080713256962, 2008364878937874434, 'equipment_used', '3', '暂停服役', 2, '暂停服役', 0, 1, 0);