code生成修改
This commit is contained in:
		@@ -79,7 +79,7 @@ public class AlarmBaseController extends BaseController {
 | 
			
		||||
 | 
			
		||||
    @PostMapping(value = "codeGenerator")
 | 
			
		||||
    @ApiOperation(value = "编码生成")
 | 
			
		||||
    private String CodeGenerator(){
 | 
			
		||||
        return IDGenerator.gen("BJ", "yyyyMMddHHmm", 2, "ALARMBASE_CODE");
 | 
			
		||||
    private R<String> codeGenerator() {
 | 
			
		||||
        return successful(IDGenerator.gen("BJ", "yyyyMMddHHmm", 2, "ALARMBASE_CODE"));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -80,7 +80,7 @@ public class KilnInfoController extends BaseController {
 | 
			
		||||
 | 
			
		||||
    @PostMapping(value = "codeGenerator")
 | 
			
		||||
    @ApiOperation(value = "编码生成")
 | 
			
		||||
    private String CodeGenerator(){
 | 
			
		||||
        return IDGenerator.gen("YL", "yyyyMMddHHmm", 2, "KILN_CODE");
 | 
			
		||||
    private R<String> codeGenerator(){
 | 
			
		||||
        return successful(IDGenerator.gen("YL", "yyyyMMddHHmm", 2, "KILN_CODE"));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -78,8 +78,8 @@ public class LocationInfoController extends BaseController {
 | 
			
		||||
 | 
			
		||||
    @PostMapping(value = "codeGenerator")
 | 
			
		||||
    @ApiOperation(value = "编码生成")
 | 
			
		||||
    private String CodeGenerator(){
 | 
			
		||||
        return IDGenerator.gen("KW", "yyyyMMddHHmm", 2, "LOCATION_CODE");
 | 
			
		||||
    private R<String> codeGenerator(){
 | 
			
		||||
        return successful(IDGenerator.gen("KW", "yyyyMMddHHmm", 2, "LOCATION_CODE"));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -78,8 +78,8 @@ public class VehicleController extends BaseController {
 | 
			
		||||
 | 
			
		||||
    @PostMapping(value = "codeGenerator")
 | 
			
		||||
    @ApiOperation(value = "编码生成")
 | 
			
		||||
    private String CodeGenerator(){
 | 
			
		||||
        return IDGenerator.gen("CL", "yyyyMMddHHmm", 2, "VEHICLE_CODE");
 | 
			
		||||
    private R<String> codeGenerator(){
 | 
			
		||||
        return successful(IDGenerator.gen("CL", "yyyyMMddHHmm", 2, "VEHICLE_CODE"));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -80,7 +80,7 @@ public class WarehouseController extends BaseController {
 | 
			
		||||
 | 
			
		||||
    @PostMapping(value = "codeGenerator")
 | 
			
		||||
    @ApiOperation(value = "编码生成")
 | 
			
		||||
    private String CodeGenerator(){
 | 
			
		||||
        return IDGenerator.gen("HC", "yyyyMMddHHmm", 2, "WAREHOUSE_CODE");
 | 
			
		||||
    private R<String> codeGenerator(){
 | 
			
		||||
        return successful(IDGenerator.gen("HC", "yyyyMMddHHmm", 2, "WAREHOUSE_CODE"));
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -67,7 +67,7 @@ public class KilnInfoParam extends BaseParam {
 | 
			
		||||
     * 端口号
 | 
			
		||||
     */
 | 
			
		||||
    @ApiModelProperty(value = "端口号",  example = "8888")
 | 
			
		||||
    private String partNumber;
 | 
			
		||||
    private String portNumber;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 备注
 | 
			
		||||
 
 | 
			
		||||
@@ -79,4 +79,10 @@ public class WarehouseParam extends BaseParam {
 | 
			
		||||
     */
 | 
			
		||||
    @ApiModelProperty(value = "英文名称",required = true, example = "1")
 | 
			
		||||
    private Integer number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 状态		0初始化,1已占用
 | 
			
		||||
     */
 | 
			
		||||
    @ApiModelProperty(value = "状态",required = true, example = "1")
 | 
			
		||||
    private Integer status;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -61,7 +61,7 @@ public class KilnInfoVo  extends BaseVo implements PageVo.ConvertVo {
 | 
			
		||||
     * 端口号
 | 
			
		||||
     */
 | 
			
		||||
    @ApiModelProperty(value = "端口号",  example = "8888")
 | 
			
		||||
    private String partNumber;
 | 
			
		||||
    private String portNumber;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 状态	0初始化,1损坏
 | 
			
		||||
 
 | 
			
		||||
@@ -66,12 +66,18 @@ public class WarehouseVo extends BaseVo implements PageVo.ConvertVo{
 | 
			
		||||
    /**
 | 
			
		||||
     * 别名
 | 
			
		||||
     */
 | 
			
		||||
    @ApiModelProperty(value = "英文名称",example = "1")
 | 
			
		||||
    @ApiModelProperty(value = "别名",example = "1")
 | 
			
		||||
    private String aliasName;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 库位数量
 | 
			
		||||
     */
 | 
			
		||||
    @ApiModelProperty(value = "英文名称",example = "1")
 | 
			
		||||
    @ApiModelProperty(value = "库位数量",example = "1")
 | 
			
		||||
    private Integer number;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 状态		0初始化,1已占用
 | 
			
		||||
     */
 | 
			
		||||
    @ApiModelProperty(value = "状态", example = "1")
 | 
			
		||||
    private Integer status;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user