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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_java_monomer

This commit is contained in:
1378012178@qq.com 2025-03-24 11:28:31 +08:00
parent dedcf58a38 0559db8bb4
commit 80461beccf
11 changed files with 128 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java
View File

@ -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<ProjectInfo, IProject
* @param req
* @return
*/
//@AutoLog(value = "护理单元-物联管理-TPLINK机构信息-分页列表查询")
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-分页列表查询", notes="护理单元-物联管理-TPLINK机构信息-分页列表查询")
//@AutoLog(value = "护理单元-物联管理-TPLINK项目信息-分页列表查询")
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-分页列表查询", notes="护理单元-物联管理-TPLINK项目信息-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ProjectInfo>> queryPageList(ProjectInfo projectInfo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ -61,7 +61,7 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
}
/**
* 同步机构信息
* 同步项目信息
*
* @return
*/
@ -71,7 +71,7 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
}
/**
* 异步查询机构list
* 异步查询项目list
* @return
*/
@RequestMapping(value = "/queryRegionTreeSync", method = RequestMethod.GET)
@ -95,8 +95,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
* @param projectInfo
* @return
*/
// @AutoLog(value = "护理单元-物联管理-TPLINK机构信息-添加")
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-添加", notes="护理单元-物联管理-TPLINK机构信息-添加")
// @AutoLog(value = "护理单元-物联管理-TPLINK项目信息-添加")
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-添加", notes="护理单元-物联管理-TPLINK项目信息-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ProjectInfo projectInfo) {
return service.addProject(projectInfo);
@ -108,8 +108,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
* @param projectInfo
* @return
*/
// @AutoLog(value = "护理单元-物联管理-TPLINK机构信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-编辑", notes="护理单元-物联管理-TPLINK机构信息-编辑")
// @AutoLog(value = "护理单元-物联管理-TPLINK项目信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-编辑", notes="护理单元-物联管理-TPLINK项目信息-编辑")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody ProjectInfo projectInfo) {
return service.editProject(projectInfo);
@ -121,8 +121,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
* @param projectInfo
* @return
*/
// @AutoLog(value = "护理单元-物联管理-TPLINK机构信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-通过id删除", notes="护理单元-物联管理-TPLINK机构信息-通过id删除")
// @AutoLog(value = "护理单元-物联管理-TPLINK项目信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-通过id删除", notes="护理单元-物联管理-TPLINK项目信息-通过id删除")
@PostMapping(value = "/delete")
public Result<String> deleteProject(@RequestBody ProjectInfo projectInfo) {
return service.deleteProject(projectInfo);
@ -134,8 +134,8 @@ public class ProjectInfoController extends JeecgController<ProjectInfo, IProject
* @param id
* @return
*/
//@AutoLog(value = "护理单元-物联管理-TPLINK机构信息-通过id查询")
@ApiOperation(value="护理单元-物联管理-TPLINK机构信息-通过id查询", notes="护理单元-物联管理-TPLINK机构信息-通过id查询")
//@AutoLog(value = "护理单元-物联管理-TPLINK项目信息-通过id查询")
@ApiOperation(value="护理单元-物联管理-TPLINK项目信息-通过id查询", notes="护理单元-物联管理-TPLINK项目信息-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProjectInfo> queryById(@RequestParam(name="id",required=true) String id) {
ProjectInfo projectInfo = service.getById(id);

1
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java
View File

@ -21,6 +21,7 @@ public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
IPage<ProjectInfo> findPage(Page<ProjectInfo> page, @Param("params") ProjectInfo projectInfo);
int add(Map<String, String> map);
int updateById(Map<String, String> map);
int updateByProjectId(ProjectInfo projectInfo);
int deleteByProjectId(String projectId);
int updateLeafByPId(Map<String, String> map);
List<ProjectInfo> queryTreeList();

54
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml
View File

@ -124,6 +124,58 @@
</insert>
<update id="updateById">
update nu_iot_tplink_project
set
<if test="projectName != null and projectName != ''">
project_name = #{projectName},
</if>
<if test="institutionalId != null and institutionalId != ''">
institutional_id = #{institutionalId},
</if>
<if test="createTime != null and createTime != ''">
create_time = #{createTime},
</if>
<if test="deviceNum != null">
device_num = #{deviceNum},
</if>
<if test="sort != null">
sort = #{sort},
</if>
<if test="offlineNum != null">
offline_num = #{offlineNum},
</if>
<if test="abnormalNum != null">
abnormal_num = #{abnormalNum},
</if>
<if test="unreadMessageNum != null">
unread_message_num = #{unreadMessageNum},
</if>
<if test="totalNmsDevNum != null">
total_nms_dev_num = #{totalNmsDevNum},
</if>
<if test="totalVmsDevNum != null">
total_vms_dev_num = #{totalVmsDevNum},
</if>
<if test="totalNbsDevNum != null">
total_nbs_dev_num = #{totalNbsDevNum},
</if>
<if test="offlineNmsDevNum != null">
offline_nms_dev_num = #{offlineNmsDevNum},
</if>
<if test="offlineVmsDevNum != null">
offline_vms_dev_num = #{offlineVmsDevNum},
</if>
<if test="offlineNbsDevNum != null">
offline_nbs_dev_num = #{offlineNbsDevNum},
</if>
<if test="runningTime != null">
running_time = #{runningTime},
</if>
project_id = #{projectId}
where id = #{id}
</update>
<update id="updateByProjectId">
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}
</update>
<update id="deleteByProjectId">

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

@ -143,6 +143,10 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
JSONObject jsonObject = new JSONObject(jsonResponse);
String errorCode = jsonObject.getStr("error_code");
if(errorCode.equals("0")){
JSONObject result = (JSONObject)jsonObject.get("result");
String projectId = result.getStr("projectId");
projectInfo.setProjectId(projectId);
this.save(projectInfo);
sync();
return Result.OK("项目添加成功！");
}else{
@ -165,6 +169,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, Proje
JSONObject jsonObject = new JSONObject(jsonResponse);
String errorCode = jsonObject.getStr("error_code");
if(errorCode.equals("0")){
baseMapper.updateByProjectId(projectInfo);
sync();
return Result.OK("项目编辑成功！");
}else{

30
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java
View File

@ -22,12 +22,12 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Description: 护理单元-物联管理-TPLINK区域信息
* @Description: 护理单元-物联管理-TPLINK分组信息
* @Author: jeecg-boot
* @Date: 2025-02-20
* @Version: V1.0
*/
@Api(tags="护理单元-物联管理-TPLINK区域信息")
@Api(tags="护理单元-物联管理-TPLINK分组信息")
@RestController
@RequestMapping("/iot/regionInfo")
@Slf4j
@ -44,8 +44,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
* @param req
* @return
*/
//@AutoLog(value = "护理单元-物联管理-TPLINK区域信息-分页列表查询")
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-分页列表查询", notes="护理单元-物联管理-TPLINK区域信息-分页列表查询")
//@AutoLog(value = "护理单元-物联管理-TPLINK分组信息-分页列表查询")
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-分页列表查询", notes="护理单元-物联管理-TPLINK分组信息-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<RegionInfo>> queryPageList(RegionInfo regionInfo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ -57,7 +57,7 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
}
/**
* 同步区域信息
* 同步分组信息
*
* @return
*/
@ -67,7 +67,7 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
}
/**
* 同步子区域信息
* 同步子分组信息
*
* @return
*/
@ -77,7 +77,7 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
}
/**
* 异步查询区域list
* 异步查询分组list
* @param parentId 父节点 异步加载时传递
* @return
*/
@ -102,8 +102,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
* @param regionInfo
* @return
*/
// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-添加")
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-添加", notes="护理单元-物联管理-TPLINK区域信息-添加")
// @AutoLog(value = "护理单元-物联管理-TPLINK分组信息-添加")
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-添加", notes="护理单元-物联管理-TPLINK分组信息-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody RegionInfo regionInfo) {
return service.addRegion(regionInfo);
@ -115,8 +115,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
* @param regionInfo
* @return
*/
// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-编辑", notes="护理单元-物联管理-TPLINK区域信息-编辑")
// @AutoLog(value = "护理单元-物联管理-TPLINK分组信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-编辑", notes="护理单元-物联管理-TPLINK分组信息-编辑")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody RegionInfo regionInfo) {
return service.editRegion(regionInfo);
@ -128,8 +128,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
* @param regionInfo
* @return
*/
// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-通过id删除", notes="护理单元-物联管理-TPLINK区域信息-通过id删除")
// @AutoLog(value = "护理单元-物联管理-TPLINK分组信息-编辑")
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-通过id删除", notes="护理单元-物联管理-TPLINK分组信息-通过id删除")
@PostMapping(value = "/delete")
public Result<String> deleteRegion(@RequestBody RegionInfo regionInfo) {
return service.deleteRegion(regionInfo);
@ -141,8 +141,8 @@ public class RegionInfoController extends JeecgController<RegionInfo, IRegionInf
* @param id
* @return
*/
//@AutoLog(value = "护理单元-物联管理-TPLINK区域信息-通过id查询")
@ApiOperation(value="护理单元-物联管理-TPLINK区域信息-通过id查询", notes="护理单元-物联管理-TPLINK区域信息-通过id查询")
//@AutoLog(value = "护理单元-物联管理-TPLINK分组信息-通过id查询")
@ApiOperation(value="护理单元-物联管理-TPLINK分组信息-通过id查询", notes="护理单元-物联管理-TPLINK分组信息-通过id查询")
@GetMapping(value = "/queryById")
public Result<RegionInfo> queryById(@RequestParam(name="id",required=true) String id) {
RegionInfo regionInfo = service.getById(id);

48
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java
View File

@ -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)

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java
View File

@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
/**
* 区域信息同步
* 分组信息同步
*/
@Slf4j
public class RegionSyncJob implements Job {

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java
View File

@ -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

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java
View File

@ -8,7 +8,7 @@ import java.util.Objects;
/**
* <p>
* 区域表 存储区域结构数据的实体类
* 分组表 存储分组结构数据的实体类
* <p>
*
* @Author 曹磊

2
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java
View File

@ -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

21
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java
View File

@ -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<RegionInfoMapper, RegionI
private ProjectInfoMapper projectInfoMapper;
/**
* 同步区域信息
* 同步分组信息
* @return
*/
@Override
@ -52,7 +52,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
String errorCode = jsonObject.getStr("error_code");
if(errorCode.equals("0")){
sync(jsonResponse);
return Result.OK("同步区域成功！");
return Result.OK("同步分组成功！");
}else{
return Result.error(jsonObject.getStr("msg"));
}
@ -108,7 +108,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
}
/**
* 接口返回数据同步子区域入库
* 接口返回数据同步子分组入库
* @param regionInfo
*/
@Override
@ -150,7 +150,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
syncChildren(entity);
}
}
return Result.OK("同步子区域成功！");
return Result.OK("同步子分组成功！");
}else{
return Result.error(jsonObject.getStr("msg"));
}
@ -180,7 +180,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
}
/**
* 查询区域treeList
* 查询分组treeList
*
* @param parentId
* @return
@ -206,6 +206,9 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
StringBuffer sb = new StringBuffer();
sb.append("{");
sb.append("\"projectId\"").append(":").append("\"").append(regionInfo.getProjectId()).append("\",");
if(regionInfo.getParentId()==null){
regionInfo.setParentId("0");
}
sb.append("\"parentId\"").append(":").append("\"").append(regionInfo.getParentId()).append("\",");
sb.append("\"regionName\"").append(":").append("\"").append(regionInfo.getRegionName()).append("\",");
sb.append("\"sysType\"").append(":").append("3");
@ -215,7 +218,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
String errorCode = jsonObject.getStr("error_code");
if(errorCode.equals("0")){
sync(regionInfo);
return Result.OK("区域添加成功！");
return Result.OK("分组添加成功！");
}else{
return Result.error(jsonObject.getStr("msg"));
}
@ -237,7 +240,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
String errorCode = jsonObject.getStr("error_code");
if(errorCode.equals("0")){
sync(regionInfo);
return Result.OK("区域编辑成功！");
return Result.OK("分组编辑成功！");
}else{
return Result.error(jsonObject.getStr("msg"));
}
@ -258,7 +261,7 @@ public class RegionInfoServiceImpl extends ServiceImpl<RegionInfoMapper, RegionI
String errorCode = jsonObject.getStr("error_code");
if(errorCode.equals("0")||errorCode.equals("-82401")){
baseMapper.deleteByRegionId(regionInfo.getRegionId());
return Result.OK("区域删除成功！");
return Result.OK("分组删除成功！");
}else{
return Result.error(jsonObject.getStr("msg"));
}