Compare commits
14 Commits
b4c78c1f01
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 1bacf534b9 | |||
| 77cf75a2be | |||
| dd660d416a | |||
| 5d3a727b73 | |||
| 4f640b134a | |||
| 36d1b94fd8 | |||
| a1bcde0a37 | |||
| bb3df45b9f | |||
| 92ffc47169 | |||
| 774c7f8cc2 | |||
| 3c280c5353 | |||
| 0af6fd35ab | |||
| 53855df24a | |||
| 0536ffd632 |
Generated
+6
@@ -1,7 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel>
|
||||
<module name="itmanager" target="25" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
<component name="JavacSettings">
|
||||
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
|
||||
<module name="club.itstudio.itmanager" options="-parameters" />
|
||||
<module name="club.itstudio.itmanager.main" options="-parameters" />
|
||||
<module name="club.itstudio.itmanager.test" options="-parameters" />
|
||||
<module name="itmanager" options="-parameters" />
|
||||
|
||||
+3
@@ -13,5 +13,8 @@
|
||||
</list>
|
||||
</option>
|
||||
</inspection_tool>
|
||||
<inspection_tool class="ShellCheck" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<shellcheck_settings value="SC2317" />
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
Generated
+1
-5
@@ -6,12 +6,8 @@
|
||||
<component name="Kotlin2JvmCompilerArguments">
|
||||
<option name="jvmTarget" value="21" />
|
||||
</component>
|
||||
<component name="KotlinCommonCompilerArguments">
|
||||
<option name="apiVersion" value="2.3" />
|
||||
<option name="languageVersion" value="2.3" />
|
||||
</component>
|
||||
<component name="KotlinJpsPluginSettings">
|
||||
<option name="externalSystemId" value="Gradle" />
|
||||
<option name="version" value="2.3.21" />
|
||||
<option name="version" value="2.4.20-RC" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,12 +1,13 @@
|
||||
plugins {
|
||||
kotlin("jvm") version "2.3.21"
|
||||
kotlin("plugin.spring") version "2.3.21"
|
||||
id("org.jetbrains.kotlin.plugin.serialization") version "2.4.20-RC"
|
||||
id("org.springframework.boot") version "4.1.0"
|
||||
id("io.spring.dependency-management") version "1.1.7"
|
||||
}
|
||||
|
||||
group = "club.itstudio"
|
||||
version = "0.0.1-SNAPSHOT"
|
||||
version = "1.0.0"
|
||||
description = "itmanager"
|
||||
|
||||
java {
|
||||
@@ -22,6 +23,7 @@ repositories {
|
||||
dependencies {
|
||||
implementation("com.auth0:java-jwt:4.4.0")
|
||||
implementation("com.baomidou:mybatis-plus-spring-boot4-starter:3.5.15")
|
||||
implementation("com.baomidou:mybatis-plus-jsqlparser:3.5.15")
|
||||
implementation("org.springframework.boot:spring-boot-starter-amqp")
|
||||
implementation("org.springframework.boot:spring-boot-starter-data-redis-reactive")
|
||||
implementation("org.springframework.boot:spring-boot-starter-json")
|
||||
|
||||
+2
-5
@@ -1,9 +1,6 @@
|
||||
#Mon Aug 17 12:30:11 UTC 2026
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
|
||||
networkTimeout=10000
|
||||
retries=0
|
||||
retryBackOffMs=500
|
||||
validateDistributionUrl=true
|
||||
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-9.7.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
package club.itstudio.itmanager.config
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.DbType
|
||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
|
||||
@Configuration
|
||||
class MybatisConfig {
|
||||
|
||||
@Bean
|
||||
fun mybatisPlusInterceptor(): MybatisPlusInterceptor {
|
||||
val interceptor = MybatisPlusInterceptor()
|
||||
interceptor.addInnerInterceptor(PaginationInnerInterceptor(DbType.MARIADB))
|
||||
return interceptor
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,9 @@
|
||||
package club.itstudio.itmanager.config
|
||||
|
||||
import club.itstudio.itmanager.utils.BigDecimalSerializer
|
||||
import kotlinx.serialization.json.Json
|
||||
import kotlinx.serialization.modules.SerializersModule
|
||||
import kotlinx.serialization.modules.contextual
|
||||
import org.springframework.context.annotation.Bean
|
||||
import org.springframework.context.annotation.Configuration
|
||||
|
||||
@@ -9,6 +12,9 @@ class SerializationConfig {
|
||||
|
||||
@Bean
|
||||
fun kotlinxSerializationJson(): Json = Json {
|
||||
serializersModule = SerializersModule {
|
||||
contextual(BigDecimalSerializer)
|
||||
}
|
||||
ignoreUnknownKeys = true
|
||||
isLenient = true
|
||||
encodeDefaults = false
|
||||
|
||||
@@ -7,6 +7,7 @@ import kotlin.reflect.full.createInstance
|
||||
import kotlin.reflect.full.declaredMemberProperties
|
||||
import kotlin.reflect.full.memberProperties
|
||||
import kotlin.reflect.jvm.isAccessible
|
||||
import kotlin.reflect.jvm.javaField
|
||||
|
||||
interface DataCopy {
|
||||
fun <T : Any> toAnotherObject(
|
||||
@@ -19,15 +20,21 @@ interface DataCopy {
|
||||
return try {
|
||||
val vo = toClass.createInstance()
|
||||
for (prop in toClass.declaredMemberProperties) {
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
val mutableProp = prop as? KMutableProperty1<Any, Any?> ?: continue
|
||||
val value = when {
|
||||
sourceProps.containsKey(prop.name) -> sourceProps[prop.name]
|
||||
otherProperties.containsKey(prop.name) -> otherProperties[prop.name]
|
||||
else -> continue
|
||||
}
|
||||
mutableProp.isAccessible = true
|
||||
mutableProp.set(vo, value)
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
val mutableProp = prop as? KMutableProperty1<Any, Any?>
|
||||
if (mutableProp != null) {
|
||||
mutableProp.isAccessible = true
|
||||
mutableProp.set(vo, value)
|
||||
} else {
|
||||
val field = prop.javaField ?: continue
|
||||
field.isAccessible = true
|
||||
field.set(vo, value)
|
||||
}
|
||||
}
|
||||
vo
|
||||
} catch (e: ReflectiveOperationException) {
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName
|
||||
import club.itstudio.itmanager.entity.DataCopy
|
||||
import club.itstudio.itmanager.entity.enums.FinanceRecordType
|
||||
import kotlinx.datetime.LocalDateTime
|
||||
import kotlinx.serialization.Contextual
|
||||
import kotlinx.serialization.Serializable
|
||||
import java.math.BigDecimal
|
||||
|
||||
@@ -17,7 +18,7 @@ data class FinanceRecord(
|
||||
val recordNo: String? = null,
|
||||
val type: FinanceRecordType = FinanceRecordType.OTHER,
|
||||
val relatedItemId: Long? = null,
|
||||
val amount: BigDecimal = BigDecimal.ZERO,
|
||||
val amount: @Contextual BigDecimal = BigDecimal.ZERO,
|
||||
val currency: String = "CNY",
|
||||
val vendor: String? = null,
|
||||
val occurredAt: LocalDateTime? = null,
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName
|
||||
import club.itstudio.itmanager.entity.DataCopy
|
||||
import kotlinx.datetime.LocalDate
|
||||
import kotlinx.datetime.LocalDateTime
|
||||
import kotlinx.serialization.Contextual
|
||||
import kotlinx.serialization.Serializable
|
||||
import java.math.BigDecimal
|
||||
|
||||
@@ -23,7 +24,7 @@ data class Item(
|
||||
val totalQuantity: Int = 0,
|
||||
val availableQuantity: Int = 0,
|
||||
val unit: String = "件",
|
||||
val price: BigDecimal? = null,
|
||||
val price: @Contextual BigDecimal? = null,
|
||||
val purchaseDate: LocalDate? = null,
|
||||
val supplier: String? = null,
|
||||
val status: String = "normal",
|
||||
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
package club.itstudio.itmanager.mapper.typehandler
|
||||
|
||||
import kotlinx.datetime.LocalDateTime
|
||||
import kotlinx.datetime.toJavaLocalDateTime
|
||||
import kotlinx.datetime.toKotlinLocalDateTime
|
||||
import org.apache.ibatis.type.BaseTypeHandler
|
||||
import org.apache.ibatis.type.JdbcType
|
||||
import org.apache.ibatis.type.MappedJdbcTypes
|
||||
import org.apache.ibatis.type.MappedTypes
|
||||
import java.sql.CallableStatement
|
||||
import java.sql.PreparedStatement
|
||||
import java.sql.ResultSet
|
||||
|
||||
@MappedTypes(LocalDateTime::class)
|
||||
@MappedJdbcTypes(JdbcType.TIMESTAMP)
|
||||
class TimeTypeHandler : BaseTypeHandler<LocalDateTime>() {
|
||||
override fun setNonNullParameter(
|
||||
ps: PreparedStatement,
|
||||
i: Int,
|
||||
parameter: LocalDateTime,
|
||||
jdbcType: JdbcType?
|
||||
) {
|
||||
ps.setObject(i, parameter.toJavaLocalDateTime())
|
||||
}
|
||||
|
||||
override fun getNullableResult(
|
||||
rs: ResultSet,
|
||||
columnName: String
|
||||
): LocalDateTime? =
|
||||
rs.getTimestamp(columnName)
|
||||
?.toLocalDateTime()
|
||||
?.toKotlinLocalDateTime()
|
||||
|
||||
override fun getNullableResult(
|
||||
rs: ResultSet,
|
||||
columnIndex: Int
|
||||
): LocalDateTime? =
|
||||
rs.getTimestamp(columnIndex)
|
||||
?.toLocalDateTime()
|
||||
?.toKotlinLocalDateTime()
|
||||
|
||||
override fun getNullableResult(
|
||||
cs: CallableStatement,
|
||||
columnIndex: Int
|
||||
): LocalDateTime? =
|
||||
cs.getTimestamp(columnIndex)
|
||||
?.toLocalDateTime()
|
||||
?.toKotlinLocalDateTime()
|
||||
}
|
||||
@@ -1,20 +1,19 @@
|
||||
package club.itstudio.itmanager.service
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService
|
||||
import club.itstudio.itmanager.entity.dto.Account
|
||||
import club.itstudio.itmanager.entity.vo.request.EmailRegisterVO
|
||||
import club.itstudio.itmanager.entity.vo.request.PasswordResetVO
|
||||
import club.itstudio.itmanager.entity.vo.response.ReloginVO
|
||||
import com.baomidou.mybatisplus.extension.service.IService
|
||||
import org.springframework.security.core.userdetails.ReactiveUserDetailsService
|
||||
import reactor.core.publisher.Mono
|
||||
|
||||
interface AccountService : IService<Account>, ReactiveUserDetailsService {
|
||||
fun findAccountById(id: Long): Mono<Account>
|
||||
fun findAccountByNameOrEmail(text: String): Mono<Account>
|
||||
fun findAccountByName(username: String): Mono<Account>
|
||||
fun findAccountByEmail(email: String): Mono<Account>
|
||||
fun existAccountByName(username: String): Mono<Boolean>
|
||||
fun existAccountByEmail(email: String): Mono<Boolean>
|
||||
fun resetPasswordByEmail(email: String, encodedPassword: String): Mono<Void>
|
||||
fun createAccount(account: Account): Mono<Boolean>
|
||||
|
||||
// fun batchInsert(accounts: List<Account>): Mono<Boolean>
|
||||
// fun replaceAll(accounts: List<Account>): Mono<Boolean>
|
||||
|
||||
@@ -9,6 +9,7 @@ interface AttachmentService : IService<Attachment> {
|
||||
fun listByRelated(relatedTable: String, relatedId: Long): Mono<List<Attachment>>
|
||||
fun listByUploader(uploadedBy: Long): Mono<List<Attachment>>
|
||||
fun createAttachment(attachment: Attachment): Mono<Boolean>
|
||||
fun updateAttachment(attachment: Attachment): Mono<Boolean>
|
||||
fun deleteAttachment(id: Long): Mono<Boolean>
|
||||
fun deleteByRelated(relatedTable: String, relatedId: Long): Mono<Boolean>
|
||||
fun exportAllAttachments(): Mono<List<Attachment>>
|
||||
|
||||
@@ -2,10 +2,12 @@ package club.itstudio.itmanager.service
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService
|
||||
import club.itstudio.itmanager.entity.dto.BorrowRecord
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import reactor.core.publisher.Mono
|
||||
|
||||
interface BorrowRecordService : IService<BorrowRecord> {
|
||||
fun getBorrowRecordById(id: Long): Mono<BorrowRecord>
|
||||
fun pageUsages(page: Page<BorrowRecord>, keyword: String?, status: String?): Mono<Page<BorrowRecord>>
|
||||
fun listByItem(itemId: Long): Mono<List<BorrowRecord>>
|
||||
fun listByBorrower(borrower: String): Mono<List<BorrowRecord>>
|
||||
fun listByStatus(status: String): Mono<List<BorrowRecord>>
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
package club.itstudio.itmanager.service
|
||||
|
||||
import club.itstudio.itmanager.utils.Const
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.http.codec.multipart.FilePart
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.io.IOException
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.Paths
|
||||
import java.util.*
|
||||
|
||||
@Service
|
||||
class FileStorageService(
|
||||
@Value($$"${app.file.data-path}")
|
||||
private val dataPath: String
|
||||
) {
|
||||
data class StoredFile(
|
||||
val path: Path,
|
||||
val size: Long
|
||||
)
|
||||
|
||||
private val logger = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
fun saveImage(file: FilePart, subDir: String, entityId: Long): Mono<StoredFile> {
|
||||
val directory = Paths.get(dataPath, Const.FILE_DIR_IMAGE, subDir, entityId.toString())
|
||||
val savedName = generateSafeFileName(file.filename())
|
||||
val target = directory.resolve(savedName)
|
||||
return Mono.fromCallable<Void> { Files.createDirectories(directory); null }
|
||||
.then(file.transferTo(target))
|
||||
.then(Mono.fromCallable { StoredFile(target, Files.size(target)) })
|
||||
.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
|
||||
fun deleteFile(path: String?): Mono<Void> {
|
||||
if (path.isNullOrBlank()) return Mono.empty()
|
||||
return Mono.fromRunnable<Void> {
|
||||
try {
|
||||
Files.deleteIfExists(Paths.get(path))
|
||||
} catch (e: IOException) {
|
||||
logger.warn("Failed to delete file: {}", path, e)
|
||||
}
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
|
||||
fun generateSafeFileName(original: String?): String {
|
||||
val extension = original
|
||||
?.substringAfterLast('.')
|
||||
?.lowercase()
|
||||
?.takeIf {
|
||||
it.isNotBlank() &&
|
||||
it.length <= 10 &&
|
||||
it.all { ch -> ch.isLetterOrDigit() }
|
||||
}
|
||||
return if (extension != null) "${UUID.randomUUID()}.$extension" else UUID.randomUUID().toString()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,10 +2,20 @@ package club.itstudio.itmanager.service
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService
|
||||
import club.itstudio.itmanager.entity.dto.FinanceRecord
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import reactor.core.publisher.Mono
|
||||
|
||||
interface FinanceRecordService : IService<FinanceRecord> {
|
||||
fun getFinanceRecordById(id: Long): Mono<FinanceRecord>
|
||||
fun pageFinanceRecords(
|
||||
page: Page<FinanceRecord>,
|
||||
keyword: String?,
|
||||
type: String?,
|
||||
start: String?,
|
||||
end: String?,
|
||||
vendor: String?,
|
||||
itemId: Long?
|
||||
): Mono<Page<FinanceRecord>>
|
||||
fun listByType(type: String): Mono<List<FinanceRecord>>
|
||||
fun listByDateRange(start: String, end: String): Mono<List<FinanceRecord>>
|
||||
fun listByVendor(vendor: String): Mono<List<FinanceRecord>>
|
||||
|
||||
+14
@@ -47,6 +47,14 @@ class AccountServiceImpl : ServiceImpl<AccountMapper, Account>(), AccountService
|
||||
.one()
|
||||
}
|
||||
|
||||
override fun findAccountById(id: Long): Mono<Account> =
|
||||
blockingCall {
|
||||
logger.info("Searching account by id")
|
||||
ktQuery()
|
||||
.eq(Account::id, id)
|
||||
.one()
|
||||
}
|
||||
|
||||
override fun findAccountByEmail(email: String): Mono<Account> =
|
||||
findAccount("email") {
|
||||
ktQuery()
|
||||
@@ -141,4 +149,10 @@ class AccountServiceImpl : ServiceImpl<AccountMapper, Account>(), AccountService
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun createAccount(account: Account): Mono<Boolean> =
|
||||
blockingCall {
|
||||
logger.info("Creating account")
|
||||
save(account)
|
||||
}
|
||||
}
|
||||
+21
-5
@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.util.NoSuchElementException
|
||||
|
||||
@Service
|
||||
class AttachmentServiceImpl : ServiceImpl<AttachmentMapper, Attachment>(), AttachmentService {
|
||||
@@ -21,19 +20,26 @@ class AttachmentServiceImpl : ServiceImpl<AttachmentMapper, Attachment>(), Attac
|
||||
override fun getAttachmentById(id: Long): Mono<Attachment> =
|
||||
blockingCall {
|
||||
logger.info("Searching attachment by id")
|
||||
ktQuery().eq(Attachment::id, id).one()
|
||||
ktQuery()
|
||||
.eq(Attachment::id, id)
|
||||
.one()
|
||||
}.switchIfEmpty(Mono.error(NoSuchElementException("Attachment not found")))
|
||||
|
||||
override fun listByRelated(relatedTable: String, relatedId: Long): Mono<List<Attachment>> =
|
||||
blockingCall {
|
||||
logger.info("Searching attachments by related table and id")
|
||||
ktQuery().eq(Attachment::relatedTable, relatedTable).eq(Attachment::relatedId, relatedId).list()
|
||||
ktQuery()
|
||||
.eq(Attachment::relatedTable, relatedTable)
|
||||
.eq(Attachment::relatedId, relatedId)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByUploader(uploadedBy: Long): Mono<List<Attachment>> =
|
||||
blockingCall {
|
||||
logger.info("Searching attachments by uploader")
|
||||
ktQuery().eq(Attachment::uploadedBy, uploadedBy).list()
|
||||
ktQuery()
|
||||
.eq(Attachment::uploadedBy, uploadedBy)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun createAttachment(attachment: Attachment): Mono<Boolean> =
|
||||
@@ -42,6 +48,12 @@ class AttachmentServiceImpl : ServiceImpl<AttachmentMapper, Attachment>(), Attac
|
||||
save(attachment)
|
||||
}
|
||||
|
||||
override fun updateAttachment(attachment: Attachment): Mono<Boolean> =
|
||||
blockingCall {
|
||||
logger.info("Updating attachment")
|
||||
updateById(attachment)
|
||||
}
|
||||
|
||||
override fun deleteAttachment(id: Long): Mono<Boolean> =
|
||||
blockingCall {
|
||||
logger.info("Deleting attachment by id")
|
||||
@@ -51,7 +63,11 @@ class AttachmentServiceImpl : ServiceImpl<AttachmentMapper, Attachment>(), Attac
|
||||
override fun deleteByRelated(relatedTable: String, relatedId: Long): Mono<Boolean> =
|
||||
blockingCall {
|
||||
logger.info("Deleting attachments by related table and id")
|
||||
remove(ktQuery().eq(Attachment::relatedTable, relatedTable).eq(Attachment::relatedId, relatedId))
|
||||
remove(
|
||||
ktQuery()
|
||||
.eq(Attachment::relatedTable, relatedTable)
|
||||
.eq(Attachment::relatedId, relatedId)
|
||||
)
|
||||
}
|
||||
|
||||
override fun exportAllAttachments(): Mono<List<Attachment>> =
|
||||
|
||||
+41
-6
@@ -3,12 +3,14 @@ package club.itstudio.itmanager.service.impl
|
||||
import club.itstudio.itmanager.entity.dto.BorrowRecord
|
||||
import club.itstudio.itmanager.mapper.BorrowRecordMapper
|
||||
import club.itstudio.itmanager.service.BorrowRecordService
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.util.NoSuchElementException
|
||||
|
||||
@Service
|
||||
class BorrowRecordServiceImpl : ServiceImpl<BorrowRecordMapper, BorrowRecord>(), BorrowRecordService {
|
||||
@@ -21,31 +23,64 @@ class BorrowRecordServiceImpl : ServiceImpl<BorrowRecordMapper, BorrowRecord>(),
|
||||
override fun getBorrowRecordById(id: Long): Mono<BorrowRecord> =
|
||||
blockingCall {
|
||||
logger.info("Searching borrow record by id")
|
||||
ktQuery().eq(BorrowRecord::id, id).one()
|
||||
ktQuery()
|
||||
.eq(BorrowRecord::id, id)
|
||||
.one()
|
||||
}.switchIfEmpty(Mono.error(NoSuchElementException("BorrowRecord not found")))
|
||||
|
||||
override fun pageUsages(
|
||||
page: Page<BorrowRecord>,
|
||||
keyword: String?,
|
||||
status: String?
|
||||
): Mono<Page<BorrowRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Paging borrow records")
|
||||
if (keyword.isNullOrBlank() && status.isNullOrBlank()) {
|
||||
page.addOrder(OrderItem.desc("created_at"))
|
||||
page(page)
|
||||
} else {
|
||||
val wrapper = QueryWrapper<BorrowRecord>()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.like("borrower", keyword)
|
||||
}
|
||||
if (!status.isNullOrBlank()) {
|
||||
wrapper.eq("status", status)
|
||||
}
|
||||
wrapper.orderByDesc("created_at")
|
||||
page(page, wrapper)
|
||||
}
|
||||
}
|
||||
|
||||
override fun listByItem(itemId: Long): Mono<List<BorrowRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching borrow records by item id")
|
||||
ktQuery().eq(BorrowRecord::itemId, itemId).list()
|
||||
ktQuery()
|
||||
.eq(BorrowRecord::itemId, itemId)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByBorrower(borrower: String): Mono<List<BorrowRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching borrow records by borrower")
|
||||
ktQuery().eq(BorrowRecord::borrower, borrower).list()
|
||||
ktQuery()
|
||||
.eq(BorrowRecord::borrower, borrower)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByStatus(status: String): Mono<List<BorrowRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching borrow records by status")
|
||||
ktQuery().eq(BorrowRecord::status, status).list()
|
||||
ktQuery()
|
||||
.eq(BorrowRecord::status, status)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listOverdueRecords(): Mono<List<BorrowRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching overdue borrow records")
|
||||
ktQuery().eq(BorrowRecord::status, "OVERDUE").list()
|
||||
ktQuery()
|
||||
.eq(BorrowRecord::status, "OVERDUE")
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun createBorrowRecord(record: BorrowRecord): Mono<Boolean> =
|
||||
|
||||
+6
-3
@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.util.NoSuchElementException
|
||||
|
||||
@Service
|
||||
class CategoryServiceImpl : ServiceImpl<CategoryMapper, Category>(), CategoryService {
|
||||
@@ -21,7 +20,9 @@ class CategoryServiceImpl : ServiceImpl<CategoryMapper, Category>(), CategorySer
|
||||
override fun getCategoryById(id: Long): Mono<Category> =
|
||||
blockingCall {
|
||||
logger.info("Searching category by id")
|
||||
ktQuery().eq(Category::id, id).one()
|
||||
ktQuery()
|
||||
.eq(Category::id, id)
|
||||
.one()
|
||||
}.switchIfEmpty(Mono.error(NoSuchElementException("Category not found")))
|
||||
|
||||
override fun listAllCategories(): Mono<List<Category>> =
|
||||
@@ -33,7 +34,9 @@ class CategoryServiceImpl : ServiceImpl<CategoryMapper, Category>(), CategorySer
|
||||
override fun listByParentId(parentId: Long): Mono<List<Category>> =
|
||||
blockingCall {
|
||||
logger.info("Searching categories by parent id")
|
||||
ktQuery().eq(Category::parentId, parentId).list()
|
||||
ktQuery()
|
||||
.eq(Category::parentId, parentId)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun createCategory(category: Category): Mono<Boolean> =
|
||||
|
||||
+8
-8
@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.util.NoSuchElementException
|
||||
|
||||
@Service
|
||||
class EmailNoticeServiceImpl : ServiceImpl<EmailNoticeMapper, EmailNotice>(), EmailNoticeService {
|
||||
@@ -21,7 +20,9 @@ class EmailNoticeServiceImpl : ServiceImpl<EmailNoticeMapper, EmailNotice>(), Em
|
||||
override fun getEmailNoticeById(id: Long): Mono<EmailNotice> =
|
||||
blockingCall {
|
||||
logger.info("Searching email notice by id")
|
||||
ktQuery().eq(EmailNotice::id, id).one()
|
||||
ktQuery()
|
||||
.eq(EmailNotice::id, id)
|
||||
.one()
|
||||
}.switchIfEmpty(Mono.error(NoSuchElementException("EmailNotice not found")))
|
||||
|
||||
override fun listAllNotices(): Mono<List<EmailNotice>> =
|
||||
@@ -33,7 +34,9 @@ class EmailNoticeServiceImpl : ServiceImpl<EmailNoticeMapper, EmailNotice>(), Em
|
||||
override fun listEnabledNotices(): Mono<List<EmailNotice>> =
|
||||
blockingCall {
|
||||
logger.info("Listing enabled email notices")
|
||||
ktQuery().eq(EmailNotice::enabled, true).list()
|
||||
ktQuery()
|
||||
.eq(EmailNotice::enabled, true)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun createEmailNotice(notice: EmailNotice): Mono<Boolean> =
|
||||
@@ -57,11 +60,8 @@ class EmailNoticeServiceImpl : ServiceImpl<EmailNoticeMapper, EmailNotice>(), Em
|
||||
override fun toggleEnabled(id: Long): Mono<Boolean> =
|
||||
blockingCall {
|
||||
val notice = ktQuery().eq(EmailNotice::id, id).one()
|
||||
if (notice != null) {
|
||||
updateById(notice.copy(enabled = !notice.enabled))
|
||||
} else {
|
||||
false
|
||||
}
|
||||
notice != null
|
||||
&& updateById(notice.copy(enabled = !notice.enabled))
|
||||
}
|
||||
|
||||
override fun exportAllEmailNotices(): Mono<List<EmailNotice>> =
|
||||
|
||||
+61
-6
@@ -3,12 +3,13 @@ package club.itstudio.itmanager.service.impl
|
||||
import club.itstudio.itmanager.entity.dto.FinanceRecord
|
||||
import club.itstudio.itmanager.mapper.FinanceRecordMapper
|
||||
import club.itstudio.itmanager.service.FinanceRecordService
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.util.NoSuchElementException
|
||||
|
||||
@Service
|
||||
class FinanceRecordServiceImpl : ServiceImpl<FinanceRecordMapper, FinanceRecord>(), FinanceRecordService {
|
||||
@@ -21,31 +22,85 @@ class FinanceRecordServiceImpl : ServiceImpl<FinanceRecordMapper, FinanceRecord>
|
||||
override fun getFinanceRecordById(id: Long): Mono<FinanceRecord> =
|
||||
blockingCall {
|
||||
logger.info("Searching finance record by id")
|
||||
ktQuery().eq(FinanceRecord::id, id).one()
|
||||
ktQuery()
|
||||
.eq(FinanceRecord::id, id)
|
||||
.one()
|
||||
}.switchIfEmpty(Mono.error(NoSuchElementException("FinanceRecord not found")))
|
||||
|
||||
override fun pageFinanceRecords(
|
||||
page: Page<FinanceRecord>,
|
||||
keyword: String?,
|
||||
type: String?,
|
||||
start: String?,
|
||||
end: String?,
|
||||
vendor: String?,
|
||||
itemId: Long?
|
||||
): Mono<Page<FinanceRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Paging finance records")
|
||||
if (keyword.isNullOrBlank() && type.isNullOrBlank() && start.isNullOrBlank() &&
|
||||
end.isNullOrBlank() && vendor.isNullOrBlank() && itemId == null
|
||||
) {
|
||||
page(page)
|
||||
} else {
|
||||
val wrapper = QueryWrapper<FinanceRecord>()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.and {
|
||||
it.like("record_no", keyword)
|
||||
.or().like("vendor", keyword)
|
||||
.or().like("note", keyword)
|
||||
}
|
||||
}
|
||||
if (!type.isNullOrBlank()) {
|
||||
wrapper.eq("type", type)
|
||||
}
|
||||
if (!start.isNullOrBlank() && !end.isNullOrBlank()) {
|
||||
wrapper.apply("occurred_at BETWEEN {0} AND {1}", start, end)
|
||||
} else if (!start.isNullOrBlank()) {
|
||||
wrapper.ge("occurred_at", start)
|
||||
} else if (!end.isNullOrBlank()) {
|
||||
wrapper.le("occurred_at", end)
|
||||
}
|
||||
if (!vendor.isNullOrBlank()) {
|
||||
wrapper.eq("vendor", vendor)
|
||||
}
|
||||
if (itemId != null) {
|
||||
wrapper.eq("related_item_id", itemId)
|
||||
}
|
||||
page(page, wrapper)
|
||||
}
|
||||
}
|
||||
|
||||
override fun listByType(type: String): Mono<List<FinanceRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching finance records by type")
|
||||
ktQuery().eq(FinanceRecord::type, type).list()
|
||||
ktQuery()
|
||||
.eq(FinanceRecord::type, type)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByDateRange(start: String, end: String): Mono<List<FinanceRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching finance records by date range")
|
||||
ktQuery().apply("occurred_at BETWEEN {0} AND {1}", start, end).list()
|
||||
ktQuery()
|
||||
.apply("occurred_at BETWEEN {0} AND {1}", start, end)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByVendor(vendor: String): Mono<List<FinanceRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching finance records by vendor")
|
||||
ktQuery().eq(FinanceRecord::vendor, vendor).list()
|
||||
ktQuery()
|
||||
.eq(FinanceRecord::vendor, vendor)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByRelatedItem(itemId: Long): Mono<List<FinanceRecord>> =
|
||||
blockingCall {
|
||||
logger.info("Searching finance records by related item id")
|
||||
ktQuery().eq(FinanceRecord::relatedItemId, itemId).list()
|
||||
ktQuery()
|
||||
.eq(FinanceRecord::relatedItemId, itemId)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun createFinanceRecord(record: FinanceRecord): Mono<Boolean> =
|
||||
|
||||
+46
-24
@@ -3,13 +3,14 @@ package club.itstudio.itmanager.service.impl
|
||||
import club.itstudio.itmanager.entity.dto.Item
|
||||
import club.itstudio.itmanager.mapper.ItemMapper
|
||||
import club.itstudio.itmanager.service.ItemService
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.stereotype.Service
|
||||
import org.springframework.transaction.annotation.Transactional
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.util.NoSuchElementException
|
||||
|
||||
@Service
|
||||
class ItemServiceImpl : ServiceImpl<ItemMapper, Item>(), ItemService {
|
||||
@@ -22,40 +23,54 @@ class ItemServiceImpl : ServiceImpl<ItemMapper, Item>(), ItemService {
|
||||
override fun pageItems(page: Page<Item>, keyword: String?, status: String?): Mono<Page<Item>> =
|
||||
blockingCall {
|
||||
logger.info("Paging items with keyword and status")
|
||||
val wrapper = ktQuery()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.and {
|
||||
it.like(Item::name, keyword).or().like(Item::code, keyword)
|
||||
if (keyword.isNullOrBlank() && status.isNullOrBlank()) {
|
||||
page(page)
|
||||
} else {
|
||||
val wrapper = QueryWrapper<Item>()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.and {
|
||||
it.like("name", keyword)
|
||||
.or().like("code", keyword)
|
||||
}
|
||||
}
|
||||
if (!status.isNullOrBlank()) {
|
||||
wrapper.eq("status", status)
|
||||
}
|
||||
page(page, wrapper)
|
||||
}
|
||||
if (!status.isNullOrBlank()) {
|
||||
wrapper.eq(Item::status, status)
|
||||
}
|
||||
page(page, wrapper)
|
||||
}
|
||||
|
||||
override fun getItemById(id: Long): Mono<Item> =
|
||||
blockingCall {
|
||||
logger.info("Searching item by id")
|
||||
ktQuery().eq(Item::id, id).one()
|
||||
ktQuery()
|
||||
.eq(Item::id, id)
|
||||
.one()
|
||||
}.switchIfEmpty(Mono.error(NoSuchElementException("Item not found")))
|
||||
|
||||
override fun listAvailableItems(): Mono<List<Item>> =
|
||||
blockingCall {
|
||||
logger.info("Listing available items")
|
||||
ktQuery().gt(Item::availableQuantity, 0).eq(Item::status, "normal").list()
|
||||
ktQuery()
|
||||
.gt(Item::availableQuantity, 0)
|
||||
.eq(Item::status, "normal")
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listInUseItems(): Mono<List<Item>> =
|
||||
blockingCall {
|
||||
logger.info("Listing in-use items")
|
||||
ktQuery().apply("total_quantity - available_quantity > 0").list()
|
||||
ktQuery()
|
||||
.apply("total_quantity - available_quantity > 0")
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listItemsByCategory(categoryId: Long): Mono<List<Item>> =
|
||||
blockingCall {
|
||||
logger.info("Listing items by category")
|
||||
ktQuery().eq(Item::categoryId, categoryId).list()
|
||||
ktQuery()
|
||||
.eq(Item::categoryId, categoryId)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun createItem(item: Item): Mono<Boolean> =
|
||||
@@ -79,35 +94,42 @@ class ItemServiceImpl : ServiceImpl<ItemMapper, Item>(), ItemService {
|
||||
override fun setPrimaryImage(id: Long, imagePath: String): Mono<Boolean> =
|
||||
blockingCall {
|
||||
logger.info("Setting primary image for item")
|
||||
ktUpdate().eq(Item::id, id).set(Item::imagePath, imagePath).update()
|
||||
ktUpdate()
|
||||
.eq(Item::id, id)
|
||||
.set(Item::imagePath, imagePath)
|
||||
.update()
|
||||
}
|
||||
|
||||
override fun borrowItem(id: Long, quantity: Int): Mono<Boolean> =
|
||||
blockingCall {
|
||||
val item = ktQuery().eq(Item::id, id).one()
|
||||
if (item != null && item.availableQuantity >= quantity) {
|
||||
ktUpdate().eq(Item::id, id).set(Item::availableQuantity, item.availableQuantity - quantity).update()
|
||||
} else {
|
||||
false
|
||||
}
|
||||
item != null
|
||||
&& item.availableQuantity >= quantity
|
||||
&& ktUpdate()
|
||||
.eq(Item::id, id)
|
||||
.set(Item::availableQuantity, item.availableQuantity - quantity)
|
||||
.update()
|
||||
}
|
||||
|
||||
override fun returnItem(id: Long, quantity: Int): Mono<Boolean> =
|
||||
blockingCall {
|
||||
val item = ktQuery().eq(Item::id, id).one()
|
||||
if (item != null && item.totalQuantity >= item.availableQuantity + quantity) {
|
||||
ktUpdate().eq(Item::id, id).set(Item::availableQuantity, item.availableQuantity + quantity).update()
|
||||
} else {
|
||||
false
|
||||
}
|
||||
item != null
|
||||
&& item.totalQuantity >= item.availableQuantity + quantity
|
||||
&& ktUpdate()
|
||||
.eq(Item::id, id)
|
||||
.set(Item::availableQuantity, item.availableQuantity + quantity)
|
||||
.update()
|
||||
}
|
||||
|
||||
@Transactional
|
||||
override fun batchInsertItems(items: List<Item>): Mono<Boolean> =
|
||||
blockingCall {
|
||||
logger.info("Batch inserting items")
|
||||
saveBatch(items)
|
||||
}
|
||||
|
||||
@Transactional
|
||||
override fun replaceAllItems(items: List<Item>): Mono<Boolean> =
|
||||
blockingCall {
|
||||
logger.info("Replacing all items")
|
||||
|
||||
+12
-5
@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.util.NoSuchElementException
|
||||
|
||||
@Service
|
||||
class ItemTransactionServiceImpl : ServiceImpl<ItemTransactionMapper, ItemTransaction>(), ItemTransactionService {
|
||||
@@ -21,25 +20,33 @@ class ItemTransactionServiceImpl : ServiceImpl<ItemTransactionMapper, ItemTransa
|
||||
override fun getTransactionById(id: Long): Mono<ItemTransaction> =
|
||||
blockingCall {
|
||||
logger.info("Searching transaction by id")
|
||||
ktQuery().eq(ItemTransaction::id, id).one()
|
||||
ktQuery()
|
||||
.eq(ItemTransaction::id, id)
|
||||
.one()
|
||||
}.switchIfEmpty(Mono.error(NoSuchElementException("ItemTransaction not found")))
|
||||
|
||||
override fun listByItem(itemId: Long): Mono<List<ItemTransaction>> =
|
||||
blockingCall {
|
||||
logger.info("Searching transactions by item id")
|
||||
ktQuery().eq(ItemTransaction::itemId, itemId).list()
|
||||
ktQuery()
|
||||
.eq(ItemTransaction::itemId, itemId)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByType(transType: String): Mono<List<ItemTransaction>> =
|
||||
blockingCall {
|
||||
logger.info("Searching transactions by type")
|
||||
ktQuery().eq(ItemTransaction::transType, transType).list()
|
||||
ktQuery()
|
||||
.eq(ItemTransaction::transType, transType)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun listByOperator(operatorId: Long): Mono<List<ItemTransaction>> =
|
||||
blockingCall {
|
||||
logger.info("Searching transactions by operator id")
|
||||
ktQuery().eq(ItemTransaction::operatorId, operatorId).list()
|
||||
ktQuery()
|
||||
.eq(ItemTransaction::operatorId, operatorId)
|
||||
.list()
|
||||
}
|
||||
|
||||
override fun createTransaction(transaction: ItemTransaction): Mono<Boolean> =
|
||||
|
||||
+1
-1
@@ -77,7 +77,7 @@ class AuthorizationService(
|
||||
isStaff = false,
|
||||
createdAt = getCurrentDateTime()
|
||||
)
|
||||
Mono.fromCallable { accountService.save(account) }
|
||||
accountService.createAccount(account)
|
||||
.flatMap { success ->
|
||||
if (success) {
|
||||
stringRedisTemplate.delete(Const.VERIFY_EMAIL_DATA + email)
|
||||
|
||||
+16
-87
@@ -9,22 +9,18 @@ import club.itstudio.itmanager.service.AccountService
|
||||
import club.itstudio.itmanager.service.AttachmentService
|
||||
import club.itstudio.itmanager.service.CategoryService
|
||||
import club.itstudio.itmanager.service.FinanceRecordService
|
||||
import club.itstudio.itmanager.service.FileStorageService
|
||||
import club.itstudio.itmanager.utils.Const
|
||||
import club.itstudio.itmanager.utils.DateUtils.getCurrentDateTime
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.amqp.core.AmqpTemplate
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.http.codec.multipart.FilePart
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Flux
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.io.IOException
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Paths
|
||||
import java.util.NoSuchElementException
|
||||
import java.util.UUID
|
||||
|
||||
@Service
|
||||
class FinanceApiService(
|
||||
@@ -33,9 +29,7 @@ class FinanceApiService(
|
||||
private val attachmentService: AttachmentService,
|
||||
private val accountService: AccountService,
|
||||
private val amqpTemplate: AmqpTemplate,
|
||||
|
||||
@Value($$"${app.file.data-path}")
|
||||
private val dataPath: String
|
||||
private val fileStorageService: FileStorageService
|
||||
) {
|
||||
private val logger = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
@@ -49,46 +43,9 @@ class FinanceApiService(
|
||||
itemId: Long?
|
||||
): Mono<Page<FinanceRecord>> {
|
||||
logger.info("Listing finance records")
|
||||
return pageFinanceRecords(page, keyword, type, start, end, vendor, itemId)
|
||||
return financeRecordService.pageFinanceRecords(page, keyword, type, start, end, vendor, itemId)
|
||||
}
|
||||
|
||||
private fun pageFinanceRecords(
|
||||
page: Page<FinanceRecord>,
|
||||
keyword: String?,
|
||||
type: String?,
|
||||
start: String?,
|
||||
end: String?,
|
||||
vendor: String?,
|
||||
itemId: Long?
|
||||
): Mono<Page<FinanceRecord>> =
|
||||
Mono.fromCallable {
|
||||
val wrapper = financeRecordService.ktQuery()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.and {
|
||||
it.like(FinanceRecord::recordNo, keyword)
|
||||
.or().like(FinanceRecord::vendor, keyword)
|
||||
.or().like(FinanceRecord::note, keyword)
|
||||
}
|
||||
}
|
||||
if (!type.isNullOrBlank()) {
|
||||
wrapper.eq(FinanceRecord::type, type)
|
||||
}
|
||||
if (!start.isNullOrBlank() && !end.isNullOrBlank()) {
|
||||
wrapper.apply("occurred_at BETWEEN {0} AND {1}", start, end)
|
||||
} else if (!start.isNullOrBlank()) {
|
||||
wrapper.ge(FinanceRecord::occurredAt, start)
|
||||
} else if (!end.isNullOrBlank()) {
|
||||
wrapper.le(FinanceRecord::occurredAt, end)
|
||||
}
|
||||
if (!vendor.isNullOrBlank()) {
|
||||
wrapper.eq(FinanceRecord::vendor, vendor)
|
||||
}
|
||||
if (itemId != null) {
|
||||
wrapper.eq(FinanceRecord::relatedItemId, itemId)
|
||||
}
|
||||
financeRecordService.page(page, wrapper)
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
|
||||
fun createFinanceRecord(record: FinanceRecord): Mono<String> {
|
||||
logger.info("Creating finance record")
|
||||
val rightNow = getCurrentDateTime()
|
||||
@@ -208,41 +165,25 @@ class FinanceApiService(
|
||||
}
|
||||
|
||||
private fun saveFinanceImage(financeRecordId: Long, file: FilePart): Mono<Attachment> {
|
||||
val directory = Paths.get(dataPath, Const.FILE_DIR_IMAGE, "finance", financeRecordId.toString())
|
||||
val savedName = generateSafeFileName(file.filename())
|
||||
val target = directory.resolve(savedName)
|
||||
return Mono.fromCallable {
|
||||
Files.createDirectories(directory)
|
||||
file.transferTo(target)
|
||||
Attachment(
|
||||
relatedTable = "finance_records",
|
||||
relatedId = financeRecordId,
|
||||
fileName = savedName,
|
||||
filePath = target.toString(),
|
||||
fileSize = Files.size(target),
|
||||
contentType = file.headers().contentType?.toString(),
|
||||
uploadedAt = getCurrentDateTime()
|
||||
)
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
|
||||
private fun generateSafeFileName(original: String?): String {
|
||||
val extension = original
|
||||
?.substringAfterLast('.')
|
||||
?.lowercase()
|
||||
?.takeIf {
|
||||
it.isNotBlank() &&
|
||||
it.length <= 10 &&
|
||||
it.all { ch -> ch.isLetterOrDigit() }
|
||||
return fileStorageService.saveImage(file, "finance", financeRecordId)
|
||||
.map { stored ->
|
||||
Attachment(
|
||||
relatedTable = "finance_records",
|
||||
relatedId = financeRecordId,
|
||||
fileName = stored.path.fileName.toString(),
|
||||
filePath = stored.path.toString(),
|
||||
fileSize = stored.size,
|
||||
contentType = file.headers().contentType?.toString(),
|
||||
uploadedAt = getCurrentDateTime()
|
||||
)
|
||||
}
|
||||
return if (extension != null) "${UUID.randomUUID()}.$extension" else UUID.randomUUID().toString()
|
||||
}
|
||||
|
||||
private fun cleanupFinanceAttachments(financeRecordId: Long): Mono<Boolean> {
|
||||
return attachmentService.listByRelated("finance_records", financeRecordId)
|
||||
.flatMap { attachments ->
|
||||
Flux.fromIterable(attachments)
|
||||
.flatMap { deletePhysicalFile(it.filePath) }
|
||||
.flatMap { fileStorageService.deleteFile(it.filePath) }
|
||||
.then(attachmentService.deleteByRelated("finance_records", financeRecordId))
|
||||
}
|
||||
.onErrorResume { error ->
|
||||
@@ -253,8 +194,7 @@ class FinanceApiService(
|
||||
|
||||
private fun sendFinanceDeleteNotification(record: FinanceRecord): Mono<Void> {
|
||||
val recordedBy = record.recordedBy ?: return Mono.empty()
|
||||
return Mono.fromCallable { accountService.getById(recordedBy) }
|
||||
.subscribeOn(Schedulers.boundedElastic())
|
||||
return accountService.findAccountById(recordedBy)
|
||||
.flatMap { account ->
|
||||
val email = account.email
|
||||
if (email.isNullOrBlank()) {
|
||||
@@ -274,15 +214,4 @@ class FinanceApiService(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun deletePhysicalFile(path: String?): Mono<Void> {
|
||||
if (path.isNullOrBlank()) return Mono.empty()
|
||||
return Mono.fromRunnable<Void> {
|
||||
try {
|
||||
Files.deleteIfExists(Paths.get(path))
|
||||
} catch (e: IOException) {
|
||||
logger.warn("Failed to delete file: {}", path, e)
|
||||
}
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
}
|
||||
@@ -7,23 +7,18 @@ import club.itstudio.itmanager.entity.dto.ItemTransaction
|
||||
import club.itstudio.itmanager.entity.enums.TransactionType
|
||||
import club.itstudio.itmanager.service.AttachmentService
|
||||
import club.itstudio.itmanager.service.CategoryService
|
||||
import club.itstudio.itmanager.service.FileStorageService
|
||||
import club.itstudio.itmanager.service.ItemService
|
||||
import club.itstudio.itmanager.service.ItemTransactionService
|
||||
import club.itstudio.itmanager.utils.Const
|
||||
import club.itstudio.itmanager.utils.DateUtils.getCurrentDateTime
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.http.codec.multipart.FilePart
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Flux
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.io.IOException
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Paths
|
||||
import java.util.NoSuchElementException
|
||||
import java.util.UUID
|
||||
|
||||
@Service
|
||||
class ItemsApiService(
|
||||
@@ -31,9 +26,7 @@ class ItemsApiService(
|
||||
private val categoryService: CategoryService,
|
||||
private val attachmentService: AttachmentService,
|
||||
private val transactionService: ItemTransactionService,
|
||||
|
||||
@Value($$"${app.file.data-path}")
|
||||
private val dataPath: String
|
||||
private val fileStorageService: FileStorageService
|
||||
) {
|
||||
private val logger = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
@@ -262,8 +255,7 @@ class ItemsApiService(
|
||||
fun updateItemImage(attachment: Attachment): Mono<String> {
|
||||
logger.info("Updating item image")
|
||||
if (attachment.id == null) return Mono.just("item image id is required.")
|
||||
return Mono.fromCallable { attachmentService.updateById(attachment) }
|
||||
.subscribeOn(Schedulers.boundedElastic())
|
||||
return attachmentService.updateAttachment(attachment)
|
||||
.flatMap { success ->
|
||||
if (success) Mono.just("")
|
||||
else Mono.just("item image update failed.")
|
||||
@@ -277,7 +269,7 @@ class ItemsApiService(
|
||||
.flatMap { attachment ->
|
||||
attachmentService.deleteAttachment(id).flatMap { success ->
|
||||
if (success) {
|
||||
deletePhysicalFile(attachment.filePath).thenReturn("")
|
||||
fileStorageService.deleteFile(attachment.filePath).thenReturn("")
|
||||
} else {
|
||||
Mono.just("item image delete failed.")
|
||||
}
|
||||
@@ -297,41 +289,25 @@ class ItemsApiService(
|
||||
}
|
||||
|
||||
private fun saveItemImage(itemId: Long, file: FilePart): Mono<Attachment> {
|
||||
val directory = Paths.get(dataPath, Const.FILE_DIR_IMAGE, "items", itemId.toString())
|
||||
val savedName = generateSafeFileName(file.filename())
|
||||
val target = directory.resolve(savedName)
|
||||
return Mono.fromCallable {
|
||||
Files.createDirectories(directory)
|
||||
file.transferTo(target)
|
||||
Attachment(
|
||||
relatedTable = "items",
|
||||
relatedId = itemId,
|
||||
fileName = savedName,
|
||||
filePath = target.toString(),
|
||||
fileSize = Files.size(target),
|
||||
contentType = file.headers().contentType?.toString(),
|
||||
uploadedAt = getCurrentDateTime()
|
||||
)
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
|
||||
private fun generateSafeFileName(original: String?): String {
|
||||
val extension = original
|
||||
?.substringAfterLast('.')
|
||||
?.lowercase()
|
||||
?.takeIf {
|
||||
it.isNotBlank() &&
|
||||
it.length <= 10 &&
|
||||
it.all { ch -> ch.isLetterOrDigit() }
|
||||
return fileStorageService.saveImage(file, "items", itemId)
|
||||
.map { stored ->
|
||||
Attachment(
|
||||
relatedTable = "items",
|
||||
relatedId = itemId,
|
||||
fileName = stored.path.fileName.toString(),
|
||||
filePath = stored.path.toString(),
|
||||
fileSize = stored.size,
|
||||
contentType = file.headers().contentType?.toString(),
|
||||
uploadedAt = getCurrentDateTime()
|
||||
)
|
||||
}
|
||||
return if (extension != null) "${UUID.randomUUID()}.$extension" else UUID.randomUUID().toString()
|
||||
}
|
||||
|
||||
private fun cleanupItemAttachments(itemId: Long): Mono<String> {
|
||||
return attachmentService.listByRelated("items", itemId)
|
||||
.flatMap { attachments ->
|
||||
Flux.fromIterable(attachments)
|
||||
.flatMap { deletePhysicalFile(it.filePath) }
|
||||
.flatMap { fileStorageService.deleteFile(it.filePath) }
|
||||
.then(attachmentService.deleteByRelated("items", itemId))
|
||||
.thenReturn("")
|
||||
}
|
||||
@@ -340,15 +316,4 @@ class ItemsApiService(
|
||||
Mono.just("")
|
||||
}
|
||||
}
|
||||
|
||||
private fun deletePhysicalFile(path: String?): Mono<Void> {
|
||||
if (path.isNullOrBlank()) return Mono.empty()
|
||||
return Mono.fromRunnable<Void> {
|
||||
try {
|
||||
Files.deleteIfExists(Paths.get(path))
|
||||
} catch (e: IOException) {
|
||||
logger.warn("Failed to delete file: {}", path, e)
|
||||
}
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
}
|
||||
|
||||
+1
-2
@@ -41,8 +41,7 @@ class ProofImagesApiService(
|
||||
fun updateProofImage(attachment: Attachment): Mono<String> {
|
||||
logger.info("Updating proof image")
|
||||
if (attachment.id == null) return Mono.just("proof image id is required.")
|
||||
return Mono.fromCallable { attachmentService.updateById(attachment) }
|
||||
.subscribeOn(Schedulers.boundedElastic())
|
||||
return attachmentService.updateAttachment(attachment)
|
||||
.flatMap { success ->
|
||||
if (success) Mono.just("")
|
||||
else Mono.just("proof image update failed.")
|
||||
|
||||
+17
-63
@@ -4,46 +4,28 @@ import club.itstudio.itmanager.entity.dto.Attachment
|
||||
import club.itstudio.itmanager.entity.dto.BorrowRecord
|
||||
import club.itstudio.itmanager.service.AttachmentService
|
||||
import club.itstudio.itmanager.service.BorrowRecordService
|
||||
import club.itstudio.itmanager.service.FileStorageService
|
||||
import club.itstudio.itmanager.utils.Const
|
||||
import club.itstudio.itmanager.utils.DateUtils.getCurrentDateTime
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page
|
||||
import org.slf4j.LoggerFactory
|
||||
import org.springframework.beans.factory.annotation.Value
|
||||
import org.springframework.http.codec.multipart.FilePart
|
||||
import org.springframework.stereotype.Service
|
||||
import reactor.core.publisher.Flux
|
||||
import reactor.core.publisher.Mono
|
||||
import reactor.core.scheduler.Schedulers
|
||||
import java.io.IOException
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Paths
|
||||
import java.util.NoSuchElementException
|
||||
import java.util.UUID
|
||||
|
||||
@Service
|
||||
class UsagesApiService(
|
||||
private val borrowRecordService: BorrowRecordService,
|
||||
private val attachmentService: AttachmentService,
|
||||
|
||||
@Value($$"${app.file.data-path}")
|
||||
private val dataPath: String
|
||||
private val fileStorageService: FileStorageService
|
||||
) {
|
||||
private val logger = LoggerFactory.getLogger(this::class.java)
|
||||
|
||||
fun getUsages(page: Page<BorrowRecord>, keyword: String?, status: String?): Mono<Page<BorrowRecord>> {
|
||||
logger.info("Paging usages with keyword and status")
|
||||
return Mono.fromCallable {
|
||||
val wrapper = Wrappers.lambdaQuery<BorrowRecord>()
|
||||
if (!keyword.isNullOrBlank()) {
|
||||
wrapper.like(BorrowRecord::borrower, keyword)
|
||||
}
|
||||
if (!status.isNullOrBlank()) {
|
||||
wrapper.eq(BorrowRecord::status, status)
|
||||
}
|
||||
wrapper.orderByDesc(BorrowRecord::createdAt)
|
||||
borrowRecordService.page(page, wrapper)
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
return borrowRecordService.pageUsages(page, keyword, status)
|
||||
}
|
||||
|
||||
fun createUsage(record: BorrowRecord): Mono<String> {
|
||||
@@ -145,8 +127,7 @@ class UsagesApiService(
|
||||
fun updateUsageImage(attachment: Attachment): Mono<String> {
|
||||
logger.info("Updating usage image")
|
||||
if (attachment.id == null) return Mono.just("usage image id is required.")
|
||||
return Mono.fromCallable { attachmentService.updateById(attachment) }
|
||||
.subscribeOn(Schedulers.boundedElastic())
|
||||
return attachmentService.updateAttachment(attachment)
|
||||
.flatMap { success ->
|
||||
if (success) Mono.just("")
|
||||
else Mono.just("usage image update failed.")
|
||||
@@ -161,7 +142,7 @@ class UsagesApiService(
|
||||
.flatMap { attachment ->
|
||||
attachmentService.deleteAttachment(id).flatMap { success ->
|
||||
if (success) {
|
||||
deletePhysicalFile(attachment.filePath).thenReturn("")
|
||||
fileStorageService.deleteFile(attachment.filePath).thenReturn("")
|
||||
} else {
|
||||
Mono.just("usage image delete failed.")
|
||||
}
|
||||
@@ -172,41 +153,25 @@ class UsagesApiService(
|
||||
}
|
||||
|
||||
private fun saveUsageImage(usageId: Long, file: FilePart): Mono<Attachment> {
|
||||
val directory = Paths.get(dataPath, Const.FILE_DIR_IMAGE, "borrow_records", usageId.toString())
|
||||
val savedName = generateSafeFileName(file.filename())
|
||||
val target = directory.resolve(savedName)
|
||||
return Mono.fromCallable {
|
||||
Files.createDirectories(directory)
|
||||
file.transferTo(target)
|
||||
Attachment(
|
||||
relatedTable = RELATED_TABLE,
|
||||
relatedId = usageId,
|
||||
fileName = savedName,
|
||||
filePath = target.toString(),
|
||||
fileSize = Files.size(target),
|
||||
contentType = file.headers().contentType?.toString(),
|
||||
uploadedAt = getCurrentDateTime()
|
||||
)
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
|
||||
private fun generateSafeFileName(original: String?): String {
|
||||
val extension = original
|
||||
?.substringAfterLast('.')
|
||||
?.lowercase()
|
||||
?.takeIf {
|
||||
it.isNotBlank() &&
|
||||
it.length <= 10 &&
|
||||
it.all { ch -> ch.isLetterOrDigit() }
|
||||
return fileStorageService.saveImage(file, "borrow_records", usageId)
|
||||
.map { stored ->
|
||||
Attachment(
|
||||
relatedTable = RELATED_TABLE,
|
||||
relatedId = usageId,
|
||||
fileName = stored.path.fileName.toString(),
|
||||
filePath = stored.path.toString(),
|
||||
fileSize = stored.size,
|
||||
contentType = file.headers().contentType?.toString(),
|
||||
uploadedAt = getCurrentDateTime()
|
||||
)
|
||||
}
|
||||
return if (extension != null) "${UUID.randomUUID()}.$extension" else UUID.randomUUID().toString()
|
||||
}
|
||||
|
||||
private fun cleanupUsageAttachments(usageId: Long): Mono<String> {
|
||||
return attachmentService.listByRelated(RELATED_TABLE, usageId)
|
||||
.flatMap { attachments ->
|
||||
Flux.fromIterable(attachments)
|
||||
.flatMap { deletePhysicalFile(it.filePath) }
|
||||
.flatMap { fileStorageService.deleteFile(it.filePath) }
|
||||
.then(attachmentService.deleteByRelated(RELATED_TABLE, usageId))
|
||||
.thenReturn("")
|
||||
}
|
||||
@@ -216,17 +181,6 @@ class UsagesApiService(
|
||||
}
|
||||
}
|
||||
|
||||
private fun deletePhysicalFile(path: String?): Mono<Void> {
|
||||
if (path.isNullOrBlank()) return Mono.empty()
|
||||
return Mono.fromRunnable<Void> {
|
||||
try {
|
||||
Files.deleteIfExists(Paths.get(path))
|
||||
} catch (e: IOException) {
|
||||
logger.warn("Failed to delete file: {}", path, e)
|
||||
}
|
||||
}.subscribeOn(Schedulers.boundedElastic())
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val RELATED_TABLE = "borrow_records"
|
||||
private const val STATUS_BORROWED = "BORROWED"
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package club.itstudio.itmanager.utils
|
||||
|
||||
import kotlinx.serialization.KSerializer
|
||||
import kotlinx.serialization.SerializationException
|
||||
import kotlinx.serialization.descriptors.PrimitiveKind
|
||||
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
|
||||
import kotlinx.serialization.descriptors.SerialDescriptor
|
||||
import kotlinx.serialization.encoding.Decoder
|
||||
import kotlinx.serialization.encoding.Encoder
|
||||
import kotlinx.serialization.json.JsonDecoder
|
||||
import kotlinx.serialization.json.JsonPrimitive
|
||||
import java.math.BigDecimal
|
||||
|
||||
object BigDecimalSerializer : KSerializer<BigDecimal> {
|
||||
override val descriptor: SerialDescriptor =
|
||||
PrimitiveSerialDescriptor("BigDecimal", PrimitiveKind.STRING)
|
||||
|
||||
override fun serialize(encoder: Encoder, value: BigDecimal) {
|
||||
encoder.encodeString(value.toPlainString())
|
||||
}
|
||||
|
||||
override fun deserialize(decoder: Decoder): BigDecimal {
|
||||
val element = (decoder as JsonDecoder).decodeJsonElement()
|
||||
if (element !is JsonPrimitive) {
|
||||
throw SerializationException("Expected JSON primitive, got $element")
|
||||
}
|
||||
return element.content.toBigDecimal()
|
||||
}
|
||||
}
|
||||
@@ -103,6 +103,8 @@ class JwtUtils(
|
||||
return cal.time
|
||||
}
|
||||
|
||||
fun convertToToken(headerToken: String?): String? =
|
||||
headerToken?.replace("Bearer ", "")
|
||||
fun convertToToken(headerToken: String?): String? {
|
||||
val token = headerToken?.replace("Bearer ", "")?.trim()
|
||||
return token?.takeIf { it.isNotEmpty() }
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,7 @@
|
||||
spring:
|
||||
profiles:
|
||||
active: private
|
||||
|
||||
webflux:
|
||||
base-path: /
|
||||
|
||||
@@ -17,8 +20,8 @@ spring:
|
||||
host: localhost
|
||||
port: 5672
|
||||
virtual-host: /
|
||||
username: admin
|
||||
password: 123456
|
||||
#username: admin
|
||||
#password: 123456
|
||||
|
||||
application:
|
||||
name: itmanager
|
||||
@@ -34,6 +37,9 @@ spring:
|
||||
#username: root
|
||||
#password: 123456
|
||||
|
||||
mybatis-plus:
|
||||
type-handlers-package: club.itstudio.itmanager.mapper.typehandler
|
||||
|
||||
app:
|
||||
flow-limit:
|
||||
count: 1000
|
||||
|
||||
@@ -2,6 +2,7 @@ package club.itstudio.itmanager
|
||||
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.springframework.boot.test.context.SpringBootTest
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
|
||||
|
||||
@SpringBootTest
|
||||
class ItmanagerApplicationTests {
|
||||
|
||||
Reference in New Issue
Block a user