mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-13 05:12:07 +08:00
1、系统管理配置列表改为不分页,自定义板编号筛选返回最大版本号;2、系统配置服务处理器抽象修改;3、新增自定义板编号相关feign服务;
This commit is contained in:
+26
@@ -0,0 +1,26 @@
|
||||
package com.cf.imes.module.system.api.customplateno;
|
||||
|
||||
import com.cf.imes.framework.common.pojo.CommonResult;
|
||||
import com.cf.imes.module.system.api.customplateno.dto.CustomPlateNoSeqRespDTO;
|
||||
import com.cf.imes.module.system.enums.ApiConstants;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
|
||||
/**
|
||||
* 自定义板编号序号feign接口
|
||||
*
|
||||
* @author Gqr
|
||||
* @since 2024/11/15 11:26
|
||||
*/
|
||||
@FeignClient(name = ApiConstants.NAME) // TODO 晨丰:fallbackFactory =
|
||||
@Tag(name = "RPC 服务 - 自定义板编号序号")
|
||||
public interface CustomPlateNoSeqApi {
|
||||
String PREFIX = ApiConstants.PREFIX + "/custom-plateno-seq";
|
||||
|
||||
@GetMapping(PREFIX + "/organ")
|
||||
@Operation(summary = "获取组织下自定义版编号序号")
|
||||
CommonResult<CustomPlateNoSeqRespDTO> getOrgCustomPlateNoSeq();
|
||||
}
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package com.cf.imes.module.system.api.customplateno.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Gqr
|
||||
* @since 2024/11/15 14:18
|
||||
*/
|
||||
@Schema(description = "RPC 服务 - 自定义板编号序号 Resp DTO")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class CustomPlateNoSeqRespDTO implements Serializable {
|
||||
private static final long serialVersionUID = -3415615478757941611L;
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 组织ID
|
||||
*/
|
||||
private Long organId;
|
||||
|
||||
/**
|
||||
* 规则ID
|
||||
*/
|
||||
private Long configId;
|
||||
|
||||
/**
|
||||
* 上次生产单号
|
||||
*/
|
||||
private Long lastOrderNo;
|
||||
|
||||
/**
|
||||
* 生产单序号前值
|
||||
*/
|
||||
private Integer orderNoSeq;
|
||||
|
||||
/**
|
||||
* 板序号前值
|
||||
*/
|
||||
private Integer plateNoSeq;
|
||||
|
||||
/**
|
||||
* 上次年
|
||||
*/
|
||||
private int lastYear;
|
||||
|
||||
/**
|
||||
* 上次月
|
||||
*/
|
||||
private int lastMonth;
|
||||
|
||||
/**
|
||||
* 上次天
|
||||
*/
|
||||
private int lastDay;
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.cf.imes.module.system.api.systemconfig;
|
||||
|
||||
import com.cf.imes.framework.common.pojo.CommonResult;
|
||||
import com.cf.imes.module.system.api.systemconfig.dto.SystemConfigRespDTO;
|
||||
import com.cf.imes.module.system.enums.ApiConstants;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
|
||||
|
||||
/**
|
||||
* 系统配置feign接口
|
||||
*
|
||||
* @author Gqr
|
||||
* @since 2024/11/15 11:26
|
||||
*/
|
||||
@FeignClient(name = ApiConstants.NAME) // TODO 晨丰:fallbackFactory =
|
||||
@Tag(name = "RPC 服务 - 系统配置")
|
||||
public interface SystemConfigApi {
|
||||
String PREFIX = ApiConstants.PREFIX + "/system-config";
|
||||
|
||||
@GetMapping(PREFIX + "/organ/custom-plateno-config")
|
||||
@Operation(summary = "获取组织下自定义版编号配置")
|
||||
CommonResult<SystemConfigRespDTO> getOrgCustomPlateNoConfig();
|
||||
|
||||
@GetMapping(PREFIX + "/organ/custom-plateno-config/{id}")
|
||||
@Operation(summary = "获取组织下自定义版编号配置")
|
||||
CommonResult<SystemConfigRespDTO> getById(Long id);
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.cf.imes.module.system.api.systemconfig.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 系统配置
|
||||
*
|
||||
* @author Gqr
|
||||
* @since 2024/11/7 16:12
|
||||
*/
|
||||
@Schema(description = "RPC 服务 - 系统配置 Resp DTO")
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SystemConfigRespDTO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1788458794035807655L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 配置项名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private int status;
|
||||
|
||||
/**
|
||||
* 配置类型
|
||||
*/
|
||||
private int type;
|
||||
|
||||
/**
|
||||
* 配置规则
|
||||
*/
|
||||
private String setting;
|
||||
|
||||
/**
|
||||
* 组织id
|
||||
*/
|
||||
private Long organId;
|
||||
}
|
||||
Reference in New Issue
Block a user