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

部门查询添加排序字段

Browse Source
This commit is contained in:
雨木c
2022-11-10 12:49:10 +08:00
parent 3eff054c3e
commit cc8979d589
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,8 +167,9 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
@Override @Override
public CommunicateVO getComFlagInfoData(String id, String searchBeginTime, String searchEndTime) { public CommunicateVO getComFlagInfoData(String id, String searchBeginTime, String searchEndTime) {
String devId = lineMapper.getDevIndex(id);
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Communicate> communicateList = getCommunicate(id, searchBeginTime, searchEndTime); List<Communicate> communicateList = getCommunicate(devId, searchBeginTime, searchEndTime);
CommunicateVO communicateVOList = new CommunicateVO(); CommunicateVO communicateVOList = new CommunicateVO();
List<String> updateTime = new ArrayList<>(); List<String> updateTime = new ArrayList<>();
List<Integer> comType = new ArrayList<>(); List<Integer> comType = new ArrayList<>();
@@ -659,7 +660,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
//组装sql语句 //组装sql语句
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and "); stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and ");
stringBuilder.append("line_id = '").append(lineIndex).append("' group by line_id ").append(InfluxDBPublicParam.TIME_ZONE); stringBuilder.append("dev_id = '").append(lineIndex).append("' group by dev_id ").append(InfluxDBPublicParam.TIME_ZONE);
String sql = "select * from " + InfluxDBPublicParam.PQS_COMMUNICATE + " where " + stringBuilder.toString(); String sql = "select * from " + InfluxDBPublicParam.PQS_COMMUNICATE + " where " + stringBuilder.toString();
//获取暂降事件 //获取暂降事件
QueryResult result = influxDbUtils.query(sql); QueryResult result = influxDbUtils.query(sql);

2
pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
View File

@@ -28,6 +28,8 @@ public class DeptDTO implements Serializable {
private String remark; private String remark;
private Integer sort;
/** /**
* 部门类型 0-非自定义；1-web自定义；2-App自定义；3-web测试 * 部门类型 0-非自定义；1-web自定义；2-App自定义；3-web测试
*/ */

3
pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
View File

@@ -126,7 +126,8 @@
T3.NAME, T3.NAME,
T3.type, T3.type,
T5.NAME area , T5.NAME area ,
T3.Remark T3.Remark,
T3.sort
FROM FROM
( (
SELECT SELECT