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

修改bug

This commit is contained in:
yangjun 2025-10-31 16:36:01 +08:00
parent 7b7dc23bd9
commit 165429ab4a
8 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-common/src/main/java/com/nu/entity/HumidAlarmEntity.java
View File

@ -39,5 +39,8 @@ public class HumidAlarmEntity implements Serializable {
private Date alarmEndTime;
private Date clearStartTime;
private Date clearEndTime;
private String nuId;
private String humidity;
private String temperature;
}

5
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.nu.modules.warehouseMaterialInfo.service.impl;
import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
import com.nu.modules.warehouseMaterialInfo.service.IBlWarehouseMaterialInfoService;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.SpringContextUtils;
import org.springframework.stereotype.Service;
@ -23,7 +24,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
@Override
public void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
LoginUser loginUser = SpringContextUtils.getBean(LoginUser.class);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//获取仓库nuid
String nuId = blWarehouseMaterialInfo.getNuId();
//获取所有剩余的物料信息，并且去掉库存上限或者下限为空的数据
@ -31,7 +32,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
//将所有查询到的物料进行批量新增
for(BlWarehouseMaterialInfo blWarehouseMaterialInfo1:list){
blWarehouseMaterialInfo1.setNuId(nuId);
blWarehouseMaterialInfo1.setCreateBy(loginUser.getUsername());
blWarehouseMaterialInfo1.setCreateBy(sysUser.getUsername());
blWarehouseMaterialInfo1.setCreateTime(new Date());
}
baseMapper.batchInsert(list);

2
nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/humiddevice/api/IHumidAlarmApi.java
View File

@ -5,7 +5,9 @@ import com.nu.entity.HumidAlarmEntity;
import com.nu.entity.HumidDeviceEntity;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
public interface IHumidAlarmApi {
IPage<HumidAlarmEntity> list(HumidAlarmEntity humidAlarmEntity, Integer pageNo, Integer pageSize, HttpServletRequest req);
}

3
nursing-unit-iot/nu-iot-api/nu-iot-local-api/src/main/java/com/nu/modules/humiddevice/api/IHumidDeviceApi.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nu.entity.HumidDeviceEntity;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
public interface IHumidDeviceApi {
IPage<HumidDeviceEntity> list(HumidDeviceEntity humidDeviceEntity, Integer pageNo, Integer pageSize, HttpServletRequest req);
@ -13,4 +14,6 @@ public interface IHumidDeviceApi {
void baoxiu(HumidDeviceEntity humidDeviceEntity);
IPage<HumidDeviceEntity> queryLogPageList(HumidDeviceEntity humidDeviceEntity, Integer pageNo, Integer pageSize, HttpServletRequest req);
List<HumidDeviceEntity> listAll();
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidAlarmServiceImpl.java
View File

@ -1,11 +1,14 @@
package com.nu.modules.yiweilian.humid.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.entity.HumidAlarmEntity;
import com.nu.entity.HumidDeviceEntity;
import com.nu.modules.humiddevice.api.IHumidAlarmApi;
import com.nu.modules.yiweilian.humid.entity.HumidAlarm;
import com.nu.modules.yiweilian.humid.mapper.HumidAlarmMapper;
@ -168,5 +171,6 @@ public class HumidAlarmServiceImpl extends ServiceImpl<HumidAlarmMapper, HumidAl
return resultPage;
}
}

11
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.nu.modules.yiweilian.humid.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@ -14,6 +15,7 @@ import com.nu.entity.HumidDeviceEntity;
import com.nu.modules.humiddevice.api.IHumidDeviceApi;
import com.nu.modules.syncLog.entity.SyncBizLog;
import com.nu.modules.syncLog.service.ISyncBizLogService;
import com.nu.modules.yiweilian.humid.entity.HumidAlarm;
import com.nu.modules.yiweilian.humid.entity.HumidDevice;
import com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper;
import com.nu.modules.yiweilian.humid.service.IHumidDeviceService;
@ -601,5 +603,14 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
return resultPage;
}
@Override
public List<HumidDeviceEntity> listAll() {
List<HumidDevice> list = baseMapper.selectList(new QueryWrapper<>());
List<HumidDeviceEntity> list2 = BeanUtil.copyToList(list, HumidDeviceEntity.class);
return list2;
}
}

3
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
View File

@ -172,5 +172,8 @@ public class NuBaseInfo implements Serializable {
private List<CustomerDirectiveEntity> customerDirectiveDtoList;
@TableField(exist = false)
private List<ElderServerEntity> elderServerEntityList;
//温湿度计
@TableField(exist = false)
private List<HumidDeviceEntity> humidDeviceList;
}

18
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java
View File

@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.entity.*;
import com.nu.modules.camerainfo.api.CameraInfoApi;
import com.nu.modules.elder.api.IElderInfoApi;
import com.nu.modules.humiddevice.api.IHumidAlarmApi;
import com.nu.modules.humiddevice.api.IHumidDeviceApi;
import com.nu.modules.nubaseinfo.entity.NuBaseInfo;
import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper;
import com.nu.modules.nubaseinfo.service.INuBaseInfoService;
@ -49,6 +51,9 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
@Lazy
@Autowired
private IElderInfoApi elderInfoApi;
@Autowired
private IHumidDeviceApi humidDeviceApi;
@Override
public void setNuId(NuBaseInfo nuBaseInfo) {
@ -135,6 +140,8 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
//查询未退住的老人
List<ElderInfoEntity> customerList = elderInfoApi.selectCurrentState3();
List<HumidDeviceEntity> humidDeviceList = humidDeviceApi.listAll();
//查找list集合里的nuid等于cameraList集合中nuid的就给list集合赋值
list.getRecords().forEach(ni -> {
//赋值摄像头信息
@ -161,6 +168,17 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
}
}
});
//赋值温湿度信息
humidDeviceList.forEach(humidDto -> {
if (StringUtils.equals(ni.getNuId(), humidDto.getNuId())) {
List<HumidDeviceEntity> humidDtoList = ni.getHumidDeviceList();
if (humidDtoList == null) {
humidDtoList = new ArrayList<>();
}
humidDtoList.add(humidDto);
ni.setHumidDeviceList(humidDtoList);
}
});
});
IPage<NuBaseInfoEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());