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

Compare commits

base: yangjun:8315c0b3d53277552bf13c347cf9ae1a445fc97a
Branches Tags
yangjun:master
...
compare: yangjun:af2a0448e764672d010a0c4137a7427104375ba1
Branches Tags
yangjun:master

2 Commits
8315c0b3d5 ... af2a0448e7

Author SHA1 Message Date
yangjun af2a0448e7 Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer 
# Conflicts:
#	nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
 2025-06-27 09:25:01 +08:00
yangjun 1a18c2999e 修改文件地址 2025-06-27 09:20:38 +08:00
15 changed files with 91 additions and 167 deletions
Show Stats Expand all files Collapse all files

19
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/controller/NuIotTqApiRequestLogController.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/controller/NuIotTqApiRequestLogController.java
View File

@ -1,12 +1,8 @@
package com.nu.modules.nuIotTqApiRequestLog.controller;
package com.nu.modules.tq.apiRequestLog.controller;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -14,27 +10,18 @@ import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog;
import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService;
import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog;
import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

8
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/entity/NuIotTqApiRequestLog.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/entity/NuIotTqApiRequestLog.java
View File

@ -1,15 +1,11 @@
package com.nu.modules.nuIotTqApiRequestLog.entity;
package com.nu.modules.tq.apiRequestLog.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;

7
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/NuIotTqApiRequestLogMapper.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/NuIotTqApiRequestLogMapper.java
View File

