Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

终端文件提交

Browse Source
This commit is contained in:
hongawen
2024-05-13 18:07:31 +08:00
parent 0037a6a5b6
commit 31d6121e52
12 changed files with 195 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/vo/TerminalSelectTreeVO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.njcn.device.biz.pojo.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@Data
public class TerminalSelectTreeVO implements Serializable {
private String value;
private String label;
private List<TerminalSelectTreeVO> children = new ArrayList<>();
}

13
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java
View File

@@ -53,6 +53,19 @@ public class TerminalTreeController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe);
}
/**
* 获取设备树给前端下拉选择
*/
@ApiOperation("获取终端树")
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
@GetMapping("getTerminalSelectTree")
public HttpResult<List<TerminalTree>> getTerminalSelectTree(Integer level){
String methodDescribe = getMethodDescribe("getTerminalSelectTree");
List<TerminalTree> tree = terminalTreeService.getTerminalSelectTree(level);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe);
}
/**
* 获取终端台账设备树
* @author cdf

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java
View File

@@ -40,4 +40,6 @@ public interface TerminalTreeService {
* @date 2022/1/14
*/
List<DeptLineTreeVO> getDeptBindDeptLineTree(String deptId, Integer deptType, String id, Integer type);
List<TerminalTree> getTerminalSelectTree(Integer level);
}

12
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
View File

@@ -212,6 +212,18 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
return deptLineTreeVOS;
}
/**
* 等级：0-项目名称；1- 工程名称；2-单位；3-部门；4-终端；5-母线；6-监测点
* level为终端时
* 返回的是 2-3-4
* level为监测点时
* 返回的是 2-3-(5+6)
*/
@Override
public List<TerminalTree> getTerminalSelectTree(Integer level) {
return null;
}
/**
* 获取全部子节点

13
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java
View File

@@ -40,7 +40,7 @@ public class QuitRunningDeviceParam extends BaseEntity implements Serializable {
* 设备类型 1:装置；2:监测点
*/
@ApiModelProperty(value = "设备类型")
@NotNull(message = "设备编号不能为空")
@NotNull(message = "设备类型不能为空")
private Integer deviceType;
/**
@@ -89,6 +89,17 @@ public class QuitRunningDeviceParam extends BaseEntity implements Serializable {
@EqualsAndHashCode(callSuper = true)
public static class QuitRunningDeviceQueryParam extends BaseParam {
/**
* 设备类型 1:装置；2:监测点
*/
@ApiModelProperty(value = "设备类型")
private Integer deviceType;
/**
* 设备编号
*/
@ApiModelProperty(value = "设备编号")
private String deviceId;
}

70
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java Normal file
View File

@@ -0,0 +1,70 @@
package com.njcn.supervision.pojo.vo.device;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author hongawen
* @since 2024-05-13
*/
@Data
public class QuitRunningDeviceVO extends BaseEntity implements Serializable{
private static final long serialVersionUID = 1L;
/**
* 设备退运表索引
*/
private String id;
/**
* 设备编号
*/
@ApiModelProperty(value = "设备编号")
private String deviceId;
/**
* 设备名称
*/
@ApiModelProperty(value = "设备名称")
private String deviceName;
/**
* 设备类型 1:装置；2:监测点
*/
@ApiModelProperty(value = "设备类型")
private Integer deviceType;
/**
* 资产编号
*/
@ApiModelProperty(value = "资产编号")
private String propertyNo;
/**
* 报告文件地址
*/
@ApiModelProperty(value = "报告文件")
private String reportPath;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
@ApiModelProperty(value = "审批状态")
private Integer status;
/**
* 流程实例的编号
*/
@ApiModelProperty(value = "流程实例的编号")
private String processInstanceId;
}

15
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java
View File

@@ -1,6 +1,7 @@
package com.njcn.supervision.controller.device;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
import com.njcn.common.pojo.enums.common.LogEnum;
@@ -9,6 +10,8 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
import com.njcn.supervision.pojo.param.user.UserReportParam;
import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
import com.njcn.supervision.pojo.vo.user.UserReportVO;
import com.njcn.supervision.service.device.IQuitRunningDeviceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -40,6 +43,16 @@ public class QuitRunningDeviceController extends BaseController {
private final IQuitRunningDeviceService quitRunningDeviceService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/list")
@ApiOperation("分页查询当前用户能看到的退运设备数据")
@ApiImplicitParam(name = "quitRunningDeviceQueryParam", value = "参数", required = true)
public HttpResult<Page<QuitRunningDeviceVO>> getQuitRunningDevice(@RequestBody @Validated QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam){
String methodDescribe = getMethodDescribe("getQuitRunningDevice");
Page<QuitRunningDeviceVO> out = quitRunningDeviceService.getQuitRunningDevice(quitRunningDeviceQueryParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
@PostMapping("/add")
@ApiOperation("新增设备退运")
@@ -50,5 +63,7 @@ public class QuitRunningDeviceController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, runningDeviceId, methodDescribe);
}
}

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java
View File

