refactor(client): 重构服务类继承关系并统一使用QueryService

重构所有服务类,使其继承自QueryService接口,统一数据查询逻辑。同时为服务类添加@Service注解,确保Spring容器管理。更新相关FXML文件的控制器路径,从manager.ds调整为controller目录结构。调整pom.xml版本号至0.0.84-SNAPSHOT。新增MessageNotitfication和SimpleMessage消息类,提供基础消息结构支持。
This commit is contained in:
2025-09-11 00:06:22 +08:00
parent 23e1f98ae5
commit 375de610ef
163 changed files with 2085 additions and 578 deletions

View File

@@ -30,6 +30,7 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.IEntityService;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.QueryService;
import com.ecep.contract.cloud.rk.CloudRkService;
import com.ecep.contract.cloud.tyc.CloudTycService;
import com.ecep.contract.cloud.u8.YongYouU8Service;
@@ -47,6 +48,7 @@ import com.ecep.contract.model.CompanyOldName;
import com.ecep.contract.model.CompanyVendor;
import com.ecep.contract.util.MyStringUtils;
import com.ecep.contract.util.SpecificationUtils;
import com.fasterxml.jackson.databind.JsonNode;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
@@ -60,7 +62,7 @@ import jakarta.transaction.Transactional;
@Lazy
@Service
@CacheConfig(cacheNames = "company")
public class CompanyService implements IEntityService<Company> {
public class CompanyService implements IEntityService<Company>, QueryService<Company> {
private static final Logger logger = LoggerFactory.getLogger(CompanyService.class);
private static final String COMPANY_BASE_PATH = "company.base.path";
@@ -122,6 +124,12 @@ public class CompanyService implements IEntityService<Company> {
return companyRepository.findAll(spec, pageable);
}
@Override
public Page<Company> findAll(JsonNode paramsNode, Pageable pageable) {
Specification<Company> spec = null;
return findAll(spec, pageable);
}
/**
* 查找
* 重复的删除

View File

@@ -1,20 +1,12 @@
package com.ecep.contract.ds.other.repository;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;
import com.ecep.contract.ds.MyRepository;
import com.ecep.contract.model.EmployeeLoginHistory;
@Lazy
@Repository
public interface EmployeeLoginHistoryRepository extends
// JDBC interfaces
CrudRepository<EmployeeLoginHistory, Integer>,
PagingAndSortingRepository<EmployeeLoginHistory, Integer>,
// JPA interfaces
JpaRepository<EmployeeLoginHistory, Integer>, JpaSpecificationExecutor<EmployeeLoginHistory> {
public interface EmployeeLoginHistoryRepository extends MyRepository<EmployeeLoginHistory, Integer> {
}

View File

@@ -3,8 +3,6 @@ package com.ecep.contract.ds.other.repository;
import java.util.Optional;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import com.ecep.contract.ds.MyRepository;
@@ -20,9 +18,4 @@ public interface EmployeeRepository extends MyRepository<Employee, Integer> {
Optional<Employee> findByAlias(String alias);
Optional<Employee> findByCode(String personCode);
@Modifying
@Query(value = "update EMPLOYEE_LOGIN_HISTORY e set e.LATEST_ACTIVE = now() where e.id = ?1", nativeQuery = true)
void updateActive(int sessionId);
}

View File

@@ -141,11 +141,6 @@ public class EmployeeService implements IEntityService<Employee> {
return employeeRepository.findAll(spec, Pageable.ofSize(10)).getContent();
}
@Transactional
public void updateActive(int sessionId) {
employeeRepository.updateActive(sessionId);
}
@Transactional
public List<EmployeeRole> getRolesByEmployeeId(int employeeId) {
Optional<Employee> optional = employeeRepository.findById(employeeId);