diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 70f816f23..da4f90945 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -1,6 +1,5 @@ package com.iformall.controller.device; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.Result; @@ -8,7 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.KwBox; import com.iformall.domain.po.KwBoxCmdHistory; -import com.iformall.enums.EnumBoxStatus; +import com.iformall.enums.EnumBoxRegisterStatus; import com.iformall.service.kw.KwBoxCmdHistoryService; import com.iformall.service.kw.KwBoxService; import io.netty.util.internal.StringUtil; @@ -41,11 +40,10 @@ public class KwBoxV1Controller extends BaseController { KwBoxCmdHistory kwBoxCmdHistory = new KwBoxCmdHistory(); kwBoxCmdHistory.setCmd(cmd); kwBoxCmdHistory.setCreateTime(new Date()); - kwBoxCmdHistory.setUpdateTime(new Date()); kwBoxCmdHistory.setDeviceTime(deviceTime); kwBoxCmdHistory.setIccid(ccid); kwBoxCmdHistory.setImei(imei); - kwBoxCmdHistory.setInfo(JSONObject.toJSON(paramMap).toString()); + kwBoxCmdHistory.setContent(JSONObject.toJSON(paramMap).toString()); kwBoxCmdHistory.setTenantId(tenantId); kwBoxCmdHistoryService.saveOrUpdate(kwBoxCmdHistory); @@ -67,7 +65,7 @@ public class KwBoxV1Controller extends BaseController { if (kwBox == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - if (!kwBox.getStatus().equals(EnumBoxStatus.INIT.getCode())) + if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.INIT.getCode())) return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); saveCmd(kwBox.getTenantId(),"regist",imei,ccid,deviceTime,paramMap); @@ -80,11 +78,11 @@ public class KwBoxV1Controller extends BaseController { record.setUpdateTime(new Date()); record.setRegisterTime(new Date()); record.setLastOnlineTime(new Date()); - record.setStatus(EnumBoxStatus.REGISTERED.getCode()); + record.setRegisterStatus(EnumBoxRegisterStatus.REGISTERED.getCode()); kwBoxService.saveOrUpdate(record); Map data = new HashMap<>(); - data.put("sysStatus",record.getStatus()); + data.put("sysStatus",record.getRegisterStatus()); if (kwBox.getComKey() != null) data.put("comKey",kwBox.getComKey()); if (kwBox.getConfig() != null) @@ -103,7 +101,7 @@ public class KwBoxV1Controller extends BaseController { if (kwBox == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - if (!kwBox.getStatus().equals(EnumBoxStatus.REGISTERED.getCode())) + if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.REGISTERED.getCode())) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); saveCmd(kwBox.getTenantId(),"login",imei,ccid,deviceTime,paramMap); @@ -128,7 +126,7 @@ public class KwBoxV1Controller extends BaseController { if (kwBox == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - if (!kwBox.getStatus().equals(EnumBoxStatus.REGISTERED.getCode())) + if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.REGISTERED.getCode())) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); saveCmd(kwBox.getTenantId(),"hb",imei,ccid,deviceTime,paramMap); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index fd7922e67..3682b3590 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -50,11 +50,11 @@ public class KwBox extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "硬件版本号", name = "hdVersion") private String hdVersion; - @io.swagger.annotations.ApiModelProperty(value = "注册状态0出厂已注册1", name = "status") - private Integer status; + @io.swagger.annotations.ApiModelProperty(value = "注册状态0出厂已注册1", name = "registerStatus") + private Integer registerStatus; - @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online") - private Integer online; + @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "onlineStatus") + private Integer onlineStatus; @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config") private String config; @@ -75,7 +75,12 @@ public class KwBox extends BaseEntity { private String comKey; public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"), + UpdateTime_ASC("`update_time` ASC"), + UpdateTime_DESC("`update_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java index f34184f6d..113078a18 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java @@ -41,11 +41,11 @@ public class KwBoxCmdHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "SIM卡编号", name = "iccid") private String iccid; - @io.swagger.annotations.ApiModelProperty(value = "'命令类型", name = "cmd") + @io.swagger.annotations.ApiModelProperty(value = "命令", name = "cmd") private String cmd; - @io.swagger.annotations.ApiModelProperty(value = "'信息", name = "info") - private String info; + @io.swagger.annotations.ApiModelProperty(value = "命令内容", name = "content") + private String content; @io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime") private Date deviceTime; @@ -53,11 +53,12 @@ public class KwBoxCmdHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; - @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") - private Date updateTime; public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index 69c64553e..ea84c8338 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -14,7 +14,7 @@ import java.util.List; /** * @author gongbiao */ -@Table(name = "kw_meters") +@Table(name = "kw_meter") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @@ -53,8 +53,8 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate") private Integer bandrate; - @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online") - private Integer online; + @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online_status") + private Integer online_status; @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config") private String config; @@ -72,7 +72,12 @@ public class KwMeter extends BaseEntity { private Date updateTime; public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"), + UpdateTime_ASC("`update_time` ASC"), + UpdateTime_DESC("`update_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index 39d60bcba..18ab54825 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -44,8 +44,8 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address") private String address; - @io.swagger.annotations.ApiModelProperty(value = "度数", name = "result") - private String result; + @io.swagger.annotations.ApiModelProperty(value = "总用电量", name = "totalConsumption") + private String totalConsumption; @io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime") private Date deviceTime; @@ -53,11 +53,13 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; - @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") - private Date updateTime; - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + DeviceTime_ASC("`device_time` ASC"), + DeviceTime_DESC("`device_time` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBoxRegisterStatus.java similarity index 70% rename from mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java rename to mallinkService/src/main/java/com/iformall/enums/EnumBoxRegisterStatus.java index de23d59e7..b20c210c6 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBoxRegisterStatus.java @@ -3,12 +3,12 @@ package com.iformall.enums; /** * Created by Stormeye on 2018/08/09. */ -public enum EnumBoxStatus { +public enum EnumBoxRegisterStatus { INIT(0, "出厂"), REGISTERED(1, "注册"); - public static EnumBoxStatus getEnum(Integer code) { - for (EnumBoxStatus value : values()) { + public static EnumBoxRegisterStatus getEnum(Integer code) { + for (EnumBoxRegisterStatus value : values()) { if (value.getCode().equals(code)) { return value; } @@ -19,7 +19,7 @@ public enum EnumBoxStatus { private Integer code; private String message; - EnumBoxStatus(Integer code, String message) { + EnumBoxRegisterStatus(Integer code, String message) { this.code = code; this.message = message; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java similarity index 72% rename from mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java rename to mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java index d2214ff06..9554cf64e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.KwMeter; import java.util.List; -public interface KwMetersMapper extends CommonMapper { +public interface KwMeterMapper extends CommonMapper { List findList(KwMeter param); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index ecb86842a..5cfd48f5d 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -97,13 +97,12 @@ public class KwBoxServiceImpl implements KwBoxService { KwMeterData kwMeterData = new KwMeterData(); kwMeterData.setTenantId(record.getTenantId()); - kwMeterData.setUpdateTime(new Date()); kwMeterData.setAddress(addr); kwMeterData.setBoxId(record.getId()); kwMeterData.setCreateTime(new Date()); kwMeterData.setDeviceTime(deviceTime); kwMeterData.setMeterId(kwMeter.getId()); - kwMeterData.setResult(data); + kwMeterData.setTotalConsumption(data); kwMeterDataService.saveOrUpdate(kwMeterData); return kwMeterData; diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java index 3b48bf34c..e0e46ca22 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.KwMeter; -import com.iformall.mapper.KwMetersMapper; +import com.iformall.mapper.KwMeterMapper; import com.iformall.service.kw.KwMeterService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,16 +20,16 @@ public class KwMeterServiceImpl implements KwMeterService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - KwMetersMapper kwMetersMapper; + KwMeterMapper kwMeterMapper; @Override public PageInfo listAsPage(KwMeter record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMetersMapper.findList(record)); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterMapper.findList(record)); } @Override public KwMeter getById(Long id) { - return kwMetersMapper.selectByPrimaryKey(id); + return kwMeterMapper.selectByPrimaryKey(id); } @@ -38,9 +38,9 @@ public class KwMeterServiceImpl implements KwMeterService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - kwMetersMapper.insertSelective(record); + kwMeterMapper.insertSelective(record); } else { - kwMetersMapper.updateByPrimaryKeySelective(record); + kwMeterMapper.updateByPrimaryKeySelective(record); } return new ResultData(); } @@ -48,12 +48,12 @@ public class KwMeterServiceImpl implements KwMeterService { @Override public void deleteById(Long id) { - kwMetersMapper.deleteByPrimaryKey(id); + kwMeterMapper.deleteByPrimaryKey(id); } @Override public List findList(KwMeter record) { - return kwMetersMapper.findList(record); + return kwMeterMapper.findList(record); } diff --git a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml index 32ab96016..457f9ea29 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml @@ -7,14 +7,13 @@ - + - - `id`,`tenant_id`,`imei`,`iccid`,`cmd`,`info`,`device_time`,`create_time`,`update_time` + `id`,`tenant_id`,`imei`,`iccid`,`content`,`info`,`device_time`,`create_time` diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index fb370a55e..b4f4dc85c 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -9,8 +9,8 @@ - - + + @@ -20,7 +20,7 @@ - `id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`status`,`online`,`register_time`, + `id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`register_status`,`online_status`,`register_time`, `last_online_time`,`config`,`create_time`,`update_time`,`com_key` @@ -35,24 +35,24 @@ and `tenant_id` = #{tenantId} - - and `imei` like concat('%', #{imei},'%') + + and `imei` = #{imei} - - and `iccid` like concat('%', #{iccid},'%') + + and `iccid` = #{iccid} and `place` like concat('%', #{place},'%') - - and `status` = #{status} + + and `register_status` = #{registerStatus} - - and `online` = #{online} + + and `online_status` = #{onlineStatus} diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 4939304a2..8f7443cc6 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -7,14 +7,13 @@ - + - - `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`result`,`device_time`,`create_time`,`update_time` + `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_consumption`,`device_time`,`create_time` @@ -40,7 +39,7 @@ diff --git a/mallinkService/src/main/resources/mapper/KwMetersMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml similarity index 90% rename from mallinkService/src/main/resources/mapper/KwMetersMapper.xml rename to mallinkService/src/main/resources/mapper/KwMeterMapper.xml index 125016fba..a9219c26c 100644 --- a/mallinkService/src/main/resources/mapper/KwMetersMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -1,6 +1,6 @@ - + @@ -10,14 +10,14 @@ - + - `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`online`,`config`,`create_time`,`update_time` + `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`online_status`,`config`,`create_time`,`update_time` @@ -63,7 +63,7 @@