liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

WEB端查看APP客户设备绑定

Browse Source
This commit is contained in:
daiyongfei
2025-07-10 10:55:47 +08:00
parent 1dc00f0431
commit d75658e81e
4 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/equipment/APPDeviceController.java
View File

@ -12,9 +12,12 @@ import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
import com.fuyuanshen.common.log.annotation.Log;
import com.fuyuanshen.common.log.enums.BusinessType;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.web.core.BaseController;
import com.fuyuanshen.equipment.domain.bo.UserAppBo;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
import com.fuyuanshen.equipment.service.AppUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -68,14 +71,13 @@ public class APPDeviceController extends BaseController {
@GetMapping
@Operation(summary = "WEB端查看APP客户设备绑定")
public TableDataInfo<APPDevice> queryAPPDevice(APPDeviceQueryCriteria criteria) {
Page<APPDevice> page = new Page<>(criteria.getPage(), criteria.getSize());
TableDataInfo<APPDevice> devices = null;
devices = appDeviceService.queryAll(page, criteria);
return devices;
public TableDataInfo<APPDevice> queryAPPDevice(DeviceQueryCriteria criteria) {
return appDeviceService.queryAppDeviceList(criteria);
}
@PostMapping(value = "/unbind")
@Operation(summary = "设备解绑")
public ResponseVO<String> unbindAPPDevice(@Validated @ModelAttribute APPUnbindDTO deviceForm) {

11
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/equipment/APPDeviceService.java
View File

@ -9,6 +9,7 @@ import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import java.util.List;
@ -62,4 +63,14 @@ public interface APPDeviceService extends IService<APPDevice> {
List<APPDeviceTypeVo> getTypeList();
void reName(APPReNameDTO reNameDTO);
/**
* WEB端查看APP客户设备绑定
*
* @param criteria
* @return
*/
TableDataInfo<APPDevice> queryAppDeviceList(DeviceQueryCriteria criteria);
}

18
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/equipment/APPDeviceServiceImpl.java
View File

@ -23,6 +23,8 @@ import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.equipment.domain.Device;
import com.fuyuanshen.equipment.domain.DeviceType;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
import com.fuyuanshen.equipment.enums.BindingStatusEnum;
import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
import com.fuyuanshen.equipment.mapper.DeviceMapper;
@ -210,4 +212,20 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
}
/**
* WEB端查看APP客户设备绑定
*
* @param criteria
* @return
*/
@Override
public TableDataInfo<APPDevice> queryAppDeviceList(DeviceQueryCriteria criteria) {
// Page<AppDeviceVo> result = baseMapper.queryAppDeviceList(pageQuery.build(), bo);
// return TableDataInfo.build(result);
return null;
}
}

33
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceAPPController.java
View File

@ -6,17 +6,17 @@ import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
import com.fuyuanshen.common.log.annotation.Log;
import com.fuyuanshen.common.log.enums.BusinessType;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.web.core.BaseController;
import com.fuyuanshen.equipment.domain.bo.UserAppBo;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import com.fuyuanshen.equipment.service.AppUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
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.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @Description:
@ -27,23 +27,26 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "设备管理", description = "设备：设备管理")
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/app/device")
@RequestMapping("/api/app/device1")
public class DeviceAPPController extends BaseController {
private final AppUserService appUserService;
/**
* 修改APP用户信息
*/
// @SaCheckPermission("app:user:edit")
@Log(title = "APP用户信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserAppBo bo) {
return toAjax(appUserService.updateByBo(bo));
}
//
//
// @GetMapping
// @Operation(summary = "WEB端查看APP客户设备绑定")
// public TableDataInfo<APPDevice> queryAPPDevice(APPDeviceQueryCriteria criteria) {
// Page<APPDevice> page = new Page<>(criteria.getPage(), criteria.getSize());
// TableDataInfo<APPDevice> devices = null;
// devices = appDeviceService.queryAll(page, criteria);
// return devices;
// }
}