From fbdc37d2eefee853a52c78d3cc1750c89fda5621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?= <10549902+zhuangruibo@user.noreply.gitee.com> Date: Sun, 17 May 2026 22:13:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BureauUnitController.java | 27 +++++++++++++ .../controller/DictController.java | 35 ----------------- .../EnterpriseSearchController.java | 4 ++ .../controller/QrCodeController.java | 38 ------------------- 4 files changed, 31 insertions(+), 73 deletions(-) delete mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/DictController.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseSearchController.java delete mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeController.java diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java index 9bf23583..784ba8eb 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/BureauUnitController.java @@ -1,4 +1,31 @@ package com.zdxt.enforcementcode.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.zdxt.enforcementcode.domain.vo.UnitUserVo; +import com.zdxt.enforcementcode.service.IEfcodeVirtualUnitService; +import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/enforcementcode/bureauUnit") public class BureauUnitController { + private final IEfcodeVirtualUnitService efcodeVirtualUnitService; + + @SaCheckPermission("enforcementcode:virtualUnit:list") + @GetMapping("/users") + public TableDataInfo queryUsers( + @RequestParam(required = false) String sysDeptId, + @RequestParam(required = false) String keyword, + @RequestParam(defaultValue = "false") boolean globalSearch, + PageQuery pageQuery) { + return efcodeVirtualUnitService.queryUsersBySysDeptId(sysDeptId, keyword, globalSearch, pageQuery); + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/DictController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/DictController.java deleted file mode 100644 index 562f34b9..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/DictController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zdxt.enforcementcode.controller; - -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.service.ISysDictDataService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * App端-字典数据查询 - */ -@RequiredArgsConstructor -@RestController -@RequestMapping("/common/dict") -public class DictController { - - private final ISysDictDataService dictDataService; - - /** - * 根据字典类型查询字典数据 - * - * @param dictType 字典类型 - * @return 字典数据列表 - */ - @GetMapping("/queryDict") - public R> queryDict(@RequestParam String dictType) { - List list = dictDataService.selectDictDataByType(dictType); - return R.ok(list); - } -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseSearchController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseSearchController.java new file mode 100644 index 00000000..04bc5f0b --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseSearchController.java @@ -0,0 +1,4 @@ +package com.zdxt.enforcementcode.controller; + +public class EnterpriseSearchController { +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeController.java deleted file mode 100644 index d25298ef..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.zdxt.enforcementcode.controller; - -import com.zdxt.enforcementcode.domain.vo.QrCodeGenerateHistoryVo; -import com.zdxt.enforcementcode.helper.QrCodeHelper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.web.core.BaseController; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * 二维码生成通用接口 - *

- * 提供二维码生成(标准黑白 / 蓝色带 LOGO)、Base64 编码、二维码解析等通用能力。 - * 生成后自动上传到 OSS 并保存 zdxt_file 和 qr_code_generate_history 记录。 - *

- * - * @author zdxt - */ -@Slf4j -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/common/qrcode") -public class QrCodeController extends BaseController { - -}