Sfoglia il codice sorgente

add qc item master

create_edit_user
cyril.tsui 5 mesi fa
parent
commit
9a2b56fe71
3 ha cambiato i file con 38 aggiunte e 11 eliminazioni
  1. +2
    -0
      src/main/java/com/ffii/fpsms/modules/master/entity/QcItemRepository.kt
  2. +17
    -1
      src/main/java/com/ffii/fpsms/modules/master/service/QcItemService.kt
  3. +19
    -10
      src/main/java/com/ffii/fpsms/modules/master/web/QcItemController.kt

+ 2
- 0
src/main/java/com/ffii/fpsms/modules/master/entity/QcItemRepository.kt Vedi File

@@ -8,4 +8,6 @@ interface QcItemRepository : AbstractRepository<QcItem, Long> {
fun findAllByDeletedIsFalse(): List<QcItem> fun findAllByDeletedIsFalse(): List<QcItem>


fun findByCodeAndDeletedIsFalse(code: String): QcItem? fun findByCodeAndDeletedIsFalse(code: String): QcItem?

fun findByIdAndDeletedIsFalse(id: Long): QcItem?
} }

+ 17
- 1
src/main/java/com/ffii/fpsms/modules/master/service/QcItemService.kt Vedi File

@@ -1,12 +1,14 @@
package com.ffii.fpsms.modules.master.service package com.ffii.fpsms.modules.master.service


import com.ffii.core.support.AbstractBaseEntityService
import com.ffii.core.support.JdbcDao
import com.ffii.fpsms.modules.master.entity.QcItem import com.ffii.fpsms.modules.master.entity.QcItem
import com.ffii.fpsms.modules.master.entity.QcItemRepository import com.ffii.fpsms.modules.master.entity.QcItemRepository
import org.springframework.stereotype.Service import org.springframework.stereotype.Service


@Service @Service
open class QcItemService( open class QcItemService(
private val qcItemRepository: QcItemRepository
private val qcItemRepository: QcItemRepository,
) { ) {
open fun allQcItems(): List<QcItem> { open fun allQcItems(): List<QcItem> {
return qcItemRepository.findAllByDeletedIsFalse() return qcItemRepository.findAllByDeletedIsFalse()
@@ -15,4 +17,18 @@ open class QcItemService(
open fun findQcItemByCode(code: String): QcItem? { open fun findQcItemByCode(code: String): QcItem? {
return qcItemRepository.findByCodeAndDeletedIsFalse(code) return qcItemRepository.findByCodeAndDeletedIsFalse(code)
} }

open fun findQcItemById(id: Long): QcItem? {
return qcItemRepository.findByIdAndDeletedIsFalse(id)
}

open fun markDeleted(id: Long): List<QcItem> {
val qcItem = qcItemRepository.findById(id).orElseThrow().apply {
deleted = true
}

qcItemRepository.save(qcItem)

return allQcItems()
}
} }

+ 19
- 10
src/main/java/com/ffii/fpsms/modules/master/web/QcItemController.kt Vedi File

@@ -1,21 +1,16 @@
package com.ffii.fpsms.modules.master.web package com.ffii.fpsms.modules.master.web


import com.ffii.core.exception.NotFoundException
import com.ffii.core.utils.JwtTokenUtil
import com.ffii.fpsms.modules.master.entity.QcItem import com.ffii.fpsms.modules.master.entity.QcItem
import com.ffii.fpsms.modules.master.entity.QcItemRepository import com.ffii.fpsms.modules.master.entity.QcItemRepository
import com.ffii.fpsms.modules.master.service.QcItemService import com.ffii.fpsms.modules.master.service.QcItemService
import com.ffii.fpsms.modules.master.web.models.SaveQcItemRequest import com.ffii.fpsms.modules.master.web.models.SaveQcItemRequest
import com.ffii.fpsms.modules.master.web.models.SaveQcItemResponse import com.ffii.fpsms.modules.master.web.models.SaveQcItemResponse
import jakarta.validation.Valid import jakarta.validation.Valid
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
import kotlin.reflect.KClass
import kotlin.reflect.KProperty
import kotlin.reflect.KParameter
import kotlin.reflect.KTypeParameter
import kotlin.reflect.typeOf
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.web.bind.annotation.*


@RestController @RestController
@RequestMapping("/qcItems") @RequestMapping("/qcItems")
@@ -23,11 +18,25 @@ class QcItemController(
private val qcItemService: QcItemService, private val qcItemService: QcItemService,
private val qcItemRepository: QcItemRepository, private val qcItemRepository: QcItemRepository,
) { ) {

var logger: Logger = LoggerFactory.getLogger(JwtTokenUtil::class.java)
@GetMapping @GetMapping
fun allQcItems(): List<QcItem> { fun allQcItems(): List<QcItem> {
return qcItemService.allQcItems() return qcItemService.allQcItems()
} }


@DeleteMapping("/{id}")
// @ResponseStatus(HttpStatus.NO_CONTENT)
fun deleteQcItem(@PathVariable id: Long): List<QcItem> {
return qcItemService.markDeleted(id)
}

@GetMapping("/qcItemDetails/{id}")
fun qcItemDetails(@PathVariable id: Long): QcItem {
logger.info(qcItemService.findQcItemById(id)?.code)
return qcItemService.findQcItemById(id) ?: throw NotFoundException()
}

@PostMapping("/save") @PostMapping("/save")
fun saveQcItem(@Valid @RequestBody request: SaveQcItemRequest): SaveQcItemResponse { fun saveQcItem(@Valid @RequestBody request: SaveQcItemRequest): SaveQcItemResponse {




Caricamento…
Annulla
Salva