From b9ff0ede78518a3c7c160f12942acd9410c33ce5 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 14:41:01 +0800
Subject: [PATCH] 清除不符合品管理, 调整设备档案和维护保养
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceDocumentsController.java | 92 +++++++++
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java | 10
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceDocumentsServiceImpl.java | 14 +
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 7
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java | 6
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 67 ++----
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java | 5
cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java | 1
cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml | 11 -
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceDocumentsMapper.java | 12 +
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 26 --
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 30 ++
/dev/null | 14 -
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 148 --------------
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 100 ----------
cnas-device/src/main/java/com/ruoyi/device/service/DeviceDocumentsService.java | 10 +
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 22 --
18 files changed, 182 insertions(+), 396 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceDocumentsController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceDocumentsController.java
new file mode 100644
index 0000000..0725f6f
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceDocumentsController.java
@@ -0,0 +1,92 @@
+package com.ruoyi.device.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.pojo.DeviceDocuments;
+import com.ruoyi.device.service.DeviceDocumentsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 璁惧妗ｆ鏂囨。
+ *
+ * @author zhuo
+ * @since 2025-02-28
+ */
+@RestController
+@Api(tags = "璁惧妗ｆ鏂囨。")
+@RequestMapping("/deviceDocuments")
+public class DeviceDocumentsController {
+
+ @Resource
+ private DeviceDocumentsService deviceDocumentsService;
+
+
+ /**
+ * 鏂板璁惧妗ｆ
+ * @param document
+ * @return
+ */
+ @ApiOperation(value = "鏂板璁惧妗ｆ")
+ @PostMapping("/addDocument")
+ public Result addDocument(DeviceDocuments document) {
+ if (document.getDeviceId() == null) {
+ throw new RuntimeException("璁惧id涓虹┖");
+ }
+ deviceDocumentsService.save(document);
+ return Result.success();
+ }
+
+ /**
+ * 鏌ヨ璁惧妗ｆ淇℃伅
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ璁惧妗ｆ淇℃伅")
+ @GetMapping("/id")
+ public Result getDocumentById(Integer id) {
+ return Result.success(deviceDocumentsService.getById(id));
+ }
+
+ /**
+ * 淇敼璁惧妗ｆ
+ * @param document
+ * @return
+ */
+ @ApiOperation(value = "淇敼璁惧妗ｆ")
+ @PostMapping("/updateDocument")
+ public Result updateDocument(@RequestBody DeviceDocuments document) {
+ return Result.success(deviceDocumentsService.updateById(document));
+ }
+
+ /**
+ * 鍒犻櫎璁惧妗ｆ
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鍒犻櫎璁惧妗ｆ")
+ @DeleteMapping("/deleteDocumentById")
+ public Result deleteDocumentById(Integer id) {
+ return Result.success(deviceDocumentsService.removeById(id));
+ }
+
+ /**
+ * 鏌ヨ璁惧妗ｆ鍒楄〃
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ璁惧妗ｆ鍒楄〃")
+ @GetMapping("/getAllDocuments")
+ public Result getAllDocuments(Integer id) {
+ LambdaQueryWrapper<DeviceDocuments> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(DeviceDocuments::getDeviceId, id);
+ return Result.success(deviceDocumentsService.list(lambdaQueryWrapper));
+ }
+
+}
+
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 9420f41..a7bf0df 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -9,6 +9,7 @@
import com.ruoyi.device.excel.DeviceMaintenanceExport;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.DeviceMaintenanceService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
@@ -26,7 +27,8 @@
* todo: 瀛欐渤婊�
*/
@RestController
-@RequestMapping("/device-maintain")
+@Api(tags = "璁惧缁存姢淇濆吇")
+@RequestMapping("/deviceMaintain")
public class DeviceMaintenanceController {
@Autowired
@@ -34,9 +36,15 @@
@Autowired
private NumberGenerator<DeviceMaintenance> numberGenerator;
- //澧�
- @PostMapping()
- public Result create(@RequestBody DeviceMaintenance deviceMaintenance){
+
+ /**
+ * 鏂板璁惧缁存姢淇濆吇
+ * @param deviceMaintenance
+ * @return
+ */
+ @ApiOperation(value = "鏂板璁惧缁存姢淇濆吇")
+ @PostMapping("/addDeviceMaintenance")
+ public Result addDeviceMaintenance(@RequestBody DeviceMaintenance deviceMaintenance){
String year = new SimpleDateFormat("yy", Locale.CHINESE).format(new Date());
String month = new SimpleDateFormat("MM", Locale.CHINESE).format(new Date());
String processNumber = numberGenerator.generateNumberWithPrefix(3, "DG-TC-23FM " + month + "-" + year + month, DeviceMaintenance::getDeviceNumber);
@@ -44,32 +52,29 @@
return Result.success(deviceMaintenanceService.save(deviceMaintenance));
}
- //閫氳繃deviceId鏌ヨ缁存姢鏁版嵁
+ /**
+ * 閫氳繃璁惧id鏌ヨ璁惧缁存姢淇濆吇淇℃伅
+ * @param deviceId
+ * @param page
+ * @param deviceNumber
+ * @return
+ */
+ @ApiOperation(value = "閫氳繃璁惧id鏌ヨ璁惧缁存姢淇濆吇淇℃伅")
@GetMapping("/getDeviceMaintenancePage")
public Result getDeviceMaintenancePage(@RequestParam("deviceId") Integer deviceId, Page page, String deviceNumber){
return Result.success(deviceMaintenanceService.getDeviceMaintenancePage(page, deviceId, deviceNumber));
}
- //鍒�
- @DeleteMapping("/delete/{id}")
- public void deleteDeviceFault(@PathVariable Integer id) {
+ /**
+ * 鍒犻櫎璁惧缁存姢淇濆吇
+ * @param id
+ */
+ @ApiOperation(value = "鏂板璁惧缁存姢淇濆吇")
+ @DeleteMapping("/deleteDeviceMaintenance")
+ public void deleteDeviceMaintenance(@PathVariable Integer id) {
deviceMaintenanceService.removeById(id);
}
- @GetMapping("/deviceMaintenanceExport")
- public Result deviceMaintenanceExport(@RequestParam("deviceId") Integer deviceId, HttpServletResponse response) throws IOException {
- List<DeviceMaintenanceExport> list = deviceMaintenanceService.deviceMaintenanceExport(deviceId);
- response.setHeader("requestType","excel");
- response.setHeader("Access-Control-Expose-Headers", "requestType");
- // 璁剧疆鍗曞厓鏍兼牱寮�
- // 淇濆瓨鍒扮涓�涓猻heet涓�
- EasyExcel.write(response.getOutputStream())
- .head(DeviceMaintenanceExport.class)
- .registerWriteHandler(getHorizontalCellStyleStrategy((short) 12))
- .sheet()
- .doWrite(list);
- return Result.success();
- }
@ApiOperation(value = "璁惧缁存姢璁板綍瀵煎嚭")
@GetMapping("/exportMaintenanceRecord")
@@ -77,22 +82,4 @@
deviceMaintenanceService.exportMaintenanceRecord(deviceId, response);
}
- /**
- * 鍗曞厓鏍兼牱寮忕瓥鐣�
- */
- public static HorizontalCellStyleStrategy getHorizontalCellStyleStrategy(Short fontHeightInPoints) {
- // 鍐呭鐨勭瓥鐣�
- WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-
- // 銆愭按骞冲眳涓渶瑕佷娇鐢ㄤ互涓嬩袱琛屻��
- // 璁剧疆鏂囧瓧宸﹀彸灞呬腑
- contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
- // 璁剧疆鏂囧瓧涓婁笅灞呬腑
- contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
- // 璁剧疆 鑷姩鎹㈣
- contentWriteCellStyle.setWrapped(true);
-
- // 鏍峰紡绛栫暐
- return new HorizontalCellStyleStrategy(null, contentWriteCellStyle);
- }
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceDocumentsMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceDocumentsMapper.java
new file mode 100644
index 0000000..e786646
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceDocumentsMapper.java
@@ -0,0 +1,12 @@
+package com.ruoyi.device.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.device.pojo.DeviceDocuments;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 璁惧妗ｆ
+ */
+@Mapper
+public interface DeviceDocumentsMapper extends BaseMapper<DeviceDocuments> {
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
index 0297885..b4cbdfb 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java
@@ -13,8 +13,5 @@
*/
@Mapper
public interface DeviceMaintenanceMapper extends BaseMapper<DeviceMaintenance> {
- List<DeviceMaintenance> getDeviceMaintenanceParam();
-
- List<DeviceMaintenanceExport> deviceMaintenanceExport(Integer deviceId);
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DocumentMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DocumentMapper.java
deleted file mode 100644
index d2fc7d0..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DocumentMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ruoyi.device.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.device.pojo.Document;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 璁惧妗ｆ
- */
-@Mapper
-public interface DocumentMapper extends BaseMapper<Document> {
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/Document.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java
similarity index 87%
rename from cnas-device/src/main/java/com/ruoyi/device/pojo/Document.java
rename to cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java
index 25ab334..243852c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/Document.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceDocuments.java
@@ -14,7 +14,7 @@
*/
@Data
@TableName(value = "device_documents")
-public class Document implements Serializable {
+public class DeviceDocuments implements Serializable {
private static final long serialVersionUID = 1L;
@@ -57,7 +57,6 @@
/**
* 鎻愪緵鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime provideDate;
/**
@@ -70,16 +69,17 @@
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime createdAt;
+ private LocalDateTime createTime;
/**
* 鏇存柊鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updatedAt;
+ private LocalDateTime updateTime;
- private int deviceId;
+ @ApiModelProperty("璁惧id")
+ private Integer deviceId;
@ApiModelProperty("璧勪骇缂栧彿")
private String number;
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceDocumentsService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceDocumentsService.java
new file mode 100644
index 0000000..f6d91cf
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceDocumentsService.java
@@ -0,0 +1,10 @@
+package com.ruoyi.device.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.device.pojo.DeviceDocuments;
+
+/**
+ * 璁惧妗ｆ
+ */
+public interface DeviceDocumentsService extends IService<DeviceDocuments> {
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
index 4883178..6ba0be6 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
@@ -12,7 +12,6 @@
public interface DeviceMaintenanceService extends IService<DeviceMaintenance> {
IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber);
- List<DeviceMaintenanceExport> deviceMaintenanceExport(Integer deviceId);
/**
* 瀵煎嚭Word璁惧缁存姢璁板綍
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DocumentService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DocumentService.java
deleted file mode 100644
index bd9b275..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DocumentService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.ruoyi.device.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.device.pojo.Document;
-
-/**
- * 璁惧妗ｆ
- */
-public interface DocumentService extends IService<Document> {
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/QrShowService.java b/cnas-device/src/main/java/com/ruoyi/device/service/QrShowService.java
deleted file mode 100644
index 8ed0bfd..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/service/QrShowService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.device.service;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.device.pojo.DeviceMetricRecord;
-import org.springframework.ui.Model;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.Objects;
-import java.util.Optional;
-
-public interface QrShowService {
-
- /**
- * 璁＄畻鍚敤鏃堕暱
- * @param activationDate
- * @return
- */
- double calcUsedYears(LocalDateTime activationDate);
-
- /**
- * 璁＄畻璺濈涓嬫鏍″噯鏃ユ湡鐨勫ぉ鏁扮櫨鍒嗘瘮
- * @param startDate
- * @param endDate
- * @return
- */
- double calcDeviceNextCheckRatio(Date startDate, Date endDate);
-
- /**
- * 鏌ヨ璁惧鏍″噯/鏍告煡璁板綍
- * @param deviceId
- * @param type
- * @return
- */
- DeviceMetricRecord getDeviceMetricRecord(int deviceId, String type);
-
- /**
- * 鏍煎紡鍖栨棩鏈�
- * @return
- */
- String formatDate(Date date,String formatter);
-
-
- /**
- * 鏍煎紡鍖栨棩鏈�
- * @return
- */
- String formatDate(LocalDate date, String formatter);
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceDocumentsServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceDocumentsServiceImpl.java
new file mode 100644
index 0000000..2e24439
--- /dev/null
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceDocumentsServiceImpl.java
@@ -0,0 +1,14 @@
+package com.ruoyi.device.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.device.mapper.DeviceDocumentsMapper;
+import com.ruoyi.device.pojo.DeviceDocuments;
+import com.ruoyi.device.service.DeviceDocumentsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 璁惧妗ｆ
+ */
+@Service
+public class DeviceDocumentsServiceImpl extends ServiceImpl<DeviceDocumentsMapper, DeviceDocuments> implements DeviceDocumentsService {
+}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
index 3487fc2..5b0d72c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
@@ -33,11 +33,6 @@
}
@Override
- public List<DeviceMaintenanceExport> deviceMaintenanceExport(Integer deviceId) {
- return baseMapper.deviceMaintenanceExport(deviceId);
- }
-
- @Override
public void exportMaintenanceRecord(Integer deviceId, HttpServletResponse response) {
// 鏌ヨcnas璁惧缁翠慨璁板綍
List<DeviceMaintenance> deviceMaintenanceList = baseMapper.selectList(Wrappers.<DeviceMaintenance>lambdaQuery()
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 2192576..fdb5a55 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -25,7 +25,7 @@
import com.ruoyi.device.pojo.*;
import com.ruoyi.device.service.DataConfigService;
import com.ruoyi.device.service.DeviceService;
-import com.ruoyi.device.service.DocumentService;
+import com.ruoyi.device.service.DeviceDocumentsService;
import com.ruoyi.device.utils.DataAcquisition;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.mapper.InsSampleMapper;
@@ -35,7 +35,6 @@
import lombok.AllArgsConstructor;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -65,11 +64,9 @@
private DataConfigService dataConfigService;
- private QrShowServiceImpl qrShowService;
-
private InsSampleMapper insSampleMapper;
- private DocumentService documentService;
+ private DeviceDocumentsService documentService;
private DeviceMetricRecordMapper deviceMetricRecordMapper;
@@ -171,7 +168,7 @@
}
deviceDto.setAuthorizedPersonName(name);
//鏌ヨ璁惧鏍″噯淇℃伅
- DeviceMetricRecord calibrate = qrShowService.getDeviceMetricRecord(id, "calibrate");
+ DeviceMetricRecord calibrate = getDeviceMetricRecord(id, "calibrate");
deviceDto.setCalibrateNo(calibrate.getCertificateSerialNumber());
// 鍒颁簡鍋滅敤鏃ユ湡锛岃嚜鍔ㄥ皢鐘舵�佹敼涓哄仠鐢�
@@ -185,6 +182,21 @@
}
}
return deviceDto;
+ }
+
+ /**
+ * 鏌ヨ璁惧鏍″噯/鏍告煡璁板綍
+ * @param deviceId
+ * @param type
+ * @return
+ */
+ public DeviceMetricRecord getDeviceMetricRecord(int deviceId, String type){
+ return Optional.ofNullable(
+ deviceMetricRecordMapper.selectOne(Wrappers.<DeviceMetricRecord>lambdaQuery()
+ .eq(DeviceMetricRecord::getDeviceId, deviceId)
+ .eq(DeviceMetricRecord::getType, type)
+ .orderByDesc(DeviceMetricRecord::getCreateTime)
+ .last("limit 1"))).orElse(new DeviceMetricRecord());
}
@Override
@@ -309,7 +321,7 @@
// 璁惧淇℃伅
Device device = baseMapper.selectById(deviceId);
// 璁惧妗ｆ
- List<Document> documentList = documentService.list(Wrappers.<Document>lambdaQuery().eq(Document::getDeviceId, deviceId));
+ List<DeviceDocuments> documentList = documentService.list(Wrappers.<DeviceDocuments>lambdaQuery().eq(DeviceDocuments::getDeviceId, deviceId));
// 璁惧鏍″噯琛�
List<DeviceMetricRecord> deviceMetricRecordList = deviceMetricRecordMapper.selectList(Wrappers.<DeviceMetricRecord>lambdaQuery().eq(DeviceMetricRecord::getDeviceId, deviceId));
// 璁惧缁翠慨琛�
@@ -411,13 +423,13 @@
* @param documentList 妗ｆ鍒楄〃
* @param documentExportWordDtoList 杩斿洖缁檞ord鐨勬暟鎹垪琛�
*/
- private static void extracted(List<Document> documentList, List<DocumentExportWordDto> documentExportWordDtoList) {
+ private static void extracted(List<DeviceDocuments> documentList, List<DocumentExportWordDto> documentExportWordDtoList) {
// 缁欐。妗堝姞搴忓彿 骞朵笖鍒嗕负宸﹀彸涓や釜鍒楄〃鍦╳ord涓樉绀�
for (int i = 0; i < documentList.size(); i++) {
// 鍒涘缓word琛ㄦ牸涓竴琛岀殑鏁版嵁瀵硅薄
DocumentExportWordDto documentExportWordDto = new DocumentExportWordDto();
// 鑾峰彇妗ｆ淇℃伅
- Document document = documentList.get(i);
+ DeviceDocuments document = documentList.get(i);
// 鏍煎紡鍖栨棩鏈�
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 鏍规嵁搴忓彿 鍒嗗埆鍔犲叆涓や釜鍒楄〃
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DocumentServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DocumentServiceImpl.java
deleted file mode 100644
index 0f905bc..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DocumentServiceImpl.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ruoyi.device.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.device.mapper.DocumentMapper;
-import com.ruoyi.device.pojo.Document;
-import com.ruoyi.device.service.DocumentService;
-import org.springframework.stereotype.Service;
-
-/**
- * 璁惧妗ｆ
- */
-@Service
-public class DocumentServiceImpl extends ServiceImpl<DocumentMapper, Document> implements DocumentService {
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/QrShowServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/QrShowServiceImpl.java
deleted file mode 100644
index bb26ed6..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/QrShowServiceImpl.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.ruoyi.device.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.basic.mapper.StructureItemParameterMapper;
-import com.ruoyi.basic.service.ProductService;
-import com.ruoyi.device.mapper.DeviceMapper;
-import com.ruoyi.device.mapper.DeviceMetricRecordMapper;
-import com.ruoyi.device.pojo.DeviceMetricRecord;
-import com.ruoyi.device.service.QrShowService;
-import com.ruoyi.inspect.mapper.InsOrderMapper;
-import com.ruoyi.inspect.service.InsOrderService;
-import com.ruoyi.system.service.CustomService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.Objects;
-import java.util.Optional;
-
-@Service
-public class QrShowServiceImpl implements QrShowService {
-
-
-
- @Autowired
- private DeviceMetricRecordMapper deviceMetricRecordMapper;
-
-
-
- /**
- * 璁＄畻鍚敤鏃堕暱
- * @param activationDate
- * @return
- */
- public double calcUsedYears(LocalDateTime activationDate) {
- if(Objects.isNull(activationDate)){
- return 0;
- }
- BigDecimal defDays = BigDecimal.valueOf(365);
- BigDecimal usedDays = BigDecimal.valueOf(Duration.between(activationDate,LocalDateTime.now()).toDays());
- return usedDays.divide(defDays,2,RoundingMode.HALF_UP).setScale(2,RoundingMode.HALF_UP).doubleValue();
- }
-
- /**
- * 璁＄畻璺濈涓嬫鏍″噯鏃ユ湡鐨勫ぉ鏁扮櫨鍒嗘瘮
- * @param startDate
- * @param endDate
- * @return
- */
- public double calcDeviceNextCheckRatio(Date startDate, Date endDate){
- if(Objects.isNull(startDate) || Objects.isNull(endDate)){
- return 0;
- }
- LocalDateTime startLocalDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
- LocalDateTime endLocalDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
- long totalDays = Duration.between(startLocalDate, endLocalDate).toDays();
- long usedDays = Duration.between(startLocalDate, LocalDateTime.now()).toDays();
- BigDecimal calcVal = BigDecimal.valueOf(usedDays).divide(BigDecimal.valueOf(totalDays),2,RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP);
- if(calcVal.compareTo(BigDecimal.ZERO)<0){
- calcVal = BigDecimal.ZERO;
- }else if(calcVal.compareTo(BigDecimal.valueOf(100))>0){
- calcVal = BigDecimal.valueOf(100);
- }
- return calcVal.doubleValue();
- }
-
- /**
- * 鏌ヨ璁惧鏍″噯/鏍告煡璁板綍
- * @param deviceId
- * @param type
- * @return
- */
- public DeviceMetricRecord getDeviceMetricRecord(int deviceId, String type){
- return Optional.ofNullable(
- deviceMetricRecordMapper.selectOne(Wrappers.<DeviceMetricRecord>lambdaQuery()
- .eq(DeviceMetricRecord::getDeviceId, deviceId)
- .eq(DeviceMetricRecord::getType, type)
- .orderByDesc(DeviceMetricRecord::getCreateTime)
- .last("limit 1"))).orElse(new DeviceMetricRecord());
- }
-
- /**
- * 鏍煎紡鍖栨棩鏈�
- * @return
- */
- public String formatDate(Date date,String formatter){
- if(Objects.isNull(date)){
- return "";
- }
- LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
- return localDateTime.format(DateTimeFormatter.ofPattern(formatter));
- }
- /**
- * 鏍煎紡鍖栨棩鏈�
- * @return
- */
- public String formatDate(LocalDate date,String formatter){
- if(Objects.isNull(date)){
- return "";
- }
- return date.format(DateTimeFormatter.ofPattern(formatter));
- }
-
-
-}
diff --git a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
index 79d1849..136b242 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
@@ -3,15 +3,4 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
- <select id="getDeviceMaintenanceParam" resultType="com.ruoyi.device.pojo.DeviceMaintenance">
- select id,device_id,device_name, device_number,management_number,content,name
- ,date from device_maintenance
- </select>
-
-
- <select id="deviceMaintenanceExport" resultType="com.ruoyi.device.excel.DeviceMaintenanceExport">
- select id, device_id, device_name, device_number, management_number, content, date, if(maintenance_type = 1, '璁″垝涓淮鎶�', '浣跨敤鍓嶅悗缁存姢'), next_date, name, comments
- from device_maintenance dm
- where dm.device_id = #{deviceId}
- </select>
</mapper>
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 22d4748..2f95736 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -134,25 +134,6 @@
return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
}
- @ApiOperation(value = "璐圭敤缁熻")
- @GetMapping("/costStatistics")
- public Result<?> costStatistics(Page page, CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
- }
-
- @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
- @GetMapping("/costStatistics2")
- public Result<?> costStatistics2(CostStatisticsDto costStatisticsDto){
- return Result.success(insOrderService.costStatistics2(costStatisticsDto));
- }
-
-
- @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
- @GetMapping("/selectSampleDefects")
- public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
- return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
- }
-
@ApiOperation(value = "鎾ら攢")
@PostMapping("/updateStatus")
@@ -193,13 +174,6 @@
Integer state = (Integer) param.get("state");
insProductService.checkUpdate(orderId,state);
return Result.success();
- }
-
-
- @ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
- @GetMapping("/export")
- public void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response) throws ServletException, IOException {
- insOrderService.export(costStatisticsDto,response);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnPassPageDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnPassPageDto.java
deleted file mode 100644
index 96111a8..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnPassPageDto.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.inspect.dto;
-
-import com.ruoyi.inspect.pojo.InsUnPass;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 鏈变匠鍚�
- * @date 2024/5/8 12:38
- */
-@Data
-public class UnPassPageDto extends InsUnPass implements Serializable {
-
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
index 96a5ca8..449c56d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
@@ -34,14 +34,8 @@
IPage<SampleProductDto2> selectSampleAndProductByOrderId(@Param("page") IPage<SampleProductDto2> page, @Param("ew") QueryWrapper<SampleProductDto2> ew, @Param("id") Integer id);
- IPage<CostStatisticsDto> selectCostStatistics(@Param("page") IPage<CostStatisticsDto> page, @Param("ew") QueryWrapper<CostStatisticsDto> ew);
-
- List<CostStatisticsDto> selectCostStatistics2(@Param("ew") QueryWrapper<CostStatisticsDto> ew);
-
List<Map<String, String>> selectDeviceList(@Param("managementNumbers") Set<String> managementNumbers);
List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
-
- Long getCount(@Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber);
String getStandardMethodCode(@Param("id") Integer id);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java
deleted file mode 100644
index 2e55796..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnPassMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.inspect.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ruoyi.inspect.dto.UnPassPageDto;
-import com.ruoyi.inspect.pojo.InsUnPass;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author 鏈变匠鍚�
- * @date 2024/5/8 13:05
- */
-public interface InsUnPassMapper extends BaseMapper<InsUnPass> {
- IPage<UnPassPageDto> pageInsUnPass(@Param("page") IPage<UnPassPageDto> page, @Param("ew") QueryWrapper<UnPassPageDto> ew);
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnPass.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnPass.java
deleted file mode 100644
index 3dfa2c8..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnPass.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.ruoyi.inspect.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author 鏈变匠鍚�
- * @date 2024/5/8 14:11
- */
-@Data
-@TableName("ins_un_pass")
-public class InsUnPass implements Serializable {
- /**
- * 涓嶅悎鏍糹d
- */
- @ApiModelProperty(value = "涓婚敭")
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- /**
- * 瑙勬牸鍨嬪彿
- */
- @ApiModelProperty("瑙勬牸鍨嬪彿")
- private String model;
- /**
- * 鏍峰搧鍚嶇О
- */
- @ApiModelProperty("鏍峰搧鍚嶇О")
- private String sample;
- /**
- * 妫�娴嬮」
- */
- @ApiModelProperty("妫�娴嬮」")
- private String inspectionItem;
- /**
- * 妫�娴嬪瓙椤�
- */
- @ApiModelProperty("妫�娴嬪瓙椤�")
- private String inspectionItemSubclass;
- /**
- * 妫�娴嬬粨鏋�
- */
- @ApiModelProperty("妫�娴嬬粨鏋�")
- @TableField("`last_value`")
- private String lastValue;
- /**
- * 澶勭悊鎰忚
- */
- @ApiModelProperty("澶勭悊鎰忚")
- private String handleSuggestion;
- /**
- * 濮旀墭缂栧彿
- */
- @ApiModelProperty("濮旀墭缂栧彿")
- private String entrustCode;
- /**
- * 鐢ㄦ埛鍚�
- */
- @ApiModelProperty("妫�楠屼汉")
- private String name;
-
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @ApiModelProperty("淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
-
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
index e845236..e666245 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -39,16 +39,9 @@
IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto);
- IPage<CostStatisticsDto> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);
-
- Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto);
-
- Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
int updateStatus(Integer id);
-
- void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException;
// 鑾峰彇ifs搴撳瓨淇℃伅
void getIfsOrder();
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnPassService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnPassService.java
deleted file mode 100644
index fd63ba1..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnPassService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.inspect.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.dto.UnPassPageDto;
-import com.ruoyi.inspect.pojo.InsUnPass;
-
-import java.util.Map;
-
-/**
- * @author 鏈变匠鍚�
- * @date 2024/5/8 13:00
- */
-public interface InsUnPassService extends IService<InsUnPass> {
-
- IPage<UnPassPageDto> pageInsUnPass(Page page, UnPassPageDto unPassPageDto);
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index d366471..0a6305f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -119,8 +119,6 @@
@Resource
private InsProductUserMapper insProductUserMapper;
@Resource
- private InsUnPassService insUnPassService;
- @Resource
private AuxiliaryOutputWorkingHoursService auxiliaryOutputWorkingHoursService;
@Resource
private AuxiliaryOutputWorkingHoursTemporaryService auxiliaryOutputWorkingHoursTemporaryService;
@@ -132,7 +130,6 @@
private CustomMapper customMapper;
@Value("${file.path}")
private String imgUrl;
-
@Resource
private InsOrderFileMapper insOrderFileMapper;
@Resource
@@ -1116,7 +1113,6 @@
* @param orderId
*/
private void generateReport(Integer orderId) {
- List<InsUnPass> insUnPasses = new ArrayList<>();
/*鏍峰搧涓嬬殑椤圭洰鍙鏈変竴涓」鐩笉鍚堟牸鍒欐楠岀粨鏋滀负0,鍚﹀垯涓�1*/
//杩欓噷鐨刬nsSamples鏄鍗曚笅鐨勬墍鏈夋牱鍝佸寘鎷�("/")
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
@@ -1132,25 +1128,7 @@
insSample.setInsResult(1);
}
insSampleMapper.updateById(insSample);
- /*澶嶆牳閫氳繃鍚庯紝灏嗕笉鍚堟牸鐨勯」鐩俊鎭坊鍔犲埌ins_un_pass琛ㄤ腑*/
- for (InsProduct insProduct : insProducts) {
- if (insProduct.getInsResult() == 0) {
- InsUnPass insUnPass = new InsUnPass();
- insUnPass.setId(null);
- insUnPass.setModel(insSample.getModel());
- insUnPass.setSample(insSample.getSample());
- insUnPass.setInspectionItem(insProduct.getInspectionItem());
- insUnPass.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());
- insUnPass.setLastValue(insProduct.getLastValue());
- insUnPass.setEntrustCode(insOrderMapper.selectById(orderId).getEntrustCode());
- List<Integer> userIds = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().eq(InsProductUser::getInsProductId, insProduct.getId())).stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList());
- String name = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(","));
- insUnPass.setName(name);
- insUnPasses.add(insUnPass);
- }
- }
}
- insUnPassService.saveBatch(insUnPasses);
InsOrder insOrder = insOrderMapper.selectById(orderId);
// 鎶芥鍙樻垚濮旀墭妫�楠�
if (insOrder.getOrderType().equals(InsOrderTypeConstants.SPOT_CHECK)) {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index ae86eed..28495bc 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -557,112 +557,12 @@
return productDto2IPage;
}
- @Override
- public IPage<CostStatisticsDto> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto) {
- String dates = costStatisticsDto.getDates();
- String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- costStatisticsDto.setDates(null);
-
- //todo:浠呯湅鑷繁
-
- IPage<CostStatisticsDto> dtoIPage = insOrderMapper.selectCostStatistics(page, QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
- List<CostStatisticsDto> collect = dtoIPage.getRecords().stream().map(dto -> {
- Set<String> uniqueTags = new HashSet<>();
- if (dto.getInspectionItem().contains(",")) {
- for (String s : dto.getInspectionItem().split(",")) {
- uniqueTags.add(s.split("@")[0]);
- }
- } else {
- uniqueTags.add(dto.getInspectionItem().split("@")[0]);
- }
- dto.setInspectionItem(uniqueTags.toString());
- return dto;
- }).collect(Collectors.toList());
- dtoIPage.setRecords(collect);
- return dtoIPage;
- }
-
- @Override
- public Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto) {
- Map<String, Object> map = new HashMap<>();
- String dates = costStatisticsDto.getDates();
- String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- costStatisticsDto.setDates(null);
- List<CostStatisticsDto> costStatisticsDtos = insOrderMapper.selectCostStatistics2(QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
- double totalPrice = costStatisticsDtos.stream()
- .filter(dto -> dto.getPrice() != null) // 杩囨护鎺変环鏍间负 null 鐨勫璞�
- .mapToDouble(value -> value.getPrice().doubleValue() * value.getNum())
- .sum();
- map.put("total", totalPrice);
- return map;
- }
-
- @Override
- public Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber) {
- List<SampleDefectsFatherVo> sampleDefectsFatherVos = insOrderMapper.selectSampleDefects(page, inspectionItems, orderNumber);
- Map<String, Object> map = new HashMap<>();
- map.put("records", sampleDefectsFatherVos);
- Long aLong = insOrderMapper.getCount(inspectionItems, orderNumber);
- map.put("total", aLong);
- return map;
- }
@Override
public int updateStatus(Integer id) {
return insOrderMapper.updateStatus(id);
}
-
- @Override
- public void export(CostStatisticsDto costStatisticsDto, HttpServletResponse response) throws IOException {
- //鏌ヨ瀵煎嚭鐨勮垂鐢ㄧ粺璁℃暟鎹�
- String dates = costStatisticsDto.getDates();
- String[] split = dates.replaceAll("\\[", "").replaceAll("]", "").replaceAll("\"", "").split(",");
- costStatisticsDto.setDates(null);
- List<CostStatisticsDto> costStatisticsDtos = insOrderMapper.selectCostStatistics2(QueryWrappers.queryWrappers(costStatisticsDto).ge("create_time", split[0]).le("create_time", split[1] + " 23:59:59"));
- costStatisticsDtos = costStatisticsDtos.stream().map(dto -> {
- Set<String> uniqueTags = new HashSet<>();
- if (dto.getInspectionItem().contains(",")) {
- for (String s : dto.getInspectionItem().split(",")) {
- uniqueTags.add(s.split("@")[0]);
- }
- } else {
- uniqueTags.add(dto.getInspectionItem().split("@")[0]);
- }
- dto.setInspectionItem(uniqueTags.toString());
- return dto;
- }).collect(Collectors.toList());
-
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("UTF-8");
- // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
- String fileName = URLEncoder.encode("鏍峰搧璐圭敤缁熻瀵煎嚭", "UTF-8");
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- Map<String, List<CostStatisticsDto>> groupByCompany =
- costStatisticsDtos.stream().filter(e -> StrUtil.isNotEmpty(e.getCompany()))
- .collect(Collectors.groupingBy(CostStatisticsDto::getCompany));
- try {
- // 鏂板缓ExcelWriter
- // 鏂板缓ExcelWriter
- ExcelWriter excelWriter =
- EasyExcel.write(response.getOutputStream())
- .registerWriteHandler(new SimpleColumnWidthStyleStrategy(25))
- .build();
- for (Map.Entry<String, List<CostStatisticsDto>> companyDataEntry : groupByCompany.entrySet()) {
- String sheetName = companyDataEntry.getKey();
- List<CostStatisticsDto> dataList = companyDataEntry.getValue();
- WriteSheet mainSheet = EasyExcel.writerSheet(sheetName)
- .head(CostStatisticsDto.class)
- .registerWriteHandler(new SimpleColumnWidthStyleStrategy(25))
- .build();
- excelWriter.write(dataList, mainSheet);
- }
- // 鍏抽棴娴�
- excelWriter.finish();
- } catch (IOException e) {
- throw new RuntimeException("瀵煎嚭澶辫触");
- }
- }
/**
* 鑾峰彇ifs搴撳瓨淇℃伅
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnPassServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnPassServiceImpl.java
deleted file mode 100644
index 6c7dc54..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnPassServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.inspect.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.dto.UnPassPageDto;
-import com.ruoyi.inspect.mapper.InsUnPassMapper;
-import com.ruoyi.inspect.pojo.InsUnPass;
-import com.ruoyi.inspect.service.InsUnPassService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author 鏈变匠鍚�
- * @date 2024/5/8 13:02
- */
-@Service
-public class InsUnPassServiceImpl extends ServiceImpl<InsUnPassMapper, InsUnPass> implements InsUnPassService {
-
- @Resource
- private InsUnPassMapper insUnPassMapper;
-
- @Override
- public IPage<UnPassPageDto> pageInsUnPass(Page page, UnPassPageDto unPassPageDto) {
- return insUnPassMapper.pageInsUnPass(page, QueryWrappers.queryWrappers(unPassPageDto));
- }
-}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 2eb8e88..01a3ecf 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -178,60 +178,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="selectCostStatistics" resultType="com.ruoyi.inspect.dto.CostStatisticsDto">
- select * from (
- SELECT A.id,
- A.entrust_code,
- A.create_time,
- A.sample,
- A.model,
- A.inspection_item,
- A.company,
- A.`name`,
- COUNT(1) num,
- SUM(A.price) price,
- SUM(A.cost) cost
- FROM
- (SELECT
- i.id,
- i.entrust_code,
- i.create_time,
- isa.sample,
- isa.sample_code,
- isa.model,
- c.price,
- c.cost,
- c.inspection_item,
- i.company,
- u.`name`,
- i.create_user,
- c.ins_sample_id
- FROM
- ins_order i
- LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
- LEFT JOIN `user` u ON u.id = i.user_id
- left join custom cus on cus.id = u.company
- LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,
- GROUP_CONCAT(b.inspection_item2
- SEPARATOR ',')
- inspection_item from (select * ,
- GROUP_CONCAT(CONCAT(inspection_item,'@',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL GROUP BY ins_sample_id,man_hour_group) b GROUP
- BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
- where (i.state = 1 or i.state = 3 or i.state = 4) and c.ins_sample_id IS not NULL)A
- GROUP BY
- A.id,
- A.entrust_code,
- A.create_time,
- A.sample,
- A.model,
- A.inspection_item,
- A.company,
- A.`name`
- ) B
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
+
<select id="selectDeviceList" resultType="java.util.Map">
select device_name,
en_device_name,
@@ -272,28 +219,6 @@
</if>
</select>
- <select id="getCount" resultType="long">
- select count(1)
- from (
- SELECT io.entrust_code,sam.sample,ip.inspection_item,u.name,b.create_time, sam.id
- from ins_order io
- left JOIN ins_sample sam on io.id=sam.ins_order_id
- LEFT JOIN ins_product ip on ip.ins_sample_id=sam.id
- LEFT JOIN
- (SELECT create_time,create_user,ins_product_id FROM (select * FROM ins_product_user ORDER BY
- ins_product_user.create_time DESC) a GROUP BY a.ins_product_id) b
- on b.ins_product_id=ip.id
- left JOIN `user` u on u.id=b.create_user
- where (ip.ins_result=0 OR ip.state=0)
- <if test="inspectionItems != null and inspectionItems != ''">
- and inspection_item like concat('%', #{inspectionItems}, '%')
- </if>
- <if test="orderNumber != null and orderNumber != ''">
- and io.entrust_code like concat('%', #{orderNumber}, '%')
- </if>
- ) temp
- </select>
-
<select id="getStandardMethodCode" resultType="java.lang.String">
select code
from standard_method
@@ -312,77 +237,6 @@
where son_laboratory = #{laboratory}
and ins_sample_id in
(select id from ins_sample where ins_order_id = #{id}))
- </select>
-
- <select id="selectCostStatistics2" resultType="com.ruoyi.inspect.dto.CostStatisticsDto">
- select * from (
- SELECT A.id,
- A.entrust_code,
- A.create_time,
- A.sample,
- A.model,
- A.inspection_item,
- A.company,
- A.`name`,
- production,
- engineering,
- COUNT(1) num,
- SUM(A.price) price,
- SUM(A.cost) cost
- FROM
- (SELECT
- i.id,
- i.entrust_code,
- i.create_time,
- isa.sample,
- isa.sample_code,
- isa.model,
- c.price,
- c.cost,
- c.inspection_item,
- i.company,
- u.`name`,
- i.create_user,
- c.ins_sample_id,
- production,
- engineering
- FROM
- ins_order i
- LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
- LEFT JOIN `user` u ON u.id = i.user_id
- left join custom cus on cus.id = u.company
- LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,
- GROUP_CONCAT(b.inspection_item2
- SEPARATOR ',')
- inspection_item from (select * ,
- GROUP_CONCAT(CONCAT(inspection_item,'@',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL GROUP BY ins_sample_id,man_hour_group) b GROUP
- BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
- where (i.state = 1 or i.state = 3 or i.state = 4) and c.ins_sample_id IS not NULL)A
- GROUP BY
- A.id,
- A.entrust_code,
- A.create_time,
- A.sample,
- A.model,
- A.inspection_item,
- A.company,
- A.`name`,
- production,
- engineering
- ORDER BY
- A.id,
- A.entrust_code,
- A.create_time,
- A.sample,
- A.model,
- A.inspection_item,
- A.company,
- A.`name`,
- production,
- engineering) B
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
</select>
<select id="seldepLimsId" resultType="java.lang.String">
diff --git a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
deleted file mode 100644
index 8a22fe9..0000000
--- a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.inspect.mapper.InsUnPassMapper">
-
- <select id="pageInsUnPass" resultType="com.ruoyi.inspect.dto.UnPassPageDto">
- SELECT * FROM
- ins_un_pass iu
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-</mapper>
--
Gitblit v1.9.3