添加仓库货架管理

src/main/java/cn/lihongjie/coal/base/mapper/CommonEntityMapper.java

@@ -11,6 +11,7 @@ import cn.lihongjie.coal.coalParameterDef.entity.CoalParameterDefEntity;
 import cn.lihongjie.coal.coalPrice.entity.CoalPriceEntity;
 import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisEntity;
 import cn.lihongjie.coal.coalWashingDailyAnalysisParam.entity.CoalWashingDailyAnalysisParamEntity;
+import cn.lihongjie.coal.coalWashingMonthReport.entity.CoalWashingMonthReportEntity;
 import cn.lihongjie.coal.cronJob.entity.CronJobEntity;
 import cn.lihongjie.coal.cronJobLog.entity.CronJobLogEntity;
 import cn.lihongjie.coal.deliveryInformation.entity.DeliveryInformationEntity;
@@ -53,6 +54,8 @@ import cn.lihongjie.coal.supplier.entity.SupplierEntity;
 import cn.lihongjie.coal.sysconfig.entity.SysConfigEntity;
 import cn.lihongjie.coal.syslog.entity.SysLogEntity;
 import cn.lihongjie.coal.user.entity.UserEntity;
+import cn.lihongjie.coal.warehouse.entity.WarehouseEntity;
+import cn.lihongjie.coal.warehouseShelve.entity.WarehouseShelveEntity;
 
 import org.mapstruct.Mapper;
 
@@ -358,6 +361,16 @@ public interface CommonEntityMapper {
         return e;
     }
 
