From 07a78e6ef9218d48c8a76d4af5e001f35736347b Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Sat, 8 Jun 2024 08:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=8C=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cameradevice/CameraDeviceController.java | 23 ++-- .../vo/CameraDevicePageReqVO.java | 3 +- .../cameradevice/vo/CameraDeviceRespVO.java | 6 +- .../vo/CameraDeviceSaveReqVO.java | 5 +- .../factoryinfo/vo/FactoryInfoSaveReqVO.java | 10 +- .../device}/cameradevice/CameraDeviceDO.java | 2 +- .../dataobject/factoryinfo/FactoryInfoDO.java | 1 + .../cameradevice/CameraDeviceMapper.java | 8 +- .../mysql/factorydata/FactoryDataMapper.java | 4 +- .../cameradevice/CameraDeviceService.java | 8 +- .../cameradevice/CameraDeviceServiceImpl.java | 10 +- .../factorydata/FactoryDataServiceImpl.java | 67 +++------- .../factoryinfo/FactoryInfoService.java | 7 + .../factoryinfo/FactoryInfoServiceImpl.java | 6 + .../cameradevice/CameraDeviceMapper.xml | 2 +- .../mapper/factorydata/FactoryDataMapper.xml | 123 +++++++++++++++--- 16 files changed, 171 insertions(+), 114 deletions(-) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/controller/admin => smartfactory/controller/admin/device}/cameradevice/CameraDeviceController.java (80%) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/controller/admin => smartfactory/controller/admin/device}/cameradevice/vo/CameraDevicePageReqVO.java (94%) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/controller/admin => smartfactory/controller/admin/device}/cameradevice/vo/CameraDeviceRespVO.java (92%) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/controller/admin => smartfactory/controller/admin/device}/cameradevice/vo/CameraDeviceSaveReqVO.java (94%) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/dal/dataobject => smartfactory/dal/dataobject/device}/cameradevice/CameraDeviceDO.java (94%) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/dal/mysql => smartfactory/dal/mysql/device}/cameradevice/CameraDeviceMapper.java (84%) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/service => smartfactory/service/device}/cameradevice/CameraDeviceService.java (78%) rename zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/{device/service => smartfactory/service/device}/cameradevice/CameraDeviceServiceImpl.java (80%) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/CameraDeviceController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/CameraDeviceController.java similarity index 80% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/CameraDeviceController.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/CameraDeviceController.java index f1dd5eab..5ae8cf7f 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/CameraDeviceController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/CameraDeviceController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.device.controller.admin.cameradevice; +package cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -25,13 +24,13 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; -import cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo.*; -import cn.iocoder.yudao.module.device.dal.dataobject.cameradevice.CameraDeviceDO; -import cn.iocoder.yudao.module.device.service.cameradevice.CameraDeviceService; +import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.*; +import cn.iocoder.yudao.module.smartfactory.dal.dataobject.device.cameradevice.CameraDeviceDO; +import cn.iocoder.yudao.module.smartfactory.service.device.cameradevice.CameraDeviceService; @Tag(name = "管理后台 - 设备-监控摄像头") @RestController -@RequestMapping("/device/camera-device") +@RequestMapping("/smartfactory/camera-device") @Validated public class CameraDeviceController { @@ -40,14 +39,14 @@ public class CameraDeviceController { @PostMapping("/create") @Operation(summary = "创建设备-监控摄像头") - @PreAuthorize("@ss.hasPermission('device:camera-device:create')") + @PreAuthorize("@ss.hasPermission('smartfactory:camera-device:create')") public CommonResult createCameraDevice(@Valid @RequestBody CameraDeviceSaveReqVO createReqVO) { return success(cameraDeviceService.createCameraDevice(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新设备-监控摄像头") - @PreAuthorize("@ss.hasPermission('device:camera-device:update')") + @PreAuthorize("@ss.hasPermission('smartfactory:camera-device:update')") public CommonResult updateCameraDevice(@Valid @RequestBody CameraDeviceSaveReqVO updateReqVO) { cameraDeviceService.updateCameraDevice(updateReqVO); return success(true); @@ -56,7 +55,7 @@ public class CameraDeviceController { @DeleteMapping("/delete") @Operation(summary = "删除设备-监控摄像头") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('device:camera-device:delete')") + @PreAuthorize("@ss.hasPermission('smartfactory:camera-device:delete')") public CommonResult deleteCameraDevice(@RequestParam("id") Long id) { cameraDeviceService.deleteCameraDevice(id); return success(true); @@ -65,7 +64,7 @@ public class CameraDeviceController { @GetMapping("/get") @Operation(summary = "获得设备-监控摄像头") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('device:camera-device:query')") + @PreAuthorize("@ss.hasPermission('smartfactory:camera-device:query')") public CommonResult getCameraDevice(@RequestParam("id") Long id) { CameraDeviceDO cameraDevice = cameraDeviceService.getCameraDevice(id); return success(BeanUtils.toBean(cameraDevice, CameraDeviceRespVO.class)); @@ -73,7 +72,7 @@ public class CameraDeviceController { @GetMapping("/page") @Operation(summary = "获得设备-监控摄像头分页") - @PreAuthorize("@ss.hasPermission('device:camera-device:query')") + @PreAuthorize("@ss.hasPermission('smartfactory:camera-device:query')") public CommonResult> getCameraDevicePage(@Valid CameraDevicePageReqVO pageReqVO) { PageResult pageResult = cameraDeviceService.getCameraDevicePage(pageReqVO); return success(BeanUtils.toBean(pageResult, CameraDeviceRespVO.class)); @@ -81,7 +80,7 @@ public class CameraDeviceController { @GetMapping("/export-excel") @Operation(summary = "导出设备-监控摄像头 Excel") - @PreAuthorize("@ss.hasPermission('device:camera-device:export')") + @PreAuthorize("@ss.hasPermission('smartfactory:camera-device:export')") @OperateLog(type = EXPORT) public void exportCameraDeviceExcel(@Valid CameraDevicePageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDevicePageReqVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDevicePageReqVO.java similarity index 94% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDevicePageReqVO.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDevicePageReqVO.java index 50c869f1..82b988bc 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDevicePageReqVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDevicePageReqVO.java @@ -1,7 +1,6 @@ -package cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo; +package cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDeviceRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDeviceRespVO.java similarity index 92% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDeviceRespVO.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDeviceRespVO.java index 1a5f55c1..191e8b51 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDeviceRespVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDeviceRespVO.java @@ -1,10 +1,8 @@ -package cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo; +package cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDeviceSaveReqVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDeviceSaveReqVO.java similarity index 94% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDeviceSaveReqVO.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDeviceSaveReqVO.java index e9dc59ce..166f68d8 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/controller/admin/cameradevice/vo/CameraDeviceSaveReqVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/device/cameradevice/vo/CameraDeviceSaveReqVO.java @@ -1,10 +1,9 @@ -package cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo; +package cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import javax.validation.constraints.*; -import java.util.*; @Schema(description = "管理后台 - 设备-监控摄像头新增/修改 Request VO") @Data diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/vo/FactoryInfoSaveReqVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/vo/FactoryInfoSaveReqVO.java index 3862a101..bb6eb796 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/vo/FactoryInfoSaveReqVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/vo/FactoryInfoSaveReqVO.java @@ -1,10 +1,10 @@ package cn.iocoder.yudao.module.smartfactory.controller.admin.factoryinfo.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; @Schema(description = "管理后台 - 工厂信息新增/修改 Request VO") @@ -22,7 +22,7 @@ public class FactoryInfoSaveReqVO { @NotEmpty(message = "工厂简称不能为空") private String shortName; - @Schema(description = "工厂类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "工厂类型 | 字典值 参考 sf_factory_type", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotEmpty(message = "工厂类型不能为空") private String type; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/dal/dataobject/cameradevice/CameraDeviceDO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/device/cameradevice/CameraDeviceDO.java similarity index 94% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/dal/dataobject/cameradevice/CameraDeviceDO.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/device/cameradevice/CameraDeviceDO.java index a3e35e83..f7a140d9 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/dal/dataobject/cameradevice/CameraDeviceDO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/device/cameradevice/CameraDeviceDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.device.dal.dataobject.cameradevice; +package cn.iocoder.yudao.module.smartfactory.dal.dataobject.device.cameradevice; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryinfo/FactoryInfoDO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryinfo/FactoryInfoDO.java index 05c3a954..af47854d 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryinfo/FactoryInfoDO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/factoryinfo/FactoryInfoDO.java @@ -47,6 +47,7 @@ public class FactoryInfoDO extends BaseDO { private String shortName; /** * 工厂类型 + * 字典值 参考 sf_factory_type */ private String type; /** diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/dal/mysql/cameradevice/CameraDeviceMapper.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java similarity index 84% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/dal/mysql/cameradevice/CameraDeviceMapper.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java index cf66146b..920f09d0 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/dal/mysql/cameradevice/CameraDeviceMapper.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/device/cameradevice/CameraDeviceMapper.java @@ -1,13 +1,11 @@ -package cn.iocoder.yudao.module.device.dal.mysql.cameradevice; - -import java.util.*; +package cn.iocoder.yudao.module.smartfactory.dal.mysql.device.cameradevice; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.device.dal.dataobject.cameradevice.CameraDeviceDO; +import cn.iocoder.yudao.module.smartfactory.dal.dataobject.device.cameradevice.CameraDeviceDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo.*; +import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.*; /** * 设备-监控摄像头 Mapper diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java index 1f576da3..fd07155c 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/factorydata/FactoryDataMapper.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.smartfactory.dal.mysql.factorydata; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataDetailRespVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataInfoRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataPageReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.factorydata.vo.FactoryDataTotalVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factorydata.FactoryDataDO; @@ -21,7 +21,7 @@ import java.util.List; @Mapper public interface FactoryDataMapper extends BaseMapperX { - IPage selectDetailPage(@Param("page") IPage mpPage, @Param("reqVO") FactoryDataPageReqVO pageReqVO); + IPage selectDetailPage(@Param("page") IPage mpPage, @Param("reqVO") FactoryDataPageReqVO pageReqVO); default FactoryDataDO selectListByType(Long factoryId, LocalDate date, Integer type) { diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/service/cameradevice/CameraDeviceService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceService.java similarity index 78% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/service/cameradevice/CameraDeviceService.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceService.java index 2b02a549..3ef3b434 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/service/cameradevice/CameraDeviceService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceService.java @@ -1,11 +1,9 @@ -package cn.iocoder.yudao.module.device.service.cameradevice; +package cn.iocoder.yudao.module.smartfactory.service.device.cameradevice; -import java.util.*; import javax.validation.*; -import cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo.*; -import cn.iocoder.yudao.module.device.dal.dataobject.cameradevice.CameraDeviceDO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.*; +import cn.iocoder.yudao.module.smartfactory.dal.dataobject.device.cameradevice.CameraDeviceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 设备-监控摄像头 Service 接口 diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/service/cameradevice/CameraDeviceServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java similarity index 80% rename from zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/service/cameradevice/CameraDeviceServiceImpl.java rename to zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java index 51242270..46c579e2 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/device/service/cameradevice/CameraDeviceServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/device/cameradevice/CameraDeviceServiceImpl.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.device.service.cameradevice; +package cn.iocoder.yudao.module.smartfactory.service.device.cameradevice; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo.CameraDevicePageReqVO; -import cn.iocoder.yudao.module.device.controller.admin.cameradevice.vo.CameraDeviceSaveReqVO; -import cn.iocoder.yudao.module.device.dal.dataobject.cameradevice.CameraDeviceDO; -import cn.iocoder.yudao.module.device.dal.mysql.cameradevice.CameraDeviceMapper; +import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.CameraDevicePageReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.CameraDeviceSaveReqVO; +import cn.iocoder.yudao.module.smartfactory.dal.dataobject.device.cameradevice.CameraDeviceDO; +import cn.iocoder.yudao.module.smartfactory.dal.mysql.device.cameradevice.CameraDeviceMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java index 2120bbc1..9e57ce13 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factorydata/FactoryDataServiceImpl.java @@ -175,53 +175,19 @@ public class FactoryDataServiceImpl implements FactoryDataService { public PageResult getDataPage(FactoryDataPageReqVO pageReqVO) { //获得 出入库数据分页列表 - IPage mpPage = MyBatisUtils.buildPage(pageReqVO); - IPage page = dataMapper.selectDetailPage(mpPage, pageReqVO); - PageResult dataPage = new PageResult<>(page.getRecords(), page.getTotal()); + IPage mpPage = MyBatisUtils.buildPage(pageReqVO); + IPage page = dataMapper.selectDetailPage(mpPage, pageReqVO); - //获得 入库数、打包破损、入库破损、出库数、出库破损的工厂规格数据 - List infoDatas = dataSizeService.getDetailList(pageReqVO.getFactoryId(), pageReqVO.getDate(), pageReqVO.getCreateTime()); - - List respVOS = dataPage.getList(); + List respVOS = page.getRecords(); + List toDayData = new ArrayList<>(); if (!respVOS.isEmpty()) { - //获得工厂信息列表 - List factoryIdS = respVOS.stream().map(FactoryDataDetailRespVO::getFactoryId).collect(Collectors.toList()); - List factoryInfoDOS = factoryInfoService.getFactoryList(factoryIdS); - Map factoryMap = convertMap(factoryInfoDOS, FactoryInfoDO::getId); - - respVOS.forEach(items -> { - - //规格明细数据 - List infoList = infoDatas.stream() - .filter(data -> data.getFactoryId().equals(items.getFactoryId()) && data.getDate().equals(items.getDate())) - .collect(Collectors.toList()); - infoList.forEach(info -> { - int num = Optional.ofNullable(info.getNum()).orElse(0); - int autoNum = Optional.ofNullable(info.getAutoNum()).orElse(0); - int inNum = Optional.ofNullable(info.getInNum()).orElse(0); - info.setInNum((num + autoNum + inNum) == 0 ? null : (num + autoNum + inNum)); - }); - - items.setItems(infoList); - items.setFactoryName(factoryMap.get(items.getFactoryId()).getName()); - - //移除 已处理过的数据 - infoDatas.removeAll(infoList); - }); - }else { - respVOS = new ArrayList<>(); - } - - List toDayData = new ArrayList<>(); - // 展示当天录入的数据 - if (!infoDatas.isEmpty()) { - // 按 工厂id和日期 进行分组 - Map>> groupedByFactoryIdAndDate = infoDatas.stream() + Map>> groupedByFactoryIdAndDate = respVOS.stream() .collect(Collectors.groupingBy(FactoryDataInfoRespVO::getFactoryId, Collectors.groupingBy(FactoryDataInfoRespVO::getDate))); + //获得工厂信息列表 Map factoryMaps = convertMap(factoryInfoService.getFactoryList(groupedByFactoryIdAndDate.keySet()) , FactoryInfoDO::getId); groupedByFactoryIdAndDate.forEach((factoryId, dateMap) -> { @@ -277,11 +243,9 @@ public class FactoryDataServiceImpl implements FactoryDataService { toDayData.add(dataDetailRespVO); }); }); - respVOS.addAll(0, toDayData); - dataPage.setTotal((long) respVOS.size()); } - return new PageResult<>(respVOS, dataPage.getTotal()); + return new PageResult<>(toDayData, page.getTotal()); } @Override @@ -323,6 +287,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { } FactoryImportRespVO respVO = FactoryImportRespVO.builder().createUsernames(new ArrayList<>()).updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build(); + list.forEach(data -> { //校验，判断是否有不符合的原因 @@ -331,7 +296,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { factoryId = validateFactoryForCreate(data.getFactoryName(), data.getSizeName(), data.getDate()); } catch (ServiceException ex) { - respVO.getFailureUsernames().put(data.getFactoryName(), ex.getMessage()); + respVO.getFailureUsernames().put(data.getFactoryName() + "-" + data.getDate(), ex.getMessage()); return; } @@ -373,13 +338,13 @@ public class FactoryDataServiceImpl implements FactoryDataService { List factoryDataSizeDOs = new ArrayList<>(); if (data.getInDamageNum() != null || data.getInNum() != null || data.getOutNum() != null) { - if (data.getInDamageNum() != null) { + if (data.getInDamageNum() != null && data.getInDamageNum() != 0) { FactoryDataSizeDO dataSizeDO = new FactoryDataSizeDO(); //设置规格信息 dataSizeDO.setSizeId(sizeId); dataSizeDO.setSizeName(sizeName); - dataSizeDO.setSizePieces(packageDO == null ? null : packageDO.getSizePieces()); +// dataSizeDO.setSizePieces(packageDO == null ? null : packageDO.getSizePieces()); //设置工厂和日期 dataSizeDO.setFactoryId(factoryId); dataSizeDO.setDate(data.getDate()); @@ -390,13 +355,13 @@ public class FactoryDataServiceImpl implements FactoryDataService { factoryDataSizeDOs.add(dataSizeDO); } - if (data.getInNum() != null) { + if (data.getInNum() != null && data.getInNum() != 0) { FactoryDataSizeDO dataSizeDO = new FactoryDataSizeDO(); //设置规格信息 dataSizeDO.setSizeId(sizeId); dataSizeDO.setSizeName(sizeName); - dataSizeDO.setSizePieces(packageDO == null ? null : packageDO.getSizePieces()); +// dataSizeDO.setSizePieces(packageDO == null ? null : packageDO.getSizePieces()); //设置工厂和日期 dataSizeDO.setFactoryId(factoryId); dataSizeDO.setDate(data.getDate()); @@ -407,7 +372,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { factoryDataSizeDOs.add(dataSizeDO); } - if (data.getOutNum() != null) { + if (data.getOutNum() != null && data.getOutNum() != 0) { FactoryDataSizeDO dataSizeDO = new FactoryDataSizeDO(); //设置规格信息 @@ -423,7 +388,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { factoryDataSizeDOs.add(dataSizeDO); } - if (data.getOutDamageNum() != null) { + if (data.getOutDamageNum() != null && data.getOutDamageNum() != 0) { FactoryDataSizeDO dataSizeDO = new FactoryDataSizeDO(); //设置规格信息 @@ -442,7 +407,7 @@ public class FactoryDataServiceImpl implements FactoryDataService { factoryDataSizeMapper.insertBatch(factoryDataSizeDOs); } - respVO.getCreateUsernames().add(data.getFactoryName()); + respVO.getCreateUsernames().add(data.getFactoryName() + "-" + data.getDate()); }); return respVO; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java index dd583dc4..2b69df44 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoService.java @@ -48,6 +48,13 @@ public interface FactoryInfoService { */ FactoryInfoDO getFactoryInfo(Long id); + /** + * 获得工厂信息列表 + * + * @return 工厂信息 + */ + List getFactoryList(); + /** * 获得工厂信息列表 * diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java index 5b62f430..9be157a0 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java @@ -122,6 +122,12 @@ public class FactoryInfoServiceImpl implements FactoryInfoService { return factoryInfoMapper.selectById(id); } + @Override + public List getFactoryList() { + + return factoryInfoMapper.selectList(); + } + @Override public List getFactoryList(Collection ids) { diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/cameradevice/CameraDeviceMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/cameradevice/CameraDeviceMapper.xml index f4d5c7b6..afac57da 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/cameradevice/CameraDeviceMapper.xml +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/cameradevice/CameraDeviceMapper.xml @@ -1,6 +1,6 @@ - + - SELECT - factory_id, - date, - SUM(CASE WHEN data_type = 2 THEN total_num END) AS inTotalNum, - SUM(CASE WHEN data_type = 1 THEN square_num END) AS squareNum, - SUM(CASE WHEN data_type = 1 THEN total_num END) AS outTotalNum, - SUM(CASE WHEN data_type = 1 or data_type = 2 THEN damage_num END) AS damageNum + a.id AS id, + a.factory_id AS factoryId, + a.package_name AS packageName, + a.package_date AS date, + a.size_id AS sizeId, + a.size_name AS sizeName, + a.size_pieces AS sizePieces, + a.num AS num, + a.auto_num AS autoNum, + a.square_num AS squareNum, + a.damage_num AS damageNum, + b.inNumId, + b.inNum, + b.inDamageNumId, + b.inDamageNum, + b.outNumId, + b.outNum, + b.outDamageNumId, + b.outDamageNum FROM - sf_factory_data + sf_package_data a + LEFT JOIN ( + SELECT + factory_id, + date, + size_pieces, + MAX( CASE WHEN type = 4 THEN id END ) AS inNumId, + MAX( CASE WHEN type = 4 THEN num END ) AS inNum, + MAX( CASE WHEN type = 1 THEN id END ) AS inDamageNumId, + MAX( CASE WHEN type = 1 THEN num END ) AS inDamageNum, + MAX( CASE WHEN type = 2 THEN id END ) AS outNumId, + MAX( CASE WHEN type = 2 THEN num END ) AS outNum, + MAX( CASE WHEN type = 3 THEN id END ) AS outDamageNumId, + MAX( CASE WHEN type = 3 THEN num END ) AS outDamageNum + FROM + sf_factory_data_size + GROUP BY + factory_id, + date, + size_pieces + ) b + ON a.factory_id = b.factory_id + AND a.package_date = b.date + and a.size_pieces = b.size_pieces - deleted = 0 + a.deleted = 0 - AND factory_id = #{reqVO.factoryId} - - - AND data_type = #{reqVO.dataType} + AND a.factory_id = #{reqVO.factoryId} - AND date >= #{reqVO.date[0]} + AND a.package_date >= #{reqVO.date[0]} - AND date <= #{reqVO.date[1]} + AND a.package_date <= #{reqVO.date[1]} - AND create_time >= #{reqVO.createTime[0]} + AND a.create_time >= #{reqVO.createTime[0]} - AND create_time <= #{reqVO.createTime[1]} + AND a.create_time <= #{reqVO.createTime[1]} - GROUP BY factory_id,date + + UNION + + SELECT + NULL AS id, + c.factory_id AS factoryId, + NULL AS packageName, + c.date AS date, + c.size_id AS sizeId, + c.size_name AS sizeName, + NULL AS sizePieces, + NULL AS num, + NULL AS autoNum, + NULL AS squareNum, + NULL AS damageNum, + MAX(CASE WHEN c.type = 4 THEN c.id END) AS inNumId, + MAX(CASE WHEN c.type = 4 THEN c.num END) AS inNum, + MAX(CASE WHEN c.type = 1 THEN c.id END) AS inDamageNumId, + MAX(CASE WHEN c.type = 1 THEN c.num END) AS inDamageNum, + MAX(CASE WHEN c.type = 2 THEN c.id END) AS outNumId, + MAX(CASE WHEN c.type = 2 THEN c.num END) AS outNum, + MAX(CASE WHEN c.type = 3 THEN c.id END) AS outDamageNumId, + MAX(CASE WHEN c.type = 3 THEN c.num END) AS outDamageNum + FROM + sf_factory_data_size AS c + WHERE + NOT EXISTS ( + SELECT 1 + FROM sf_package_data + WHERE + size_id = c.size_id + AND size_pieces = c.size_pieces + AND package_date = c.date + ) + AND c.deleted = 0 + + AND c.factory_id = #{reqVO.factoryId} + + + + AND c.date >= #{reqVO.date[0]} + + + AND c.date <= #{reqVO.date[1]} + + + + + AND c.create_time >= #{reqVO.createTime[0]} + + + AND c.create_time <= #{reqVO.createTime[1]} + + + GROUP BY c.factory_id,c.date,c.size_id,c.size_name ORDER BY date DESC