根据数据字典将key值转换为value

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/AmosFeignService.java

@@ -25,7 +25,7 @@ public class AmosFeignService {
      * @param dictCode
      * @return
      */
-    public Object listDictionaryByDictCode(String dictCode) throws Exception {
+    public List<DictionarieValueModel> listDictionaryByDictCode(String dictCode) throws Exception {
         logger.info("===========>listDictionaryByDictCode方法请求参数：{}", dictCode);
         List<DictionarieValueModel> dictionaryModel;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorDto.java

@@ -70,7 +70,7 @@ public class ElevatorDto extends BaseEntity {
     private String category;
 
     @ApiModelProperty(value = "使用场所分类")
-    private String useSiteCategroy;
+    private String useSiteCategory;
 
     @ApiModelProperty(value = "电梯型号")
     private String model;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/MaintenanceUnitDto.java

@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("cb_maintenance_unit")
-@ApiModel(value="MaintenanceUnitDto", description="")
+@ApiModel(value = "MaintenanceUnitDto", description = "MaintenanceUnitDto")
 public class MaintenanceUnitDto extends BaseEntity {
     private static final long serialVersionUID = 1L;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/RescueStationDto.java

@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tcb_rescue_station")
-@ApiModel(value="RescueStationDto", description="")
+@ApiModel(value = "RescueStationDto", description = "RescueStationDto")
 public class RescueStationDto extends BaseEntity {
     private static final long serialVersionUID = 1L;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/UseUnitDto.java

@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tcb_use_unit")
-@ApiModel(value="UseUnitDto", description="")
+@ApiModel(value = "UseUnitDto", description = "UseUnitDto")
 public class UseUnitDto extends BaseEntity {
     private static final long serialVersionUID = 1L;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java

@@ -71,7 +71,7 @@ public class Elevator extends BaseEntity {
     private String category;
 
     @ApiModelProperty(value = "使用场所分类")
-    private String useSiteCategroy;
+    private String useSiteCategory;
 
     @ApiModelProperty(value = "电梯型号")
     private String model;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/MaintenanceUnit.java

@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("cb_maintenance_unit")
-@ApiModel(value="MaintenanceUnit对象", description="")
+@ApiModel(value = "MaintenanceUnit对象", description = "MaintenanceUnit对象")
 public class MaintenanceUnit extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/RescueStation.java

@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tcb_rescue_station")
-@ApiModel(value="RescueStation对象", description="")
+@ApiModel(value = "RescueStation对象", description = "RescueStation对象")
 public class RescueStation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/UseUnit.java

@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tcb_use_unit")
-@ApiModel(value="UseUnit对象", description="")
+@ApiModel(value = "UseUnit对象", description = "UseUnit对象")
 public class UseUnit extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/ElevatorVo.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -15,6 +16,7 @@ import lombok.experimental.Accessors;
  * @date 2021-06-01
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tcb_elevator")
 @ApiModel(value = "ElevatorVo", description = "ElevatorVo")
@@ -69,7 +71,7 @@ public class ElevatorVo extends BaseEntity {
     private String category;
 
     @ApiModelProperty(value = "使用场所分类")
-    private String useSiteCategroy;
+    private String useSiteCategory;
 
     @ApiModelProperty(value = "电梯型号")
     private String model;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/MaintenanceUnitVo.java

@@ -7,21 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("cb_maintenance_unit")
-@ApiModel(value="MaintenanceUnitVo", description="")
+@ApiModel(value = "MaintenanceUnitVo", description = "MaintenanceUnitVo")
 public class MaintenanceUnitVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/RescueStationVo.java

@@ -7,22 +7,17 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tcb_rescue_station")
-@ApiModel(value="RescueStationVo", description="")
-public class RescueStationVo extends BaseEntity{
+@ApiModel(value = "RescueStationVo", description = "RescueStationVo")
+public class RescueStationVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/UseUnitVo.java

@@ -7,22 +7,17 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-01
-*/
+ * @author tb
+ * @date 2021-06-01
+ */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("tcb_use_unit")
-@ApiModel(value="UseUnitVo", description="")
-public class UseUnitVo extends BaseEntity{
+@ApiModel(value = "UseUnitVo", description = "UseUnitVo")
+public class UseUnitVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -26,6 +26,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 电梯Api
@@ -96,7 +97,7 @@ public class ElevatorController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ElevatorVo selectById(@PathVariable Long id) {
         Elevator elevator = iElevatorService.getById(id);
-        return BeanDtoVoUtils.convert(elevator, ElevatorVo.class);
+        return BeanDtoVoUtils.convertElevatorEntityToVo(elevator);
     }
 
     /**
@@ -147,7 +148,7 @@ public class ElevatorController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iElevatorService.page(pageBean, elevatorQueryWrapper);
-        return BeanDtoVoUtils.iPageVoStream(page, ElevatorVo.class);
+        return BeanDtoVoUtils.elevatorIPageVo(page);
     }
 
     /**
@@ -194,7 +195,7 @@ public class ElevatorController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iElevatorService.page(pageBean, elevatorQueryWrapper);
-        return BeanDtoVoUtils.iPageVoStream(page, ElevatorVo.class);
+        return BeanDtoVoUtils.elevatorIPageVo(page);
     }
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/MaintenanceUnitController.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
 import com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitVo;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -20,6 +21,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -89,7 +91,7 @@ public class MaintenanceUnitController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public MaintenanceUnitVo selectById(@PathVariable Long id) {
         MaintenanceUnit maintenanceUnit = iMaintenanceUnitService.getById(id);
-        return BeanDtoVoUtils.convert(maintenanceUnit, MaintenanceUnitVo.class);
+        return BeanDtoVoUtils.convertMaintenanceUnitEntityToVo(maintenanceUnit);
     }
 
     /**
@@ -140,7 +142,7 @@ public class MaintenanceUnitController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iMaintenanceUnitService.page(pageBean, maintenanceUnitQueryWrapper);
-        return BeanDtoVoUtils.iPageVoStream(page, MaintenanceUnitVo.class);
+        return BeanDtoVoUtils.maintenanceUnitIPageVo(page);
     }
 
     /**
@@ -188,7 +190,7 @@ public class MaintenanceUnitController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iMaintenanceUnitService.page(pageBean, maintenanceUnitQueryWrapper);
-        return BeanDtoVoUtils.iPageVoStream(page, MaintenanceUnitVo.class);
+        return BeanDtoVoUtils.maintenanceUnitIPageVo(page);
     }
 }
 

amos-boot-tzs-system/src/main/resources/application.properties

 spring.application.name=SPECIAL-EQUIPMENT
 server.port=10000
 spring.profiles.active=dev
+server.servlet.context-path=/specialEquipment
\ No newline at end of file