diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java index 531aa7b..f0631df 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java @@ -26,12 +26,12 @@ import io.swagger.annotations.ApiOperation; import java.util.List; /** - * @Description: 护理单元-物联管理-TPLINK机构信息 + * @Description: 护理单元-物联管理-TPLINK项目信息 * @Author: jeecg-boot * @Date: 2025-01-22 * @Version: V1.0 */ -@Api(tags="护理单元-物联管理-TPLINK机构信息") +@Api(tags="护理单元-物联管理-TPLINK项目信息") @RestController @RequestMapping("/iot/projectInfo") @Slf4j @@ -48,8 +48,8 @@ public class ProjectInfoController extends JeecgController> queryPageList(ProjectInfo projectInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -61,7 +61,7 @@ public class ProjectInfoController extends JeecgController add(@RequestBody ProjectInfo projectInfo) { return service.addProject(projectInfo); @@ -108,8 +108,8 @@ public class ProjectInfoController extends JeecgController edit(@RequestBody ProjectInfo projectInfo) { return service.editProject(projectInfo); @@ -121,8 +121,8 @@ public class ProjectInfoController extends JeecgController deleteProject(@RequestBody ProjectInfo projectInfo) { return service.deleteProject(projectInfo); @@ -134,8 +134,8 @@ public class ProjectInfoController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { ProjectInfo projectInfo = service.getById(id); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java index 11c2be5..ba5ad87 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java @@ -21,6 +21,7 @@ public interface ProjectInfoMapper extends BaseMapper { IPage findPage(Page page, @Param("params") ProjectInfo projectInfo); int add(Map map); int updateById(Map map); + int updateByProjectId(ProjectInfo projectInfo); int deleteByProjectId(String projectId); int updateLeafByPId(Map map); List queryTreeList(); 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 0c229f2..182e51f 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 @@ -124,6 +124,58 @@ + update nu_iot_tplink_project + set + + project_name = #{projectName}, + + + institutional_id = #{institutionalId}, + + + create_time = #{createTime}, + + + device_num = #{deviceNum}, + + + sort = #{sort}, + + + offline_num = #{offlineNum}, + + + abnormal_num = #{abnormalNum}, + + + unread_message_num = #{unreadMessageNum}, + + + total_nms_dev_num = #{totalNmsDevNum}, + + + total_vms_dev_num = #{totalVmsDevNum}, + + + total_nbs_dev_num = #{totalNbsDevNum}, + + + offline_nms_dev_num = #{offlineNmsDevNum}, + + + offline_vms_dev_num = #{offlineVmsDevNum}, + + + offline_nbs_dev_num = #{offlineNbsDevNum}, + + + running_time = #{runningTime}, + + project_id = #{projectId} + where id = #{id} + + + update nu_iot_tplink_project set project_id = #{projectId}, project_name = #{projectName}, @@ -142,7 +194,7 @@ offline_vms_dev_num = #{offlineVmsDevNum}, offline_nbs_dev_num = #{offlineNbsDevNum}, running_time = #{runningTime} - where id = #{id} + where project_id = #{projectId} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java index 05e4d8a..62a74ed 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java @@ -143,6 +143,10 @@ public class ProjectInfoServiceImpl extends ServiceImpl> queryPageList(RegionInfo regionInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -57,7 +57,7 @@ public class RegionInfoController extends JeecgController add(@RequestBody RegionInfo regionInfo) { return service.addRegion(regionInfo); @@ -115,8 +115,8 @@ public class RegionInfoController extends JeecgController edit(@RequestBody RegionInfo regionInfo) { return service.editRegion(regionInfo); @@ -128,8 +128,8 @@ public class RegionInfoController extends JeecgController deleteRegion(@RequestBody RegionInfo regionInfo) { return service.deleteRegion(regionInfo); @@ -141,8 +141,8 @@ public class RegionInfoController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { RegionInfo regionInfo = service.getById(id); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java index 99e2d49..fb7e516 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java @@ -15,7 +15,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-02-20 * @Version: V1.0 @@ -24,7 +24,7 @@ import java.io.Serializable; @TableName("nu_iot_tplink_region") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tplink_region对象", description="护理单元-物联管理-TPLINK区域信息") +@ApiModel(value="nu_iot_tplink_region对象", description="护理单元-物联管理-TPLINK分组信息") public class RegionInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -32,19 +32,19 @@ public class RegionInfo implements Serializable { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "ID") private Integer id; - /**区域ID*/ - @Excel(name = "区域ID", width = 15) - @ApiModelProperty(value = "区域ID") + /**分组ID*/ + @Excel(name = "分组ID", width = 15) + @ApiModelProperty(value = "分组ID") private String regionId; - /**区域名称*/ - @Excel(name = "区域名称", width = 15) - @ApiModelProperty(value = "区域名称") + /**分组名称*/ + @Excel(name = "分组名称", width = 15) + @ApiModelProperty(value = "分组名称") private String regionName; - /**区域层级*/ - @Excel(name = "区域层级", width = 15) - @ApiModelProperty(value = "区域层级") + /**分组层级*/ + @Excel(name = "分组层级", width = 15) + @ApiModelProperty(value = "分组层级") private String regionLevel; - /**区域次序,接口对应字段,在数据库中是关键字,数据库中用sort代替order*/ + /**分组次序,接口对应字段,在数据库中是关键字,数据库中用sort代替order*/ @ApiModelProperty(value = "项目次序") @TableField(exist = false) private String order; @@ -52,13 +52,13 @@ public class RegionInfo implements Serializable { @Excel(name = "项目次序", width = 15) @ApiModelProperty(value = "项目次序") private Integer sort; - /**父区域ID*/ - @Excel(name = "父区域ID", width = 15) - @ApiModelProperty(value = "父区域ID") + /**父分组ID*/ + @Excel(name = "父分组ID", width = 15) + @ApiModelProperty(value = "父分组ID") private String parentId; - /**父区域ID*/ - @Excel(name = "父区域", width = 15) - @ApiModelProperty(value = "父区域") + /**父分组ID*/ + @Excel(name = "父分组", width = 15) + @ApiModelProperty(value = "父分组") @TableField(exist = false) private String parentName; /**项目ID*/ @@ -78,13 +78,13 @@ public class RegionInfo implements Serializable { @Excel(name = "流道", width = 15) @ApiModelProperty(value = "流道") private String streamWay; - /**是否有子区域*/ - @Excel(name = "是否有子区域", width = 15) - @ApiModelProperty(value = "是否有子区域 0无 1有") + /**是否有子分组*/ + @Excel(name = "是否有子分组", width = 15) + @ApiModelProperty(value = "是否有子分组 0无 1有") private String hasChildren; - /**区域类型*/ - @Excel(name = "区域类型", width = 15) - @ApiModelProperty(value = "区域类型") + /**分组类型*/ + @Excel(name = "分组类型", width = 15) + @ApiModelProperty(value = "分组类型") private String regionType; /**更新时间*/ @Excel(name = "更新时间", width = 15) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java index 05dc45e..5cc1313 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * 区域信息同步 + * 分组信息同步 */ @Slf4j public class RegionSyncJob implements Job { diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java index b7bafc5..e018a04 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-02-20 * @Version: V1.0 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java index 9b16874..739b7a6 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java @@ -8,7 +8,7 @@ import java.util.Objects; /** *

- * 区域表 存储区域结构数据的实体类 + * 分组表 存储分组结构数据的实体类 *

* * @Author 曹磊 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java index 084d1c1..2f30389 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java @@ -10,7 +10,7 @@ import com.nu.modules.tplink.region.model.RegionTreeModel; import java.util.List; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-01-22 * @Version: V1.0 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 2d3c5d2..3597403 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 @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-02-20 * @Version: V1.0 @@ -37,7 +37,7 @@ public class RegionInfoServiceImpl extends ServiceImpl