省级平台在正式检测时增加温度、相对湿度参数

detection/src/main/java/com/njcn/gather/device/pojo/po/PqDev.java

@@ -201,5 +201,15 @@ public class PqDev extends BaseEntity implements Serializable {
     @TableField("Preinvestment_Plan")
     private String preinvestmentPlan;
 
+    /**
+     * 温度
+     */
+    private Float temperature;
+
+    /**
+     * 相对湿度
+     */
+    private Float humidity;
+
 }
 

detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java

@@ -152,9 +152,11 @@ public interface IPqDevService extends IService<PqDev> {
      * @param valueType
      * @param code
      * @param userId
+     * @param temperature
+     * @param humidity
      * @return
      */
-    boolean updateResult(List<String> ids, List<String> valueType, String code,String userId);
+    boolean updateResult(List<String> ids, List<String> valueType, String code, String userId, Float temperature, Float humidity);
 
     void updatePqDevReportState(String devId, int i);
 

detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java

@@ -521,7 +521,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     }
 
     @Override
-    public boolean updateResult(List<String> ids, List<String> valueType, String code, String userId) {
+    public boolean updateResult(List<String> ids, List<String> valueType, String code, String userId, Float temperature, Float humidity) {
         if (CollUtil.isNotEmpty(ids)) {
             SysTestConfig config = sysTestConfigService.getOneConfig();
             Map<String, Integer> result = detectionDataDealService.devResult(ids, valueType, code);
@@ -536,6 +536,11 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                             .set(PqDev::getCheckBy, userId)
                             .set(PqDev::getCheckTime, LocalDateTime.now())
                             .eq(PqDev::getId, pqDev.getId());
+                    String currrentScene = sysTestConfigService.getCurrrentScene();
+                    if (SceneEnum.PROVINCE_PLATFORM.getValue().equals(currrentScene)) {
+                        wrapper.set(ObjectUtil.isNotNull(temperature), PqDev::getTemperature, temperature)
+                                .set(ObjectUtil.isNotNull(humidity), PqDev::getHumidity, humidity);
+                    }
                     if (pqDev.getReCheckNum() >= config.getMaxTime()) {
                         // 装置报告生成 todo...
                         //this.baseMapper.updateReportState(pqDev.getId());