From d5420a8fef6d680e5bdce86b36cb8e90d7e22419 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期六, 16 八月 2025 09:49:25 +0800
Subject: [PATCH] 安灯发起-工单-飞书发送消息(一级响应/二级响应/三级响应) 飞书安灯消息模板相关代码

---
 src/main/java/org/jeecg/modules/andon/controller/AndonButtonConfigController.java |   36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/andon/controller/AndonButtonConfigController.java b/src/main/java/org/jeecg/modules/andon/controller/AndonButtonConfigController.java
index a589c4b..633af0f 100644
--- a/src/main/java/org/jeecg/modules/andon/controller/AndonButtonConfigController.java
+++ b/src/main/java/org/jeecg/modules/andon/controller/AndonButtonConfigController.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,7 +13,9 @@
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.andon.dto.AndonButtonDTO;
 import org.jeecg.modules.andon.entity.AndonButtonConfig;
+import org.jeecg.modules.andon.entity.AndonOrder;
 import org.jeecg.modules.andon.service.IAndonButtonConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.List;
 
 /**
 * @Description: 瀹夌伅鎸夐挳閰嶇疆
@@ -61,34 +65,22 @@
 
 
     /**
-     * APP鍒嗛〉鍒楄〃鏌ヨ
+     * APP瀹夌伅鎸夐挳鍒楄〃鏌ヨ
      *
-     * @param andonButtonConfig
-     * @param pageNo
-     * @param pageSize
-     * @param req
+     * @param factoryId
      * @return
      */
     @ApiOperation(value="瀹夌伅鎸夐挳閰嶇疆-鍒嗛〉鍒楄〃鏌ヨ", notes="瀹夌伅鎸夐挳閰嶇疆-鍒嗛〉鍒楄〃鏌ヨ")
-    @GetMapping(value = "/App/list")
-    public Result<IPage<AndonButtonConfig>> queryPageAppList(AndonButtonConfig andonButtonConfig,
-                                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        QueryWrapper<AndonButtonConfig> queryWrapper = QueryGenerator.initQueryWrapper(andonButtonConfig, req.getParameterMap());
-
-        // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (sysUser != null) {
-            // 澧炲姞閫氳繃绯荤粺鐧诲綍浜鸿繘琛岃繃婊�
-            queryWrapper.eq("create_by", sysUser.getUsername());
-        }
-
-        Page<AndonButtonConfig> page = new Page<AndonButtonConfig>(pageNo, pageSize);
-        IPage<AndonButtonConfig> pageList = andonButtonConfigService.page(page, queryWrapper);
-        return Result.OK(pageList);
+    @GetMapping(value = "/queryUserAndonButtonList")
+        public Result<List<AndonButtonDTO>> queryUserAndonButtonList(@RequestParam("factoryId") String factoryId) {
+        List<AndonButtonDTO> list = andonButtonConfigService.queryUserAndonButtonList(factoryId);
+        return Result.OK(list);
     }
 
+
+
+
+
    /**
     *   娣诲姞
     *

--
Gitblit v1.9.3