获取便携式设备基础数据功能

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

@@ -23,6 +23,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
@@ -98,6 +99,20 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 批量新增原始数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/addBaseDataList")
+    @ApiOperation("批量新增原始数据")
+    @ApiImplicitParam(name = "wlRecord", value = "装置原始数据", required = true)
+    public HttpResult<Boolean> addBaseDataList(@RequestBody @Validated List<WlRecord> wlRecord) {
+        String methodDescribe = getMethodDescribe("addBaseDataList");
+        LogUtil.njcnDebug(log, "{}，装置原始数据为：{}", methodDescribe, wlRecord);
+        wlRecordService.addBaseDataList(wlRecord);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
     /**
      * 修改测试项
      */
@@ -166,5 +181,19 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    /**
+     * 查询装置基础数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
+    @PostMapping("/findDevBaseData")
+    @ApiOperation("查询装置基础数据")
+    @ApiImplicitParam(name = "param", value = "查询条件", required = true)
+    public HttpResult<WlRecord> findDevBaseData(@RequestBody @Validated WlRecordParam.Record param) {
+        String methodDescribe = getMethodDescribe("findDevBaseData");
+        LogUtil.njcnDebug(log, "{}，查询对象为：{}", methodDescribe, param);
+        WlRecord record = wlRecordService.findDevBaseData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, record, methodDescribe);
+    }
+
 }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java

@@ -49,6 +49,13 @@ public interface IWlRecordService extends IService<WlRecord> {
      */
     void addBaseData(WlRecord wlRecord);
 
+    /**
+     * 批量新增原始数据
+     * @param wlRecord
+     * @return
+     */
+    void addBaseDataList(List<WlRecord> wlRecord);
+
     /**
      * 修改测试项
      * @param record
@@ -89,4 +96,10 @@ public interface IWlRecordService extends IService<WlRecord> {
      */
     List<ThdDataVO> queryCommonStatisticalByTest(CommonStatisticalQueryParam commonStatisticalQueryParam);
 
+    /**
+     * 获取装置基础数据
+     * @return
+     */
+    WlRecord findDevBaseData(WlRecordParam.Record param);
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

@@ -98,13 +98,13 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
         List<CsLedgerVO> portables = allList.stream().filter(item->Objects.equals(item.getLevel(),2) && Objects.equals(item.getPid(),"0")).collect(Collectors.toList());
-        portables.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
-        checkDevSetData(portables);
         for(CsLedgerVO c : portables){
             c.setPid(portable.getId());
             CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
             c.setComFlag(po.getRunStatus());
         }
+        portables.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
+        checkDevSetData(portables);
         portable.setChildren(portables);
 
         CsLedgerVO government = new CsLedgerVO();

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

@@ -115,11 +115,18 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         this.save(wlRecord);
     }
 
+    @Override
+    public void addBaseDataList(List<WlRecord> wlRecord) {
+        this.saveBatch(wlRecord);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateTestRecord(WlRecordParam.UpdateRecord record) {
         WlRecord wlRecord = new WlRecord();
         BeanUtils.copyProperties(record, wlRecord);
+        wlRecord.setStartTime(record.getProStartTime());
+        wlRecord.setEndTime(record.getProEndTime());
         this.updateById(wlRecord);
         saveDataRecord(record);
     }
@@ -399,6 +406,18 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         return result;
     }
 
+    @Override
+    public WlRecord findDevBaseData(WlRecordParam.Record param) {
+        LambdaQueryWrapper<WlRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(WlRecord::getGcName,param.getProName())
+                .eq(WlRecord::getDevId,param.getDevId())
+                .eq(WlRecord::getLineId,param.getLineId())
+                .eq(WlRecord::getStartTime,param.getProStartTime())
+                .eq(WlRecord::getType,1)
+                .eq(WlRecord::getState,1);
+        return this.getOne(lambdaQueryWrapper);
+    }
+
     /**
      * 数据项内的时间进行覆盖:解决多个数据项的startTime及endTime之间存在时间冲突
      * @param data 数据项