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

Merge branch 'yewu_20260506' of http://47.115.223.229:8888/yangjun/nursing_unit_java into yewu_20260506

This commit is contained in:
1378012178@qq.com 2026-05-13 10:18:25 +08:00
parent 8e56d6fc1d 36a6acd656
commit e770be5094
12 changed files with 180 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/entity/EmployeesApply.java
View File

@ -195,6 +195,7 @@ public class EmployeesApply implements Serializable {
@ApiModelProperty(value = "修改状态")
private java.lang.String modifyStatus;
private java.lang.String headPath;
private java.lang.String optType;
/**
* 审批字符串 有值时说明是走的审批

76
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java
View File

@ -271,82 +271,6 @@ public class DeviceManagerController extends JeecgController<DeviceManager, IDev
return Result.OK(pageList);
}
/**
* 设备集成-区域获取要添加摄像头列表查询
*
* @param deviceManager
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/cameraInfoUnbindList")
public Result<IPage<CameraInfo>> cameraInfoUnbindList(DeviceManager deviceManager,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<CameraInfo> page = new Page<CameraInfo>(pageNo, pageSize);
IPage<CameraInfo> pageList = service.findCameraInfoUnbindPage(page, deviceManager);
return Result.OK(pageList);
}
/**
* 设备集成-区域获取要添加电表列表查询
*
* @param deviceManager
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/electricityMeterUnbindList")
public Result<IPage<ElectricityMeter>> electricityMeterUnbindList(DeviceManager deviceManager,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<ElectricityMeter> page = new Page<ElectricityMeter>(pageNo, pageSize);
IPage<ElectricityMeter> pageList = service.findElectricityMeterUnbindPage(page, deviceManager);
return Result.OK(pageList);
}
/**
* 设备集成-区域获取要添加水表列表查询
*
* @param deviceManager
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/waterMeterUnbindList")
public Result<IPage<WaterMeter>> waterMeterUnbindList(DeviceManager deviceManager,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<WaterMeter> page = new Page<WaterMeter>(pageNo, pageSize);
IPage<WaterMeter> pageList = service.findWaterMeterUnbindPage(page, deviceManager);
return Result.OK(pageList);
}
/**
* 设备集成-区域获取要添加温湿度计列表查询
*
* @param deviceManager
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/humidDeviceUnbindList")
public Result<IPage<HumidDevice>> humidDeviceUnbindList(DeviceManager deviceManager,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<HumidDevice> page = new Page<HumidDevice>(pageNo, pageSize);
IPage<HumidDevice> pageList = service.findHumidDeviceUnbindPage(page, deviceManager);
return Result.OK(pageList);
}
/**
* 绑定设备
*

5
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java
View File

@ -30,15 +30,10 @@ public interface DeviceManagerMapper extends BaseMapper<DeviceManager> {
List<DeviceManager> queryNuList(DeviceManager deviceManager);
List<DeviceManager> exportDeviceExcel(DeviceManager deviceManager);
List<DeviceManagerHz> exportDeviceHzExcel(DeviceManagerHz deviceManager);
List<CameraInfo> cameraInfoList(DeviceManager deviceManager);
IPage<CameraInfo> findCameraInfoUnbindPage(Page<CameraInfo> page, @Param("params") DeviceManager deviceManager);
List<WaterMeter> waterMeterList(DeviceManager deviceManager);
IPage<WaterMeter> findWaterMeterUnbindPage(Page<WaterMeter> page, @Param("params") DeviceManager deviceManager);
List<ElectricityMeter> electricityMeterList(DeviceManager deviceManager);
IPage<ElectricityMeter> findElectricityMeterUnbindPage(Page<ElectricityMeter> page, @Param("params") DeviceManager deviceManager);
List<HumidDevice> humidDeviceList(DeviceManager deviceManager);
IPage<HumidDevice> findHumidDeviceUnbindPage(Page<HumidDevice> page, @Param("params") DeviceManager deviceManager);
void editPreviewStatusBySn(DeviceManager deviceManager);
void editPreviewById(DeviceManager deviceManager);
IPage<DeviceManager> findGhPage(Page<DeviceManager> page, @Param("params") DeviceManager deviceManager);

38
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml
View File

@ -205,17 +205,8 @@
from nu_iot_device_preview a
inner join nu_iot_tplink_camera b on a.sn = b.mac
where a.nu_id = #{nuId}
and a.device_type = 'SURVEILLANCECAMERA'
and ifnull(a.device_status,'') != '损坏'
</select>
<select id="findCameraInfoUnbindPage" parameterType="com.nu.modules.manager.entity.DeviceManager" resultType="com.nu.modules.tplink.camera.entity.CameraInfo">
select a.id,a.batch_no,a.nu_id,a.sn,a.device_type,a.device_model,a.device_status as maintainStatus,b.device_status,b.device_index
from nu_iot_device_preview a
left join nu_iot_tplink_camera b on a.sn = b.mac
where a.nu_id is null
and a.device_type = 'SURVEILLANCECAMERA'
and ifnull(a.device_status,'') != '损坏'
order by a.device_type
</select>
<select id="waterMeterList" parameterType="com.nu.modules.manager.entity.DeviceManager" resultType="com.nu.modules.tq.water.entity.WaterMeter">
@ -227,15 +218,6 @@
and ifnull(a.device_status,'') != '损坏'
</select>
<select id="findWaterMeterUnbindPage" parameterType="com.nu.modules.manager.entity.DeviceManager" resultType="com.nu.modules.tq.water.entity.WaterMeter">
select a.id,a.batch_no,a.nu_id,a.sn,a.device_type,a.device_model,a.device_status as maintainStatus,b.relay_state,b.cid,b.address,b.water_value
from nu_iot_device_preview a
left join nu_iot_tq_water_meter b on a.sn = b.cid
where a.nu_id is null
and a.device_type = 'sb'
and ifnull(a.device_status,'') != '损坏'
</select>
<select id="electricityMeterList" parameterType="com.nu.modules.manager.entity.DeviceManager" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
select a.batch_no,a.nu_id,a.sn,a.device_type,a.device_model,a.device_status as maintainStatus,b.relay_state,b.ele_value
from nu_iot_device_preview a
@ -245,15 +227,6 @@
and ifnull(a.device_status,'') != '损坏'
</select>
<select id="findElectricityMeterUnbindPage" parameterType="com.nu.modules.manager.entity.DeviceManager" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
select a.id,a.batch_no,a.nu_id,a.sn,a.device_type,a.device_model,a.device_status as maintainStatus,b.relay_state,b.ele_value
from nu_iot_device_preview a
left join nu_iot_ds_electricity_meter b on a.sn = b.sn
where a.nu_id is null
and a.device_type = 'db'
and ifnull(a.device_status,'') != '损坏'
</select>
<select id="humidDeviceList" parameterType="com.nu.modules.manager.entity.DeviceManager" resultType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
select a.batch_no,a.nu_id,a.sn,a.device_type,a.device_model,a.device_status as maintainStatus,b.status,b.temperature,b.humidity
from nu_iot_device_preview a
@ -263,15 +236,6 @@
and ifnull(a.device_status,'') != '损坏'
</select>
<select id="findHumidDeviceUnbindPage" parameterType="com.nu.modules.manager.entity.DeviceManager" resultType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
select a.id,a.batch_no,a.nu_id,a.sn,a.device_type,a.device_model,a.device_status as maintainStatus,b.status,b.temperature,b.humidity
from nu_iot_device_preview a
left join nu_iot_yiweilian_humid_device b on a.sn = b.sn
where a.nu_id is null
and a.device_type = 'wsdj'
and ifnull(a.device_status,'') != '损坏'
</select>
<update id="editPreviewStatusBySn">
update nu_iot_device_preview
set device_status = #{deviceStatus}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java
View File

@ -32,10 +32,6 @@ public interface IDeviceManagerService extends IService<DeviceManager> {
List<DeviceManagerHz> exportDeviceHzExcel(DeviceManagerHz deviceManager);
Map<String, Object> bindedList(DeviceManager deviceManager);
IPage<CameraInfo> findCameraInfoUnbindPage(Page<CameraInfo> page, DeviceManager deviceManager);
IPage<ElectricityMeter> findElectricityMeterUnbindPage(Page<ElectricityMeter> page, DeviceManager deviceManager);
IPage<WaterMeter> findWaterMeterUnbindPage(Page<WaterMeter> page, DeviceManager deviceManager);
IPage<HumidDevice> findHumidDeviceUnbindPage(Page<HumidDevice> page, DeviceManager deviceManager);
DeviceManager findBySn(DeviceManager deviceManager);
DeviceManager findOneByType(DeviceManager deviceManager);
void editPreviewStatusBySn(DeviceManager deviceManager);

20
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java
View File

@ -156,26 +156,6 @@ public class DeviceManagerServiceImpl extends ServiceImpl<DeviceManagerMapper, D
return map;
}
@Override
public IPage<CameraInfo> findCameraInfoUnbindPage(Page<CameraInfo> page, DeviceManager deviceManager) {
return baseMapper.findCameraInfoUnbindPage(page,deviceManager);
}
@Override
public IPage<ElectricityMeter> findElectricityMeterUnbindPage(Page<ElectricityMeter> page, DeviceManager deviceManager) {
return baseMapper.findElectricityMeterUnbindPage(page,deviceManager);
}
@Override
public IPage<WaterMeter> findWaterMeterUnbindPage(Page<WaterMeter> page, DeviceManager deviceManager) {
return baseMapper.findWaterMeterUnbindPage(page,deviceManager);
}
@Override
public IPage<HumidDevice> findHumidDeviceUnbindPage(Page<HumidDevice> page, DeviceManager deviceManager) {
return baseMapper.findHumidDeviceUnbindPage(page,deviceManager);
}
@Override
public DeviceManager findBySn(DeviceManager deviceManager){
return baseMapper.findBySn(deviceManager);

22
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/controller/CameraInfoController.java
View File

@ -93,6 +93,28 @@ public class CameraInfoController extends JeecgController<CameraInfo, ICameraInf
return service.getDeviceDetails(cameraInfo);
}
/**
* 获取画面操作信息
*
* @param map
* @return
*/
@PostMapping(value = "/getImageSwitch")
public Result<JSONObject> getImageSwitch(@RequestBody Map<String,Object> map) {
return service.getImageSwitch(map);
}
/**
* 设置画面操作信息
*
* @param map
* @return
*/
@PostMapping(value = "/setImageSwitch")
public Result setImageSwitch(@RequestBody Map<String,Object> map) {
return service.setImageSwitch(map);
}
/**
* 获取摄像头实时播放地址
*

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

@ -23,6 +23,8 @@ public interface ICameraInfoService extends IService<CameraInfo> {
List<CameraTreeModel> findModelList(CameraInfo cameraInfo);
List<CameraInfo> findAllList();
Result<JSONObject> getDeviceDetails(CameraInfo cameraInfo);
Result<JSONObject> getImageSwitch(Map<String,Object> map);
Result setImageSwitch(Map<String,Object> map);
Result<Map<String,String>> getPreviewUrl(CameraInfo cameraInfo);
Result testAudio(Map<String,Object> map);
Result<Map<String,Object>> getMultitransUrl(CameraInfo cameraInfo) throws Exception;

146
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -137,6 +137,152 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
return Result.OK();
}
/**
* 获取画面操作信息
*
* @param map
* @return
* @throws Exception
*/
@Override
public Result<JSONObject> getImageSwitch(Map<String,Object> map){
String id = map.get("deviceIndex").toString();
String type = map.get("type").toString();
CameraInfo cameraInfo = new CameraInfo();
cameraInfo.setDeviceIndex(id);
cameraInfo = baseMapper.getByDeviceId(cameraInfo);
String parentId = cameraInfo.getParentId();
if(!parentId.equals("0")){
id = parentId;
type = "chn"+cameraInfo.getChannel()+"_switch";
}
StringBuffer sb = new StringBuffer();
sb.append("{");
sb.append("\"devId\"").append(":").append("\"").append(id).append("\"").append(",");
sb.append("\"param\"").append(":").append("{");
sb.append("\"method\"").append(":").append("\"get\"").append(",");
sb.append("\"image\"").append(":").append("{");
sb.append("\"name\"").append(":").append("\"").append(type).append("\"");
sb.append("}");
sb.append("}");
sb.append("}");
String addPreviewRes = tumsApi.passthrough(sb.toString());
JSONObject jsonObject = new JSONObject(addPreviewRes);
String errCode = jsonObject.getStr("error_code");
if("0".equals(errCode)){
JSONObject result = (JSONObject)jsonObject.get("result");
JSONObject responseData = (JSONObject)result.get("responseData");
String errorCode = responseData.getStr("error_code");
if("0".equals(errorCode)){
JSONObject image = (JSONObject)responseData.get("image");
JSONObject data = (JSONObject)image.get(type);
// updateDeviceStatus(id,errorCode);
return Result.OK(data);
}else{
String errorMsg = "";
try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
// updateDeviceStatus(id,errorCode);
log.info("getImageCommon:{}",errorMsg);
return Result.error(errorMsg);
}
}else{
String errMsg = "";
try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
// updateDeviceStatus(id,errCode);
log.info("getImageCommon:{}",errMsg);
return Result.error(errMsg);
}
}
/**
* 设置画面操作信息
*
* @param map
* @return
* @throws Exception
*/
@Override
public Result setImageSwitch(Map<String,Object> map){
String id = map.get("deviceIndex").toString();
String type = map.get("type").toString();
CameraInfo cameraInfo = new CameraInfo();
cameraInfo.setDeviceIndex(id);
cameraInfo = baseMapper.getByDeviceId(cameraInfo);
String parentId = cameraInfo.getParentId();
if(!parentId.equals("0")){
id = parentId;
type = "chn"+cameraInfo.getChannel()+"_switch";
}
Map<String,Object> paramMap = (Map<String,Object>)map.get("param");
StringBuffer sb = new StringBuffer();
sb.append("{");
sb.append("\"devId\"").append(":").append("\"").append(id).append("\"").append(",");
sb.append("\"param\"").append(":").append("{");
sb.append("\"method\"").append(":").append("\"set\"").append(",");
sb.append("\"image\"").append(":").append("{");
sb.append("\"").append(type).append("\"").append(":").append("{");
//类属性+类值
StringBuffer csb = new StringBuffer();
Set<String> keys = paramMap.keySet();
// 遍历键的集合并打印每个键
for (String key : keys) {
String value = paramMap.get(key).toString();
csb.append("\"").append(key).append("\"").append(":").append("\"").append(value).append("\"").append(",");
}
String cstr = csb.toString();
if(cstr.length()>0){
cstr = cstr.substring(0,cstr.length()-1);
}
sb.append(cstr);
sb.append("}");
sb.append("}");
sb.append("}");
sb.append("}");
String addPreviewRes = tumsApi.passthrough(sb.toString());
JSONObject jsonObject = new JSONObject(addPreviewRes);
String errCode = jsonObject.getStr("error_code");
if("0".equals(errCode)){
JSONObject result = (JSONObject)jsonObject.get("result");
JSONObject responseData = (JSONObject)result.get("responseData");
String errorCode = responseData.getStr("error_code");
if("0".equals(errorCode)){
return Result.OK("设置成功");
}else{
String errorMsg = "";
try{
ErrorCode errorVo = errorCodeService.getByCode(errorCode);
errorMsg = errorVo.getErrorMsg();
}catch (Exception e){
errorMsg = errorCode;
}
// updateDeviceStatus(id,errorCode);
log.info("setImageCommon:{}",errorMsg);
return Result.error(errorMsg);
}
}else{
String errMsg = "";
try{
ErrorCode errVo = errorCodeService.getByCode(errCode);
errMsg = errVo.getErrorMsg();
}catch (Exception e){
errMsg = errCode;
}
// updateDeviceStatus(id,errCode);
log.info("setImageCommon:{}",errMsg);
return Result.error(errMsg);
}
}
/**
* 获取摄像头实时播放地址
* 添加预览通道

5
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java
View File

@ -12,12 +12,14 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.system.vo.LoginUser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -139,6 +141,9 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
@RequiresPermissions("nuBaseInfo:nu_base_info:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody NuBaseInfo nuBaseInfo) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
nuBaseInfo.setOrgCode(loginUser.getOrgCode());
service.setNuId(nuBaseInfo);
nuBaseInfoService.save(nuBaseInfo);

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

@ -145,6 +145,7 @@ public class NuBaseInfo implements Serializable {
* 是否绑定护理单元支付中 Y支付中（有客户正在给护理单元充值） N没有人在绑定缴费（可以让用户绑定）
*/
private String izBindPaying;
private String orgCode;
@TableField(exist = false)
private String deviceId;//摄像头 ID
@ -162,8 +163,6 @@ public class NuBaseInfo implements Serializable {
@TableField(exist = false)
private String orgCode;
@TableField(exist = false)
private String asyncId;
@TableField(exist = false)

2
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
View File

@ -1859,6 +1859,8 @@ public class SysBaseApiImpl implements ISysBaseAPI {
@Override
public void addOrgInfo(SysDepartDto dto) {
//先删除后插入
sysDepartService.remove(new QueryWrapper<SysDepart>());
SysDepart sysDepart = new SysDepart();
BeanUtils.copyProperties(dto,sysDepart);
sysDepartService.save(sysDepart);