From 4d441e0ac3ce9d84e8a420fe107a4c88c06c7b2d Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Fri, 12 Jul 2024 16:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/devuce/DevuceController.java | 36 +++++++++++++++++++ .../admin/devuce/vo/DevuceListVO.java | 13 +++++++ ...ntroller.java => AppDevuceController.java} | 19 ++++++++-- .../controller/app/devuce/vo/DevuceReqVO.java | 17 +++++++++ .../system/dal/mysql/devuce/DevuceMapper.java | 11 +++--- .../system/service/devuce/DevuceService.java | 6 ++++ .../service/devuce/DevuceServiceImpl.java | 17 +++++++++ .../src/main/resources/application.yaml | 4 +-- 8 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/vo/DevuceListVO.java rename yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/{DevuceController.java => AppDevuceController.java} (86%) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java new file mode 100644 index 00000000..c0ebd577 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.system.controller.admin.devuce; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.system.controller.admin.devuce.vo.DevuceListVO; +import cn.iocoder.yudao.module.system.service.devuce.DevuceService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +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.RestController; + +import javax.annotation.Resource; +import javax.annotation.security.PermitAll; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + + +@Tag(name = "管理后台 - 设备") +@RestController +@RequestMapping("/t/devuce") +@Validated +@PermitAll +public class DevuceController { + + @Resource + private DevuceService devuceService; + + @GetMapping("/get") + @Operation(summary = "获取菜品剩余重量") + public CommonResult> get() { + return success(devuceService.getList()); + } +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/vo/DevuceListVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/vo/DevuceListVO.java new file mode 100644 index 00000000..1db09d85 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/vo/DevuceListVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.system.controller.admin.devuce.vo; + +import cn.iocoder.yudao.module.system.dal.dataobject.devuce.DevuceDO; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 设备 Response VO") +@Data +@ExcelIgnoreUnannotated +public class DevuceListVO extends DevuceDO { + private String dishesName; +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/AppDevuceController.java similarity index 86% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/AppDevuceController.java index 449c7fc5..597e7835 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/AppDevuceController.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesRespVO; import cn.iocoder.yudao.module.system.controller.admin.dishestype.vo.DishesTypeRespVO; +import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceReqVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; import cn.iocoder.yudao.module.system.dal.dataobject.dishestype.DishesTypeDO; @@ -11,7 +12,13 @@ import cn.iocoder.yudao.module.system.service.devuce.DevuceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.annotation.security.PermitAll; @@ -28,7 +35,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @RequestMapping("/t/devuce") @Validated @PermitAll -public class DevuceController { +public class AppDevuceController { @Resource private DevuceService devuceService; @@ -115,4 +122,12 @@ public class DevuceController { public CommonResult> getDishesNutrition(@RequestParam("dishesId") Long dishesId,@RequestParam(value = "cId",required = false) String cId) { return success(devuceService.getDishesNutrition( dishesId,cId)); } + + @PostMapping("/updateWeight") + @Operation(summary = "更改菜品剩余重量") + public CommonResult updateWeight( @RequestBody DevuceReqVO updateReqVO) { + devuceService.updateWeight(updateReqVO); + return success(true); + } + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java new file mode 100644 index 00000000..c64726d9 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java @@ -0,0 +1,17 @@ +package cn.iocoder.yudao.module.system.controller.app.devuce.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 设备新增/修改 Request VO") +@Data +public class DevuceReqVO { + + private String deviceSn; + + @Schema(description = "剩余重量") + private BigDecimal remWeight; + +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java index a8a4495b..d68656e1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java @@ -4,11 +4,13 @@ package cn.iocoder.yudao.module.system.dal.mysql.devuce; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.system.controller.admin.devuce.vo.DevuceListVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevucePageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.devuce.DevuceDO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 设备 Mapper @@ -27,6 +29,7 @@ public interface DevuceMapper extends BaseMapperX { .orderByDesc(DevuceDO::getId)); } - - + @Select("select de.*,di.dishes_name from t_devuce de left join t_dishes di on de.dishes_id = di.id\n" + + "where bind = true") + List getList(); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java index 98d94bfc..196c49bd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java @@ -1,7 +1,9 @@ package cn.iocoder.yudao.module.system.service.devuce; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.system.controller.admin.devuce.vo.DevuceListVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevucePageReqVO; +import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceReqVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.devuce.DevuceDO; import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO; @@ -86,4 +88,8 @@ public interface DevuceService { * @return */ List getDishesNutrition(Long dishesId,String cId); + + void updateWeight(DevuceReqVO updateReqVO); + List getList(); + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java index 8e29fbb0..ac467805 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java @@ -5,7 +5,9 @@ import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.system.controller.admin.devuce.vo.DevuceListVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevucePageReqVO; +import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceReqVO; import cn.iocoder.yudao.module.system.controller.app.devuce.vo.DevuceSaveReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.deviceInfo.DeviceInfoDO; import cn.iocoder.yudao.module.system.dal.dataobject.devuce.DevuceDO; @@ -228,4 +230,19 @@ public class DevuceServiceImpl implements DevuceService { throw exception(2000_10_002,"无法通IP获取门店"); } } + + @Override + public void updateWeight(DevuceReqVO updateReqVO) { + String hearder = this.getHearder(); + devuceMapper.update(new DevuceDO(),new LambdaUpdateWrapper() + .set(DevuceDO::getRemWeight,updateReqVO.getRemWeight()) + .eq(DevuceDO::getDeviceSn,hearder) + .eq(DevuceDO::getBind,true)); + } + + @Override + public List getList() { + List list = devuceMapper.getList(); + return list; + } } \ No newline at end of file diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 209d0a61..542dffa6 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -12,8 +12,8 @@ spring: servlet: # 文件上传相关配置项 multipart: - max-file-size: 16MB # 单个文件大小 - max-request-size: 32MB # 设置总上传的文件大小 + max-file-size: 20MB # 单个文件大小 + max-request-size: 40MB # 设置总上传的文件大小 mvc: pathmatch: matching-strategy: ANT_PATH_MATCHER # 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题，参见 SpringFoxHandlerProviderBeanPostProcessor 类