From 4c2fc60cd224419928d7ef847264b2395644f616 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Thu, 28 Mar 2024 14:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Eid=20-=20=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8E=82=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/FactoryScreenDataController.java     | 16 +++++++++++++---
 .../factory/vo/FactoryRollDataRespVO.java        |  2 ++
 .../mapper/factoryinfo/FactoryInfoMapper.xml     |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java
index a2dda549..596df041 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/FactoryScreenDataController.java
@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory.vo.*;
+import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factory.SfFactoryInfoDO;
+import cn.iocoder.yudao.module.smartfactory.service.factory.SfFactoryInfoService;
 import cn.iocoder.yudao.module.smartfactory.service.screendata.ScreenDataService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,9 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.annotation.security.PermitAll;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -29,6 +28,8 @@ public class FactoryScreenDataController {
 
     @Resource
     private ScreenDataService screenDataService;
+    @Resource
+    private SfFactoryInfoService sfFactoryInfoService;
 
     /**
      * @param code
@@ -164,4 +165,13 @@ public class FactoryScreenDataController {
         ObtainFactoryInboundAndOutboundStatusVO data = screenDataService.getObtainFactoryInboundAndOutboundStatus(factoryId);
         return success(data);
     }
+
+    @GetMapping("/getFactoryInfoById")
+    @Operation(summary = "获取工厂详情")
+    @PermitAll
+    public CommonResult<SfFactoryInfoDO> getFactoryInfoById(@RequestParam Long factoryId) {
+        SfFactoryInfoDO sfFactoryInfo = sfFactoryInfoService.getSfFactoryInfo(factoryId);
+        return success(sfFactoryInfo);
+    }
+
 }
\ No newline at end of file
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/vo/FactoryRollDataRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/vo/FactoryRollDataRespVO.java
index f5931b20..03e9ca1b 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/vo/FactoryRollDataRespVO.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/screendata/factory/vo/FactoryRollDataRespVO.java
@@ -12,6 +12,8 @@ import lombok.Data;
 @Schema(description = "大屏数据 - 工厂基础滚动数据 Response VO")
 @Data
 public class FactoryRollDataRespVO {
+    @Schema(description = "工厂id", requiredMode = Schema.RequiredMode.REQUIRED, example = "工厂id")
+    private Long id;
 
     @Schema(description = "工厂名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "江西省南昌市第一工厂")
     private String name;
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factoryinfo/FactoryInfoMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factoryinfo/FactoryInfoMapper.xml
index f9c78e75..a59c28cd 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factoryinfo/FactoryInfoMapper.xml
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/factoryinfo/FactoryInfoMapper.xml
@@ -11,7 +11,8 @@
 
     <select id="getFactoryRollData"
             resultType="cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory.vo.FactoryRollDataRespVO">
-        SELECT a.name                                                                   as name,
+        SELECT a.id                                                                     as id,
+               a.name                                                                   as name,
                a.short_name                                                             as shortName,
                a.city_name                                                              as cityName,
                (select count(1) from sf_staff where factory_id = a.id and `status` = 1) as total,