@@ -1,7 +1,11 @@
package com.njcn.supervision.mapper.device;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +17,5 @@ import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
*/
public interface QuitRunningDeviceMapper extends BaseMapper<QuitRunningDevice> {
Page<QuitRunningDeviceVO> page(@Param("page")Page<Object> objectPage, @Param("ew")QueryWrapper<QuitRunningDeviceVO> quitRunningDeviceVOQueryWrapper);
}

15
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml
View File

@@ -1,5 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.supervision.mapper.device.QuitRunningDeviceMapper">
<!--获取流程表单分页列表-->
<select id="page" resultType="QuitRunningDeviceVO">
SELECT
supervision_user_report.id,
supervision_user_report.device_id,
supervision_user_report.device_type,
supervision_user_report.property_no,
supervision_user_report.report_path,
supervision_user_report.process_instance_id,
supervision_user_report.create_time,
supervision_user_report.status
FROM supervision_quit_running_device supervision_quit_running_device
WHERE ${ew.sqlSegment}
</select>
</mapper>

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/IQuitRunningDeviceService.java
View File

@@ -1,8 +1,10 @@
package com.njcn.supervision.service.device;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
/**
* <p>
@@ -15,4 +17,6 @@ import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
public interface IQuitRunningDeviceService extends IService<QuitRunningDevice> {
String addRunningDevice(QuitRunningDeviceParam quitRunningDeviceParam);
Page<QuitRunningDeviceVO> getQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam);
}

25
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
View File

@@ -1,5 +1,8 @@
package com.njcn.supervision.service.device.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.bpm.api.BpmProcessFeignClient;
import com.njcn.bpm.enums.BpmTaskStatusEnum;
@@ -8,13 +11,16 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper;
import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO;
import com.njcn.supervision.service.device.IQuitRunningDeviceService;
import com.njcn.web.factory.PageFactory;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
/**
* <p>
@@ -58,6 +64,25 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
return quitRunningDevice.getId();
}
@Override
public Page<QuitRunningDeviceVO> getQuitRunningDevice(QuitRunningDeviceParam.QuitRunningDeviceQueryParam quitRunningDeviceQueryParam) {
QueryWrapper<QuitRunningDeviceVO> quitRunningDeviceVOQueryWrapper = new QueryWrapper<>();
if (Objects.nonNull(quitRunningDeviceQueryParam)) {
//判断监测点/设备的选择
if(Objects.nonNull(quitRunningDeviceQueryParam.getDeviceType())&&Objects.nonNull(quitRunningDeviceQueryParam.getDeviceId())){
quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type",quitRunningDeviceQueryParam.getDeviceType());
quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_id",quitRunningDeviceQueryParam.getDeviceId());
}
//添加上时间范围
quitRunningDeviceVOQueryWrapper.between("supervision_quit_running_device.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime())));
}
quitRunningDeviceVOQueryWrapper.orderByDesc("supervision_quit_running_device.create_time");
//todo...根据设备id获取详细数据用于回显，待会做
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(quitRunningDeviceQueryParam), PageFactory.getPageSize(quitRunningDeviceQueryParam)), quitRunningDeviceVOQueryWrapper);
}
private void checkDeviceStatus(QuitRunningDeviceParam quitRunningDeviceParam) {
//todo...
}

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.njcn.supervision.service.user.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -169,6 +170,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
//查询所有区域下的数据
userReportVOQueryWrapper.in("supervision_user_report.city", userReportQueryParam.getCity());
}
//添加上时间范围
// userReportVOQueryWrapper.between("supervision_user_report.Create_Time",
// DateUtil.beginOfDay(DateUtil.parse(userReportQueryParam.getSearchBeginTime())),
// DateUtil.endOfDay(DateUtil.parse(userReportQueryParam.getSearchEndTime())));
}
userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);