+    default WarehouseEntity createWarehouseEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new WarehouseEntity();
+        e.setId(id);
+        return e;
+    }
+
     default ResetPwdEntity createResetPwdEntity(String id) {
 
         if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
@@ -468,6 +481,16 @@ public interface CommonEntityMapper {
         return e;
     }
 
+    default WarehouseShelveEntity createWarehouseShelveEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new WarehouseShelveEntity();
+        e.setId(id);
+        return e;
+    }
+
     default DeliveryInformationEntity createDeliveryInformationEntity(String id) {
 
         if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
@@ -579,6 +602,16 @@ public interface CommonEntityMapper {
         return e;
     }
 
+    default CoalWashingMonthReportEntity createCoalWashingMonthReportEntity(String id) {
+
+        if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {
+            return null;
+        }
+        var e = new CoalWashingMonthReportEntity();
+        e.setId(id);
+        return e;
+    }
+
     default FileEntity createFileEntity(String id) {
 
         if (org.apache.commons.lang3.StringUtils.isEmpty(id)) {

src/main/java/cn/lihongjie/coal/warehouseShelve/controller/WarehouseShelveController.java

@@ -0,0 +1,54 @@
+package cn.lihongjie.coal.warehouseShelve.controller;
+
+import cn.lihongjie.coal.annotation.OrgScope;
+import cn.lihongjie.coal.annotation.SysLog;
+import cn.lihongjie.coal.base.dto.CommonQuery;
+import cn.lihongjie.coal.base.dto.IdRequest;
+import cn.lihongjie.coal.warehouseShelve.dto.CreateWarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.dto.UpdateWarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.dto.WarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.service.WarehouseShelveService;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+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;
+
+@RestController
+@RequestMapping("/warehouseShelve")
+@SysLog(module = "仓库货架管理")
+@Slf4j
+@OrgScope
+public class WarehouseShelveController {
+    @Autowired private WarehouseShelveService service;
+
+    @PostMapping("/create")
+    public WarehouseShelveDto create(@RequestBody CreateWarehouseShelveDto request) {
+        return this.service.create(request);
+    }
+
+    @PostMapping("/update")
+    public WarehouseShelveDto update(@RequestBody UpdateWarehouseShelveDto request) {
+        return this.service.update(request);
+    }
+
+    @PostMapping("/delete")
+    public Object delete(@RequestBody IdRequest request) {
+        this.service.delete(request);
+        return true;
+    }
+
+    @PostMapping("/getById")
+    public WarehouseShelveDto getById(@RequestBody IdRequest request) {
+        return this.service.getById(request.getId());
+    }
+
+    @PostMapping("/list")
+    public Page<WarehouseShelveDto> list(@RequestBody CommonQuery request) {
+        return this.service.list(request);
+    }
+}

src/main/java/cn/lihongjie/coal/warehouseShelve/dto/CreateWarehouseShelveDto.java

@@ -0,0 +1,11 @@
+package cn.lihongjie.coal.warehouseShelve.dto;
+
+import cn.lihongjie.coal.base.dto.OrgCommonDto;
+
+import lombok.Data;
+
+@Data
+public class CreateWarehouseShelveDto extends OrgCommonDto {
+
+    private String warehouse;
+}

src/main/java/cn/lihongjie/coal/warehouseShelve/dto/UpdateWarehouseShelveDto.java

@@ -0,0 +1,11 @@
+package cn.lihongjie.coal.warehouseShelve.dto;
+
+import cn.lihongjie.coal.base.dto.OrgCommonDto;
+
+import lombok.Data;
+
+@Data
+public class UpdateWarehouseShelveDto extends OrgCommonDto {
+
+    private String warehouse;
+}

src/main/java/cn/lihongjie/coal/warehouseShelve/dto/WarehouseShelveDto.java

@@ -0,0 +1,12 @@
+package cn.lihongjie.coal.warehouseShelve.dto;
+
+import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.warehouse.dto.WarehouseDto;
+
+import lombok.Data;
+
+@Data
+public class WarehouseShelveDto extends OrgCommonDto {
+
+    private WarehouseDto warehouse;
+}

src/main/java/cn/lihongjie/coal/warehouseShelve/entity/WarehouseShelveEntity.java

@@ -0,0 +1,21 @@
+package cn.lihongjie.coal.warehouseShelve.entity;
+
+import cn.lihongjie.coal.base.entity.OrgCommonEntity;
+import cn.lihongjie.coal.warehouse.entity.WarehouseEntity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+
+import lombok.Data;
+
+@Data
+@Entity
+public class WarehouseShelveEntity extends OrgCommonEntity {
+
+
+    @ManyToOne
+    WarehouseEntity warehouse;
+
+
+
+}

src/main/java/cn/lihongjie/coal/warehouseShelve/mapper/WarehouseShelveMapper.java

@@ -0,0 +1,23 @@
+package cn.lihongjie.coal.warehouseShelve.mapper;
+
+import cn.lihongjie.coal.base.mapper.BaseMapper;
+import cn.lihongjie.coal.base.mapper.CommonEntityMapper;
+import cn.lihongjie.coal.base.mapper.CommonMapper;
+import cn.lihongjie.coal.warehouseShelve.dto.CreateWarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.dto.UpdateWarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.dto.WarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.entity.WarehouseShelveEntity;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.control.DeepClone;
+
+@Mapper(
+        componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING,
+        uses = {CommonMapper.class, CommonEntityMapper.class},
+        mappingControl = DeepClone.class)
+public interface WarehouseShelveMapper
+        extends BaseMapper<
+                WarehouseShelveEntity,
+                WarehouseShelveDto,
+                CreateWarehouseShelveDto,
+                UpdateWarehouseShelveDto> {}

src/main/java/cn/lihongjie/coal/warehouseShelve/repository/WarehouseShelveRepository.java

@@ -0,0 +1,9 @@
+package cn.lihongjie.coal.warehouseShelve.repository;
+
+import cn.lihongjie.coal.base.dao.BaseRepository;
+import cn.lihongjie.coal.warehouseShelve.entity.WarehouseShelveEntity;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WarehouseShelveRepository extends BaseRepository<WarehouseShelveEntity> {}

src/main/java/cn/lihongjie/coal/warehouseShelve/service/WarehouseShelveService.java

@@ -0,0 +1,71 @@
+package cn.lihongjie.coal.warehouseShelve.service;
+
+import cn.lihongjie.coal.base.dto.CommonQuery;
+import cn.lihongjie.coal.base.dto.IdRequest;
+import cn.lihongjie.coal.base.service.BaseService;
+import cn.lihongjie.coal.warehouseShelve.dto.CreateWarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.dto.UpdateWarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.dto.WarehouseShelveDto;
+import cn.lihongjie.coal.warehouseShelve.entity.WarehouseShelveEntity;
+import cn.lihongjie.coal.warehouseShelve.mapper.WarehouseShelveMapper;
+import cn.lihongjie.coal.warehouseShelve.repository.WarehouseShelveRepository;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Slf4j
+@Transactional
+public class WarehouseShelveService
+        extends BaseService<WarehouseShelveEntity, WarehouseShelveRepository> {
+    @Autowired private WarehouseShelveRepository repository;
+
+    @Autowired private WarehouseShelveMapper mapper;
+
+    @Autowired private ConversionService conversionService;
+
+    public WarehouseShelveDto create(CreateWarehouseShelveDto request) {
+        WarehouseShelveEntity entity = mapper.toEntity(request);
+
+        this.repository.save(entity);
+        return getById(entity.getId());
+    }
+
+    public WarehouseShelveDto update(UpdateWarehouseShelveDto request) {
+        WarehouseShelveEntity entity = this.repository.get(request.getId());
+        this.mapper.updateEntity(entity, request);
+
+        this.repository.save(entity);
+
+        return getById(entity.getId());
+    }
+
+    public void delete(IdRequest request) {
+        this.repository.deleteAllById(request.getIds());
+    }
+
+    public WarehouseShelveDto getById(String id) {
+        WarehouseShelveEntity entity = repository.get(id);
+
+        return mapper.toDto(entity);
+    }
+
+    public Page<WarehouseShelveDto> list(CommonQuery query) {
+        Page<WarehouseShelveEntity> page =
+                repository.findAll(
+                        query.specification(conversionService),
+                        PageRequest.of(
+                                query.getPageNo(),
+                                query.getPageSize(),
+                                Sort.by(query.getOrders())));
+
+        return page.map(this.mapper::toDto);
+    }
+}