安徽测试报告整改

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java

@@ -966,12 +966,21 @@ public class CustomReportServiceImpl implements CustomReportService {
                                 if (Objects.nonNull(finalTerminalMap)) {
                                     if ("statis_time".equals(tem)) {
                                         //如何时间是大于当前时间则用当前时间
+//                                        String localTime = InfluxDbSqlConstant.END_TIME;
+//                                        LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
+//                                        if(LocalDate.now().isEqual(localDate)){
+//                                            localTime =" "+ LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
+//                                        }
+//                                        son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
                                         String localTime = InfluxDbSqlConstant.END_TIME;
                                         LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
-                                        if(LocalDate.now().isEqual(localDate)){
+                                        LocalDate nowDate = LocalDate.now();
+                                        if (nowDate.isAfter(localDate)) {
+                                            son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
+                                        } else {
                                             localTime =" "+ LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
+                                            son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + nowDate + localTime);
                                         }
-                                        son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
                                     } else {
                                         //台账信息
                                         son.set("v", finalTerminalMap.getOrDefault(tem, "/"));

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml

@@ -52,6 +52,7 @@
                left join supervision_temp_line_run_test
                          on supervision_temp_line_debug.id = supervision_temp_line_run_test.id
       where supervision_temp_line_debug.status = 5
+        and (supervision_temp_line_run_test.state = 1 OR supervision_temp_line_run_test.state IS NULL)
         and ${ew.sqlSegment}
   </select>
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java

@@ -57,6 +57,7 @@ import com.njcn.web.utils.RequestUtil;
 import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java

@@ -51,8 +51,15 @@ import com.njcn.supervision.service.device.ISupervisionTempLineRunTestService;
 import com.njcn.supervision.service.device.TempLineRunTestWarningService;
 import com.njcn.supervision.service.user.*;
 import com.njcn.supervision.utils.InstanceUtil;
+import com.njcn.system.enums.DicDataEnum;
 import com.njcn.web.utils.RequestUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.LocalDate;
@@ -62,14 +69,6 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.MediaType;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletResponse;
-
 
 /**
  * <p>
@@ -410,7 +409,7 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl<Supervisi
         long count = supervisionTempLineRunTestPOS.stream().filter(x -> !BpmTaskStatusEnum.WAIT.getStatus().equals(x.getStatus())).count();
         InstanceUtil.deleteRole(RequestUtil.getUserIndex(), collect, count);
         return this.update(new LambdaUpdateWrapper<SupervisionTempLineRunTestPO>().set(SupervisionTempLineRunTestPO::getState, DataStateEnum.DELETED.getCode())
-                    .in(SupervisionTempLineRunTestPO::getId, supervisionId));
+                .in(SupervisionTempLineRunTestPO::getId, supervisionId));
     }
 
     private String assMsg(List<SupervisionTempLineReport> supervisionTempLineReportList, List<SupervisionTempLineRunTestPO> supervisionTempLineRunTestPOList) {

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

@@ -23,7 +23,9 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.utils.FileUtil;
 import com.njcn.device.pms.utils.PubUtil;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.po.LineDetail;
@@ -777,6 +779,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void importSensitiveUserData(MultipartFile file, HttpServletResponse response) {
+        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
+        if (!fileType) {
+            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
+        }
         ImportParams params = new ImportParams();
         //表头
         params.setHeadRows(1);
@@ -996,6 +1002,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void importSensitiveReportData(MultipartFile file, HttpServletResponse response) {
+        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
+        if (!fileType) {
+            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
+        }
         ImportParams params = new ImportParams();
         //表头
         params.setHeadRows(1);