From 74eb299633663cd1e7ed7afb6d9049c0dda15991 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 18 Feb 2025 14:17:22 +0800 Subject: [PATCH] =?UTF-8?q?2/18=20=E6=A7=BD=E4=BD=8D=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E8=A1=A8=20--=E5=8F=96=E8=B4=A7=E6=9E=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplaceRegionController.java | 42 +++++++++++++++++++ .../dao/basic/SysWorkplaceRegionMapper.java | 19 +++++++++ .../req/basic/SysWorkplaceRegionRequest.java | 21 ++++++++++ .../res/basic/SysWorkplaceRegionResponse.java | 41 ++++++++++++++++++ .../basic/SysWorkplaceRegionService.java | 32 ++++++++++++++ .../collect/IoCollectLedGroupService.java | 2 +- .../mapper/basic/SysWorkplaceRegionMapper.xml | 16 +++++++ src/main/resources/schemas/schema_v2.4.sql | 25 ++++++++--- 8 files changed, 192 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java create mode 100644 src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java create mode 100644 src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java create mode 100644 src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java create mode 100644 src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java create mode 100644 src/main/resources/mybatis/mapper/basic/SysWorkplaceRegionMapper.xml diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java new file mode 100644 index 000000000..0d18e2c86 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -0,0 +1,42 @@ +package com.glxp.api.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.basic.SysWorkplaceRegion; +import com.glxp.api.req.basic.SysWorkplaceRegionRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SysWorkplaceRegionResponse; +import com.glxp.api.service.basic.SysWorkplaceRegionService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author : zhuzhu + * @date : 2025/2/18 11:04 + * @modyified By : + */ +@Slf4j +@RestController +public class SysWorkplaceRegionController extends BaseController { + + + @Resource + SysWorkplaceRegionService SysWorkplaceRegionService; + + + @GetMapping("/udiwms/sysWorkplaceRegion/getList") + public BaseResponse getUserBindWork(SysWorkplaceRegionRequest request) { + List regionResponses = SysWorkplaceRegionService.filterList(request); + PageInfo pageInfo = new PageInfo<>(regionResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(regionResponses); + return ResultVOUtils.success(pageSimpleResponse); + } +} diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java new file mode 100644 index 000000000..7e0e2385f --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java @@ -0,0 +1,19 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.SysWorkplaceRegion; +import com.glxp.api.req.basic.SysWorkplaceRegionRequest; +import com.glxp.api.res.basic.SysWorkplaceRegionResponse; + +import java.util.List; + +/** + * @author : zhangsan + * @date : 2025/2/18 11:02 + * @modyified By : + */ + +public interface SysWorkplaceRegionMapper extends BaseMapper { + + List filterList(SysWorkplaceRegionRequest request); +} diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java new file mode 100644 index 000000000..358ad0e66 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * @author : zhuzhu + * @date : 2025/2/18 11:08 + * @modyified By : + */ + +@Data +public class SysWorkplaceRegionRequest extends ListPageRequest { + + + private Integer regionCode; + + + private String regionName; + +} diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java new file mode 100644 index 000000000..d5aeef8ae --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java @@ -0,0 +1,41 @@ +package com.glxp.api.res.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author : zhuzhu + * @date : 2025/2/18 11:09 + * @modyified By : + */ + +@Data +public class SysWorkplaceRegionResponse { + + + private Long id; + + /** + * 区域编号 + */ + private Integer regionCode; + + /** + * 区域名称 + */ + private String regionName; + + + private Date updateTime; + + private Date createTime; + + private String updateUser; + + private String createUser; +} diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java new file mode 100644 index 000000000..7e6c449ce --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java @@ -0,0 +1,32 @@ +package com.glxp.api.service.basic; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.SysWorkplaceRegionMapper; +import com.glxp.api.entity.basic.SysWorkplaceRegion; +import com.glxp.api.req.basic.SysWorkplaceRegionRequest; +import com.glxp.api.res.basic.SysWorkplaceRegionResponse; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SysWorkplaceRegionService extends ServiceImpl { + + + @Resource + SysWorkplaceRegionMapper sysWorkplaceRegionMapper; + + + public List filterList(SysWorkplaceRegionRequest request) { + if (null == request) { + return Collections.emptyList(); + } + if (null != request.getPage() && null != request.getLimit()) { + PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit()); + } + return super.baseMapper.filterList(request); + } +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java index 52bd45ed8..863bce120 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java @@ -168,7 +168,7 @@ public class IoCollectLedGroupService extends ServiceImpl + + + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 8151823cd..63a215d60 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5159,8 +5159,6 @@ CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow', - - CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'inCodeCount', 'int NULL DEFAULT NULL COMMENT ''入库码数量''', 1); @@ -5192,11 +5190,11 @@ VALUES (463279, 213, '2', 1, 'macBind', '灯组是否绑定', 'select', NULL, NU -CREATE TABLE IF NOT EXISTS `sys_order_led` +CREATE TABLE IF NOT EXISTS `sys_order_led` ( `id` int NOT NULL, `ledNum` tinyint NULL DEFAULT NULL COMMENT '1.红，2：橙，3：蓝，4：绿', - `orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号', + `orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `updateTime` datetime NULL DEFAULT NULL, `createTime` datetime NULL DEFAULT NULL, @@ -5218,7 +5216,7 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'relCodeCount', ' int DEFAULT ''0'' COMMENT ''关联关系数量''', 1); INSERT IGNORE INTO sys_scheduled(`id`, `cronName`, `cron`, `customerId`, `remark`) -VALUES (510,'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); +VALUES (510, 'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount', 'int NULL DEFAULT NULL COMMENT ''扫码数量''', @@ -5245,3 +5243,20 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'outputMode', 1); +DROP TABLE IF EXISTS `sys_workplace_region`; +CREATE TABLE `sys_workplace_region` +( + `id` bigint NOT NULL, + `regionCode` int NULL DEFAULT NULL COMMENT '区域编号', + `regionName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '区域名称', + `updateTime` datetime NULL DEFAULT NULL, + `createTime` datetime NULL DEFAULT NULL, + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 8052 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + COMMENT = '槽位区域表' + ROW_FORMAT = Dynamic;