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

app：查看APP客户设备绑定

Browse Source
This commit is contained in:
daiyongfei
2025-07-10 09:39:57 +08:00
parent 87f2e3a8b5
commit f0bfc4aa35
5 changed files with 213 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,16 @@ import com.fuyuanshen.app.domain.APPDeviceType;
import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
import com.fuyuanshen.app.service.equipment.APPDeviceService;
import com.fuyuanshen.common.core.domain.R;
import com.fuyuanshen.common.core.domain.ResponseVO;
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.service.AppUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
@ -27,9 +35,10 @@ import java.util.List;
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/app/device")
public class APPDeviceController {
public class APPDeviceController extends BaseController {
private final APPDeviceService appDeviceService;
private final AppUserService appUserService;
@PostMapping(value = "/list")
@ -76,4 +85,16 @@ public class APPDeviceController {
/**
* 修改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));
}
}

12
fys-modules/fys-app/src/main/resources/mapper/app/equipment/APPDeviceMapper.xml
View File

@ -79,17 +79,19 @@
<if test="criteria.createTime != null and criteria.createTime.size() != 0">
and d.create_time between #{criteria.createTime[0]} and #{criteria.createTime[1]}
</if>
<if test="criteria.tenantId != null">
AND tenant_id = #{criteria.tenantId}
</if>
and d.customer_id = #{criteria.customerId}
</where>
order by d.create_time desc
</select>
<select id="getTypeList" resultType="com.fuyuanshen.app.domain.vo.APPDeviceTypeVo">
SELECT dt.id, dt.type_name, dt.communication_mode FROM device_type dt
WHERE EXISTS(select 1 from device d where d.device_type = dt.id and d.binding_user_id = #{userId} AND d.binding_status = 1 )
SELECT dt.id, dt.type_name, dt.communication_mode
FROM device_type dt
WHERE EXISTS(select 1
from device d
where d.device_type = dt.id
and d.binding_user_id = #{userId}
AND d.binding_status = 1)
</select>

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

@ -30,19 +30,21 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/api/app/device")
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;
// }
}

106
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/APPDevice1.java Normal file
View File

@ -0,0 +1,106 @@
package com.fuyuanshen.equipment.domain;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fuyuanshen.common.tenant.core.TenantEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* @Description: 设备表
* @Author: WY
* @Date: 2025/5/16
**/
@Data
@TableName("app_device")
public class APPDevice1 extends TenantEntity {
@TableId(value = "app_device_id", type = IdType.AUTO)
@Schema(name = "ID")
private Long id;
@Schema(name = "设备类型")
private Long deviceType;
@Schema(name = "设备类型名称")
private String deviceTypeName;
@Schema(name = "客户号")
private Long customerId;
@Schema(name = "所属客户")
private String customerName;
/*@Schema(name = "设备编号")
private String deviceNo;*/
@Schema(name = "设备名称")
private String deviceName;
@Schema(name = "设备图片")
private String devicePic;
@Schema(name = "设备MAC")
private String deviceMac;
@Schema(name = "设备IMEI")
private String deviceImei;
@Schema(name = "设备SN")
private String deviceSn;
@Schema(name = "经度")
private String longitude;
@Schema(name = "纬度")
private String latitude;
@Schema(name = "备注")
private String remark;
@TableField(exist = false)
@Schema(name = "设备类型名称")
private String typeName;
/**
* 租户ID
*/
@TableField(value = "tenant_id")
@Schema(hidden = true)
private String tenantId;
/**
* 设备状态
* 0 失效
* 1 正常
*/
@Schema(name = "设备状态")
private Integer deviceStatus;
/**
* 绑定状态
* 0 未绑定
* 1 已绑定
*/
@Schema(name = "绑定状态")
private Integer bindingStatus;
/**
* 绑定类型
* 0 APP
* 1 小程序
*/
@Schema(name = "绑定类型")
private Integer bindingType;
public void copy(APPDevice1 source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
}

65
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/APPDeviceQueryCriteria1.java Normal file
View File

@ -0,0 +1,65 @@
package com.fuyuanshen.equipment.domain.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.sql.Timestamp;
import java.util.List;
import java.util.Set;
/**
* @Description:
* @Author: WY
* @Date: 2025/5/16
**/
@Data
public class APPDeviceQueryCriteria1 {
@Schema(name = "设备名称")
private String deviceName;
@Schema(name = "设备类型")
private Long deviceType;
@Schema(name = "设备MAC")
private String deviceMac;
@Schema(name = "设备IMEI")
private String deviceImei;
@Schema(name = "设备SN")
private String deviceSn;
/**
* 设备状态
* 0 失效
* 1 正常
*/
@Schema(name = "设备状态 0 失效 1 正常 ")
private Integer deviceStatus;
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'")
@Schema(name = "创建时间")
private List<Timestamp> createTime;
@Schema(name = "页码", example = "1")
private Integer page = 1;
@Schema(name = "每页数据量", example = "10")
private Integer size = 10;
@Schema(name = "客户id")
private Long customerId;
private Set<Long> customerIds;
@Schema(name = "当前所有者")
private Long currentOwnerId;
@Schema(name = "租户ID")
private Long tenantId;
@Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
private Integer communicationMode;
}