dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/6170' into 6170

Browse Source
This commit is contained in:
chenyouting
2025-11-19 17:17:40 +08:00
parent a0ab5e9fe0 891ee7c1c9
commit 76c11fff15
27 changed files with 1435 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java
View File

@ -38,6 +38,8 @@ public class AppDeviceXinghanController extends BaseController {
private final DeviceXinghanBizService appDeviceService;
private final DeviceService deviceService;
/**
* 人员信息登记
*/
@ -67,7 +69,7 @@ public class AppDeviceXinghanController extends BaseController {
public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
MultipartFile file = bo.getFile();
if(file.getSize()>1024*1024*2){
if (file.getSize() > 1024 * 1024 * 2) {
return R.warn("图片不能大于2M");
}
appDeviceService.uploadDeviceLogo(bo);
@ -125,7 +127,7 @@ public class AppDeviceXinghanController extends BaseController {
@GetMapping(value = "/typeAll")
@Operation(summary = "查询所有设备类型")
public R<List<DeviceType>> queryDeviceTypes() {
public R<List<DeviceType>> queryDeviceTypes() {
List<DeviceType> deviceTypes = appDeviceService.queryDeviceTypes();
return R.ok(deviceTypes);
}

2
fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceBJQ6075Controller.java
View File

@ -148,7 +148,7 @@ public class AppDeviceBJQ6075Controller extends BaseController {
*/
@GetMapping("/getShareInfo/{id}")
public R<AppDevice6075DetailVo> getShareInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@PathVariable Long id) {
return R.ok(appDeviceService6075.getInfo(id));
}