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

智能电表水表

This commit is contained in:
曹磊 2025-06-10 16:21:36 +08:00
parent 3727efbb74
commit 34d189e375
15 changed files with 227 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -83,6 +83,8 @@ public class ShiroConfig {
}
// 配置不会被拦截的链接 顺序判断
filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调
filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调
filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除

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

@ -2354,8 +2354,11 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
cameraInfo.setProcess(process);
return Result.OK(cameraInfo);
}else{
String errMsg = jsonObject.getStr("msg");
if(errMsg == null || errMsg.equals("")) {
ErrorCode errVo = errorCodeService.getByCode(String.valueOf(errorCode));
String errMsg = errVo.getErrorMsg();
errMsg = errVo.getErrorMsg();
}
log.info("getUploadToServerProcess:{}-{}",errorCode,errMsg);
return Result.error(errMsg);
}

23
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java
View File

@ -1,5 +1,7 @@
package com.nu.modules.tq.electricity.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import com.nu.modules.tq.electricity.service.IElectricityMeterService;
import lombok.extern.slf4j.Slf4j;
@ -8,7 +10,9 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@RestController
@ -18,6 +22,25 @@ public class ElectricityMeterController extends JeecgController<ElectricityMeter
@Autowired
private IElectricityMeterService service;
/**
* 分页列表查询
*
* @param electricityMeter
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/list")
public Result<IPage<ElectricityMeter>> queryPageList(ElectricityMeter electricityMeter,
@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.findPage(page, electricityMeter);
return Result.OK(pageList);
}
/**
* 获取设备信息
* @param electricityMeter

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

@ -37,7 +37,7 @@ public class ElectricityMeter implements Serializable {
@Excel(name = "操作类型", width = 15)
@ApiModelProperty(value = "操作类型")
@TableField(exist = false)
private Integer type;//9清零 3抄表 10电表拉闸 11电表合闸 43水表开闸 53水表关闸
private Integer type;//9清零 3抄表 10电表拉闸 11电表合闸
@Excel(name = "电表值", width = 15)
@ApiModelProperty(value = "电表值")
private String eleValue; //电表-电量值
@ -66,4 +66,13 @@ public class ElectricityMeter implements Serializable {
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
private String remark;
@TableField(exist = false)
private String nuId;//护理单元ID
@TableField(exist = false)
private String nuName;//护理单元
@TableField(exist = false)
private String departId;//机构ID
@TableField(exist = false)
private String departName;//机构名称
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java
View File

@ -1,9 +1,13 @@
package com.nu.modules.tq.electricity.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import org.apache.ibatis.annotations.Param;
public interface ElectricityMeterMapper extends BaseMapper<ElectricityMeter> {
IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, @Param("params") ElectricityMeter electricityMeter);
ElectricityMeter getElectricityMeter(ElectricityMeter electricityMeter);
int insert(ElectricityMeter electricityMeter);
int update(ElectricityMeter electricityMeter);

47
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml
View File

@ -2,6 +2,53 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper">
<select id="findPage" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
select
a.id,
a.cid,
a.address,
a.ele_value as eleValue,
a.relay_state as relayState,
a.read_time as readTime,
a.remark,
b.online,
b.csq,
b.disconnect_time as disconnectTime,
b.connect_time as connectTime,
a.nu_id as nuId,
a.nu_name as nuName,
a.depart_id as departId,
a.depart_name as departName
from nu_iot_tq_electricity_meter a
left join nu_iot_tq_collector b on a.cid = b.cid
<where>
<if test="params.address != null and params.address != ''">
AND a.address = #{params.address}
</if>
<if test="params.nuId != null and params.nuId != ''">
AND a.nuId = #{params.nuId}
</if>
<if test="params.departId != null and params.departId != ''">
AND a.departId = #{params.departId}
</if>
<if test="params.relayState != null and params.relayState != ''">
AND a.relay_state = #{params.relayState}
</if>
<if test="params.online != null and params.online != ''">
AND b.online = #{params.online}
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 1">
AND b.csq &gt; 20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 2">
AND b.csq &gt;= 10 AND b.csq &lt;=20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 3">
AND b.csq &lt; 10
</if>
</where>
</select>
<select id="getElectricityMeter" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
select
id,

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

@ -1,12 +1,13 @@
package com.nu.modules.tq.electricity.service;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.tq.electricity.entity.ElectricityMeter;
import org.jeecg.common.api.vo.Result;
public interface IElectricityMeterService extends IService<ElectricityMeter> {
IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, ElectricityMeter electricityMeter);
Result<String> eleReset(ElectricityMeter electricityMeter);
Result<String> eleControl(ElectricityMeter electricityMeter);
Result<String> eleRead(ElectricityMeter electricityMeter);

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

@ -3,6 +3,8 @@ package com.nu.modules.tq.electricity.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
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.tq.common.entity.TqApiLog;
import com.nu.modules.tq.common.service.ITqApiLogService;
@ -29,6 +31,10 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
@Autowired
ITqApiLogService logService;
public IPage<ElectricityMeter> findPage(Page<ElectricityMeter> page, ElectricityMeter electricityMeter){
return baseMapper.findPage(page,electricityMeter);
}
/**
* 清零
*/
@ -77,7 +83,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(9);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -88,7 +94,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(9);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -102,7 +108,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(9);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -223,7 +229,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(3);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -234,7 +240,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(3);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -248,7 +254,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
tqApiLog.setCid(electricityMeter.getCid());
tqApiLog.setAddress(electricityMeter.getAddress());
tqApiLog.setType(3);
tqApiLog.setResolveValue(entity.getEleValue());
tqApiLog.setRequestValue(entity.getEleValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -275,7 +281,7 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
String status = jsonObject.getStr("status");//返回状态
String oprId = jsonObject.getStr("opr_id");//操作ID
String resolveTime = jsonObject.getStr("resolve_time");//反馈时间
String data = jsonObject.getStr("data");//反馈时间
String data = jsonObject.getStr("data");//反馈备注
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setResolveValue("0");
@ -378,7 +384,6 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
Integer type = data.getInt("type");//类型
String resolveValue = data.getJSONArray("value").get(0).toString();//值
String dsp = data.getStr("dsp");//描述
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setType(type);

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/utils/TqApi.java
View File

@ -111,11 +111,11 @@ public class TqApi {
public String waterReset(List<Map<String, Object>> req){
this.initTqConfig();
String request_content = JSON.toJSONString(req);
log.info("eleReset:request:{}",request_content);
log.info("waterReset:request:{}",request_content);
String url = tqConfig.getRequestUrl()+TqApiEnum.WATER_RESET.getValue();
String notifyUrl = tqConfig.getNotifyUrl()+"/waterMeter/waterResetNotify";
String responseStr = requestAsync(url,request_content,notifyUrl);
log.info("eleReset:response:{}",responseStr);
log.info("waterReset:response:{}",responseStr);
return responseStr;
}

23
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java
View File

@ -1,5 +1,7 @@
package com.nu.modules.tq.water.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.tq.water.entity.WaterMeter;
import com.nu.modules.tq.water.service.IWaterMeterService;
import lombok.extern.slf4j.Slf4j;
@ -8,7 +10,9 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@RestController
@ -18,6 +22,25 @@ public class WaterMeterController extends JeecgController<WaterMeter, IWaterMete
@Autowired
private IWaterMeterService service;
/**
* 分页列表查询
*
* @param waterMeter
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/list")
public Result<IPage<WaterMeter>> queryPageList(WaterMeter waterMeter,
@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.findPage(page, waterMeter);
return Result.OK(pageList);
}
/**
* 清零
* @param waterMeter

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

@ -37,13 +37,13 @@ public class WaterMeter implements Serializable {
@Excel(name = "操作类型", width = 15)
@ApiModelProperty(value = "操作类型")
@TableField(exist = false)
private Integer type;//49清零 42抄表 10电表拉闸 11电表合闸 43水表开闸 53水表关闸
private Integer type;//49清零 42抄表 43水表开闸 53水表关闸
@Excel(name = "水表值", width = 15)
@ApiModelProperty(value = "水表值")
private String waterValue; //电表-电量值
@Excel(name = "阀门状态", width = 15)
@ApiModelProperty(value = "阀门状态")
private String relayState; //电表-阀门状态 1 表示合闸/开阀， 0 表示拉闸/关阀，其他，表示未知状态或异常
private String relayState; //水表-阀门状态 1 开阀， 0 表示关阀，其他，表示未知状态或异常
@Excel(name = "水表电池状态", width = 15)
@ApiModelProperty(value = "水表电池状态")
private String batteryState; //水表电池状态 0 正常 ， 1 电池低电压,其他 电池低电压
@ -69,4 +69,13 @@ public class WaterMeter implements Serializable {
@Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述")
private String remark;
@TableField(exist = false)
private String nuId;//护理单元ID
@TableField(exist = false)
private String nuName;//护理单元
@TableField(exist = false)
private String departId;//机构ID
@TableField(exist = false)
private String departName;//机构名称
}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java
View File

@ -1,9 +1,13 @@
package com.nu.modules.tq.water.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.tq.water.entity.WaterMeter;
import org.apache.ibatis.annotations.Param;
public interface WaterMeterMapper extends BaseMapper<WaterMeter> {
IPage<WaterMeter> findPage(Page<WaterMeter> page, @Param("params") WaterMeter waterMeter);
WaterMeter getWaterMeter(WaterMeter waterMeter);
int insert(WaterMeter waterMeter);
int update(WaterMeter waterMeter);

49
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml
View File

@ -2,6 +2,54 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.tq.water.mapper.WaterMeterMapper">
<select id="findPage" parameterType="com.nu.modules.tq.water.entity.WaterMeter" resultType="com.nu.modules.tq.water.entity.WaterMeter">
select
a.id,
a.cid,
a.address,
a.water_value as waterValue,
a.relay_state as relayState,
a.battery_state as batteryState,
a.read_time as readTime,
a.remark,
b.online,
b.csq,
b.disconnect_time as disconnectTime,
b.connect_time as connectTime,
a.nu_id as nuId,
a.nu_name as nuName,
a.depart_id as departId,
a.depart_name as departName
from nu_iot_tq_water_meter a
left join nu_iot_tq_collector b on a.cid = b.cid
<where>
<if test="params.address != null and params.address != ''">
AND a.address = #{params.address}
</if>
<if test="params.nuId != null and params.nuId != ''">
AND a.nuId = #{params.nuId}
</if>
<if test="params.departId != null and params.departId != ''">
AND a.departId = #{params.departId}
</if>
<if test="params.relayState != null and params.relayState != ''">
AND a.relay_state = #{params.relayState}
</if>
<if test="params.online != null and params.online != ''">
AND b.online = #{params.online}
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 1">
AND b.csq &gt; 20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 2">
AND b.csq &gt;= 10 AND b.csq &lt;=20
</if>
<if test="params.csq != null and params.csq != '' and params.csq == 3">
AND b.csq &lt; 10
</if>
</where>
</select>
<select id="getWaterMeter" parameterType="com.nu.modules.tq.water.entity.WaterMeter" resultType="com.nu.modules.tq.water.entity.WaterMeter">
select
id,
@ -10,6 +58,7 @@
water_value as waterValue,
relay_state as relayState,
battery_state as batteryState,
read_time as readTime,
remark
from nu_iot_tq_water_meter
where cid = #{cid}

4
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java
View File

@ -1,11 +1,13 @@
package com.nu.modules.tq.water.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.tq.water.entity.WaterMeter;
import org.jeecg.common.api.vo.Result;
public interface IWaterMeterService extends IService<WaterMeter> {
IPage<WaterMeter> findPage(Page<WaterMeter> page, WaterMeter waterMeter);
Result<String> waterReset(WaterMeter waterMeter);
Result<String> waterControl(WaterMeter waterMeter);
Result<String> waterRead(WaterMeter waterMeter);

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

@ -3,12 +3,11 @@ package com.nu.modules.tq.water.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
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.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.mapper.ElectricityMeterMapper;
import com.nu.modules.tq.electricity.service.IElectricityMeterService;
import com.nu.modules.tq.utils.HttpTool;
import com.nu.modules.tq.utils.SignTool;
import com.nu.modules.tq.utils.TqApi;
@ -32,6 +31,10 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
@Autowired
ITqApiLogService logService;
public IPage<WaterMeter> findPage(Page<WaterMeter> page, WaterMeter waterMeter){
return baseMapper.findPage(page,waterMeter);
}
/**
* 清零
*/
@ -80,7 +83,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(49);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -91,7 +94,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(49);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -105,7 +108,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(49);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -123,7 +126,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
Integer type = waterMeter.getType();
WaterMeter entity = baseMapper.getWaterMeter(waterMeter);
if(entity == null){
if(type.equals("43")){
if(type.equals(43)){
return Result.error("请先同步水表设备信息后再进行开闸");
}else{
return Result.error("请先同步水表设备信息后再进行关闸");
@ -139,7 +142,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
item.put("address", waterMeter.getAddress());
item.put("type", type);
req.add(item);
String responseStr = tqApi.waterReset(req);
String responseStr = tqApi.waterControl(req);
JSONObject jsonObject = new JSONObject(responseStr);
String httpStatus = jsonObject.getStr("status");
if(httpStatus.equals("SUCCESS")){
@ -226,7 +229,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(42);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
logService.insert(tqApiLog);
@ -237,7 +240,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(42);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(status);
tqApiLog.setRequestRemark(errorMsg);
@ -251,7 +254,7 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
tqApiLog.setCid(waterMeter.getCid());
tqApiLog.setAddress(waterMeter.getAddress());
tqApiLog.setType(42);
tqApiLog.setResolveValue(entity.getWaterValue());
tqApiLog.setRequestValue(entity.getWaterValue());
tqApiLog.setRequestTime(DateUtil.now());
tqApiLog.setRequestStatus(httpStatus);
tqApiLog.setRequestRemark(errorMsg);
@ -278,11 +281,13 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
String status = jsonObject.getStr("status");//返回状态
String oprId = jsonObject.getStr("opr_id");//操作ID
String resolveTime = jsonObject.getStr("resolve_time");//反馈时间
String data = jsonObject.getStr("data");//反馈备注
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setResolveValue("0");
tqApiLog.setResolveTime(resolveTime);
tqApiLog.setResolveStatus(status);
tqApiLog.setResolveRemark(data);
TqApiLog logEntity = logService.getApiLog(tqApiLog);
if(logEntity!=null) {
tqApiLog.setId(logEntity.getId());
@ -378,12 +383,16 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
JSONObject data = (JSONObject)datas.get(j);
Integer type = data.getInt("type");//类型
String resolveValue = data.getJSONArray("value").get(0).toString();//值
String[] waterVelues = resolveValue.split("\\|");
String dsp = data.getStr("dsp");//描述
TqApiLog tqApiLog = new TqApiLog();
tqApiLog.setOprId(oprId);
tqApiLog.setType(type);
if(waterVelues.length>0){
tqApiLog.setResolveValue(waterVelues[0]);
}else{
tqApiLog.setResolveValue(resolveValue);
}
tqApiLog.setResolveTime(resolveTime);
tqApiLog.setResolveStatus(status);
tqApiLog.setResolveRemark(dsp);
@ -394,7 +403,11 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
WaterMeter wm = new WaterMeter();
wm.setCid(cid);
wm.setAddress(address);
if(waterVelues.length>0){
wm.setWaterValue(waterVelues[0]);
}else{
wm.setWaterValue(resolveValue);
}
wm.setReadTime(resolveTime);
baseMapper.updateValue(wm);
tqApiLog.setId(logEntity.getId());
@ -418,4 +431,5 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
}
return "SUCCESS";
}
}