From b6ac849ce5b143ee30603ca652515bd16cc5465d Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 30 Apr 2024 16:15:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dev/DeviceInfoController.java | 13 +++++++++++ .../api/service/dev/DeviceInfoService.java | 2 ++ .../dev/impl/DeviceInfoServiceImpl.java | 22 +++++++++++++++++++ src/main/resources/schemas/schema_v2.4.sql | 5 +++++ 4 files changed, 42 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 36979dd5b..5c206de22 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -13,6 +13,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeLogEntity; +import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -389,4 +390,16 @@ public class DeviceInfoController extends BaseController { return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); } + + /** + * 更新明细 + * + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udi/device/info/update") + public BaseResponse updateOrderItem(@RequestBody DeviceInfoEntity entity) { + deviceInfoService.updateOrderItem(entity); + return ResultVOUtils.successMsg("保存成功!"); + } } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java index dffc22687..2b91f2f87 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java @@ -101,4 +101,6 @@ public interface DeviceInfoService extends IService { boolean exitOrder(Long orderId, String deviceCode); String genDeviceCode(); + + boolean updateOrderItem(DeviceInfoEntity entity); } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java index bdd5ddd4a..082098b8d 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java @@ -1,12 +1,15 @@ package com.glxp.api.service.dev.impl; import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; @@ -202,6 +205,25 @@ public class DeviceInfoServiceImpl extends ServiceImpl= 7) { + String catalogCode = ybbm.substring(0, 7); + Integer catalogcode1 = Integer.valueOf(ybbm.substring(1, 3)); + Integer catalogcode2 = Integer.valueOf(catalogcode1 + ybbm.substring(3, 5)); + Integer catalogcode3 = Integer.valueOf(catalogcode2 + ybbm.substring(5, 7)); + entity.setCatalogCode1(catalogcode1); + entity.setCatalogCode2(catalogcode2); + entity.setCatalogCode3(catalogcode3); + entity.setCatalogCode(catalogCode); + } + + UpdateWrapper uw = new UpdateWrapper<>(); + uw.eq("deviceCode",entity.getDeviceCode()); + return super.update(entity,uw); + } } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index f05419a5d..b8b4bc50a 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2485,3 +2485,8 @@ CALL Pro_Temp_ColumnWork('device_check_detail', 'livePath', CALL Pro_Temp_ColumnWork('device_check_detail', 'suggestion', ' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''巡检建议''', 1); + +UPDATE auth_menu +SET `menu_name` = '本科室设备', `parent_id` = 1703, `order_num` = 4, `path` = '/dev/deviceInfoSelf', `component` = 'dev/deviceInfoSelf', + `query_param` = NULL, `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, + `create_by` = '超级用户', `create_time` = '2023-11-22 16:16:48', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 2021;