Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 416ab249 由 孙克
选项

重构layer

1 个父辈 0f6bd5c3
全部展开
内嵌 并排
正在显示 327 个修改的文件 包含 410 行增加 和 954 行删除
.gitignore
...@@ -31,4 +31,4 @@ build/ ...@@ -31,4 +31,4 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
!/src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java !/src/main/java/com/neotel/smfcore/businessServices/order/rest/OrderController.java
README.md
...@@ -245,8 +245,8 @@ String chineseMessage = messageSource.getMessage( ...@@ -245,8 +245,8 @@ String chineseMessage = messageSource.getMessage(
### 8.3 商务合作 ### 8.3 商务合作
如需商务合作或定制化需求，请联系： 如需商务合作或定制化需求，请联系：
- 邮箱：business@smf-core.com - 邮箱：business@neotel.tech
- 电话：+86-XXX-XXXXXXXX - 电话：+86-13651614238
--- ---
......
docs/architecture.md
# SMF Core 架构文档
## 1. 系统概述
SMF Core 是一个模块化设计的核心服务框架，采用分层架构模式，提供了灵活、可扩展的数据访问和业务处理能力。本文档描述了框架的整体架构设计、主要组件及其交互关系。
## 2. 架构层次
SMF Core 框架采用经典的分层架构，从上到下依次为：
1. **接口层 (API Layer)**
- 提供对外的服务接口
- 处理请求路由和参数验证
2. **业务逻辑层 (Service Layer)**
- 实现核心业务逻辑
- 协调各组件之间的交互
3. **对象映射层 (Mapper Layer)**
- 负责DTO和Entity之间的转换
- 简化数据传输和对象关系映射
4. **数据访问层 (DAO Layer)**
- 提供数据持久化和检索功能
- 封装数据库操作细节
5. **基础设施层 (Infrastructure Layer)**
- 提供通用工具和辅助功能
- 包括国际化、日志、配置管理等
## 3. 核心组件
### 3.1 AbstractBaseDao
抽象基础数据访问对象，提供MongoDB数据操作的核心实现：
- **主要功能**：
- 通用CRUD操作
- 分页查询支持
- 多条件查询
- 数据排序和过滤
- **设计特点**：
- 使用泛型支持不同类型的实体
- 提供可扩展的查询接口
- 内置事务支持
### 3.2 BaseMapper
对象映射框架，提供DTO和Entity对象间的转换功能：
- **主要功能**：
- 单个对象转换
- 集合对象批量转换
- 支持自定义转换规则
- **设计特点**：
- 接口式设计，便于实现和扩展
- 类型安全的转换方法
- 支持null值处理
### 3.3 国际化支持组件
提供多语言国际化功能的核心组件：
- **主要功能**：
- 多语言消息资源管理
- 动态语言切换
- 支持语言地区设置
- **设计特点**：
- 基于Spring MessageSource构建
- 支持属性文件和JSON格式的资源文件
- 缓存优化的消息检索
### 3.4 日志记录系统
统一的日志管理组件：
- **主要功能**：
- 多级日志记录
- 自定义日志格式
- 日志轮转和归档
- **设计特点**：
- 基于Log4j2实现
- 支持多种输出目标
- 异步日志处理
## 4. 组件交互
### 4.1 数据流程
系统处理请求的数据流程如下：
1. 客户端发起请求到API层
2. API层进行参数验证并调用相应Service
3. Service层执行业务逻辑，必要时调用Mapper进行对象转换
4. Service层通过DAO层与数据库交互
5. DAO层执行数据操作并返回结果
6. 结果沿调用链返回给客户端
### 4.2 依赖关系
各核心组件之间的依赖关系：
- Service组件依赖Mapper和DAO组件
- Mapper组件作为独立功能，不依赖其他核心组件
- DAO组件依赖基础设施层提供的工具类
- 所有组件共享国际化和日志系统
## 5. 扩展性设计
### 5.1 接口扩展
框架提供了多个扩展点，允许用户自定义功能：
- 自定义Repository：继承AbstractBaseDao实现特定的数据访问需求
- 自定义Mapper：实现BaseMapper接口提供特定的对象转换逻辑
- 自定义转换器：实现Converter接口支持复杂对象转换
### 5.2 配置扩展
支持多种配置方式：
- JSON配置文件
- Spring环境变量
- 注解配置
- 运行时动态配置
## 6. 性能考量
### 6.1 缓存策略
- 多级缓存设计
- 查询结果缓存
- 配置缓存
- 对象转换缓存
### 6.2 并发处理
- 线程安全设计
- 异步操作支持
- 并行查询优化
## 7. 安全设计
### 7.1 数据安全
- 敏感数据加密
- 输入验证和净化
- 防SQL注入保护
### 7.2 访问控制
- 基于角色的权限控制
- 细粒度的API访问限制
- 操作审计日志
---
*最后更新时间：2024年*
\ No newline at end of file \ No newline at end of file
# SMF Core 项目架构设计
## 概述
SMF Core 是一个智能物料管理系统的核心组件，采用多层架构设计，提供了完整的物料追踪、仓储管理、设备集成和业务流程支持功能。
## 系统架构
### 1. 分层架构
SMF Core 采用经典的四层架构设计：
```
┌─────────────────────────────────────────────┐
│ integrations │
│ (外部系统和设备集成层) │
├─────────────────────────────────────────────┤
│ api-gateway │
│ (API网关层/请求处理层) │
├─────────────────────────────────────────────┤
│ business-services │
│ (业务服务逻辑层) │
├─────────────────────────────────────────────┤
│ smf-platform │
│ (核心平台基础设施) │
├─────────────────────────────────────────────┤
│ shared │
│ (共享基础组件层) │
└─────────────────────────────────────────────┘
```
### 2. 各层职责
#### 2.1 integrations 层
- 外部系统集成接口
- 客户定制化实现
- 设备适配器
- 第三方系统对接
#### 2.2 api-gateway 层
- REST API 接口定义
- 请求参数验证
- 响应格式化
- 权限控制
#### 2.3 business-services 层
- 业务逻辑实现
- 业务规则处理
- 数据验证
- 工作流协调
#### 2.4 smf-platform 层
- 核心平台功能
- 系统配置管理
- 数据访问层
- 缓存机制
#### 2.5 shared 层
- 工具类
- 通用模型
- 异常处理
- 常量定义
## 核心模块
### 1. 物料管理 (Material Management)
- 条码识别与解析
- 物料追踪
- 批次管理
- 生命周期控制
### 2. 仓储管理 (Warehouse Management)
- 库位分配
- 库存控制
- 物料上架/下架
- 库位状态管理
### 3. 设备集成 (Device Integration)
- AGV调度
- 料仓控制系统
- 条码扫描器
- 温湿度监控设备
### 4. 工单管理 (Order Management)
- 工单接收与处理
- 工单状态追踪
- 物料需求分析
- 工单完成确认
## 技术栈
- **后端框架**: Spring Boot
- **数据存储**: MongoDB, MySQL
- **消息队列**: WebSocket
- **缓存**: Redis
- **API规范**: RESTful
- **认证授权**: Spring Security
## 依赖关系
系统各层之间采用单向依赖原则：
- integrations 层可以访问 business-services 层
- api-gateway 层可以访问 business-services 和 smf-platform 层
- business-services 层只能访问 smf-platform 和 shared 层
- smf-platform 层只能访问 shared 层
- shared 层不依赖任何其他层
## 扩展性设计
1. **模块化设计**: 各功能模块高度内聚，低耦合
2. **插件机制**: 支持通过插件扩展系统功能
3. **配置驱动**: 核心逻辑通过配置文件控制，无需修改代码
4. **事件驱动**: 采用事件机制实现模块间通信
## 部署架构
系统支持多种部署模式：
1. **单体应用部署**: 适合小型应用场景
2. **微服务部署**: 适合大规模应用场景
3. **容器化部署**: 支持Docker和Kubernetes
## 性能优化
1. **缓存策略**: 多级缓存机制
2. **异步处理**: 关键操作异步化
3. **数据分片**: 大数据量分片存储
4. **连接池管理**: 优化数据库连接
## 安全设计
1. **认证与授权**: 基于角色的访问控制
2. **数据加密**: 敏感数据加密存储
3. **接口安全**: API接口签名验证
4. **日志审计**: 操作日志完整记录
\ No newline at end of file \ No newline at end of file
docs/faq.md deleted 100644 → 0
# SMF Core 常见问题解答 (FAQ)
本文档汇总了使用SMF Core框架时常见的问题和解决方案，帮助开发者快速解决使用过程中遇到的困难。
## 1. 安装与配置问题
### 1.1 如何更改MongoDB连接设置？
**解答**：在`src/main/resources/smfcore.json`文件中修改数据库连接配置：
```json
{
"database": {
"mongo": {
"uri": "mongodb://username:password@host:port/database",
"connections": 20, // 连接池大小
"maxWaitTime": 15000 // 最大等待时间(毫秒)
}
}
}
```
### 1.2 如何更改服务端口？
**解答**：可以通过以下几种方式修改：
1. 在`smfcore.json`中设置：
```json
{
"service": {
"port": 8081
}
}
```
2. 通过环境变量：
```bash
export SMF_SERVICE_PORT=8081
```
3. 通过JVM参数：
```bash
java -jar smf-core.jar --smf.service.port=8081
```
### 1.3 如何启用日志调试模式？
**解答**：修改`smfcore.json`中的日志级别：
```json
{
"logging": {
"level": "DEBUG"
}
}
```
或者在`log4j2-spring.xml`中针对特定包设置更低的日志级别：
```xml
<Logger name="com.example.mysmfproject" level="DEBUG" additivity="false">
<AppenderRef ref="Console"/>
</Logger>
```
## 2. 数据访问问题
### 2.1 如何使用AbstractBaseDao进行复杂查询？
**解答**：可以使用Spring Data MongoDB的Query对象进行复杂查询：
```java
// 创建查询对象
Query query = new Query();
// 添加条件
query.addCriteria(Criteria.where("status").is("ACTIVE"));
query.addCriteria(Criteria.where("createdDate").gte(startDate).lte(endDate));
// 添加排序
query.with(Sort.by(Sort.Direction.DESC, "createdDate"));
// 执行查询
List<MyEntity> results = myDao.findByQuery(query);
```
### 2.2 如何处理分页查询？
**解答**：使用Pageable对象进行分页：
```java
// 创建分页请求
Pageable pageable = PageRequest.of(0, 10); // 第1页，每页10条
// 执行分页查询
List<MyEntity> entities = myDao.findByQuery(query, pageable);
// 获取总数
long totalCount = myDao.countByQuery(query);
```
### 2.3 如何处理数据库事务？
**解答**：SMF Core支持Spring的事务管理，在Service方法上添加`@Transactional`注解：
```java
@Service
public class UserService {
@Autowired
private UserDao userDao;
@Transactional
public void updateUserAndLogActivity(UserDto userDto) {
// 更新用户信息
UserEntity user = userDao.findById(userDto.getId());
user.setName(userDto.getName());
userDao.save(user);
// 记录操作日志
// 如果这里发生异常，前面的用户更新也会回滚
logActivity(user.getId(), "UPDATE");
}
}
```
## 3. 对象映射问题
### 3.1 BaseMapper接口的方法名与实现不一致怎么办？
**解答**：确保实现类正确实现了BaseMapper接口中定义的方法：
```java
// 正确的方法名是toEntity和toDto，不是dtoToEntity和entityToDto
public interface UserMapper extends BaseMapper<UserDto, UserEntity> {
}
@Component
class UserMapperImpl implements UserMapper {
@Override
public UserEntity toEntity(UserDto dto) {
// 实现代码
}
@Override
public UserDto toDto(UserEntity entity) {
// 实现代码
}
// 实现其他必需的方法...
}
```
### 3.2 如何处理null参数的情况？
**解答**：在实现类中添加null检查：
```java
@Override
public UserEntity toEntity(UserDto dto) {
if (dto == null) {
return null;
}
// 正常转换逻辑
}
```
调用时也可以添加类型转换避免歧义：
```java
UserEntity entity = mapper.toEntity((UserDto) null);
```
### 3.3 如何实现复杂的对象转换逻辑？
**解答**：在实现类中添加自定义转换逻辑：
```java
@Override
public UserEntity toEntity(UserDto dto) {
if (dto == null) return null;
UserEntity entity = new UserEntity();
entity.setId(dto.getId());
entity.setName(dto.getName());
// 复杂转换 - 例如枚举值转换
entity.setUserType(UserType.valueOf(dto.getUserType().toUpperCase()));
// 复杂转换 - 处理嵌套对象
if (dto.getAddress() != null) {
AddressEntity address = new AddressEntity();
address.setStreet(dto.getAddress().getStreet());
address.setCity(dto.getAddress().getCity());
entity.setAddress(address);
}
return entity;
}
```
## 4. 国际化问题
### 4.1 如何添加新的语言支持？
**解答**：
1. 在`src/main/resources/`目录下创建语言文件，例如`messages_en_US.properties`
2. 在`smfcore.json`中添加新语言到支持列表：
```json
{
"i18n": {
"defaultLocale": "zh_CN",
"supportedLocales": ["zh_CN", "en_US", "ja_JP"] // 添加新语言
}
}
```
### 4.2 如何动态切换语言？
**解答**：可以使用Spring的LocaleContextHolder来设置当前线程的语言环境：
```java
@RestController
public class LanguageController {
@GetMapping("/setLanguage")
public String setLanguage(@RequestParam String lang) {
Locale locale;
switch (lang) {
case "en": locale = Locale.US; break;
case "ja": locale = Locale.JAPAN; break;
default: locale = Locale.SIMPLIFIED_CHINESE;
}
LocaleContextHolder.setLocale(locale);
return "Language set to: " + lang;
}
}
```
## 5. 测试问题
### 5.1 如何模拟DAO层进行单元测试？
**解答**：使用Mockito来模拟DAO操作：
```java
@RunWith(MockitoJUnitRunner.class)
public class UserServiceTest {
@Mock
private UserDao userDao;
@Mock
private UserMapper userMapper;
@InjectMocks
private UserService userService;
@Test
public void testGetUserById() {
// 准备测试数据
String userId = "123";
UserEntity mockEntity = new UserEntity();
mockEntity.setId(userId);
mockEntity.setName("Test User");
UserDto expectedDto = new UserDto();
expectedDto.setId(userId);
expectedDto.setName("Test User");
// 设置模拟行为
when(userDao.findById(userId)).thenReturn(mockEntity);
when(userMapper.toDto(mockEntity)).thenReturn(expectedDto);
// 测试方法
UserDto result = userService.getUserById(userId);
// 验证结果
assertEquals(userId, result.getId());
assertEquals("Test User", result.getName());
// 验证交互
verify(userDao).findById(userId);
verify(userMapper).toDto(mockEntity);
}
}
```
### 5.2 如何测试AbstractBaseDao的方法？
**解答**：可以使用@DataMongoTest注解和嵌入式MongoDB进行集成测试：
```java
@DataMongoTest
public class UserDaoTest {
@Autowired
private UserDao userDao;
@Test
public void testSaveAndFindById() {
// 创建测试实体
UserEntity user = new UserEntity();
user.setName("Test User");
// 保存实体
user = userDao.save(user);
assertNotNull(user.getId());
// 查询并验证
UserEntity foundUser = userDao.findById(user.getId());
assertNotNull(foundUser);
assertEquals("Test User", foundUser.getName());
}
}
```
## 6. 性能优化问题
### 6.1 如何优化数据库查询性能？
**解答**：
1. **使用索引**：为常用查询字段创建索引
2. **限制返回字段**：只查询需要的字段
3. **使用分页**：避免一次性返回大量数据
4. **使用批量操作**：对多条记录的操作使用批量API
### 6.2 如何配置连接池以获得最佳性能？
**解答**：在`smfcore.json`中调整连接池参数：
```json
{
"database": {
"mongo": {
"connections": 30, // 根据并发需求调整
"maxWaitTime": 15000, // 连接等待超时
"connectionTimeout": 10000 // 连接建立超时
}
}
}
```
### 6.3 如何缓存常用数据？
**解答**：SMF Core支持Spring Cache，可以在Service方法上添加缓存注解：
```java
@Service
@EnableCaching
public class ProductService {
@Cacheable(value = "products", key = "#id")
public ProductDto getProductById(String id) {
// 这里的代码只会在缓存未命中时执行
return productDao.findById(id).map(productMapper::toDto).orElse(null);
}
@CacheEvict(value = "products", key = "#productDto.id")
public ProductDto updateProduct(ProductDto productDto) {
// 更新操作会清除对应缓存
// ...
}
}
```
## 7. 部署与维护问题
### 7.1 如何在生产环境部署SMF Core应用？
**解答**：
1. **构建可执行JAR**：
```bash
mvn clean package
```
2. **准备配置文件**：为生产环境准备专用配置文件
3. **使用系统服务**：配置为systemd服务或其他进程管理工具
4. **使用容器化部署**：创建Dockerfile并部署到Kubernetes
### 7.2 如何监控SMF Core应用的运行状态？
**解答**：SMF Core可以集成Spring Boot Actuator提供监控端点：
1. 添加依赖
2. 配置端点暴露
3. 集成Prometheus和Grafana等监控工具
### 7.3 如何进行健康检查？
**解答**：实现Spring的HealthIndicator接口：
```java
@Component
public class DatabaseHealthIndicator implements HealthIndicator {
@Autowired
private MongoTemplate mongoTemplate;
@Override
public Health health() {
try {
// 检查数据库连接
mongoTemplate.getDb().runCommand(new Document("ping", 1));
return Health.up().withDetail("database", "MongoDB is healthy").build();
} catch (Exception e) {
return Health.down().withException(e).build();
}
}
}
```
---
如果您遇到的问题在此FAQ中未得到解答，请联系技术支持团队获取进一步帮助。
---
*最后更新时间：2024年*
\ No newline at end of file \ No newline at end of file
docs/migration-guide.md deleted 100644 → 0
# SMF Core 迁移指南
本文档提供了SMF Core框架版本升级的迁移指南，帮助开发者顺利完成从旧版本到新版本的过渡。
## 从0.1.0版本迁移到1.0.0版本
### 1. 依赖升级
**Spring Boot版本升级**
确保在`pom.xml`中更新Spring Boot版本：
```xml
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.x</version> <!-- 或更新版本 -->
<relativePath/>
</parent>
```
### 2. BaseMapper接口使用变更
**方法命名调整**
在1.0.0版本中，BaseMapper接口的方法名称更加规范化，请确保您的实现类正确实现了新的方法名称：
**0.1.0版本（旧）**:
```java
public interface UserMapper {
UserEntity dtoToEntity(UserDto dto);
UserDto entityToDto(UserEntity entity);
List<UserEntity> dtosToEntities(List<UserDto> dtos);
List<UserDto> entitiesToDtos(List<UserEntity> entities);
}
```
**1.0.0版本（新）**:
```java
public interface UserMapper extends BaseMapper<UserDto, UserEntity> {
// 方法名称变为toEntity、toDto等
// 实现BaseMapper接口中的所有方法
}
```
### 3. null参数处理
1.0.0版本修复了BaseMapper接口在处理null参数时的类型歧义问题。在调用接口方法传递null值时，建议添加明确的类型转换以避免潜在的问题：
```java
// 推荐的方式
UserEntity entity = mapper.toEntity((UserDto) null);
UserDto dto = mapper.toDto((UserEntity) null);
```
### 4. 配置文件结构变更
配置文件`smfcore.json`的结构在1.0.0版本中更加规范化：
**1.0.0版本配置文件示例**:
```json
{
"database": {
"mongo": {
"uri": "mongodb://username:password@host:port/database",
"connections": 20,
"maxWaitTime": 15000
}
},
"service": {
"port": 8080,
"contextPath": "/api"
},
"logging": {
"level": "INFO",
"file": "logs/smf-core.log"
},
"i18n": {
"defaultLocale": "zh_CN",
"supportedLocales": ["zh_CN", "en_US"]
}
}
```
请根据上述格式调整您的配置文件。
### 5. 包结构变更
1.0.0版本调整了部分包结构，确保您的导入语句正确更新为新的包路径：
**0.1.0版本（旧）**:
```java
import com.smf.core.dao.BaseDao;
import com.smf.core.mapper.ObjectMapper;
```
**1.0.0版本（新）**:
```java
import com.smf.core.dao.AbstractBaseDao;
import com.smf.core.mapper.BaseMapper;
```
### 6. 异常处理方式变更
1.0.0版本实现了统一的异常处理机制，请使用新的异常类型：
```java
// 使用新的异常类
throw new ServiceException("业务处理失败", ErrorCode.BUSINESS_ERROR);
```
### 7. 测试代码调整
BaseMapperTest类中修复了null参数处理，在您自己的测试类中也应做相应调整：
```java
@Test
public void testToEntityWithNull() {
assertNull(mapper.toEntity((TestDto) null));
}
```
## 迁移建议
1. **增量迁移**：建议分模块、分批次进行迁移，而不是一次性迁移所有内容
2. **全面测试**：每次迁移后进行全面的单元测试、集成测试和回归测试
3. **备份**：在开始迁移前，确保对项目代码和配置文件进行完整备份
4. **查阅API文档**：详细了解新版本中的API变更，避免使用已废弃的方法
## 迁移常见问题
### 编译错误：找不到方法或类
**解决方法**：检查包路径和方法名称是否已按新版本要求更新，确认导入语句正确。
### 运行时错误：类型转换异常
**解决方法**：特别注意null参数的处理，添加明确的类型转换。
### 配置无法加载
**解决方法**：检查配置文件结构是否符合新版本要求，确保所有必要的配置项都已正确设置。
---
如果在迁移过程中遇到其他问题，请参考项目文档或联系技术支持团队获取进一步帮助。
---
*最后更新时间：2024年*
\ No newline at end of file \ No newline at end of file
logs/smf.txt 0 → 100644
此文件的差异太大，无法显示。
pom.xml
...@@ -41,6 +41,12 @@ ...@@ -41,6 +41,12 @@
</profile> </profile>
</profiles> </profiles>
<dependencies> <dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>
...@@ -248,11 +254,20 @@ ...@@ -248,11 +254,20 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.java-websocket</groupId> <groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId> <artifactId>Java-WebSocket</artifactId>
<version>1.3.8</version> <version>1.3.8</version>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.5.1</version> <!-- 请使用与mockito-core匹配的版本 -->
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
...@@ -366,4 +381,18 @@ set "JAVA_OPTS=%JAVA_OPTS% -javaagent:classfinal-fatjar.jar='-nopwd'" ...@@ -366,4 +381,18 @@ set "JAVA_OPTS=%JAVA_OPTS% -javaagent:classfinal-fatjar.jar='-nopwd'"
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>aliyunmaven</id>
<name>阿里云公共仓库</name>
<url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project> </project>
\ No newline at end of file \ No newline at end of file
src/main/java/com/neotel/smfcore/SmfCoreApplication.java
package com.neotel.smfcore; package com.neotel.smfcore;
import com.neotel.smfcore.common.config.CustomConfigLoader; import com.neotel.smfcore.shared.config.CustomConfigLoader;
import com.neotel.smfcore.security.annotation.AnonymousGetMapping; import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousGetMapping;
import com.neotel.smfcore.common.utils.SpringContextHolder; import com.neotel.smfcore.shared.utils.SpringContextHolder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
......
src/main/java/com/neotel/smfcore/apiGateway/agv/AgvController.java
package com.neotel.smfcore.smfPlatform.agv; package com.neotel.smfcore.apiGateway.agv;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.smfPlatform.agv.util.AgvCache; import com.neotel.smfcore.apiGateway.agv.util.AgvCache;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
src/main/java/com/neotel/smfcore/apiGateway/agv/bean/AgvInfo.java
package com.neotel.smfcore.smfPlatform.agv.bean; package com.neotel.smfcore.apiGateway.agv.bean;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/agv/util/AgvCache.java
package com.neotel.smfcore.smfPlatform.agv.util; package com.neotel.smfcore.apiGateway.agv.util;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/bean/BoxStatusBean.java
package com.neotel.smfcore.apiGateway.device.bean; package com.neotel.smfcore.apiGateway.device.common.bean;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import lombok.Data; import lombok.Data;
import java.util.HashMap; import java.util.HashMap;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/bean/MsgInfo.java
package com.neotel.smfcore.apiGateway.device.bean; package com.neotel.smfcore.apiGateway.device.common.bean;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/bean/PosInfo.java
package com.neotel.smfcore.apiGateway.device.bean; package com.neotel.smfcore.apiGateway.device.common.bean;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/bean/StatusBean.java
package com.neotel.smfcore.apiGateway.device.bean; package com.neotel.smfcore.apiGateway.device.common.bean;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.smfPlatform.language.util.MessageUtils; import com.neotel.smfcore.smfPlatform.language.util.MessageUtils;
import com.neotel.smfcore.smfPlatform.message.enums.MessageType; import com.neotel.smfcore.smfPlatform.message.enums.MessageType;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/bean/VirtualOperateBean.java
package com.neotel.smfcore.apiGateway.device.bean; package com.neotel.smfcore.apiGateway.device.common.bean;
import com.neotel.smfcore.businessServices.storage.service.po.StoragePos; import com.neotel.smfcore.businessServices.storage.service.po.StoragePos;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/enums/BOX_STATUS.java
package com.neotel.smfcore.apiGateway.device.enums; package com.neotel.smfcore.apiGateway.device.common.enums;
/** /**
* Created by sunke on 2021/7/13. * Created by sunke on 2021/7/13.
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/enums/OP.java
package com.neotel.smfcore.apiGateway.device.enums; package com.neotel.smfcore.apiGateway.device.common.enums;
/** /**
* 操作码（0无操作（发送料仓状态给服务器），1扫码入库(扫码成功后发送给服务器)，2 出库（服务器发送） ） * 操作码（0无操作（发送料仓状态给服务器），1扫码入库(扫码成功后发送给服务器)，2 出库（服务器发送） ）
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/enums/OP_STATUS.java
package com.neotel.smfcore.apiGateway.device.enums; package com.neotel.smfcore.apiGateway.device.common.enums;
/** /**
* 操作状态 * 操作状态
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/handler/IDeviceHandler.java
package com.neotel.smfcore.apiGateway.device.handler; package com.neotel.smfcore.apiGateway.device.common.handler;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.apiGateway.device.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/handler/impl/BaseDeviceHandler.java
package com.neotel.smfcore.apiGateway.device.handler.impl; package com.neotel.smfcore.apiGateway.device.common.handler.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.apiGateway.device.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
import com.neotel.smfcore.apiGateway.device.bean.MsgInfo; import com.neotel.smfcore.apiGateway.device.common.bean.MsgInfo;
import com.neotel.smfcore.apiGateway.device.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.handler.IDeviceHandler;
import com.neotel.smfcore.apiGateway.device.handler.IDeviceHandler; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
import com.neotel.smfcore.shared.utils.ReelLockPosUtil; import com.neotel.smfcore.shared.utils.ReelLockPosUtil;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/rest/DeviceController.java
package com.neotel.smfcore.apiGateway.device.rest; package com.neotel.smfcore.apiGateway.device.common.rest;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/rest/DualPosNameDeviceController.java
package com.neotel.smfcore.apiGateway.device.rest; package com.neotel.smfcore.apiGateway.device.common.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/rest/VideoController.java
package com.neotel.smfcore.apiGateway.device.rest; package com.neotel.smfcore.apiGateway.device.common.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
......
src/main/java/com/neotel/smfcore/apiGateway/device/common/util/DataCache.java
package com.neotel.smfcore.shared.util; package com.neotel.smfcore.apiGateway.device.common.util;
import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
......
src/main/java/com/neotel/smfcore/apiGateway/device/duo/DUOBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.duo;
import com.neotel.smfcore.apiGateway.device.xlr.XLRBoxHandler;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -8,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -8,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
@Api(tags = "DUO料仓") @Api(tags = "DUO料仓")
@RestController @RestController
@Slf4j @Slf4j
public class DUOBoxHandler extends XLRBoxHandler{ public class DUOBoxHandler extends XLRBoxHandler {
@Override @Override
public DeviceType getDeviceType() { public DeviceType getDeviceType() {
return DeviceType.SMD_DUO; return DeviceType.SMD_DUO;
......
src/main/java/com/neotel/smfcore/apiGateway/device/lineBox/LineBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.lineBox;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.businessServices.storage.service.po.Storage; import com.neotel.smfcore.businessServices.storage.service.po.Storage;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -11,7 +12,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -11,7 +12,7 @@ import javax.servlet.http.HttpServletRequest;
@Service @Service
@Slf4j @Slf4j
public class LineBoxHandler extends BaseDeviceHandler { public class LineBoxHandler extends BaseDeviceHandler {
@Override @Override
public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) { public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
......
src/main/java/com/neotel/smfcore/apiGateway/device/mimo/handler/MimoBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.mimo.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
......
src/main/java/com/neotel/smfcore/apiGateway/device/mimo/handler/MimoG2BoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.mimo.handler;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
......
src/main/java/com/neotel/smfcore/apiGateway/device/mimo/handler/MimoG3BoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.mimo.handler;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.businessServices.storage.service.po.Storage; import com.neotel.smfcore.businessServices.storage.service.po.Storage;
import com.neotel.smfcore.businessServices.storage.service.po.StoragePos; import com.neotel.smfcore.businessServices.storage.service.po.StoragePos;
...@@ -26,7 +28,7 @@ import java.util.Map; ...@@ -26,7 +28,7 @@ import java.util.Map;
@Api(tags = "MIMOG3: 批量料仓(竖屏界面)增加压力传感器，灯带") @Api(tags = "MIMOG3: 批量料仓(竖屏界面)增加压力传感器，灯带")
@Service @Service
@Slf4j @Slf4j
public class MimoG3BoxHandler extends BaseDeviceHandler{ public class MimoG3BoxHandler extends BaseDeviceHandler {
@Override @Override
public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) { public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
String cid = statusBean.getCid(); String cid = statusBean.getCid();
......
src/main/java/com/neotel/smfcore/apiGateway/device/mimo/rest/SmdBoxMimoController.java
package com.neotel.smfcore.smfPlatform.dashboard.mimo; package com.neotel.smfcore.apiGateway.device.mimo.rest;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUnit;
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/bean/NLShelfOperateBean.java
package com.neotel.smfcore.apiGateway.device.common.bean; package com.neotel.smfcore.apiGateway.device.neoLight.bean;
import com.neotel.smfcore.businessServices.storage.service.po.StoragePos; import com.neotel.smfcore.businessServices.storage.service.po.StoragePos;
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/AccShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.utils.StringUtils; import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR; import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
...@@ -13,7 +15,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -13,7 +15,7 @@ import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.*; import java.util.*;
@Slf4j @Slf4j
public class AccShelfHandler extends BaseDeviceHandler{ public class AccShelfHandler extends BaseDeviceHandler {
@Override @Override
public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) { public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/NLLShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.apiGateway.device.common.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/NLMShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
...@@ -39,7 +41,7 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -39,7 +41,7 @@ import java.util.concurrent.ConcurrentHashMap;
@Api(tags = "SHELF: NLM(移动料架/自动推荐库位/合并库位)") @Api(tags = "SHELF: NLM(移动料架/自动推荐库位/合并库位)")
@RestController @RestController
@Slf4j @Slf4j
public class NLMShelfHandler extends BaseDeviceHandler { public class NLMShelfHandler extends BaseDeviceHandler {
@Autowired @Autowired
private TokenProvider tokenProvider; private TokenProvider tokenProvider;
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/NLPShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.SecurityUtils; import com.neotel.smfcore.shared.utils.SecurityUtils;
...@@ -10,7 +12,7 @@ import com.neotel.smfcore.shared.utils.StringUtils; ...@@ -10,7 +12,7 @@ import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.integrations.apiInteraction.api.bean.CodeValidateParam; import com.neotel.smfcore.integrations.apiInteraction.api.bean.CodeValidateParam;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.smfPlatform.message.enums.MessageType; import com.neotel.smfcore.smfPlatform.message.enums.MessageType;
import com.neotel.smfcore.smfPlatform.message.service.manager.IMessageManager; import com.neotel.smfcore.smfPlatform.message.service.manager.IMessageManager;
import com.neotel.smfcore.smfPlatform.message.service.po.Message; import com.neotel.smfcore.smfPlatform.message.service.po.Message;
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/NLSMShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.utils.StringUtils; import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR; import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
...@@ -20,7 +22,7 @@ import java.util.*; ...@@ -20,7 +22,7 @@ import java.util.*;
@Api(tags = "SHELF: NLSM(推荐库位钢网料架)") @Api(tags = "SHELF: NLSM(推荐库位钢网料架)")
@Slf4j @Slf4j
@Service @Service
public class NLSMShelfHandler extends BaseDeviceHandler{ public class NLSMShelfHandler extends BaseDeviceHandler {
@Override @Override
public DeviceType getDeviceType() { public DeviceType getDeviceType() {
return DeviceType.NLSM; return DeviceType.NLSM;
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/NLSShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.utils.StringUtils; import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR; import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.smfPlatform.system.bean.OrderSetting; import com.neotel.smfcore.smfPlatform.system.bean.OrderSetting;
...@@ -18,7 +20,7 @@ import java.util.*; ...@@ -18,7 +20,7 @@ import java.util.*;
@Api(tags = "SHELF: NLS(扫码钢网料架)") @Api(tags = "SHELF: NLS(扫码钢网料架)")
@Slf4j @Slf4j
@Service @Service
public class NLSShelfHandler extends BaseDeviceHandler{ public class NLSShelfHandler extends BaseDeviceHandler {
@Override @Override
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/NLShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.SecurityUtils; import com.neotel.smfcore.shared.utils.SecurityUtils;
import com.neotel.smfcore.shared.utils.StringUtils; import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.integrations.apiInteraction.api.bean.CodeValidateParam; import com.neotel.smfcore.integrations.apiInteraction.api.bean.CodeValidateParam;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.apiGateway.device.common.bean.NLShelfOperateBean; import com.neotel.smfcore.apiGateway.device.neoLight.bean.NLShelfOperateBean;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.businessServices.inList.util.InListCache; import com.neotel.smfcore.businessServices.inList.util.InListCache;
import com.neotel.smfcore.smfPlatform.language.util.MessageUtils; import com.neotel.smfcore.smfPlatform.language.util.MessageUtils;
import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR; import com.neotel.smfcore.businessServices.order.enums.ORDER_COLOR;
......
src/main/java/com/neotel/smfcore/apiGateway/device/neoLight/handler/SensorShelfHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.neoLight.handler;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.smfPlatform.security.TokenProvider; import com.neotel.smfcore.smfPlatform.security.TokenProvider;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
......
src/main/java/com/neotel/smfcore/apiGateway/device/robotBox/RobotBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.robotBox;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
...@@ -10,6 +10,7 @@ import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS; ...@@ -10,6 +10,7 @@ import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
......
src/main/java/com/neotel/smfcore/apiGateway/device/siso/handler/SisoBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.siso.handler;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.businessServices.storage.service.po.Storage; import com.neotel.smfcore.businessServices.storage.service.po.Storage;
import com.neotel.smfcore.smfPlatform.system.util.DevicesStatusUtil; import com.neotel.smfcore.smfPlatform.system.util.DevicesStatusUtil;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/dto/SpBoxDto.java
package com.neotel.smfcore.apiGateway.device.rest.dto; package com.neotel.smfcore.apiGateway.device.sp.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/dto/SpBoxStatusDto.java
package com.neotel.smfcore.smfPlatform.dashboard.bean.dto.sp; package com.neotel.smfcore.apiGateway.device.sp.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/dto/SpSettingsDto.java
package com.neotel.smfcore.apiGateway.device.rest.dto; package com.neotel.smfcore.apiGateway.device.sp.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/dto/SpTaskDto.java
package com.neotel.smfcore.apiGateway.device.rest.dto; package com.neotel.smfcore.apiGateway.device.sp.dto;
import com.neotel.smfcore.businessServices.barcode.enums.SOLDER_STATUS; import com.neotel.smfcore.businessServices.barcode.enums.SOLDER_STATUS;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/dto/mapstruct/SpSettingsMapper.java
package com.neotel.smfcore.apiGateway.device.common.bean.mapstruct; package com.neotel.smfcore.apiGateway.device.sp.dto.mapstruct;
import com.neotel.smfcore.apiGateway.device.sp.dto.SpSettingsDto; import com.neotel.smfcore.apiGateway.device.sp.dto.SpSettingsDto;
import com.neotel.smfcore.shared.base.BaseMapper; import com.neotel.smfcore.shared.base.BaseMapper;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/handler/SpBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.sp.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.ReelLockPosUtil; import com.neotel.smfcore.shared.utils.ReelLockPosUtil;
...@@ -18,9 +21,7 @@ import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; ...@@ -18,9 +21,7 @@ import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.businessServices.barcode.service.po.Component; import com.neotel.smfcore.businessServices.barcode.service.po.Component;
import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.businessServices.storage.service.po.Storage; import com.neotel.smfcore.businessServices.storage.service.po.Storage;
import com.neotel.smfcore.businessServices.storage.service.po.StoragePos; import com.neotel.smfcore.businessServices.storage.service.po.StoragePos;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/handler/SpDeviceController.java
package com.neotel.smfcore.apiGateway.device.rest; package com.neotel.smfcore.apiGateway.device.sp.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.shared.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.businessServices.storage.service.manager.IStoragePosManager; import com.neotel.smfcore.businessServices.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.businessServices.storage.service.po.Storage; import com.neotel.smfcore.businessServices.storage.service.po.Storage;
import com.neotel.smfcore.businessServices.storage.service.po.StoragePos; import com.neotel.smfcore.businessServices.storage.service.po.StoragePos;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/rest/SpBoxController.java
package com.neotel.smfcore.businessServices.solder.rest; package com.neotel.smfcore.apiGateway.device.sp.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
...@@ -16,9 +16,9 @@ import com.neotel.smfcore.businessServices.barcode.service.manager.IComponentMan ...@@ -16,9 +16,9 @@ import com.neotel.smfcore.businessServices.barcode.service.manager.IComponentMan
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.businessServices.barcode.service.po.Component; import com.neotel.smfcore.businessServices.barcode.service.po.Component;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.smfPlatform.language.util.MessageUtils; import com.neotel.smfcore.smfPlatform.language.util.MessageUtils;
import com.neotel.smfcore.apiGateway.device.rest.dto.SpTaskDto; import com.neotel.smfcore.apiGateway.device.sp.dto.SpTaskDto;
import com.neotel.smfcore.businessServices.storage.enums.CHECKOUT_TYPE; import com.neotel.smfcore.businessServices.storage.enums.CHECKOUT_TYPE;
import com.neotel.smfcore.businessServices.storage.rest.dto.CheckOutDto; import com.neotel.smfcore.businessServices.storage.rest.dto.CheckOutDto;
import com.neotel.smfcore.businessServices.storage.rest.dto.InventoryItemDto; import com.neotel.smfcore.businessServices.storage.rest.dto.InventoryItemDto;
......
src/main/java/com/neotel/smfcore/apiGateway/device/sp/rest/SpSolderController.java
package com.neotel.smfcore.businessServices.solder.rest; package com.neotel.smfcore.apiGateway.device.sp.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
...@@ -16,12 +16,12 @@ import com.neotel.smfcore.businessServices.barcode.service.manager.IBarcodeManag ...@@ -16,12 +16,12 @@ import com.neotel.smfcore.businessServices.barcode.service.manager.IBarcodeManag
import com.neotel.smfcore.businessServices.barcode.service.manager.IComponentManager; import com.neotel.smfcore.businessServices.barcode.service.manager.IComponentManager;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.businessServices.barcode.service.po.Component; import com.neotel.smfcore.businessServices.barcode.service.po.Component;
import com.neotel.smfcore.apiGateway.device.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.smfPlatform.language.util.MessageUtils; import com.neotel.smfcore.smfPlatform.language.util.MessageUtils;
import com.neotel.smfcore.businessServices.production.msd.bean.MSDSettiings; import com.neotel.smfcore.businessServices.production.msd.bean.MSDSettiings;
import com.neotel.smfcore.businessServices.solder.bean.SpSettings; import com.neotel.smfcore.businessServices.solder.bean.SpSettings;
import com.neotel.smfcore.apiGateway.device.rest.dto.SpSettingsDto; import com.neotel.smfcore.apiGateway.device.sp.dto.SpSettingsDto;
import com.neotel.smfcore.apiGateway.device.common.bean.mapstruct.SpSettingsMapper; import com.neotel.smfcore.apiGateway.device.sp.dto.mapstruct.SpSettingsMapper;
import com.neotel.smfcore.businessServices.storage.rest.dto.CheckOutDto; import com.neotel.smfcore.businessServices.storage.rest.dto.CheckOutDto;
import com.neotel.smfcore.businessServices.storage.rest.dto.StoragePosDto; import com.neotel.smfcore.businessServices.storage.rest.dto.StoragePosDto;
import com.neotel.smfcore.businessServices.storage.rest.mapstruct.StoragePosMapper; import com.neotel.smfcore.businessServices.storage.rest.mapstruct.StoragePosMapper;
......
src/main/java/com/neotel/smfcore/apiGateway/device/tailingBox/TailingMaterialBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.tailingBox;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.utils.DateUtil; import com.neotel.smfcore.shared.utils.DateUtil;
import com.neotel.smfcore.shared.utils.SecurityUtils; import com.neotel.smfcore.shared.utils.SecurityUtils;
......
src/main/java/com/neotel/smfcore/apiGateway/device/thirdBox/ThirdBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.thirdBox;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
...@@ -7,6 +7,7 @@ import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; ...@@ -7,6 +7,7 @@ import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
import com.neotel.smfcore.shared.utils.ReelLockPosUtil; import com.neotel.smfcore.shared.utils.ReelLockPosUtil;
...@@ -26,7 +27,7 @@ import java.util.*; ...@@ -26,7 +27,7 @@ import java.util.*;
@Service @Service
@Slf4j @Slf4j
public class ThirdBoxHandler extends BaseDeviceHandler{ public class ThirdBoxHandler extends BaseDeviceHandler {
@Override @Override
......
src/main/java/com/neotel/smfcore/apiGateway/device/verticalBox/VerticalBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.verticalBox;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
...@@ -7,6 +7,7 @@ import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS; ...@@ -7,6 +7,7 @@ import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.utils.StorageConstants; import com.neotel.smfcore.shared.utils.StorageConstants;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.businessServices.storage.service.po.StoragePos; import com.neotel.smfcore.businessServices.storage.service.po.StoragePos;
......
src/main/java/com/neotel/smfcore/apiGateway/device/virtualBox/VirtualBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.virtualBox;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.SecurityUtils; import com.neotel.smfcore.shared.utils.SecurityUtils;
...@@ -35,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; ...@@ -35,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
@Api(tags = "BOX: 虚拟仓") @Api(tags = "BOX: 虚拟仓")
@RestController @RestController
@Slf4j @Slf4j
public class VirtualBoxHandler extends BaseDeviceHandler{ public class VirtualBoxHandler extends BaseDeviceHandler {
//上一次入库的库位,用于扫下一条码时灭灯 //上一次入库的库位,用于扫下一条码时灭灯
private static Map<String, VirtualOperateBean> devidePutInBeanMap = new ConcurrentHashMap<>(); private static Map<String, VirtualOperateBean> devidePutInBeanMap = new ConcurrentHashMap<>();
@Autowired @Autowired
......
src/main/java/com/neotel/smfcore/apiGateway/device/xlOne/XLROneBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.xlOne;
import com.neotel.smfcore.apiGateway.device.xlr.XLRBoxHandler;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@Slf4j @Slf4j
public class XLROneBoxHandler extends XLRBoxHandler{ public class XLROneBoxHandler extends XLRBoxHandler {
@Override @Override
public DeviceType getDeviceType() { public DeviceType getDeviceType() {
......
src/main/java/com/neotel/smfcore/apiGateway/device/xlOne/XlBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.xlOne;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.utils.StorageConstants; import com.neotel.smfcore.shared.utils.StorageConstants;
import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
......
src/main/java/com/neotel/smfcore/apiGateway/device/xlc/dto/XLCPosBarcodeDto.java
package com.neotel.smfcore.apiGateway.device.sp.dto; package com.neotel.smfcore.apiGateway.device.xlc.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
......
src/main/java/com/neotel/smfcore/apiGateway/device/xlc/dto/XLCPosDetailDto.java
package com.neotel.smfcore.apiGateway.device.sp.dto; package com.neotel.smfcore.apiGateway.device.xlc.dto;
import com.neotel.smfcore.apiGateway.device.xlc.dto.XLCPosBarcodeDto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
src/main/java/com/neotel/smfcore/apiGateway/device/xlc/handler/XLCBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.xlc.handler;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.shared.utils.QueryHelp; import com.neotel.smfcore.shared.utils.QueryHelp;
import com.neotel.smfcore.shared.utils.StorageConstants; import com.neotel.smfcore.shared.utils.StorageConstants;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.BoxStatusBean;
import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean; import com.neotel.smfcore.apiGateway.device.common.bean.StatusBean;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.sp.dto.XLCPosBarcodeDto; import com.neotel.smfcore.apiGateway.device.xlc.dto.XLCPosBarcodeDto;
import com.neotel.smfcore.apiGateway.device.sp.dto.XLCPosDetailDto; import com.neotel.smfcore.apiGateway.device.xlc.dto.XLCPosDetailDto;
import com.neotel.smfcore.businessServices.storage.enums.DeviceType; import com.neotel.smfcore.businessServices.storage.enums.DeviceType;
import com.neotel.smfcore.businessServices.storage.rest.mapstruct.StoragePosMapper; import com.neotel.smfcore.businessServices.storage.rest.mapstruct.StoragePosMapper;
import com.neotel.smfcore.businessServices.storage.rest.query.StoragePosQueryCriteria; import com.neotel.smfcore.businessServices.storage.rest.query.StoragePosQueryCriteria;
......
src/main/java/com/neotel/smfcore/apiGateway/device/xlr/XLRBoxHandler.java
package com.neotel.smfcore.apiGateway.device.common.handler.impl; package com.neotel.smfcore.apiGateway.device.xlr;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.common.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.apiGateway.device.common.handler.impl.BaseDeviceHandler;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/bean/EquipMsg.java
package com.neotel.smfcore.smfPlatform.equipment.bean; package com.neotel.smfcore.apiGateway.equipment.bean;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.smfPlatform.language.util.MessageUtils; import com.neotel.smfcore.smfPlatform.language.util.MessageUtils;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/bean/EquipStatusBean.java
package com.neotel.smfcore.smfPlatform.equipment.bean; package com.neotel.smfcore.apiGateway.equipment.bean;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.smfPlatform.message.enums.MessageType; import com.neotel.smfcore.smfPlatform.message.enums.MessageType;
import lombok.Data; import lombok.Data;
import lombok.ToString; import lombok.ToString;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/enums/EquipmentType.java
package com.neotel.smfcore.smfPlatform.equipment.enums; package com.neotel.smfcore.apiGateway.equipment.enums;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/handler/IEquipmentHandler.java
package com.neotel.smfcore.smfPlatform.equipment.handler; package com.neotel.smfcore.apiGateway.equipment.handler;
import com.neotel.smfcore.smfPlatform.equipment.bean.EquipStatusBean; import com.neotel.smfcore.apiGateway.equipment.bean.EquipStatusBean;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/handler/impl/BaseEquipHandler.java
package com.neotel.smfcore.smfPlatform.equipment.handler.impl; package com.neotel.smfcore.apiGateway.equipment.handler.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.apiGateway.agv.util.AgvCache; import com.neotel.smfcore.apiGateway.agv.util.AgvCache;
import com.neotel.smfcore.apiGateway.equipment.bean.EquipMsg;
import com.neotel.smfcore.apiGateway.equipment.bean.EquipStatusBean;
import com.neotel.smfcore.apiGateway.equipment.handler.IEquipmentHandler;
import com.neotel.smfcore.smfPlatform.dashboard.bean.dto.box.MesInfoDto; import com.neotel.smfcore.smfPlatform.dashboard.bean.dto.box.MesInfoDto;
import com.neotel.smfcore.smfPlatform.equipment.bean.EquipMsg; import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.smfPlatform.equipment.bean.EquipStatusBean;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType;
import com.neotel.smfcore.smfPlatform.equipment.handler.IEquipmentHandler;
import com.neotel.smfcore.smfPlatform.message.util.DeviceMessageUtil; import com.neotel.smfcore.smfPlatform.message.util.DeviceMessageUtil;
import com.neotel.smfcore.smfPlatform.system.util.EquipStatusUtil; import com.neotel.smfcore.smfPlatform.system.util.EquipStatusUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/EquipCommunicationController.java
package com.neotel.smfcore.smfPlatform.equipment.rest; package com.neotel.smfcore.apiGateway.equipment.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.apiGateway.equipment.bean.EquipStatusBean;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.utils.StringUtils; import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.smfPlatform.equipment.util.EquipmentCache; import com.neotel.smfcore.apiGateway.equipment.util.EquipmentCache;
import com.neotel.smfcore.smfPlatform.equipment.bean.EquipStatusBean; import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.handler.IEquipmentHandler;
import com.neotel.smfcore.smfPlatform.equipment.handler.IEquipmentHandler; import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousAccess; import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/EquipConfigController.java
package com.neotel.smfcore.smfPlatform.equipment.rest; package com.neotel.smfcore.apiGateway.equipment.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
import com.neotel.smfcore.shared.utils.HttpHelper; import com.neotel.smfcore.shared.utils.HttpHelper;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.EquipConfigInfoDto; import com.neotel.smfcore.apiGateway.equipment.rest.dto.EquipConfigInfoDto;
import com.neotel.smfcore.smfPlatform.equipment.rest.mapstruct.EquipConfigInfoMapper; import com.neotel.smfcore.apiGateway.equipment.rest.mapstruct.EquipConfigInfoMapper;
import com.neotel.smfcore.smfPlatform.equipment.util.EquipConfigUtil; import com.neotel.smfcore.apiGateway.equipment.util.EquipConfigUtil;
import com.neotel.smfcore.smfPlatform.equipment.util.bean.EquipConfigInfo; import com.neotel.smfcore.apiGateway.equipment.util.bean.EquipConfigInfo;
import com.neotel.smfcore.integrations.custom.hanwha.handler.TMSApis; import com.neotel.smfcore.integrations.custom.hanwha.handler.TMSApis;
import com.neotel.smfcore.integrations.custom.hanwha.handler.TMSCommunicator; import com.neotel.smfcore.integrations.custom.hanwha.handler.TMSCommunicator;
import com.neotel.smfcore.integrations.custom.panacim.PanaApiController; import com.neotel.smfcore.integrations.custom.panacim.PanaApiController;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/EquipViewController.java
package com.neotel.smfcore.smfPlatform.equipment.rest; package com.neotel.smfcore.apiGateway.equipment.rest;
import com.neotel.smfcore.apiGateway.equipment.bean.EquipStatusBean;
import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.apiGateway.equipment.rest.dto.EquipStatusDto;
import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.smfPlatform.dashboard.bean.dto.box.MesInfoDto; import com.neotel.smfcore.smfPlatform.dashboard.bean.dto.box.MesInfoDto;
import com.neotel.smfcore.apiGateway.device.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.rest.dto.EquipGroupDto;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.EquipGroupDto; import com.neotel.smfcore.apiGateway.equipment.rest.dto.EquipKanbanDto;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.EquipKanbanDto; import com.neotel.smfcore.apiGateway.equipment.rest.dto.NsViewDto;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.NsViewDto; import com.neotel.smfcore.apiGateway.equipment.util.EquipmentCache;
import com.neotel.smfcore.smfPlatform.equipment.util.EquipmentCache;
import com.neotel.smfcore.smfPlatform.equipment.bean.EquipStatusBean;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.EquipStatusDto;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import com.neotel.smfcore.smfPlatform.language.util.MessageUtils; import com.neotel.smfcore.smfPlatform.language.util.MessageUtils;
import com.neotel.smfcore.smfPlatform.system.util.EquipStatusUtil; import com.neotel.smfcore.smfPlatform.system.util.EquipStatusUtil;
import com.neotel.smfcore.integrations.custom.hanwha.handler.TMSCommunicator; import com.neotel.smfcore.integrations.custom.hanwha.handler.TMSCommunicator;
...@@ -123,7 +123,7 @@ public class EquipViewController { ...@@ -123,7 +123,7 @@ public class EquipViewController {
Locale locale=servletRequest.getLocale(); Locale locale=servletRequest.getLocale();
List<EquipStatusDto> resultList=new ArrayList<>(); List<EquipStatusDto> resultList=new ArrayList<>();
Map<String,Equipment> allEquipList= equipmentCache.getAllEquipment(); Map<String, Equipment> allEquipList= equipmentCache.getAllEquipment();
for (Equipment equip : for (Equipment equip :
allEquipList.values()) { allEquipList.values()) {
EquipStatusDto dto=new EquipStatusDto(equip.getId(),equip.getName(),equip.getCid(),false,0,"",equip.getType(),false); EquipStatusDto dto=new EquipStatusDto(equip.getId(),equip.getName(),equip.getCid(),false,0,"",equip.getType(),false);
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/EquipmentController.java
package com.neotel.smfcore.smfPlatform.equipment.rest; package com.neotel.smfcore.apiGateway.equipment.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.apiGateway.equipment.service.manager.IEquipmentManager;
import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.shared.bean.PageData; import com.neotel.smfcore.shared.bean.PageData;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.QueryHelp; import com.neotel.smfcore.shared.utils.QueryHelp;
import com.neotel.smfcore.shared.utils.SecurityUtils; import com.neotel.smfcore.shared.utils.SecurityUtils;
import com.neotel.smfcore.shared.utils.StringUtils; import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.rest.dto.EquipmentDto;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.EquipmentDto; import com.neotel.smfcore.apiGateway.equipment.rest.mapstruct.EquipmentMapper;
import com.neotel.smfcore.smfPlatform.equipment.rest.mapstruct.EquipmentMapper; import com.neotel.smfcore.apiGateway.equipment.rest.query.EquipmentQueryCriteria;
import com.neotel.smfcore.smfPlatform.equipment.rest.query.EquipmentQueryCriteria; import com.neotel.smfcore.apiGateway.equipment.util.EquipmentCache;
import com.neotel.smfcore.smfPlatform.equipment.service.manager.IEquipmentManager;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import com.neotel.smfcore.smfPlatform.equipment.util.EquipmentCache;
import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousAccess; import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/dto/EquipConfigInfoDto.java
package com.neotel.smfcore.smfPlatform.equipment.rest.dto; package com.neotel.smfcore.apiGateway.equipment.rest.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/dto/EquipGroupDto.java
package com.neotel.smfcore.smfPlatform.equipment.rest.dto; package com.neotel.smfcore.apiGateway.equipment.rest.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/dto/EquipKanbanDto.java
package com.neotel.smfcore.smfPlatform.equipment.rest.dto; package com.neotel.smfcore.apiGateway.equipment.rest.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/dto/EquipStatusDto.java
package com.neotel.smfcore.smfPlatform.equipment.rest.dto; package com.neotel.smfcore.apiGateway.equipment.rest.dto;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/dto/EquipmentDto.java
package com.neotel.smfcore.smfPlatform.equipment.rest.dto; package com.neotel.smfcore.apiGateway.equipment.rest.dto;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType; import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/dto/NsViewDto.java
package com.neotel.smfcore.smfPlatform.equipment.rest.dto; package com.neotel.smfcore.apiGateway.equipment.rest.dto;
import com.neotel.smfcore.apiGateway.equipment.bean.EquipMsg;
import com.neotel.smfcore.smfPlatform.dashboard.bean.dto.box.MesInfoDto; import com.neotel.smfcore.smfPlatform.dashboard.bean.dto.box.MesInfoDto;
import com.neotel.smfcore.smfPlatform.equipment.bean.EquipMsg;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/mapstruct/EquipConfigInfoMapper.java
package com.neotel.smfcore.smfPlatform.equipment.rest.mapstruct; package com.neotel.smfcore.apiGateway.equipment.rest.mapstruct;
import com.neotel.smfcore.shared.base.BaseMapper; import com.neotel.smfcore.shared.base.BaseMapper;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.EquipConfigInfoDto; import com.neotel.smfcore.apiGateway.equipment.rest.dto.EquipConfigInfoDto;
import com.neotel.smfcore.smfPlatform.equipment.util.bean.EquipConfigInfo; import com.neotel.smfcore.apiGateway.equipment.util.bean.EquipConfigInfo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/mapstruct/EquipmentMapper.java
package com.neotel.smfcore.smfPlatform.equipment.rest.mapstruct; package com.neotel.smfcore.apiGateway.equipment.rest.mapstruct;
import com.neotel.smfcore.apiGateway.equipment.rest.dto.EquipmentDto;
import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.shared.base.BaseMapper; import com.neotel.smfcore.shared.base.BaseMapper;
import com.neotel.smfcore.smfPlatform.equipment.rest.dto.EquipmentDto;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/rest/query/EquipmentQueryCriteria.java
package com.neotel.smfcore.smfPlatform.equipment.rest.query; package com.neotel.smfcore.apiGateway.equipment.rest.query;
import com.neotel.smfcore.shared.annotation.QueryCondition; import com.neotel.smfcore.shared.annotation.QueryCondition;
import com.neotel.smfcore.shared.bean.BetweenData; import com.neotel.smfcore.shared.bean.BetweenData;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/service/dao/IEquipmentDao.java
package com.neotel.smfcore.smfPlatform.equipment.service.dao; package com.neotel.smfcore.apiGateway.equipment.service.dao;
import com.neotel.smfcore.shared.base.IBaseDao; import com.neotel.smfcore.shared.base.IBaseDao;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/service/dao/impl/EquipmentDaoImpl.java
package com.neotel.smfcore.smfPlatform.equipment.service.dao.impl; package com.neotel.smfcore.apiGateway.equipment.service.dao.impl;
import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.shared.base.AbstractBaseDao; import com.neotel.smfcore.shared.base.AbstractBaseDao;
import com.neotel.smfcore.smfPlatform.equipment.service.dao.IEquipmentDao; import com.neotel.smfcore.apiGateway.equipment.service.dao.IEquipmentDao;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/service/manager/IEquipmentManager.java
package com.neotel.smfcore.smfPlatform.equipment.service.manager; package com.neotel.smfcore.apiGateway.equipment.service.manager;
import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.shared.base.IBaseManager; import com.neotel.smfcore.shared.base.IBaseManager;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import java.util.List; import java.util.List;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/service/manager/impl/EquipmentManagerImpl.java
package com.neotel.smfcore.smfPlatform.equipment.service.manager.impl; package com.neotel.smfcore.apiGateway.equipment.service.manager.impl;
import com.neotel.smfcore.apiGateway.equipment.service.dao.IEquipmentDao;
import com.neotel.smfcore.apiGateway.equipment.service.manager.IEquipmentManager;
import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.shared.bean.PageData; import com.neotel.smfcore.shared.bean.PageData;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.smfPlatform.equipment.service.dao.IEquipmentDao;
import com.neotel.smfcore.smfPlatform.equipment.service.manager.IEquipmentManager;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/service/po/Equipment.java
package com.neotel.smfcore.smfPlatform.equipment.service.po; package com.neotel.smfcore.apiGateway.equipment.service.po;
import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.shared.base.BasePo; import com.neotel.smfcore.shared.base.BasePo;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType;
import lombok.Data; import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
import java.io.Serializable; import java.io.Serializable;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/util/EquipConfigUtil.java
package com.neotel.smfcore.smfPlatform.equipment.util; package com.neotel.smfcore.apiGateway.equipment.util;
import com.neotel.smfcore.apiGateway.equipment.enums.EquipmentType;
import com.neotel.smfcore.apiGateway.equipment.util.bean.EquipConfigInfo;
import com.neotel.smfcore.shared.utils.Constants; import com.neotel.smfcore.shared.utils.Constants;
import com.neotel.smfcore.shared.utils.JsonUtil; import com.neotel.smfcore.shared.utils.JsonUtil;
import com.neotel.smfcore.apiGateway.device.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.smfPlatform.equipment.enums.EquipmentType;
import com.neotel.smfcore.smfPlatform.equipment.util.bean.EquipConfigInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/util/EquipmentCache.java
package com.neotel.smfcore.smfPlatform.equipment.util; package com.neotel.smfcore.apiGateway.equipment.util;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.neotel.smfcore.apiGateway.equipment.service.manager.IEquipmentManager;
import com.neotel.smfcore.apiGateway.equipment.service.po.Equipment;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.StringUtils; import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.smfPlatform.equipment.service.manager.IEquipmentManager;
import com.neotel.smfcore.smfPlatform.equipment.service.po.Equipment;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
......
src/main/java/com/neotel/smfcore/apiGateway/equipment/util/bean/EquipConfigInfo.java
package com.neotel.smfcore.smfPlatform.equipment.util.bean; package com.neotel.smfcore.apiGateway.equipment.util.bean;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
src/main/java/com/neotel/smfcore/apiGateway/humiture/bean/dto/HumitureDto.java
package com.neotel.smfcore.smfPlatform.humiture.rest.bean.dto; package com.neotel.smfcore.apiGateway.humiture.bean.dto;
import com.neotel.smfcore.shared.bean.PageData; import com.neotel.smfcore.shared.bean.PageData;
import com.neotel.smfcore.smfPlatform.system.service.po.Humiture; import com.neotel.smfcore.smfPlatform.system.service.po.Humiture;
......
src/main/java/com/neotel/smfcore/apiGateway/humiture/bean/query/HumitureQueryCriteria.java
package com.neotel.smfcore.smfPlatform.humiture.rest.bean.query; package com.neotel.smfcore.apiGateway.humiture.bean.query;
import com.neotel.smfcore.shared.annotation.QueryCondition; import com.neotel.smfcore.shared.annotation.QueryCondition;
import com.neotel.smfcore.shared.bean.BetweenData; import com.neotel.smfcore.shared.bean.BetweenData;
......
src/main/java/com/neotel/smfcore/apiGateway/humiture/rest/HumitureController.java
package com.neotel.smfcore.smfPlatform.humiture.rest; package com.neotel.smfcore.apiGateway.humiture.rest;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.shared.base.IExcelDownLoad; import com.neotel.smfcore.shared.base.IExcelDownLoad;
import com.neotel.smfcore.shared.bean.PageData; import com.neotel.smfcore.shared.bean.PageData;
import com.neotel.smfcore.shared.utils.*; import com.neotel.smfcore.shared.utils.*;
import com.neotel.smfcore.apiGateway.device.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.smfPlatform.humiture.rest.bean.dto.HumitureDto; import com.neotel.smfcore.apiGateway.humiture.bean.dto.HumitureDto;
import com.neotel.smfcore.smfPlatform.humiture.rest.bean.query.HumitureQueryCriteria; import com.neotel.smfcore.apiGateway.humiture.bean.query.HumitureQueryCriteria;
import com.neotel.smfcore.smfPlatform.language.util.MessageUtils; import com.neotel.smfcore.smfPlatform.language.util.MessageUtils;
import com.neotel.smfcore.smfPlatform.msd.bean.MSDSettiings; import com.neotel.smfcore.businessServices.production.msd.bean.MSDSettiings;
import com.neotel.smfcore.businessServices.solder.bean.SpSettings; import com.neotel.smfcore.businessServices.solder.bean.SpSettings;
import com.neotel.smfcore.businessServices.storage.service.po.Storage; import com.neotel.smfcore.businessServices.storage.service.po.Storage;
import com.neotel.smfcore.smfPlatform.system.service.manager.IHumitureManager; import com.neotel.smfcore.smfPlatform.system.service.manager.IHumitureManager;
......
src/main/java/com/neotel/smfcore/apiGateway/virtual/controller/VirtualOperateController.java
package com.neotel.smfcore.smfPlatform.virtual.controller; package com.neotel.smfcore.apiGateway.virtual.controller;
import com.neotel.smfcore.apiGateway.device.common.enums.OP_STATUS;
import com.neotel.smfcore.shared.bean.ResultBean; import com.neotel.smfcore.shared.bean.ResultBean;
import com.neotel.smfcore.shared.exception.ValidateException; import com.neotel.smfcore.shared.exception.ValidateException;
import com.neotel.smfcore.shared.utils.DateUtil; import com.neotel.smfcore.shared.utils.DateUtil;
...@@ -15,9 +16,9 @@ import com.neotel.smfcore.businessServices.barcode.service.manager.IComponentMan ...@@ -15,9 +16,9 @@ import com.neotel.smfcore.businessServices.barcode.service.manager.IComponentMan
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.businessServices.barcode.service.po.Component; import com.neotel.smfcore.businessServices.barcode.service.po.Component;
import com.neotel.smfcore.businessServices.barcode.utils.CodeResolve; import com.neotel.smfcore.businessServices.barcode.utils.CodeResolve;
import com.neotel.smfcore.apiGateway.device.enums.OP; import com.neotel.smfcore.apiGateway.device.common.enums.OP;
import com.neotel.smfcore.apiGateway.agv.device.enums.OP_STATUS; import com.neotel.smfcore.apiGateway.device.common.enums.BOX_STATUS;
import com.neotel.smfcore.apiGateway.device.util.DataCache; import com.neotel.smfcore.apiGateway.device.common.util.DataCache;
import com.neotel.smfcore.businessServices.storage.service.manager.IStoragePosManager; import com.neotel.smfcore.businessServices.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.businessServices.storage.service.po.Storage; import com.neotel.smfcore.businessServices.storage.service.po.Storage;
import com.neotel.smfcore.businessServices.storage.service.po.StoragePos; import com.neotel.smfcore.businessServices.storage.service.po.StoragePos;
...@@ -25,7 +26,7 @@ import com.neotel.smfcore.smfPlatform.system.rest.bean.mapstruct.TaskMapper; ...@@ -25,7 +26,7 @@ import com.neotel.smfcore.smfPlatform.system.rest.bean.mapstruct.TaskMapper;
import com.neotel.smfcore.smfPlatform.system.service.manager.IDataLogManager; import com.neotel.smfcore.smfPlatform.system.service.manager.IDataLogManager;
import com.neotel.smfcore.smfPlatform.system.service.po.DataLog; import com.neotel.smfcore.smfPlatform.system.service.po.DataLog;
import com.neotel.smfcore.smfPlatform.system.util.TaskService; import com.neotel.smfcore.smfPlatform.system.util.TaskService;
import com.neotel.smfcore.smfPlatform.virtual.util.ShortUniqueCodeUtil; import com.neotel.smfcore.apiGateway.virtual.util.ShortUniqueCodeUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
src/main/java/com/neotel/smfcore/apiGateway/virtual/util/ShortUniqueCodeUtil.java
package com.neotel.smfcore.smfPlatform.virtual.util; package com.neotel.smfcore.apiGateway.virtual.util;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
......
src/main/java/com/neotel/smfcore/apiGateway/xRay/rest/XrayDeviceController.java
package com.neotel.smfcore.smfPlatform.xRay.rest; package com.neotel.smfcore.apiGateway.xRay.rest;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
...@@ -11,8 +11,8 @@ import com.neotel.smfcore.shared.utils.StringUtils; ...@@ -11,8 +11,8 @@ import com.neotel.smfcore.shared.utils.StringUtils;
import com.neotel.smfcore.businessServices.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.businessServices.barcode.service.manager.IBarcodeManager;
import com.neotel.smfcore.businessServices.barcode.service.po.Barcode; import com.neotel.smfcore.businessServices.barcode.service.po.Barcode;
import com.neotel.smfcore.businessServices.barcode.utils.CodeResolve; import com.neotel.smfcore.businessServices.barcode.utils.CodeResolve;
import com.neotel.smfcore.smfPlatform.xRay.service.manager.IXrayPrintDataManager; import com.neotel.smfcore.apiGateway.xRay.service.manager.IXrayPrintDataManager;
import com.neotel.smfcore.smfPlatform.xRay.service.po.XrayPrintData; import com.neotel.smfcore.apiGateway.xRay.service.po.XrayPrintData;
import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousAccess; import com.neotel.smfcore.smfPlatform.security.annotation.AnonymousAccess;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
src/main/java/com/neotel/smfcore/apiGateway/xRay/service/dao/IXrayPrintDataDao.java
package com.neotel.smfcore.smfPlatform.xRay.service.dao; package com.neotel.smfcore.apiGateway.xRay.service.dao;
import com.neotel.smfcore.shared.base.IBaseDao; import com.neotel.smfcore.shared.base.IBaseDao;
......
src/main/java/com/neotel/smfcore/apiGateway/xRay/service/dao/impl/XrayPrintDataDaoImpl.java
package com.neotel.smfcore.smfPlatform.xRay.service.dao.impl; package com.neotel.smfcore.apiGateway.xRay.service.dao.impl;
import com.neotel.smfcore.shared.base.AbstractBaseDao; import com.neotel.smfcore.shared.base.AbstractBaseDao;
import com.neotel.smfcore.smfPlatform.xRay.service.dao.IXrayPrintDataDao; import com.neotel.smfcore.apiGateway.xRay.service.dao.IXrayPrintDataDao;
import com.neotel.smfcore.smfPlatform.xRay.service.po.XrayPrintData; import com.neotel.smfcore.apiGateway.xRay.service.po.XrayPrintData;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
......
src/main/java/com/neotel/smfcore/apiGateway/xRay/service/manager/IXrayPrintDataManager.java
package com.neotel.smfcore.smfPlatform.xRay.service.manager; package com.neotel.smfcore.apiGateway.xRay.service.manager;
import com.neotel.smfcore.apiGateway.xRay.service.po.XrayPrintData;
import com.neotel.smfcore.shared.base.IBaseManager; import com.neotel.smfcore.shared.base.IBaseManager;
import com.neotel.smfcore.smfPlatform.xRay.service.po.XrayPrintData;
public interface IXrayPrintDataManager extends IBaseManager<XrayPrintData> { public interface IXrayPrintDataManager extends IBaseManager<XrayPrintData> {
public XrayPrintData findByReelID(String reelID); public XrayPrintData findByReelID(String reelID);
......
src/main/resources/smfclient.json 0 → 100644
此文件的差异太大，无法显示。
src/main/resources/smfcore.json 0 → 100644
此文件的差异太大，无法显示。
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!