zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zengtao01
2024-07-12 16:01:29 +08:00
parent 4d4fa55473
commit 4d441e0ac3
8 changed files with 115 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/DevuceController.java Normal file
View File

@ -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<List<DevuceListVO>> get() {
return success(devuceService.getList());
}
}

13
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/devuce/vo/DevuceListVO.java Normal file
View File

@ -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;
}

19
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/DevuceController.java → yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/AppDevuceController.java
View File

@ -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<List<Map>> getDishesNutrition(@RequestParam("dishesId") Long dishesId,@RequestParam(value = "cId",required = false) String cId) {
return success(devuceService.getDishesNutrition( dishesId,cId));
}
@PostMapping("/updateWeight")
@Operation(summary = "更改菜品剩余重量")
public CommonResult<Boolean> updateWeight( @RequestBody DevuceReqVO updateReqVO) {
devuceService.updateWeight(updateReqVO);
return success(true);
}
}

17
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceReqVO.java Normal file
View File

@ -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;
}

11
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/devuce/DevuceMapper.java
View File

@ -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<DevuceDO> {
.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<DevuceListVO> getList();
}

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceService.java
View File

@ -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<Map> getDishesNutrition(Long dishesId,String cId);
void updateWeight(DevuceReqVO updateReqVO);
List<DevuceListVO> getList();
}

17
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
View File

@ -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<DevuceDO>()
.set(DevuceDO::getRemWeight,updateReqVO.getRemWeight())
.eq(DevuceDO::getDeviceSn,hearder)
.eq(DevuceDO::getBind,true));
}
@Override
public List<DevuceListVO> getList() {
List<DevuceListVO> list = devuceMapper.getList();
return list;
}
}

4
yudao-server/src/main/resources/application.yaml
View File

@ -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 类