From 5441abe5889e5a06d53206a7fae8756f066d445f Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 29 Sep 2025 17:23:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/basicdata/controller/LoginController.java | 6 ++++-- .../controller/WorkTicketOrderAppController.java | 8 ++++---- .../policecamera/entity/vo/WorkTicketOrderVo.java | 10 +++++++++- .../policecamera/mapper/xml/WorkTicketOrderMapper.xml | 4 ++++ .../java/com/zhgd/xmgl/security/WebSecurityConfig.java | 1 + src/main/resources/application.properties | 4 ++-- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java index af5155a1e..2c58dafdf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java @@ -1,8 +1,8 @@ package com.zhgd.xmgl.modules.basicdata.controller; -import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.LineCaptcha; +import cn.hutool.captcha.generator.RandomGenerator; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -112,7 +112,9 @@ public class LoginController { @GetMapping("/login/captcha") public void getCaptcha(HttpServletResponse response) throws IOException { String captchaId = UUID.randomUUID().toString(); - LineCaptcha captcha = CaptchaUtil.createLineCaptcha(100, 40, 4, 50); + // 自定义配置创建纯数字验证码 + LineCaptcha captcha = new LineCaptcha(100, 40, 4, 50); + captcha.setGenerator(new RandomGenerator("0123456789", 4)); // 只使用数字 redisRepository.setExpire("CAPTCHA:" + captchaId, captcha.getCode(), 300); response.setHeader("captcha-id", captchaId); response.setHeader("access-control-expose-headers", "captcha-id"); diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java index 6f87f325f..3a141eb8e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java @@ -49,14 +49,14 @@ public class WorkTicketOrderAppController { @ApiImplicitParam(name = "devSn", value = "设备编号", paramType = "query", required = true, dataType = "Integer"), }) @PostMapping(value = "/loginByPoliceCameraSn") - public Result loginByPoliceCameraSn(@RequestBody @Validate Map param) { + public Result loginByPoliceCameraSn(@RequestBody @Validate Map param) { String devSn = MapUtils.getString(param, "devSn"); - int count = (int) policeCameraItemService.count(new LambdaQueryWrapper() + PoliceCameraItem item = policeCameraItemService.getOne(new LambdaQueryWrapper() .eq(PoliceCameraItem::getDevSn, devSn)); - if (count == 0) { + if (item == null) { throw new OpenAlertException("IMEI编号不存在"); } - return Result.ok(); + return Result.success(item); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java index b697bed8b..839c140a2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java @@ -2,10 +2,18 @@ package com.zhgd.xmgl.modules.policecamera.entity.vo; import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketOrder; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value="WorkTicketOrderVo实体类",description="WorkTicketOrderVo实体类") public class WorkTicketOrderVo extends WorkTicketOrder { - + /** + * 设备名称 + */ + @ApiModelProperty(value = "设备名称") + private String devName; + /**施工场站名称s（多个,分割）*/ + @ApiModelProperty(value="施工场站名称s（多个,分割）") + private java.lang.String constructionAreaNames ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml index d069c2c73..576290ace 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml @@ -4,7 +4,11 @@