@ -1,9 +1,6 @@
package com.nu.modules.nuIotTqApiRequestLog.mapper;
package com.nu.modules.tq.apiRequestLog.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog;
import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/mapper/xml/NuIotTqApiRequestLogMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.nuIotTqApiRequestLog.mapper.NuIotTqApiRequestLogMapper">
<mapper namespace="com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper">
</mapper>

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/INuIotTqApiRequestLogService.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/INuIotTqApiRequestLogService.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.nuIotTqApiRequestLog.service;
package com.nu.modules.tq.apiRequestLog.service;
import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog;
import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog;
import com.baomidou.mybatisplus.extension.service.IService;
/**

8
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqApiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/apiRequestLog/service/impl/NuIotTqApiRequestLogServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.nu.modules.nuIotTqApiRequestLog.service.impl;
package com.nu.modules.tq.apiRequestLog.service.impl;
import com.nu.modules.nuIotTqApiRequestLog.entity.NuIotTqApiRequestLog;
import com.nu.modules.nuIotTqApiRequestLog.mapper.NuIotTqApiRequestLogMapper;
import com.nu.modules.nuIotTqApiRequestLog.service.INuIotTqApiRequestLogService;
import com.nu.modules.tq.apiRequestLog.entity.NuIotTqApiRequestLog;
import com.nu.modules.tq.apiRequestLog.mapper.NuIotTqApiRequestLogMapper;
import com.nu.modules.tq.apiRequestLog.service.INuIotTqApiRequestLogService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

5
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java
View File

@ -8,14 +8,13 @@ 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.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.common.entity.TqApiLog;
import com.nu.modules.tq.common.service.ITqApiLogService;
import com.nu.modules.tq.utils.HttpTool;
import com.nu.modules.tq.utils.SignTool;
import com.nu.modules.tq.utils.TqApi;
import com.nu.modules.tq.water.entity.WaterMeter;
import lombok.extern.slf4j.Slf4j;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper;

23
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/controller/NuIotTqElectricitySyncLogController.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/controller/NuIotTqElectricitySyncLogController.java
View File

@ -1,39 +1,22 @@
package com.nu.modules.nuIotTqElectricitySyncLog.controller;
package com.nu.modules.tq.syncLog.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

9
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/entity/NuIotTqElectricitySyncLog.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/entity/NuIotTqElectricitySyncLog.java
View File

@ -1,20 +1,15 @@
package com.nu.modules.nuIotTqElectricitySyncLog.entity;
package com.nu.modules.tq.syncLog.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;

7
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/NuIotTqElectricitySyncLogMapper.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/NuIotTqElectricitySyncLogMapper.java
View File

@ -1,9 +1,6 @@
package com.nu.modules.nuIotTqElectricitySyncLog.mapper;
package com.nu.modules.tq.syncLog.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/mapper/xml/NuIotTqElectricitySyncLogMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.nuIotTqElectricitySyncLog.mapper.NuIotTqElectricitySyncLogMapper">
<mapper namespace="com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper">
</mapper>

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/INuIotTqElectricitySyncLogService.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/INuIotTqElectricitySyncLogService.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.nuIotTqElectricitySyncLog.service;
package com.nu.modules.tq.syncLog.service;
import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog;
import com.baomidou.mybatisplus.extension.service.IService;
/**

8
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/nuIotTqElectricitySyncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java → nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/syncLog/service/impl/NuIotTqElectricitySyncLogServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.nu.modules.nuIotTqElectricitySyncLog.service.impl;
package com.nu.modules.tq.syncLog.service.impl;
import com.nu.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.nuIotTqElectricitySyncLog.mapper.NuIotTqElectricitySyncLogMapper;
import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.tq.syncLog.mapper.NuIotTqElectricitySyncLogMapper;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

6
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
View File

@ -8,12 +8,10 @@ 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.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.common.entity.TqApiLog;
import com.nu.modules.tq.common.service.ITqApiLogService;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import com.nu.modules.tq.electricity.service.impl.ElectricityMeterServiceImpl;
import com.nu.modules.tq.utils.HttpTool;
import com.nu.modules.tq.utils.SignTool;
import com.nu.modules.tq.utils.TqApi;

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

@ -1,6 +1,5 @@
package com.nu.modules.yiweilian.humid.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
@ -8,8 +7,8 @@ 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.modules.nuIotTqElectricitySyncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.nuIotTqElectricitySyncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.syncLog.entity.NuIotTqElectricitySyncLog;
import com.nu.modules.tq.syncLog.service.INuIotTqElectricitySyncLogService;
import com.nu.modules.tq.utils.HttpTool;
import com.nu.modules.tq.water.entity.WaterMeter;
import com.nu.modules.tq.water.service.impl.WaterMeterServiceImpl;
@ -26,7 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@Slf4j
@Service
@ -230,7 +231,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
Integer limit = dataObj.getInt("rows");
Integer page = dataObj.getInt("page");
JSONArray dataArr = dataObj.getJSONArray("dataList");
if(dataArr.size()>0){
for(int i=0;i<dataArr.size();i++){
HumidDevice dh = new HumidDevice();
JSONObject json = (JSONObject)dataArr.get(i);
@ -240,15 +240,9 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
String temperature = json.getStr("temperature");
String humidity = json.getStr("humidity");
String reportingTime = json.getStr("date");
dh.setStatus(status);
Date reportingDate = DateUtil.parse(reportingTime,"yyyy-MM-dd HH:mm:ss");
Calendar ca = Calendar.getInstance();
ca.add(Calendar.MINUTE,-5);
Date currentDate = ca.getTime();
if(reportingDate.getTime()<=currentDate.getTime()){
dh.setStatus("1");
}
dh.setSn(sn);
dh.setStatus(status);
dh.setElectricity(electricity);
dh.setTemperature(temperature);
dh.setHumidity(humidity);
@ -261,23 +255,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
}
baseMapper.insertLog(dh);
}
}else{
errorMsg += humidDevice.getSn()+"温湿度设备丢失，请联系管理员";
HumidDevice dh = new HumidDevice();
dh.setSn(humidDevice.getSn());
dh.setStatus("1");
dh.setElectricity("0");
dh.setTemperature("0");
dh.setHumidity("0");
dh.setReportingTime(DateUtil.now());
dh.setOptType("read");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(sysUser!=null){
dh.setOptBy(sysUser.getUsername());
}
baseMapper.insertLog(dh);
baseMapper.updateValue(dh);
}
if((page+1)*limit<count){
Map<String, Object> params = getParmas(page+1,limit,humidDevice);
errorMsg += updateDeviceRealTimeData(params,humidDevice);
@ -367,8 +344,7 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
if(deviceParameters!=null){
return Result.OK(deviceParameters);
}else{
return Result.error("温湿度设备丢失获取配置错误，请联系管理员");
// return Result.error("获取设备配置参数错误");
return Result.error("获取设备配置参数错误");
}
}
@ -385,7 +361,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
if(responseCode.equals(0)){
JSONObject dataObj = jsonObject.getJSONObject("data");
JSONArray dataArr = dataObj.getJSONArray("dataList");
if(dataArr.size()>0){
for(int i=0;i<dataArr.size();i++){
JSONObject json = (JSONObject)dataArr.get(i);
String sn = json.getStr("sn");
@ -428,9 +403,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
}else{
return null;
}
}else{
return null;
}
return dh;
}