Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配合前端做些数据修改

Browse Source
This commit is contained in:
guofeihu
2024-07-12 16:37:18 +08:00
parent 2746ae377f
commit a630792641
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java
View File

@@ -138,19 +138,6 @@ public class WlRecordController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
/**
* 添加测试项中的设备基础数据
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
@PostMapping("/saveDataRecord")
@ApiOperation("添加测试项中的设备基础数据")
public HttpResult<Boolean> saveDataRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
String methodDescribe = getMethodDescribe("saveDataRecord");
LogUtil.njcnDebug(log, "{}，测试项及基础数据对象为：{}", methodDescribe, record);
wlRecordService.saveDataRecord(record);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
/**
* 查询测试项时间段实时数据
*/

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
View File

@@ -40,7 +40,7 @@
</select>
<select id="getRecordAllLine" resultType="com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo$RecordAllLineTreeVo">
select a.line_id as id,c.name as name, #{wlRecordPageParam.devId} as pid from wl_record a
select concat(a.line_id,'-',#{wlRecordPageParam.devId}) as id,c.name as name, #{wlRecordPageParam.devId} as pid from wl_record a
left join cs_line c on a.line_id = c.line_id
where a.type=1 and a.state =1 and a.dev_id=#{wlRecordPageParam.devId} and
<if test="wlRecordPageParam.isTrueFlag == 0">
@@ -53,7 +53,7 @@
</select>
<select id="getRecordAllTime" resultType="com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo$RecordAllTimeTreeVo">
select a.id as id,concat(a.start_time,'-',a.end_time) as name, #{wlRecordPageParam.lineId} as pid from wl_record a
select a.id as id,concat(a.start_time,'-',a.end_time) as name, concat(#{wlRecordPageParam.lineId},'-',#{wlRecordPageParam.devId}) as pid from wl_record a
left join cs_line c on a.line_id = c.line_id
where a.type=1 and a.state =1 and a.dev_id=#{wlRecordPageParam.devId} and a.line_id=#{wlRecordPageParam.lineId}
and

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java
View File

@@ -102,10 +102,12 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTestRecord(WlRecordParam.UpdateRecord record) {
WlRecord wlRecord = new WlRecord();
BeanUtils.copyProperties(record, wlRecord);
this.updateById(wlRecord);
saveDataRecord(record);
}
@Override
@@ -176,7 +178,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
wlRecordPageParam.setDevId(recordAllDevTreeVo.getId());
List<RecordAllDevTreeVo.RecordAllLineTreeVo> recordAllLineTreeVos = this.baseMapper.getRecordAllLine(wlRecordPageParam);
for(RecordAllDevTreeVo.RecordAllLineTreeVo recordAllLineTreeVo : recordAllLineTreeVos){
wlRecordPageParam.setLineId(recordAllLineTreeVo.getId());
wlRecordPageParam.setLineId(recordAllLineTreeVo.getId().split("-")[0]);
recordAllLineTreeVo.setChildren(this.baseMapper.getRecordAllTime(wlRecordPageParam));
}
recordAllDevTreeVo.setChildren(recordAllLineTreeVos);