yangjun
/
hldy_yunwei_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

区域标签改名为区域属性

This commit is contained in:
yangjun 2026-01-05 14:50:00 +08:00
parent b257cf5c75
commit 8886faeae9
9 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/entity/NuBaseInfo.java
View File

@ -41,10 +41,10 @@ public class NuBaseInfo implements Serializable {
@Excel(name = "护理单元编码", width = 15) @Excel(name = "护理单元编码", width = 15)
@ApiModelProperty(value = "护理单元编码") @ApiModelProperty(value = "护理单元编码")
private java.lang.String nuId; private java.lang.String nuId;
/**区域标签ID*/ /**区域属性*/
@Excel(name = "区域标签ID", width = 15, dicCode = "nu_type") @Excel(name = "区域属性", width = 15, dicCode = "nu_type")
@Dict(dicCode = "nu_type") @Dict(dicCode = "nu_type")
@ApiModelProperty(value = "区域标签ID") @ApiModelProperty(value = "区域属性")
private java.lang.String areaFlag; private java.lang.String areaFlag;
/**使用状态 0未使用 1占用 2入住 3退住 4留床*/ /**使用状态 0未使用 1占用 2入住 3退住 4留床*/
@Excel(name = "使用状态 0未使用 1占用 2入住 3退住 4留床", width = 15, dicCode = "nu_status") @Excel(name = "使用状态 0未使用 1占用 2入住 3退住 4留床", width = 15, dicCode = "nu_status")

5
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/service/impl/NuBaseInfoServiceImpl.java
View File

@ -72,7 +72,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
if(list.get(i).getNum() != null && list.get(i).getNum()!=0){ if(list.get(i).getNum() != null && list.get(i).getNum()!=0){
needAdd = true; needAdd = true;
String areaFlag = list.get(i).getType();//区域标签 String areaFlag = list.get(i).getType();//区域属性
Integer num = list.get(i).getNum();//需创建个数 Integer num = list.get(i).getNum();//需创建个数
for (int j = 0; j < num; j++) { for (int j = 0; j < num; j++) {
NuBaseInfo bf = new NuBaseInfo(); NuBaseInfo bf = new NuBaseInfo();
@ -119,6 +119,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
} }
//查询机构信息 //查询机构信息
NuBaseInfo departInfo = baseMapper.getDepartInfoByOrgCode(nuBaseInfo.getOrgCode()); NuBaseInfo departInfo = baseMapper.getDepartInfoByOrgCode(nuBaseInfo.getOrgCode());
if(StringUtils.isBlank(departInfo.getIotSn())){
//修改摄像头信息 //修改摄像头信息
departInfo.setIotSn(nuBaseInfo.getIotSn()); departInfo.setIotSn(nuBaseInfo.getIotSn());
departInfo.setNuId(nuBaseInfo.getNuId()); departInfo.setNuId(nuBaseInfo.getNuId());
@ -126,6 +127,8 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
if(iotNum == 0){ if(iotNum == 0){
throw new RuntimeException("添加失败！"); throw new RuntimeException("添加失败！");
} }
}
return 1; return 1;
} }
} }

2
nursing-unit-common/src/main/java/com/nu/dto/IotNuBaseInfoMQDto.java
View File

@ -10,7 +10,7 @@ public class IotNuBaseInfoMQDto {
private String nuId; private String nuId;
/**区域名称*/ /**区域名称*/
private String nuName; private String nuName;
/**区域标签*/ /**区域属性*/
private String areaFlag; private String areaFlag;
/**是否删除*/ /**是否删除*/
private String delFlag; private String delFlag;

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncbiz/entity/NuBaseInfo.java
View File

@ -19,7 +19,7 @@ public class NuBaseInfo implements Serializable {
private String nuId; private String nuId;
/**区域名称*/ /**区域名称*/
private String nuName; private String nuName;
/**区域标签*/ /**区域属性*/
private String areaFlag; private String areaFlag;
/**是否删除*/ /**是否删除*/
private String delFlag; private String delFlag;

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
View File

@ -331,7 +331,7 @@ public class CameraInfo implements Serializable {
private String actionType;//操作类型 private String actionType;//操作类型
@Dict(dicCode = "nu_type") @Dict(dicCode = "nu_type")
@TableField(exist = false) @TableField(exist = false)
private String areaFlag;//区域标签 private String areaFlag;//区域属性
@TableField(exist = false) @TableField(exist = false)
private Integer deviceNum;//已绑定设备数 private Integer deviceNum;//已绑定设备数
@TableField(exist = false) @TableField(exist = false)

6
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/NuBaseInfo.java
View File

@ -43,10 +43,10 @@ public class NuBaseInfo implements Serializable {
@Excel(name = "护理单元编码", width = 15) @Excel(name = "护理单元编码", width = 15)
@ApiModelProperty(value = "护理单元编码") @ApiModelProperty(value = "护理单元编码")
private String nuId; private String nuId;
/**区域标签ID*/ /**区域属性*/
@Excel(name = "区域标签ID", width = 15, dicCode = "nu_type") @Excel(name = "区域属性", width = 15, dicCode = "nu_type")
@Dict(dicCode = "nu_type") @Dict(dicCode = "nu_type")
@ApiModelProperty(value = "区域标签ID") @ApiModelProperty(value = "区域属性")
private String areaFlag; private String areaFlag;
/**使用状态 0未使用 1占用 2入住 3退住 4留床*/ /**使用状态 0未使用 1占用 2入住 3退住 4留床*/
@Excel(name = "使用状态 0未使用 1占用 2入住 3退住 4留床", width = 15, dicCode = "nu_status") @Excel(name = "使用状态 0未使用 1占用 2入住 3退住 4留床", width = 15, dicCode = "nu_status")

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java
View File

@ -73,7 +73,7 @@ public class ElectricityMeter implements Serializable {
private String nuName;//护理单元 private String nuName;//护理单元
@Dict(dicCode = "nu_type") @Dict(dicCode = "nu_type")
@TableField(exist = false) @TableField(exist = false)
private String areaFlag;//区域标签 private String areaFlag;//区域属性
@TableField(exist = false) @TableField(exist = false)
private Integer deviceNum;//已绑定设备数 private Integer deviceNum;//已绑定设备数
private String departId;//机构ID private String departId;//机构ID

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/entity/WaterMeter.java
View File

@ -76,7 +76,7 @@ public class WaterMeter implements Serializable {
private String nuName;//护理单元 private String nuName;//护理单元
@Dict(dicCode = "nu_type") @Dict(dicCode = "nu_type")
@TableField(exist = false) @TableField(exist = false)
private String areaFlag;//区域标签 private String areaFlag;//区域属性
@TableField(exist = false) @TableField(exist = false)
private Integer deviceNum;//已绑定设备数 private Integer deviceNum;//已绑定设备数
private String departId;//机构ID private String departId;//机构ID

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java
View File

@ -115,7 +115,7 @@ public class HumidDevice implements Serializable {
@Dict(dicCode = "nu_type") @Dict(dicCode = "nu_type")
@TableField(exist = false) @TableField(exist = false)
private String areaFlag;//区域标签 private String areaFlag;//区域属性
@TableField(exist = false) @TableField(exist = false)
private Integer deviceNum;//已绑定设备数 private Integer deviceNum;//已绑定设备数
private String departId;//机构ID private String departId;//机构ID