diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml index 904fc66..0c229f2 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml @@ -164,6 +164,7 @@ project_name as projectName, institutional_id as institutionalId, create_time as createTime, + DATE_FORMAT(FROM_UNIXTIME(create_time),'%Y-%m-%d %H:%i:%s') as createTimeStr, device_num as deviceNum, message_num as messageNum, sort as sort, @@ -177,6 +178,7 @@ offline_vms_dev_num as offlineVmsDevNum, offline_nbs_dev_num as offlineNbsDevNum, running_time as runningTime, + running_time DIV 86400 AS runningTimeStr, status, iz_leaf as izLeaf from nu_iot_tplink_project diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/model/ProjectTreeModel.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/model/ProjectTreeModel.java index 0b11464..e64fb56 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/model/ProjectTreeModel.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/model/ProjectTreeModel.java @@ -39,6 +39,20 @@ public class ProjectTreeModel implements Serializable{ private String projectName; + private String institutionalId; + + private String createTimeStr; + + private Integer deviceNum; + + private Integer offlineNum; + + private Integer abnormalNum; + + private String runningTimeStr; + + private Integer status; + private String order; private Integer sort; @@ -58,6 +72,13 @@ public class ProjectTreeModel implements Serializable{ this.id = "0"; this.projectId = projectInfo.getProjectId(); this.projectName = projectInfo.getProjectName(); + this.institutionalId = projectInfo.getInstitutionalId(); + this.createTimeStr = projectInfo.getCreateTimeStr(); + this.deviceNum = projectInfo.getDeviceNum(); + this.offlineNum = projectInfo.getOfflineNum(); + this.abnormalNum = projectInfo.getAbnormalNum(); + this.runningTimeStr = projectInfo.getRunningTimeStr(); + this.status = projectInfo.getStatus(); this.order = projectInfo.getOrder(); this.sort = projectInfo.getSort(); if(0 == projectInfo.getIzLeaf()){ @@ -146,6 +167,62 @@ public class ProjectTreeModel implements Serializable{ this.projectName = projectName; } + public String getInstitutionalId() { + return institutionalId; + } + + public void setInstitutionalId(String institutionalId) { + this.institutionalId = institutionalId; + } + + public String getCreateTimeStr() { + return createTimeStr; + } + + public void setCreateTimeStr(String createTimeStr) { + this.createTimeStr = createTimeStr; + } + + public Integer getDeviceNum() { + return deviceNum; + } + + public void setDeviceNum(Integer deviceNum) { + this.deviceNum = deviceNum; + } + + public Integer getOfflineNum() { + return offlineNum; + } + + public void setOfflineNum(Integer offlineNum) { + this.offlineNum = offlineNum; + } + + public Integer getAbnormalNum() { + return abnormalNum; + } + + public void setAbnormalNum(Integer abnormalNum) { + this.abnormalNum = abnormalNum; + } + + public String getRunningTimeStr() { + return runningTimeStr; + } + + public void setRunningTimeStr(String runningTimeStr) { + this.runningTimeStr = runningTimeStr; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public String getOrder() { return order; } @@ -177,6 +254,13 @@ public class ProjectTreeModel implements Serializable{ return Objects.equals(id, model.id) && Objects.equals(projectId, model.projectId) && Objects.equals(projectName, model.projectName) && + Objects.equals(institutionalId, model.institutionalId) && + Objects.equals(createTimeStr, model.createTimeStr) && + Objects.equals(deviceNum, model.deviceNum) && + Objects.equals(offlineNum, model.offlineNum) && + Objects.equals(abnormalNum, model.abnormalNum) && + Objects.equals(runningTimeStr, model.runningTimeStr) && + Objects.equals(status, model.status) && Objects.equals(order, model.order) && Objects.equals(sort, model.sort) && Objects.equals(children, model.children); @@ -187,7 +271,7 @@ public class ProjectTreeModel implements Serializable{ */ @Override public int hashCode() { - return Objects.hash(id, projectId, projectName, order, sort, children); + return Objects.hash(id, projectId, projectName, institutionalId, createTimeStr, deviceNum ,offlineNum ,abnormalNum ,runningTimeStr ,status ,order, sort, children); } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java index c48ca92..0b46415 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java @@ -66,6 +66,16 @@ public class RegionInfoController extends JeecgController { Result sync(RegionInfo regionInfo); + Result syncChildren(RegionInfo regionInfo); void sync(String jsonResponse); List findList(RegionInfo regionInfo); IPage findPage(Page page, RegionInfo regionInfo); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java index c9451af..2d3c5d2 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java @@ -111,8 +111,8 @@ public class RegionInfoServiceImpl extends ServiceImpl